Merge branch 'busybox' into merge

1 files changed, 6 insertions, 3 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index 71e3a723f..6cc189272 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -281,7 +281,7 @@
 //usage:        IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -i              Inetd mode"
 //usage:        )
-//usage:     "\n        -f              Don't daemonize"
+//usage:     "\n        -f              Run in foreground"
 //usage:     "\n        -v[v]           Verbose"
 //usage:     "\n        -p [IP:]PORT    Bind to IP:PORT (default *:"STR(CONFIG_FEATURE_HTTPD_PORT_DEFAULT)")"
 //usage:        IF_FEATURE_HTTPD_SETUID(
@@ -1918,14 +1918,17 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
                 send_headers(HTTP_OK);
 #if ENABLE_FEATURE_USE_SENDFILE
         {
-                off_t offset = (range_start < 0) ? 0 : range_start;
+                off_t offset;
+                if (range_start < 0)
+                        range_start = 0;
+                offset = range_start;
                 while (1) {
                         /* sz is rounded down to 64k */
                         ssize_t sz = MAXINT(ssize_t) - 0xffff;
                         IF_FEATURE_HTTPD_RANGES(if (sz > range_len) sz = range_len;)
                         count = sendfile(STDOUT_FILENO, fd, &offset, sz);
                         if (count < 0) {
-                                if (offset == range_start)
+                                if (offset == range_start) /* was it the very 1st sendfile? */
                                         break; /* fall back to read/write loop */
                                 goto fin;
                         }