Changeset 12069

Timestamp:

05/09/09 11:18:51 (4 years ago)

Author:

BrainSlayer

Message:

update to 1.13.4

Location:

src/router/busybox

Files:

• Makefile (modified) (1 diff)
• archival/libunarchive/get_header_tar.c (modified) (2 diffs)
• archival/tar.c (modified) (1 diff)
• coreutils/tail.c (modified) (1 diff)
• shell/ash.c (modified) (34 diffs)
• shell/hush.c (modified) (8 diffs)
• shell/hush_test/hush-parsing/starquoted2.right (modified) (1 diff)
• shell/hush_test/hush-parsing/starquoted2.tests (modified) (1 diff)
• util-linux/volume_id/get_devname.c (modified) (1 diff)

src/router/busybox/Makefile

@@ -1 +1 @@
 VERSION = 1
 PATCHLEVEL = 13
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME = Unnamed

src/router/busybox/archival/libunarchive/get_header_tar.c

@@ -92 +92 @@
  again_after_align:
 
-#if ENABLE_DESKTOP
+#if ENABLE_DESKTOP || ENABLE_FEATURE_TAR_AUTODETECT
         /* to prevent misdetection of bz2 sig */
         *(uint32_t*)(&tar) = 0;
@@ -143 +143 @@
                 char FAST_FUNC (*get_header_ptr)(archive_handle_t *);
 
- USE_DESKTOP(autodetect:)
+ autodetect:
                 /* tar gz/bz autodetect: check for gz/bz2 magic.
                  * If we see the magic, and it is the very first block,

src/router/busybox/archival/tar.c

@@ -935 +935 @@
                         tar_handle->seek = seek_by_read;
                 } else {
-                        if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) {
-                                get_header_ptr = get_header_tar;
+                        if (ENABLE_FEATURE_TAR_AUTODETECT
+                         && get_header_ptr == get_header_tar
+                         && flags == O_RDONLY
+                        ) {
                                 tar_handle->src_fd = open_zipped(tar_filename);
                                 if (tar_handle->src_fd < 0)

src/router/busybox/coreutils/tail.c

@@ -105 +105 @@
          && isdigit(argv[1][1])
         ) {
-                count = eat_num(&argv[1][1]);
+                count = eat_num(argv[1]);
                 argv++;
                 argc--;

src/router/busybox/shell/ash.c

@@ -31 +31 @@
 
 /*
- * The follow should be set to reflect the type of system you have:
+ * The following should be set to reflect the type of system you have:
  *      JOBS -> 1 if you have Berkeley job control, 0 otherwise.
  *      define SYSV if you are running under System V.
@@ -41 +41 @@
  */
 #define DEBUG 0
+/* Tweak debug output verbosity here */
+#define DEBUG_TIME 0
+#define DEBUG_PID 1
+#define DEBUG_SIG 1
+
 #define PROFILE 0
 
@@ -48 +53 @@
 
 #if DEBUG
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+# endif
 #endif
 
@@ -58 +63 @@
 #include <fnmatch.h>
 #if JOBS || ENABLE_ASH_READ_NCHARS
-#include <termios.h>
+# include <termios.h>
 #endif
 
 #ifndef PIPE_BUF
-#define PIPE_BUF 4096           /* amount of buffering in a pipe */
+# define PIPE_BUF 4096           /* amount of buffering in a pipe */
 #endif
 
 #if defined(__uClinux__)
-#error "Do not even bother, ash will not run on uClinux"
+# error "Do not even bother, ash will not run on uClinux"
 #endif
 
@@ -75 +80 @@
 #define ATABSIZE 39
 #define CMDTABLESIZE 31         /* should be prime */
-
-
-/* ============ Misc helpers */
-
-#define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0)
-
-/* C99 say: "char" declaration may be signed or unsigned default */
-#define signed_char2int(sc) ((int)((signed char)sc))
 
 
@@ -246 +243 @@
 
 
+/* ============ DEBUG */
+#if DEBUG
+static void trace_printf(const char *fmt, ...);
+static void trace_vprintf(const char *fmt, va_list va);
+# define TRACE(param)    trace_printf param
+# define TRACEV(param)   trace_vprintf param
+# define close(f) do { \
+        int dfd = (f); \
+        if (close(dfd) < 0) \
+                bb_error_msg("bug on %d: closing %d(%x)", \
+                        __LINE__, dfd, dfd); \
+} while (0)
+#else
+# define TRACE(param)
+# define TRACEV(param)
+#endif
+
+
 /* ============ Utility functions */
+#define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0)
+
+/* C99 say: "char" declaration may be signed or unsigned by default */
+#define signed_char2int(sc) ((int)(signed char)(sc))
+
 static int isdigit_str9(const char *str)
 {
@@ -285 +305 @@
         longjmp(exception_handler->loc, 1);
 }
+#if DEBUG
+#define raise_exception(e) do { \
+        TRACE(("raising exception %d on line %d\n", (e), __LINE__)); \
+        raise_exception(e); \
+} while (0)
+#endif
 
 /*
@@ -317 +343 @@
         /* NOTREACHED */
 }
+#if DEBUG
+#define raise_interrupt() do { \
+        TRACE(("raising interrupt on line %d\n", __LINE__)); \
+        raise_interrupt(); \
+} while (0)
+#endif
 
 #if ENABLE_ASH_OPTIMIZE_FOR_SIZE
@@ -335 +367 @@
 }
 #define FORCE_INT_ON force_int_on()
-#else
+
+#else /* !ASH_OPTIMIZE_FOR_SIZE */
+
 #define INT_ON do { \
         xbarrier(); \
@@ -347 +381 @@
                 raise_interrupt(); \
 } while (0)
-#endif /* ASH_OPTIMIZE_FOR_SIZE */
+#endif /* !ASH_OPTIMIZE_FOR_SIZE */
 
 #define SAVE_INT(v) ((v) = suppressint)
@@ -377 +411 @@
 {
         gotsig[signo - 1] = 1;
-        pendingsig = signo;
 
         if (/* exsig || */ (signo == SIGINT && !trap[SIGINT])) {
@@ -385 +418 @@
                 }
                 intpending = 1;
+        } else {
+                pendingsig = signo;
         }
 }
@@ -685 +720 @@
         if (debug != 1)
                 return;
+        if (DEBUG_TIME)
+                fprintf(tracefile, "%u ", (int) time(NULL));
+        if (DEBUG_PID)
+                fprintf(tracefile, "[%u] ", (int) getpid());
+        if (DEBUG_SIG)
+                fprintf(tracefile, "pending s:%d i:%d(supp:%d) ", pendingsig, intpending, suppressint);
         va_start(va, fmt);
         vfprintf(tracefile, fmt, va);
@@ -695 +736 @@
         if (debug != 1)
                 return;
+        if (DEBUG_TIME)
+                fprintf(tracefile, "%u ", (int) time(NULL));
+        if (DEBUG_PID)
+                fprintf(tracefile, "[%u] ", (int) getpid());
+        if (DEBUG_SIG)
+                fprintf(tracefile, "pending s:%d i:%d(supp:%d) ", pendingsig, intpending, suppressint);
         vfprintf(tracefile, fmt, va);
 }
@@ -998 +1045 @@
         shtree(n, 1, NULL, stdout);
 }
-
-#define TRACE(param)    trace_printf param
-#define TRACEV(param)   trace_vprintf param
-
-#else
-
-#define TRACE(param)
-#define TRACEV(param)
 
 #endif /* DEBUG */
@@ -3780 +3819 @@
         pid = waitpid(-1, &status,
                         (doing_jobctl ? (wait_flags | WUNTRACED) : wait_flags));
-        TRACE(("wait returns pid=%d, status=0x%x\n", pid, status));
+        TRACE(("wait returns pid=%d, status=0x%x, errno=%d(%s)\n", pid, status, errno, strerror(errno)));
 
         if (pid <= 0) {
@@ -5032 +5071 @@
                         /* NTOFD/NFROMFD: copy redir->ndup.dupfd to fd */
                         if (redir->ndup.dupfd < 0) { /* "fd>&-" */
-                                close(fd);
+                                /* Don't want to trigger debugging */
+                                if (fd != -1)
+                                        close(fd);
                         } else {
                                 copyfd(redir->ndup.dupfd, fd | COPYFD_EXACT);
@@ -5085 +5126 @@
                                 copyfd(copy, fd | COPYFD_EXACT);
                         }
-                        close(copy);
+                        close(copy & ~COPYFD_RESTORE);
                 }
         }
@@ -7872 +7913 @@
         xbarrier();
 
+        TRACE(("dotrap entered\n"));
         for (i = 1, q = gotsig; i < NSIG; i++, q++) {
                 if (!*q)
                         continue;
+
+                p = trap[i];
+                /* non-trapped SIGINT is handled separately by raise_interrupt,
+                 * don't upset it by resetting gotsig[SIGINT-1] */
+                if (i == SIGINT && !p)
+                        continue;
+
+                TRACE(("sig %d is active, will run handler '%s'\n", i, p));
                 *q = '\0';
-
-                p = trap[i];
                 if (!p)
                         continue;
                 skip = evalstring(p, SKIPEVAL);
                 exitstatus = savestatus;
-                if (skip)
+                if (skip) {
+                        TRACE(("dotrap returns %d\n", skip));
                         return skip;
-        }
-
+                }
+        }
+
+        TRACE(("dotrap returns 0\n"));
         return 0;
 }
@@ -7907 +7958 @@
 evaltree(union node *n, int flags)
 {
-
         struct jmploc *volatile savehandler = exception_handler;
         struct jmploc jmploc;
@@ -7913 +7963 @@
         void (*evalfn)(union node *, int);
         int status;
+        int int_level;
+
+        SAVE_INT(int_level);
 
         if (n == NULL) {
@@ -7918 +7971 @@
                 goto out1;
         }
-        TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
-                        getpid(), n, n->type, flags));
+        TRACE(("evaltree(%p: %d, %d) called\n", n, n->type, flags));
 
         exception_handler = &jmploc;
@@ -7926 +7978 @@
                 if (err) {
                         /* if it was a signal, check for trap handlers */
-                        if (exception == EXSIG)
+                        if (exception == EXSIG) {
+                                TRACE(("exception %d (EXSIG) in evaltree, err=%d\n", exception, err));
                                 goto out;
+                        }
                         /* continue on the way out */
+                        TRACE(("exception %d in evaltree, propagating err=%d\n", exception, err));
                         exception_handler = savehandler;
                         longjmp(exception_handler->loc, err);
@@ -8011 +8066 @@
                         n = n->nif.ifpart;
                         goto evaln;
-                } else if (n->nif.elsepart) {
+                }
+                if (n->nif.elsepart) {
                         n = n->nif.elsepart;
                         goto evaln;
@@ -8037 +8093 @@
                 raise_exception(EXEXIT);
         }
+
+        RESTORE_INT(int_level);
+        TRACE(("leaving evaltree (no interrupts)\n"));
 }
 
@@ -8282 +8341 @@
                         close(prevfd);
                 prevfd = pip[0];
-                close(pip[1]);
+                /* Don't want to trigger debugging */
+                if (pip[1] != -1)
+                        close(pip[1]);
         }
         if (n->npipe.pipe_backgnd == 0) {
@@ -8914 +8975 @@
                                 exitstatus = waitforjob(jp);
                                 INT_ON;
+                                TRACE(("forked child exited with %d\n", exitstatus));
                                 break;
                         }
@@ -12392 +12454 @@
 
         status = 0;
-        startword = 1;
+        startword = 2;
         backslash = 0;
 #if ENABLE_ASH_READ_TIMEOUT
@@ -12400 +12462 @@
         STARTSTACKSTR(p);
         do {
+                const char *is_ifs;
+
 #if ENABLE_ASH_READ_TIMEOUT
                 if (end_ms) {
@@ -12429 +12493 @@
                 }
                 if (!rflag && c == '\\') {
-                        backslash++;
+                        backslash = 1;
                         continue;
                 }
                 if (c == '\n')
                         break;
-                if (startword && *ifs == ' ' && strchr(ifs, c)) {
+                is_ifs = strchr(ifs, c);
+                if (startword && is_ifs) {
+                        if (isspace(c))
+                                continue;
+                        /* non-space ifs char */
+                        startword--;
+                        if (startword == 1) /* first one? */
+                                continue;
+                }
+                startword = 0;
+                if (ap[1] != NULL && is_ifs) {
+                        const char *beg;
+                        STACKSTRNUL(p);
+                        beg = stackblock();
+                        setvar(*ap, beg, 0);
+                        ap++;
+                        /* can we skip one non-space ifs? (2: yes) */
+                        startword = isspace(c) ? 2 : 1;
+                        STARTSTACKSTR(p);
                         continue;
                 }
-                startword = 0;
-                if (ap[1] != NULL && strchr(ifs, c) != NULL) {
-                        STACKSTRNUL(p);
-                        setvar(*ap, stackblock(), 0);
-                        ap++;
-                        startword = 1;
-                        STARTSTACKSTR(p);
-                } else {
  put:
-                        STPUTC(c, p);
-                }
+                STPUTC(c, p);
         }
 /* end of do {} while: */
@@ -12461 +12534 @@
 
         STACKSTRNUL(p);
-        /* Remove trailing blanks */
-        while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL)
+        /* Remove trailing space ifs chars */
+        while ((char *)stackblock() <= --p && isspace(*p) && strchr(ifs, *p) != NULL)
                 *p = '\0';
         setvar(*ap, stackblock(), 0);
@@ -13641 +13714 @@
 #if DEBUG
         opentrace();
-        trace_puts("Shell args: ");
+        TRACE(("Shell args: "));
         trace_puts_args(argv);
 #endif
@@ -13693 +13766 @@
  state3:
         state = 4;
-        if (minusc)
+        if (minusc) {
+                /* evalstring pushes parsefile stack.
+                 * Ensure we don't falsely claim that 0 (stdin)
+                 * is one of stacked source fds */
+                if (!sflag)
+                        g_parsefile->fd = -1;
                 evalstring(minusc, 0);
+        }
 
         if (sflag || minusc == NULL) {
@@ -13720 +13799 @@
         /* NOTREACHED */
 }
-
-#if DEBUG
-const char *applet_name = "debug stuff usage";
-int main(int argc, char **argv)
-{
-        return ash_main(argc, argv);
-}
-#endif
 
 

src/router/busybox/shell/hush.c

@@ -459 +459 @@
         /* these three support $?, $#, and $1 */
         smalluint last_return_code;
+        /* is global_argv and global_argv[1..n] malloced? (note: not [0]) */
+        smalluint global_args_malloced;
+        /* how many non-NULL argv's we have. NB: $# + 1 */
+        int global_argc;
         char **global_argv;
-        int global_argc;
 #if ENABLE_HUSH_LOOPS
         unsigned depth_break_continue;
@@ -634 +637 @@
 }
 
-static char **add_strings_to_strings(char **strings, char **add)
+static char **add_strings_to_strings(char **strings, char **add, int need_to_dup)
 {
         int i;
@@ -659 +662 @@
         i = count2;
         while (--i >= 0)
-                v[count1 + i] = add[i];
+                v[count1 + i] = (need_to_dup ? xstrdup(add[i]) : add[i]);
         return v;
 }
@@ -668 +671 @@
         v[0] = add;
         v[1] = NULL;
-        return add_strings_to_strings(strings, v);
+        return add_strings_to_strings(strings, v, /*dup:*/ 0);
 }
 
@@ -1214 +1217 @@
 static int o_save_ptr(o_string *o, int n)
 {
-        if (o->o_glob)
-                return o_glob(o, n); /* o_save_ptr_helper is inside */
+        if (o->o_glob) { /* if globbing is requested */
+                /* If o->has_empty_slot, list[n] was already globbed
+                 * (if it was requested back then when it was filled)
+                 * so don't do that again! */
+                if (!o->has_empty_slot)
+                        return o_glob(o, n); /* o_save_ptr_helper is inside */
+        }
         return o_save_ptr_helper(o, n);
 }
@@ -4280 +4288 @@
                 case 'c':
                         G.global_argv = argv + optind;
+                        if (!argv[optind]) {
+                                /* -c 'script' (no params): prevent empty $0 */
+                                *--G.global_argv = argv[0];
+                                optind--;
+                        } /* else -c 'script' PAR0 PAR1: $0 is PAR0 */
                         G.global_argc = argc - optind;
                         opt = parse_and_run_string(optarg, 0 /* parse_flag */);
@@ -4640 +4653 @@
 }
 
-/* built-in 'set [VAR=value]' handler */
+/* built-in 'set' handler
+ * SUSv3 says:
+ * set [-abCefmnuvx] [-h] [-o option] [argument...]
+ * set [+abCefmnuvx] [+h] [+o option] [argument...]
+ * set -- [argument...]
+ * set -o
+ * set +o
+ * Implementations shall support the options in both their hyphen and
+ * plus-sign forms. These options can also be specified as options to sh.
+ * Examples:
+ * Write out all variables and their values: set
+ * Set $1, $2, and $3 and set "$#" to 3: set c a b
+ * Turn on the -x and -v options: set -xv
+ * Unset all positional parameters: set --
+ * Set $1 to the value of x, even if it begins with '-' or '+': set -- "$x"
+ * Set the positional parameters to the expansion of x, even if x expands
+ * with a leading '-' or '+': set -- $x
+ *
+ * So far, we only support "set -- [argument...]" by ignoring all options
+ * (also, "-o option" will be mishandled by taking "option" as parameter #1).
+ */
 static int builtin_set(char **argv)
 {
-        char *temp = argv[1];
         struct variable *e;
-
-        if (temp == NULL)
+        char **pp;
+        char *arg = *++argv;
+
+        if (arg == NULL) {
                 for (e = G.top_var; e; e = e->next)
                         puts(e->varstr);
-        else
-                set_local_var(xstrdup(temp), 0);
+        } else {
+                /* NB: G.global_argv[0] ($0) is never freed/changed */
+
+                if (G.global_args_malloced) {
+                        pp = G.global_argv;
+                        while (*++pp)
+                                free(*pp);
+                        G.global_argv[1] = NULL;
+                } else {
+                        G.global_args_malloced = 1;
+                        pp = xzalloc(sizeof(pp[0]) * 2);
+                        pp[0] = G.global_argv[0]; /* retain $0 */
+                        G.global_argv = pp;
+                }
+                do  {
+                        if (arg[0] == '+')
+                                continue;
+                        if (arg[0] != '-')
+                                break;
+                        if (arg[1] == '-' && arg[2] == '\0') {
+                                argv++;
+                                break;
+                        }
+                } while ((arg = *++argv) != NULL);
+                /* Now argv[0] is 1st argument */
+
+                /* This realloc's G.global_argv */
+                G.global_argv = pp = add_strings_to_strings(G.global_argv, argv, /*dup:*/ 1);
+                G.global_argc = 1;
+                while (*++pp)
+                        G.global_argc++;
+        }
 
         return EXIT_SUCCESS;
@@ -4662 +4726 @@
         }
         if (n >= 0 && n < G.global_argc) {
-                G.global_argv[n] = G.global_argv[0];
+                if (G.global_args_malloced) {
+                        int m = 1;
+                        while (m <= n)
+                                free(G.global_argv[m++]);
+                }
                 G.global_argc -= n;
-                G.global_argv += n;
+                memmove(&G.global_argv[1], &G.global_argv[n+1],
+                                G.global_argc * sizeof(G.global_argv[0]));
                 return EXIT_SUCCESS;
         }

src/router/busybox/shell/hush_test/hush-parsing/starquoted2.right

@@ -1 +1 @@
 Should be printed
 Should be printed
+Empty:

src/router/busybox/shell/hush_test/hush-parsing/starquoted2.tests

@@ -13 +13 @@
 for a in """$@"''"$@"''; do echo Should not be printed; done
 for a in ""; do echo Should be printed; done
+
+# Bug 207: "$@" expands to nothing, and we erroneously glob "%s\\n" twice:
+printf "Empty:%s\\n" "$@"

src/router/busybox/util-linux/volume_id/get_devname.c

@@ -224 +224 @@
 {
         struct uuidCache_s *uc;
-        int spec_len = strlen(spec);
 
         uuidcache_init();
         uc = uuidCache;
         while (uc) {
-// FIXME: empty label ("LABEL=") matches anything??!
-                if (uc->label[0] && strncmp(spec, uc->label, spec_len) == 0) {
+                if (uc->label[0] && strcmp(spec, uc->label) == 0) {
                         return xstrdup(uc->device);
                 }