Changeset 17726

Timestamp:

10/08/11 15:43:28 (20 months ago)

Author:

BrainSlayer

Message:

migrate latest patches to busybox

Location:

src/router/busybox

Files:

• .config_laguna (modified) (1 diff)
• applets/applet_tables.c (modified) (1 diff)
• coreutils/tail.c (modified) (3 diffs)
• include/platform.h (modified) (1 diff)
• loginutils/chpasswd.c (modified) (5 diffs)
• miscutils/crond.c (modified) (1 diff)
• networking/inetd.c (modified) (4 diffs)
• networking/tftp.c (modified) (1 diff)
• sysklogd/syslogd.c (modified) (2 diffs)
• testsuite/tail.tests (modified) (1 diff)

src/router/busybox/.config_laguna

@@ -813 +813 @@
 CONFIG_FEATURE_TFTP_PUT=y
 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
 # CONFIG_TFTP_DEBUG is not set
 CONFIG_TRACEROUTE=y

src/router/busybox/applets/applet_tables.c

@@ -81 +81 @@
         printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
         if (NUM_APPLETS == 1) {
+                char *dash_to_underscore, *p;
                 printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
-                printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
+                /* Example: "ether-wake" -> "ether_wake" */
+                p = dash_to_underscore = strdup(applets[0].name);
+                p--;
+                while (*++p)
+                        if (*p == '-')
+                                *p = '_';
+                printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore);
         }
         printf("\n");

src/router/busybox/coreutils/tail.c

@@ -204 +204 @@
 
                 if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
-                        continue; /* may happen with -E */
+                        continue; /* may happen with -F */
 
                 if (nfiles > header_threshhold) {
@@ -253 +253 @@
                 seen = 1;
                 newlines_seen = 0;
-                while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) {
+                while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
                         if (G.from_top) {
                                 int nwrite = nread;
@@ -260 +260 @@
                                         if (COUNT_BYTES) {
                                                 nwrite -= (count - seen);
-                                                seen = count;
+                                                seen += nread;
                                         } else {
                                                 char *s = buf;

src/router/busybox/include/platform.h

@@ -434 +434 @@
 #endif
 
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(__ANDROID__)
 # undef HAVE_DPRINTF
 # undef HAVE_GETLINE

src/router/busybox/loginutils/chpasswd.c

@@ -34 +34 @@
 int chpasswd_main(int argc UNUSED_PARAM, char **argv)
 {
-        char *name, *pass;
-        char salt[sizeof("$N$XXXXXXXX")];
-        int opt, rc;
+        char *name;
+        int opt;
 
         if (getuid() != 0)
@@ -46 +45 @@
 
         while ((name = xmalloc_fgetline(stdin)) != NULL) {
+                char *free_me;
+                char *pass;
+                int rc;
+
                 pass = strchr(name, ':');
                 if (!pass)
@@ -53 +56 @@
                 xuname2uid(name); /* dies if there is no such user */
 
+                free_me = NULL;
                 if (!(opt & OPT_ENC)) {
+                        char salt[sizeof("$N$XXXXXXXX")];
+
                         crypt_make_salt(salt, 1);
                         if (opt & OPT_MD5) {
@@ -61 +67 @@
                                 crypt_make_salt(salt + 3, 4);
                         }
-                        pass = pw_encrypt(pass, salt, 0);
+                        free_me = pass = pw_encrypt(pass, salt, 0);
                 }
 
@@ -82 +88 @@
                 logmode = LOGMODE_STDIO;
                 free(name);
-                if (!(opt & OPT_ENC))
-                        free(pass);
+                free(free_me);
         }
         return EXIT_SUCCESS;

src/router/busybox/miscutils/crond.c

@@ -862 +862 @@
         /* "-b after -f is ignored", and so on for every pair a-b */
         opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
-                        ":l+:d+"; /* -l and -d have numeric param */
+                        /* -l and -d have numeric param */
+                        ":l+" IF_FEATURE_CROND_D(":d+");
         opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
                         &G.log_level, &G.log_filename, &G.crontab_dir_name

src/router/busybox/networking/inetd.c

@@ -1279 +1279 @@
                                                         rearm_alarm(); /* will revive it in RETRYTIME sec */
                                                         restore_sigmask(&omask);
+                                                        maybe_close(new_udp_fd);
                                                         maybe_close(accepted_fd);
                                                         continue; /* -> check next fd in fd set */
@@ -1299 +1300 @@
                                         sleep(1);
                                         restore_sigmask(&omask);
+                                        maybe_close(new_udp_fd);
                                         maybe_close(accepted_fd);
                                         continue; /* -> check next fd in fd set */
@@ -1305 +1307 @@
                                         pid--; /* -1: "we did fork and we are child" */
                         }
-                        /* if pid == 0 here, we never forked */
+                        /* if pid == 0 here, we didn't fork */
 
                         if (pid > 0) { /* parent */
                                 if (sep->se_wait) {
-                                        /* tcp wait: we passed listening socket to child,
+                                        /* wait: we passed socket to child,
                                          * will wait for child to terminate */
                                         sep->se_wait = pid;
@@ -1346 +1348 @@
                         /* "nowait" udp */
                         if (new_udp_fd >= 0) {
-                                len_and_sockaddr *lsa = xzalloc_lsa(sep->se_family);
+                                len_and_sockaddr *lsa;
+                                int r;
+
+                                close(new_udp_fd);
+                                lsa = xzalloc_lsa(sep->se_family);
                                 /* peek at the packet and remember peer addr */
-                                int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
+                                r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
                                         &lsa->u.sa, &lsa->len);
                                 if (r < 0)

src/router/busybox/networking/tftp.c

@@ -814 +814 @@
         }
         mode = local_file + strlen(local_file) + 1;
-        if (mode >= block_buf + result || strcmp(mode, "octet") != 0) {
+        /* RFC 1350 says mode string is case independent */
+        if (mode >= block_buf + result || strcasecmp(mode, "octet") != 0) {
                 goto err;
         }

src/router/busybox/sysklogd/syslogd.c

@@ -279 +279 @@
 
         parser = config_open2(file ? file : "/etc/syslog.conf",
-                                file ? xfopen_for_read : fopen_or_warn_stdin);
+                                file ? xfopen_for_read : fopen_for_read);
         if (!parser)
                 /* didn't find default /etc/syslog.conf */
@@ -679 +679 @@
 #if ENABLE_FEATURE_IPC_SYSLOG
                 if ((option_mask32 & OPT_circularlog) && G.shbuf) {
-                        log_to_shmem(msg);
+                        log_to_shmem(G.printbuf);
                         return;
                 }

src/router/busybox/testsuite/tail.tests

@@ -15 +15 @@
         "" "qw"
 
+testing "tail: -c +N with largish N" \
+        "
+        dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8200 | wc -c;
+        dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8208 | wc -c;
+        " \
+        "8185\n8177\n" \
+        "" ""
+
 exit $FAILCOUNT