apply post-1.18.1 patches, bump version to 1.18.21_18_2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 13 insertions, 27 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index fa42d9850..b8113a843 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1522,6 +1522,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
                         struct stat sb;
                         fstat(fd, &sb);
                         file_size = sb.st_size;
+                        last_mod = sb.st_mtime;
                 } else {
                         IF_FEATURE_HTTPD_GZIP(content_gzip = 0;)
                         fd = open(url, O_RDONLY);
diff --git a/networking/tftp.c b/networking/tftp.c
index 04c8f0ebb..fcd933f6a 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -105,39 +105,22 @@ struct BUG_G_too_big {
 #define error_pkt_str    (error_pkt + 4)
 
 #if ENABLE_FEATURE_TFTP_PROGRESS_BAR
-/* SIGALRM logic nicked from the wget applet */
-static void progress_meter(int flag)
+static void tftp_progress_update(void)
 {
-        /* We can be called from signal handler */
-        int save_errno = errno;
-
-        if (flag == -1) { /* first call to progress_meter */
-                bb_progress_init(&G.pmt);
-        }
-
         bb_progress_update(&G.pmt, G.file, 0, G.pos, G.size);
-
-        if (flag == 0) {
-                /* last call to progress_meter */
-                alarm(0);
-                bb_putchar_stderr('\n');
-        } else {
-                if (flag == -1) { /* first call to progress_meter */
-                        signal_SA_RESTART_empty_mask(SIGALRM, progress_meter);
-                }
-                alarm(1);
-        }
-
-        errno = save_errno;
 }
 static void tftp_progress_init(void)
 {
-        progress_meter(-1);
+        bb_progress_init(&G.pmt);
+        tftp_progress_update();
 }
 static void tftp_progress_done(void)
 {
-        if (G.pmt.inited)
-                progress_meter(0);
+        if (G.pmt.inited) {
+                tftp_progress_update();
+                bb_putchar_stderr('\n');
+                G.pmt.inited = 0;
+        }
 }
 #else
 # define tftp_progress_init() ((void)0)
@@ -460,9 +443,10 @@ static int tftp_protocol(
                 xsendto(socket_fd, xbuf, send_len, &peer_lsa->u.sa, peer_lsa->len);
 
 #if ENABLE_FEATURE_TFTP_PROGRESS_BAR
-                if (ENABLE_TFTP && remote_file) { /* tftp */
+                if (ENABLE_TFTP && remote_file) /* tftp */
                         G.pos = (block_nr - 1) * (uoff_t)blksize;
-                }
+                if (G.pmt.inited)
+                        tftp_progress_update();
 #endif
                 /* Was it final ACK? then exit */
                 if (finished && (opcode == TFTP_ACK))
@@ -479,6 +463,7 @@ static int tftp_protocol(
                 case 0:
                         retries--;
                         if (retries == 0) {
+                                tftp_progress_done();
                                 bb_error_msg("timeout");
                                 goto ret; /* no err packet sent */
                         }