Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/libbb

Files:

• Config.src (modified) (6 diffs)
• Kbuild.src (modified) (8 diffs)
• appletlib.c (modified) (34 diffs)
• bb_askpass.c (modified) (2 diffs)
• bb_pwd.c (modified) (2 diffs)
• bb_strtonum.c (modified) (8 diffs)
• copy_file.c (modified) (3 diffs)
• correct_password.c (modified) (2 diffs)
• crc32.c (modified) (1 diff)
• die_if_bad_username.c (modified) (1 diff)
• dump.c (modified) (10 diffs)
• execable.c (modified) (1 diff)
• find_mount_point.c (modified) (2 diffs)
• find_root_device.c (modified) (1 diff)
• get_last_path_component.c (modified) (1 diff)
• get_line_from_file.c (modified) (2 diffs)
• getopt32.c (modified) (8 diffs)
• getpty.c (modified) (2 diffs)
• hash_md5_sha.c (modified) (17 diffs)
• hash_md5prime.c (modified) (8 diffs)
• inet_common.c (modified) (4 diffs)
• isdirectory.c (modified) (1 diff)
• kernel_version.c (modified) (1 diff)
• lineedit.c (modified) (32 diffs)
• llist.c (modified) (1 diff)
• loop.c (modified) (3 diffs)
• make_directory.c (modified) (2 diffs)
• makedev.c (modified) (1 diff)
• match_fstype.c (modified) (2 diffs)
• messages.c (modified) (2 diffs)
• obscure.c (modified) (1 diff)
• parse_config.c (modified) (8 diffs)
• platform.c (modified) (2 diffs)
• procps.c (modified) (15 diffs)
• progress.c (modified) (2 diffs)
• pw_encrypt.c (modified) (2 diffs)
• read_key.c (modified) (5 diffs)
• read_printf.c (modified) (7 diffs)
• remove_file.c (modified) (1 diff)
• safe_gethostname.c (modified) (1 diff)
• selinux_common.c (modified) (1 diff)
• setup_environment.c (modified) (1 diff)
• signals.c (modified) (3 diffs)
• single_argv.c (modified) (1 diff)
• time.c (modified) (2 diffs)
• u_signal_names.c (modified) (4 diffs)
• udp_io.c (modified) (1 diff)
• unicode.c (modified) (4 diffs)
• utmp.c (modified) (1 diff)
• uuencode.c (modified) (4 diffs)
• vdprintf.c (modified) (1 diff)
• vfork_daemon_rexec.c (modified) (10 diffs)
• xatonum_template.c (modified) (1 diff)
• xconnect.c (modified) (7 diffs)
• xfuncs.c (modified) (2 diffs)
• xfuncs_printf.c (modified) (2 diffs)

branches/3.2/mindi-busybox/libbb/Config.src

@@ -15 +15 @@
       Minimum allowable password length.
 
-config MD5_SIZE_VS_SPEED
+config MD5_SMALL
     int "MD5: Trade bytes for speed (0:fast, 3:slow)"
-    default 2
+    default 1
     range 0 3
     help
@@ -29 +29 @@
       3 (smallest)        5.1                4912
 
+config SHA3_SMALL
+    int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
+    default 1
+    range 0 1
+    help
+      Trade binary size versus speed for the sha3sum algorithm.
+      SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+      64-bit x86: +270 bytes of code, 45% faster
+      32-bit x86: +450 bytes of code, 75% faster
+
 config FEATURE_FAST_TOP
     bool "Faster /proc scanning code (+100 bytes)"
@@ -81 +91 @@
 config FEATURE_EDITING_HISTORY
     int "History size"
-    range 0 99999
+    # Don't allow way too big values here, code uses fixed "char *history[N]" struct member
+    range 0 9999
     default 255
     depends on FEATURE_EDITING
     help
-      Specify command history size.
+      Specify command history size (0 - disable).
 
 config FEATURE_EDITING_SAVEHISTORY
@@ -93 +104 @@
     help
       Enable history saving in shells.
+
+config FEATURE_EDITING_SAVE_ON_EXIT
+    bool "Save history on shell exit, not after every command"
+    default n
+    depends on FEATURE_EDITING_SAVEHISTORY
+    help
+      Save history on shell exit, not after every command.
+
+config FEATURE_REVERSE_SEARCH
+    bool "Reverse history search"
+    default y
+    depends on FEATURE_EDITING_SAVEHISTORY
+    help
+      Enable readline-like Ctrl-R combination for reverse history search.
+      Increases code by about 0.5k.
 
 config FEATURE_TAB_COMPLETION
@@ -136 +162 @@
       but prevents a symlink attack.
       Similarly, "cp file device" will not send file's data
-      to the device.
+      to the device. (To do that, use "cat file >device")
 
 config FEATURE_VERBOSE_CP_MESSAGE
@@ -157 +183 @@
     default 4
     help
-      Size of buffer used by cp, mv, install etc.
+      Size of buffer used by cp, mv, install, wget etc.
       Buffers which are 4 kb or less will be allocated on stack.
       Bigger buffers will be allocated with mmap, with fallback to 4 kb
       stack buffer if mmap fails.
 
+config FEATURE_SKIP_ROOTFS
+    bool "Skip rootfs in mount table"
+    default y
+    help
+      Ignore rootfs entry in mount table.
+
+      In Linux, kernel has a special filesystem, rootfs, which is initially
+      mounted on /. It contains initramfs data, if kernel is configured
+      to have one. Usually, another file system is mounted over / early
+      in boot process, and therefore most tools which manipulate
+      mount table, such as df, will skip rootfs entry.
+
+      However, some systems do not mount anything on /.
+      If you need to configure busybox for one of these systems,
+      you may find it useful to turn this option off to make df show
+      initramfs statistics.
+
+      Otherwise, choose Y.
+
 config MONOTONIC_SYSCALL
     bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
     default n
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring

branches/3.2/mindi-busybox/libbb/Kbuild.src

@@ -14 +14 @@
 lib-y += ask_confirmation.o
 lib-y += bb_askpass.o
-lib-y += bb_basename.o
 lib-y += bb_bswap_64.o
 lib-y += bb_do_delay.o
@@ -60 +59 @@
 lib-y += make_directory.o
 lib-y += makedev.o
-lib-y += match_fstype.o
 lib-y += hash_md5_sha.o
 # Alternative (disabled) MD5 implementation
@@ -66 +64 @@
 lib-y += messages.o
 lib-y += mode_string.o
-lib-y += obscure.o
 lib-y += parse_mode.o
-lib-y += parse_config.o
 lib-y += perror_msg.o
 lib-y += perror_nomsg.o
@@ -102 +98 @@
 lib-y += trim.o
 lib-y += u_signal_names.o
-lib-y += udp_io.o
 lib-y += uuencode.o
 lib-y += vdprintf.o
@@ -121 +116 @@
 lib-y += xrealloc_vector.o
 
+lib-$(CONFIG_PLATFORM_LINUX) += match_fstype.o
+
 lib-$(CONFIG_FEATURE_UTMP) += utmp.o
 
@@ -130 +127 @@
 lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o
 
+lib-$(CONFIG_NC) += udp_io.o
+lib-$(CONFIG_DNSD) += udp_io.o
+lib-$(CONFIG_NTPD) += udp_io.o
+lib-$(CONFIG_TFTP) += udp_io.o
+lib-$(CONFIG_TFTPD) += udp_io.o
+lib-$(CONFIG_TCPSVD) += udp_io.o
+lib-$(CONFIG_UDPSVD) += udp_io.o
+lib-$(CONFIG_TRACEROUTE) += udp_io.o
+
 lib-$(CONFIG_LOSETUP) += loop.o
 lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o
@@ -138 +144 @@
 lib-$(CONFIG_DELUSER) += update_passwd.o
 
-lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o
+lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
@@ -161 +167 @@
 lib-$(CONFIG_POWERTOP) += get_cpu_count.o
 
+lib-$(CONFIG_PING) += inet_cksum.o
+lib-$(CONFIG_TRACEROUTE) += inet_cksum.o
+lib-$(CONFIG_TRACEROUTE6) += inet_cksum.o
+lib-$(CONFIG_UDHCPC) += inet_cksum.o
+lib-$(CONFIG_UDHCPC6) += inet_cksum.o
+lib-$(CONFIG_UDHCPD) += inet_cksum.o
+
 # We shouldn't build xregcomp.c if we don't need it - this ensures we don't
 # require regex.h to be in the include dir even if we don't need it thereby

branches/3.2/mindi-busybox/libbb/appletlib.c

@@ -28 +28 @@
  */
 #include "busybox.h"
-#include <assert.h>
-#include <malloc.h>
-/* Try to pull in PAGE_SIZE */
-#ifdef __linux__
-# include <sys/user.h>
-#endif
-#ifdef __GNU__ /* Hurd */
-# include <mach/vm_param.h>
+
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+        || defined(__APPLE__) \
+    )
+# include <malloc.h> /* for mallopt */
 #endif
 
@@ -43 +40 @@
 #include "applets.h"
 #undef PROTOTYPES
-
 
 /* Include generated applet names, pointers to <applet>_main, etc */
@@ -55 +51 @@
 #endif
 
-
 #include "usage_compressed.h"
+
 
 #if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
@@ -67 +63 @@
 
 static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-# include "archive.h"
+# include "bb_archive.h"
 static const char *unpack_usage_messages(void)
 {
@@ -145 +141 @@
 
 #if NUM_APPLETS > 8
-/* NB: any char pointer will work as well, not necessarily applet_names */
-static int applet_name_compare(const void *name, const void *v)
-{
-    int i = (const char *)v - applet_names;
+static int applet_name_compare(const void *name, const void *idx)
+{
+    int i = (int)(ptrdiff_t)idx - 1;
     return strcmp(name, APPLET_NAME(i));
 }
@@ -157 +152 @@
     /* Do a binary search to find the applet entry given the name. */
     const char *p;
-    p = bsearch(name, applet_names, ARRAY_SIZE(applet_main), 1, applet_name_compare);
-    if (!p)
-        return -1;
-    return p - applet_names;
+    p = bsearch(name, (void*)(ptrdiff_t)1, ARRAY_SIZE(applet_main), 1, applet_name_compare);
+    /*
+     * if (!p) return -1;
+     * ^^^^^^^^^^^^^^^^^^ the code below will do this if p == NULL :)
+     */
+    return (int)(ptrdiff_t)p - 1;
 #else
     /* A version which does not pull in bsearch */
@@ -228 +225 @@
 IF_FEATURE_SUID(static uid_t ruid;)  /* real uid */
 
-#if ENABLE_FEATURE_SUID_CONFIG
-
-/* applets[] is const, so we have to define this "override" structure */
-static struct BB_suid_config {
+# if ENABLE_FEATURE_SUID_CONFIG
+
+static struct suid_config_t {
+    /* next ptr must be first: this struct needs to be llist-compatible */
+    struct suid_config_t *m_next;
+    struct bb_uidgid_t m_ugid;
     int m_applet;
-    uid_t m_uid;
-    gid_t m_gid;
     mode_t m_mode;
-    struct BB_suid_config *m_next;
 } *suid_config;
 
@@ -245 +241 @@
 {
     struct group *grp = getgrgid(g);
-
     if (grp) {
         char **mem;
-
         for (mem = grp->gr_mem; *mem; mem++) {
             struct passwd *pwd = getpwnam(*mem);
-
             if (pwd && (pwd->pw_uid == u))
                 return 1;
@@ -259 +252 @@
 }
 
-/* This should probably be a libbb routine.  In that case,
- * I'd probably rename it to something like bb_trimmed_slice.
- */
+/* libbb candidate */
 static char *get_trimmed_slice(char *s, char *e)
 {
@@ -279 +270 @@
 }
 
-/* Don't depend on the tools to combine strings. */
-static const char config_file[] ALIGN1 = "/etc/busybox.conf";
-
-/* We don't supply a value for the nul, so an index adjustment is
- * necessary below.  Also, we use unsigned short here to save some
- * space even though these are really mode_t values. */
-static const unsigned short mode_mask[] ALIGN2 = {
-    /*  SST     sst                 xxx         --- */
-    S_ISUID,    S_ISUID|S_IXUSR,    S_IXUSR,    0,  /* user */
-    S_ISGID,    S_ISGID|S_IXGRP,    S_IXGRP,    0,  /* group */
-    0,          S_IXOTH,            S_IXOTH,    0   /* other */
-};
-
-#define parse_error(x)  do { errmsg = x; goto pe_label; } while (0)
-
 static void parse_config_file(void)
 {
-    struct BB_suid_config *sct_head;
-    struct BB_suid_config *sct;
+    /* Don't depend on the tools to combine strings. */
+    static const char config_file[] ALIGN1 = "/etc/busybox.conf";
+
+    struct suid_config_t *sct_head;
     int applet_no;
     FILE *f;
     const char *errmsg;
-    char *s;
-    char *e;
-    int i;
     unsigned lc;
     smallint section;
-    char buffer[256];
     struct stat st;
-
-    assert(!suid_config); /* Should be set to NULL by bss init. */
 
     ruid = getuid();
@@ -319 +291 @@
      || (st.st_uid != 0)                    /* Not owned by root? */
      || (st.st_mode & (S_IWGRP | S_IWOTH))  /* Writable by non-root? */
-     || !(f = fopen_for_read(config_file))      /* Cannot open? */
+     || !(f = fopen_for_read(config_file))  /* Cannot open? */
     ) {
         return;
@@ -329 +301 @@
 
     while (1) {
-        s = buffer;
-
-        if (!fgets(s, sizeof(buffer), f)) { /* Are we done? */
-// why?
-            if (ferror(f)) {   /* Make sure it wasn't a read error. */
-                parse_error("reading");
-            }
+        char buffer[256];
+        char *s;
+
+        if (!fgets(buffer, sizeof(buffer), f)) { /* Are we done? */
+            // Looks like bloat
+            //if (ferror(f)) {   /* Make sure it wasn't a read error. */
+            //  errmsg = "reading";
+            //  goto pe_label;
+            //}
             fclose(f);
             suid_config = sct_head; /* Success, so set the pointer. */
@@ -341 +315 @@
         }
 
+        s = buffer;
         lc++;                   /* Got a (partial) line. */
 
@@ -352 +327 @@
          * too long if it did end with a newline. */
         if (!strchr(s, '\n') && !feof(f)) {
-            parse_error("line too long");
+            errmsg = "line too long";
+            goto pe_label;
         }
 
@@ -368 +344 @@
              * whitespace for the section name.  We also require that
              * there are no stray characters after the closing bracket. */
-            e = strchr(s, ']');
+            char *e = strchr(s, ']');
             if (!e   /* Missing right bracket? */
              || e[1] /* Trailing characters? */
              || !*(s = get_trimmed_slice(s+1, e)) /* Missing name? */
             ) {
-                parse_error("section header");
+                errmsg = "section header";
+                goto pe_label;
             }
             /* Right now we only have one section so just check it.
@@ -398 +375 @@
 
             /* First get the key (an applet name in our case). */
-            e = strchr(s, '=');
+            char *e = strchr(s, '=');
             if (e) {
                 s = get_trimmed_slice(s, e);
             }
             if (!e || !*s) {    /* Missing '=' or empty key. */
-                parse_error("keyword");
+                errmsg = "keyword";
+                goto pe_label;
             }
 
@@ -412 +390 @@
             applet_no = find_applet_by_name(s);
             if (applet_no >= 0) {
+                unsigned i;
+                struct suid_config_t *sct;
+
                 /* Note: We currently don't check for duplicates!
                  * The last config line for each applet will be the
                  * one used since we insert at the head of the list.
                  * I suppose this could be considered a feature. */
-                sct = xmalloc(sizeof(struct BB_suid_config));
+                sct = xzalloc(sizeof(*sct));
                 sct->m_applet = applet_no;
-                sct->m_mode = 0;
+                /*sct->m_mode = 0;*/
                 sct->m_next = sct_head;
                 sct_head = sct;
@@ -427 +408 @@
 
                 for (i = 0; i < 3; i++) {
-                    /* There are 4 chars + 1 nul for each of user/group/other. */
-                    static const char mode_chars[] ALIGN1 = "Ssx-\0" "Ssx-\0" "Ttx-";
-
-                    const char *q;
-                    q = strchrnul(mode_chars + 5*i, *e++);
-                    if (!*q) {
-                        parse_error("mode");
+                    /* There are 4 chars for each of user/group/other.
+                     * "x-xx" instead of "x-" are to make
+                     * "idx > 3" check catch invalid chars.
+                     */
+                    static const char mode_chars[] ALIGN1 = "Ssx-" "Ssx-" "x-xx";
+                    static const unsigned short mode_mask[] ALIGN2 = {
+                        S_ISUID, S_ISUID|S_IXUSR, S_IXUSR, 0, /* Ssx- */
+                        S_ISGID, S_ISGID|S_IXGRP, S_IXGRP, 0, /* Ssx- */
+                                                  S_IXOTH, 0  /*   x- */
+                    };
+                    const char *q = strchrnul(mode_chars + 4*i, *e);
+                    unsigned idx = q - (mode_chars + 4*i);
+                    if (idx > 3) {
+                        errmsg = "mode";
+                        goto pe_label;
                     }
-                    /* Adjust by -i to account for nul. */
-                    sct->m_mode |= mode_mask[(q - mode_chars) - i];
+                    sct->m_mode |= mode_mask[q - mode_chars];
+                    e++;
                 }
 
-                /* Now get the the user/group info. */
+                /* Now get the user/group info. */
 
                 s = skip_whitespace(e);
-
-                /* Note: we require whitespace between the mode and the
-                 * user/group info. */
-                if ((s == e) || !(e = strchr(s, '.'))) {
-                    parse_error("<uid>.<gid>");
-                }
-                *e++ = '\0';
-
-                /* We can't use get_ug_id here since it would exit()
-                 * if a uid or gid was not found.  Oh well... */
-                sct->m_uid = bb_strtoul(s, NULL, 10);
-                if (errno) {
-                    struct passwd *pwd = getpwnam(s);
-                    if (!pwd) {
-                        parse_error("user");
+                /* Default is 0.0, else parse USER.GROUP: */
+                if (*s) {
+                    /* We require whitespace between mode and USER.GROUP */
+                    if ((s == e) || !(e = strchr(s, '.'))) {
+                        errmsg = "uid.gid";
+                        goto pe_label;
                     }
-                    sct->m_uid = pwd->pw_uid;
-                }
-
-                sct->m_gid = bb_strtoul(e, NULL, 10);
-                if (errno) {
-                    struct group *grp;
-                    grp = getgrnam(e);
-                    if (!grp) {
-                        parse_error("group");
+                    *e = ':'; /* get_uidgid needs USER:GROUP syntax */
+                    if (get_uidgid(&sct->m_ugid, s, /*allow_numeric:*/ 1) == 0) {
+                        errmsg = "unknown user/group";
+                        goto pe_label;
                     }
-                    sct->m_gid = grp->gr_gid;
                 }
             }
@@ -482 +456 @@
          * are used in some future version of busybox. */
         if (!section) {
-            parse_error("keyword outside section");
+            errmsg = "keyword outside section";
+            goto pe_label;
         }
 
@@ -488 +463 @@
 
  pe_label:
-    fprintf(stderr, "Parse error in %s, line %d: %s\n",
-            config_file, lc, errmsg);
-
     fclose(f);
+    bb_error_msg("parse error in %s, line %u: %s", config_file, lc, errmsg);
+
     /* Release any allocated memory before returning. */
-    while (sct_head) {
-        sct = sct_head->m_next;
-        free(sct_head);
-        sct_head = sct;
-    }
-}
-#else
+    llist_free((llist_t*)sct_head, NULL);
+}
+# else
 static inline void parse_config_file(void)
 {
     IF_FEATURE_SUID(ruid = getuid();)
 }
-#endif /* FEATURE_SUID_CONFIG */
-
-
-#if ENABLE_FEATURE_SUID
+# endif /* FEATURE_SUID_CONFIG */
+
+
+# if ENABLE_FEATURE_SUID
 static void check_suid(int applet_no)
 {
@@ -516 +486 @@
     rgid = getgid();
 
-#if ENABLE_FEATURE_SUID_CONFIG
+#  if ENABLE_FEATURE_SUID_CONFIG
     if (suid_cfg_readable) {
         uid_t uid;
-        struct BB_suid_config *sct;
+        struct suid_config_t *sct;
         mode_t m;
 
@@ -528 +498 @@
         goto check_need_suid;
  found:
+        /* Is this user allowed to run this applet? */
         m = sct->m_mode;
-        if (sct->m_uid == ruid)
+        if (sct->m_ugid.uid == ruid)
             /* same uid */
             m >>= 6;
-        else if ((sct->m_gid == rgid) || ingroup(ruid, sct->m_gid))
+        else if ((sct->m_ugid.gid == rgid) || ingroup(ruid, sct->m_ugid.gid))
             /* same group / in group */
             m >>= 3;
-
-        if (!(m & S_IXOTH))           /* is x bit not set ? */
-            bb_error_msg_and_die("you have no permission to run this applet!");
-
-        /* _both_ sgid and group_exec have to be set for setegid */
-        if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
-            rgid = sct->m_gid;
-        /* else (no setegid) we will set egid = rgid */
+        if (!(m & S_IXOTH)) /* is x bit not set? */
+            bb_error_msg_and_die("you have no permission to run this applet");
 
         /* We set effective AND saved ids. If saved-id is not set
-         * like we do below, seteiud(0) can still later succeed! */
+         * like we do below, seteuid(0) can still later succeed! */
+
+        /* Are we directed to change gid
+         * (APPLET = *s* USER.GROUP or APPLET = *S* USER.GROUP)?
+         */
+        if (sct->m_mode & S_ISGID)
+            rgid = sct->m_ugid.gid;
+        /* else: we will set egid = rgid, thus dropping sgid effect */
         if (setresgid(-1, rgid, rgid))
             bb_perror_msg_and_die("setresgid");
 
-        /* do we have to set effective uid? */
+        /* Are we directed to change uid
+         * (APPLET = s** USER.GROUP or APPLET = S** USER.GROUP)?
+         */
         uid = ruid;
         if (sct->m_mode & S_ISUID)
-            uid = sct->m_uid;
-        /* else (no seteuid) we will set euid = ruid */
-
+            uid = sct->m_ugid.uid;
+        /* else: we will set euid = ruid, thus dropping suid effect */
         if (setresuid(-1, uid, uid))
             bb_perror_msg_and_die("setresuid");
-        return;
-    }
-#if !ENABLE_FEATURE_SUID_CONFIG_QUIET
+
+        goto ret;
+    }
+#   if !ENABLE_FEATURE_SUID_CONFIG_QUIET
     {
         static bool onetime = 0;
@@ -565 +539 @@
         if (!onetime) {
             onetime = 1;
-            fprintf(stderr, "Using fallback suid method\n");
-        }
-    }
-#endif
+            bb_error_msg("using fallback suid method");
+        }
+    }
+#   endif
  check_need_suid:
-#endif
-    if (APPLET_SUID(applet_no) == _BB_SUID_REQUIRE) {
+#  endif
+    if (APPLET_SUID(applet_no) == BB_SUID_REQUIRE) {
         /* Real uid is not 0. If euid isn't 0 too, suid bit
          * is most probably not set on our executable */
         if (geteuid())
             bb_error_msg_and_die("must be suid to work properly");
-    } else if (APPLET_SUID(applet_no) == _BB_SUID_DROP) {
+    } else if (APPLET_SUID(applet_no) == BB_SUID_DROP) {
         xsetgid(rgid);  /* drop all privileges */
         xsetuid(ruid);
     }
-}
-#else
-#define check_suid(x) ((void)0)
-#endif /* FEATURE_SUID */
-
-
-#if ENABLE_FEATURE_INSTALLER
+#  if ENABLE_FEATURE_SUID_CONFIG
+ ret: ;
+    llist_free((llist_t*)suid_config, NULL);
+#  endif
+}
+# else
+#  define check_suid(x) ((void)0)
+# endif /* FEATURE_SUID */
+
+
+# if ENABLE_FEATURE_INSTALLER
 static const char usr_bin [] ALIGN1 = "/usr/bin/";
 static const char usr_sbin[] ALIGN1 = "/usr/sbin/";
@@ -593 +571 @@
     &usr_bin [4], /* "/bin/" */
     &usr_sbin[4]  /* "/sbin/" */
-# if !ENABLE_INSTALL_NO_USR
+#  if !ENABLE_INSTALL_NO_USR
     ,usr_bin
     ,usr_sbin
-# endif
+#  endif
 };
-
 
 /* create (sym)links for each applet */
@@ -629 +606 @@
     }
 }
-#else
-# define install_links(x,y,z) ((void)0)
-#endif
+# else
+#  define install_links(x,y,z) ((void)0)
+# endif
 
 /* If we were called as "busybox..." */
@@ -652 +629 @@
         full_write2_str(" multi-call binary.\n"); /* reuse */
         full_write2_str(
-            "Copyright (C) 1998-2009 Erik Andersen, Rob Landley, Denys Vlasenko\n"
-            "and others. Licensed under GPLv2.\n"
-            "See source distribution for full notice.\n"
+            "BusyBox is copyrighted by many authors between 1998-2012.\n"
+            "Licensed under GPLv2. See source distribution for detailed\n"
+            "copyright notices.\n"
             "\n"
-            "Usage: busybox [function] [arguments]...\n"
-            "   or: busybox --list[-full]\n"
+            "Usage: busybox [function [arguments]...]\n"
+            "   or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n"
+            IF_FEATURE_INSTALLER(
+            "   or: busybox --install [-s] [DIR]\n"
+            )
             "   or: function [arguments]...\n"
             "\n"
@@ -696 +676 @@
         dup2(1, 2);
         while (*a) {
-#if ENABLE_FEATURE_INSTALLER
-            if (argv[1][6]) /* --list-path? */
+# if ENABLE_FEATURE_INSTALLER
+            if (argv[1][6]) /* --list-full? */
                 full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
-#endif
+# endif
             full_write2_str(a);
             full_write2_str("\n");
@@ -711 +691 @@
         int use_symbolic_links;
         const char *busybox;
+
         busybox = xmalloc_readlink(bb_busybox_exec_path);
-        if (!busybox)
-            busybox = bb_busybox_exec_path;
-        /* busybox --install [-s] [DIR]: */
-        /* -s: make symlinks */
-        /* DIR: directory to install links to */
-        use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && argv++);
+        if (!busybox) {
+            /* bb_busybox_exec_path is usually "/proc/self/exe".
+             * In chroot, readlink("/proc/self/exe") usually fails.
+             * In such case, better use argv[0] as symlink target
+             * if it is a full path name.
+             */
+            if (argv[0][0] != '/')
+                bb_error_msg_and_die("'%s' is not an absolute path", argv[0]);
+            busybox = argv[0];
+        }
+        /* busybox --install [-s] [DIR]:
+         * -s: make symlinks
+         * DIR: directory to install links to
+         */
+        use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && ++argv);
         install_links(busybox, use_symbolic_links, argv[2]);
         return 0;
@@ -759 +749 @@
          * should be no different from e.g. "test --foo".  */
 //TODO: just compare applet_no with APPLET_NO_test
-        if (!ENABLE_TEST || strcmp(applet_name, "test") != 0)
+        if (!ENABLE_TEST || strcmp(applet_name, "test") != 0) {
+            /* If you want "foo --help" to return 0: */
+            /*xfunc_error_retval = 0;*/
             bb_show_usage();
+        }
     }
     if (ENABLE_FEATURE_SUID)
@@ -772 +765 @@
     if (applet >= 0)
         run_applet_no_and_exit(applet, argv);
-    if (!strncmp(name, "busybox", 7))
+    if (strncmp(name, "busybox", 7) == 0)
         exit(busybox_main(argv));
 }
@@ -787 +780 @@
 {
     /* Tweak malloc for reduced memory consumption */
-#ifndef PAGE_SIZE
-# define PAGE_SIZE (4*1024) /* guess */
-#endif
 #ifdef M_TRIM_THRESHOLD
     /* M_TRIM_THRESHOLD is the maximum amount of freed top-most memory
@@ -795 +785 @@
      * Default is way too big: 256k
      */
-    mallopt(M_TRIM_THRESHOLD, 2 * PAGE_SIZE);
+    mallopt(M_TRIM_THRESHOLD, 8 * 1024);
 #endif
 #ifdef M_MMAP_THRESHOLD
@@ -801 +791 @@
      * Default is too big: 256k
      */
-    mallopt(M_MMAP_THRESHOLD, 8 * PAGE_SIZE - 256);
+    mallopt(M_MMAP_THRESHOLD, 32 * 1024 - 256);
+#endif
+
+#if !BB_MMU
+    /* NOMMU re-exec trick sets high-order bit in first byte of name */
+    if (argv[0][0] & 0x80) {
+        re_execed = 1;
+        argv[0][0] &= 0x7f;
+    }
 #endif
 
 #if defined(SINGLE_APPLET_MAIN)
-    /* Only one applet is selected by the user! */
+    /* Only one applet is selected in .config */
+    if (argv[1] && strncmp(argv[0], "busybox", 7) == 0) {
+        /* "busybox <applet> <params>" should still work as expected */
+        argv++;
+    }
     /* applet_names in this case is just "applet\0\0" */
     lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
@@ -812 +814 @@
     lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
 
-#if !BB_MMU
-    /* NOMMU re-exec trick sets high-order bit in first byte of name */
-    if (argv[0][0] & 0x80) {
-        re_execed = 1;
-        argv[0][0] &= 0x7f;
-    }
-#endif
     applet_name = argv[0];
     if (applet_name[0] == '-')

branches/3.2/mindi-busybox/libbb/bb_askpass.c

@@ -31 +31 @@
     struct termios tio, oldtio;
 
+    fputs(prompt, stdout);
+    fflush_all();
+    tcflush(fd, TCIFLUSH);
+
     tcgetattr(fd, &oldtio);
-    tcflush(fd, TCIFLUSH);
     tio = oldtio;
-#ifndef IUCLC
-# define IUCLC 0
+#if 0
+    /* Switch off UPPERCASE->lowercase conversion (never used since 198x)
+     * and XON/XOFF (why we want to mess with this??)
+     */
+# ifndef IUCLC
+#  define IUCLC 0
+# endif
+    tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
 #endif
-    tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
-    tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP);
+    /* Switch off echo */
+    tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL);
     tcsetattr(fd, TCSANOW, &tio);
 
@@ -50 +59 @@
         alarm(timeout);
     }
-
-    fputs(prompt, stdout);
-    fflush_all();
 
     if (!passwd)

branches/3.2/mindi-busybox/libbb/bb_pwd.c

@@ -73 +73 @@
 }
 
-char* FAST_FUNC uid2uname_utoa(long uid)
+char* FAST_FUNC uid2uname_utoa(uid_t uid)
 {
     char *name = uid2uname(uid);
@@ -79 +79 @@
 }
 
-char* FAST_FUNC gid2group_utoa(long gid)
+char* FAST_FUNC gid2group_utoa(gid_t gid)
 {
     char *name = gid2group(gid);

branches/3.2/mindi-busybox/libbb/bb_strtonum.c

@@ -37 +37 @@
 }
 
-static unsigned long long handle_errors(unsigned long long v, char **endp, char *endptr)
+static unsigned long long handle_errors(unsigned long long v, char **endp)
 {
-    if (endp) *endp = endptr;
+    char next_ch = **endp;
 
     /* errno is already set to ERANGE by strtoXXX if value overflowed */
-    if (endptr[0]) {
+    if (next_ch) {
         /* "1234abcg" or out-of-range? */
-        if (isalnum(endptr[0]) || errno)
+        if (isalnum(next_ch) || errno)
             return ret_ERANGE();
         /* good number, just suspicious terminator */
@@ -58 +58 @@
     char *endptr;
 
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
     /* strtoul("  -4200000000") returns 94967296, errno 0 (!) */
     /* I don't think that this is right. Preventing this... */
@@ -64 +67 @@
     /* not 100% correct for lib func, but convenient for the caller */
     errno = 0;
-    v = strtoull(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtoull(arg, endp, base);
+    return handle_errors(v, endp);
 }
 
@@ -72 +75 @@
     unsigned long long v;
     char *endptr;
+    char first;
+
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
 
     /* Check for the weird "feature":
      * a "-" string is apparently a valid "number" for strto[u]l[l]!
      * It returns zero and errno is 0! :( */
-    char first = (arg[0] != '-' ? arg[0] : arg[1]);
+    first = (arg[0] != '-' ? arg[0] : arg[1]);
     if (!isalnum(first)) return ret_ERANGE();
 
     errno = 0;
-    v = strtoll(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtoll(arg, endp, base);
+    return handle_errors(v, endp);
 }
 
@@ -90 +97 @@
     char *endptr;
 
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
     if (!isalnum(arg[0])) return ret_ERANGE();
     errno = 0;
-    v = strtoul(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtoul(arg, endp, base);
+    return handle_errors(v, endp);
 }
 
@@ -100 +110 @@
     long v;
     char *endptr;
+    char first;
 
-    char first = (arg[0] != '-' ? arg[0] : arg[1]);
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
+    first = (arg[0] != '-' ? arg[0] : arg[1]);
     if (!isalnum(first)) return ret_ERANGE();
 
     errno = 0;
-    v = strtol(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtol(arg, endp, base);
+    return handle_errors(v, endp);
 }
 #endif
@@ -116 +130 @@
     char *endptr;
 
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
     if (!isalnum(arg[0])) return ret_ERANGE();
     errno = 0;
-    v = strtoul(arg, &endptr, base);
+    v = strtoul(arg, endp, base);
     if (v > UINT_MAX) return ret_ERANGE();
-    return handle_errors(v, endp, endptr);
+    return handle_errors(v, endp);
 }
 
@@ -127 +144 @@
     long v;
     char *endptr;
+    char first;
 
-    char first = (arg[0] != '-' ? arg[0] : arg[1]);
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
+    first = (arg[0] != '-' ? arg[0] : arg[1]);
     if (!isalnum(first)) return ret_ERANGE();
 
     errno = 0;
-    v = strtol(arg, &endptr, base);
+    v = strtol(arg, endp, base);
     if (v > INT_MAX) return ret_ERANGE();
     if (v < INT_MIN) return ret_ERANGE();
-    return handle_errors(v, endp, endptr);
+    return handle_errors(v, endp);
 }
 #endif

branches/3.2/mindi-busybox/libbb/copy_file.c

@@ -79 +79 @@
     struct stat source_stat;
     struct stat dest_stat;
-    signed char retval = 0;
-    signed char dest_exists = 0;
-    signed char ovr;
+    smallint retval = 0;
+    smallint dest_exists = 0;
+    smallint ovr;
 
 /* Inverse of cp -d ("cp without -d") */
@@ -148 +148 @@
         }
 
-        /* Create DEST */
         if (dest_exists) {
             if (!S_ISDIR(dest_stat.st_mode)) {
@@ -157 +156 @@
              * this check and actual creation of files inside dest */
         } else {
+            /* Create DEST */
             mode_t mode;
             saved_umask = umask(0);

branches/3.2/mindi-busybox/libbb/correct_password.c

@@ -42 +42 @@
     const char *correct;
     int r;
-#if ENABLE_FEATURE_SHADOWPASSWDS
-    /* Using _r function to avoid pulling in static buffers */
-    struct spwd spw;
-    char buffer[256];
-#endif
-
     /* fake salt. crypt() can choke otherwise. */
     correct = "aa";
@@ -56 +50 @@
     correct = pw->pw_passwd;
 #if ENABLE_FEATURE_SHADOWPASSWDS
+    /* Using _r function to avoid pulling in static buffers */
     if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) {
+        struct spwd spw;
+        char buffer[256];
         /* getspnam_r may return 0 yet set result to NULL.
          * At least glibc 2.4 does this. Be extra paranoid here. */

branches/3.2/mindi-busybox/libbb/crc32.c

@@ -60 +60 @@
 
     while (buf != end) {
-                val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8);
+        val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8);
         buf = (uint8_t*)buf + 1;
     }

branches/3.2/mindi-busybox/libbb/die_if_bad_username.c

@@ -19 +19 @@
 void FAST_FUNC die_if_bad_username(const char *name)
 {
-    /* 1st char being dash or dot isn't valid: */
+    const char *start = name;
+
+    /* 1st char being dash or dot isn't valid:
+     * for example, name like ".." can make adduser
+     * chown "/home/.." recursively - NOT GOOD.
+     * Name of just a single "$" is also rejected.
+     */
     goto skip;
-    /* For example, name like ".." can make adduser
-     * chown "/home/.." recursively - NOT GOOD
-     */
 
     do {
-        if (*name == '-' || *name == '.')
-            continue;
- skip:
-        if (isalnum(*name)
-         || *name == '_'
-         || *name == '@'
+        unsigned char ch;
+
+        /* These chars are valid unless they are at the 1st pos: */
+        if (*name == '-'
+         || *name == '.'
+        /* $ is allowed if it's the last char: */
          || (*name == '$' && !name[1])
         ) {
             continue;
         }
-        bb_error_msg_and_die("illegal character '%c'", *name);
+ skip:
+        ch = *name;
+        if (ch == '_'
+        /* || ch == '@' -- we disallow this too. Think about "user@host" */
+        /* open-coded isalnum: */
+         || (ch >= '0' && ch <= '9')
+         || ((ch|0x20) >= 'a' && (ch|0x20) <= 'z')
+        ) {
+            continue;
+        }
+        bb_error_msg_and_die("illegal character with code %u at position %u",
+                (unsigned)ch, (unsigned)(name - start));
     } while (*++name);
+
+    /* The minimum size of the login name is one char or two if
+     * last char is the '$'. Violations of this are caught above.
+     * The maximum size of the login name is LOGIN_NAME_MAX
+     * including the terminating null byte.
+     */
+    if (name - start >= LOGIN_NAME_MAX)
+        bb_error_msg_and_die("name is too long");
 }

branches/3.2/mindi-busybox/libbb/dump.c

@@ -72 +72 @@
              * case it's a %s format.
              */
-            while (strchr(index_str + 1, *++fmt));
+            while (strchr(index_str + 1, *++fmt))
+                continue;
             if (*fmt == '.' && isdigit(*++fmt)) {
                 prec = atoi(fmt);
@@ -100 +101 @@
 {
     enum { NOTOKAY, USEBCNT, USEPREC } sokay;
-    PR *pr, **nextpr = NULL;
     FU *fu;
+    PR *pr;
     char *p1, *p2, *p3;
     char savech, *fmtp;
@@ -112 +113 @@
          * conversion character gets its own.
          */
-        for (nconv = 0, fmtp = fu->fmt; *fmtp; nextpr = &pr->nextpr) {
+        for (nconv = 0, fmtp = fu->fmt; *fmtp; ) {
             /* NOSTRICT */
             /* DBU:[dvae@cray.com] zalloc so that forward ptrs start out NULL*/
@@ -118 +119 @@
             if (!fu->nextpr)
                 fu->nextpr = pr;
-            /* ignore nextpr -- its unused inside the loop and is
-             * uninitialized 1st time through.
-             */
 
             /* skip preceding text and up to the next % sign */
@@ -296 +294 @@
      * repeat it as necessary.
      *
-     * if, rep count is greater than 1, no trailing whitespace
+     * if rep count is greater than 1, no trailing whitespace
      * gets output from the last iteration of the format unit.
      */
     for (fu = fs->nextfu; fu; fu = fu->nextfu) {
-        if (!fu->nextfu && fs->bcnt < dumper->blocksize
-         && !(fu->flags & F_SETREP) && fu->bcnt
+        if (!fu->nextfu
+         && fs->bcnt < dumper->blocksize
+         && !(fu->flags & F_SETREP)
+         && fu->bcnt
         ) {
             fu->reps += (dumper->blocksize - fs->bcnt) / fu->bcnt;
         }
-        if (fu->reps > 1) {
+        if (fu->reps > 1 && fu->nextpr) {
             for (pr = fu->nextpr;; pr = pr->nextpr)
                 if (!pr->nextpr)
@@ -725 +725 @@
     for (;;) {
         p = skip_whitespace(p);
-        if (!*p) {
+        if (*p == '\0') {
             break;
         }
@@ -753 +753 @@
         /* skip slash and trailing white space */
         if (*p == '/') {
-            p = skip_whitespace(++p);
+            p = skip_whitespace(p + 1);
         }
 
@@ -767 +767 @@
             tfu->bcnt = atoi(savep);
             /* skip trailing white space */
-            p = skip_whitespace(++p);
+            p = skip_whitespace(p + 1);
         }
 
@@ -775 +775 @@
         }
         for (savep = ++p; *p != '"';) {
-            if (*p++ == 0) {
+            if (*p++ == '\0') {
                 bb_error_msg_and_die("bad format {%s}", fmt);
             }
@@ -786 +786 @@
         /* alphabetic escape sequences have to be done in place */
         for (p2 = p1;; ++p1, ++p2) {
-            if (!*p1) {
+            if (*p1 == '\0') {
                 *p2 = *p1;
                 break;

branches/3.2/mindi-busybox/libbb/execable.c

@@ -69 +69 @@
 
 #if ENABLE_FEATURE_PREFER_APPLETS
-/* just like the real execvp, but try to launch an applet named 'file' first
- */
-int FAST_FUNC bb_execvp(const char *file, char *const argv[])
+/* just like the real execvp, but try to launch an applet named 'file' first */
+int FAST_FUNC BB_EXECVP(const char *file, char *const argv[])
 {
-    return execvp(find_applet_by_name(file) >= 0 ? bb_busybox_exec_path : file,
-                    argv);
+    if (find_applet_by_name(file) >= 0)
+        execvp(bb_busybox_exec_path, argv);
+    return execvp(file, argv);
 }
 #endif

branches/3.2/mindi-busybox/libbb/find_mount_point.c

@@ -31 +31 @@
     devno_of_name = s.st_dev;
     block_dev = 0;
-    if (S_ISBLK(s.st_mode)) {
+    /* Why S_ISCHR? - UBI volumes use char devices, not block */
+    if (S_ISBLK(s.st_mode) || S_ISCHR(s.st_mode)) {
         devno_of_name = s.st_rdev;
         block_dev = 1;
@@ -44 +45 @@
          * and it makes sense to always ignore it.
          * Otherwise people can't reference their "real" root! */
-        if (strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
+        if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
             continue;
 

branches/3.2/mindi-busybox/libbb/find_root_device.c

@@ -30 +30 @@
     int len, rem;
 
+    len = strlen(ap->devpath);
+    rem = DEVNAME_MAX-2 - len;
+    if (rem <= 0)
+        return NULL;
+
     dir = opendir(ap->devpath);
     if (!dir)
         return NULL;
 
-    len = strlen(ap->devpath);
-    rem = DEVNAME_MAX-2 - len;
-    if (rem <= 0)
-        return NULL;
     ap->devpath[len++] = '/';
 

branches/3.2/mindi-busybox/libbb/get_last_path_component.c

@@ -7 +7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+#include "libbb.h"
 
-#include "libbb.h"
+const char* FAST_FUNC bb_basename(const char *name)
+{
+    const char *cp = strrchr(name, '/');
+    if (cp)
+        return cp + 1;
+    return name;
+}
+
 /*
  * "/"        -> "/"

branches/3.2/mindi-busybox/libbb/get_line_from_file.c

@@ -12 +12 @@
 #include "libbb.h"
 
-/* This function reads an entire line from a text file, up to a newline
- * or NUL byte, inclusive.  It returns a malloc'ed char * which
- * must be free'ed by the caller.  If end is NULL '\n' isn't considered
- * end of line.  If end isn't NULL, length of the chunk is stored in it.
- * If lineno is not NULL, *lineno is incremented for each line,
- * and also trailing '\' is recognized as line continuation.
- *
- * Returns NULL if EOF/error. */
-char* FAST_FUNC bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno)
+char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
 {
     int ch;
-    int idx = 0;
+    unsigned idx = 0;
     char *linebuf = NULL;
-    int linebufsz = 0;
 
     while ((ch = getc(file)) != EOF) {
         /* grow the line buffer as necessary */
-        if (idx >= linebufsz) {
-            linebufsz += 256;
-            linebuf = xrealloc(linebuf, linebufsz);
-        }
+        if (!(idx & 0xff))
+            linebuf = xrealloc(linebuf, idx + 0x100);
         linebuf[idx++] = (char) ch;
-        if (!ch)
+        if (ch == '\0')
             break;
-        if (end && ch == '\n') {
-            if (lineno == NULL)
-                break;
-            (*lineno)++;
-            if (idx < 2 || linebuf[idx-2] != '\\')
-                break;
-            idx -= 2;
-        }
+        if (end && ch == '\n')
+            break;
     }
     if (end)
@@ -58 +41 @@
     }
     return linebuf;
-}
-
-char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
-{
-    return bb_get_chunk_with_continuation(file, end, NULL);
 }
 

branches/3.2/mindi-busybox/libbb/getopt32.c

@@ -8 +8 @@
  */
 
-#include <getopt.h>
+#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+# include <getopt.h>
+#endif
 #include "libbb.h"
 
@@ -81 +83 @@
 
         static const char applet_longopts[] ALIGN1 =
-        //"name\0" has_arg val
-        "verbose\0" No_argument "v"
-        ;
+                //"name\0" has_arg val
+                "verbose\0" No_argument "v"
+                ;
         applet_long_options = applet_longopts;
 
@@ -227 +229 @@
         opt_complementary = "b--cf:c--bf:f--bc".  If two of the
         mutually exclusive options are found, getopt32 will call
-    bb_show_usage() and die.
+        bb_show_usage() and die.
 
  "x--x" Variation of the above, it means that -x option should occur
@@ -466 +468 @@
         for (on_off = complementary; on_off->opt_char; on_off++)
             if (on_off->opt_char == *s)
-                break;
+                goto found_opt;
+        /* Without this, diagnostic of such bugs is not easy */
+        bb_error_msg_and_die("NO OPT %c!", *s);
+ found_opt:
         if (c == ':' && s[2] == ':') {
             on_off->param_type = PARAM_LIST;
@@ -473 +478 @@
         if (c == '+' && (s[2] == ':' || s[2] == '\0')) {
             on_off->param_type = PARAM_INT;
+            s++;
             continue;
         }
@@ -532 +538 @@
     /* In case getopt32 was already called:
      * reset the libc getopt() function, which keeps internal state.
-     * run_nofork_applet_prime() does this, but we might end up here
+     * run_nofork_applet() does this, but we might end up here
      * also via gunzip_main() -> gzip_main(). Play safe.
      */
@@ -542 +548 @@
 #endif
     /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
-
-    pargv = NULL;
 
     /* Note: just "getopt() <= 0" will not work well for
@@ -575 +579 @@
         if (on_off->counter)
             (*(on_off->counter))++;
-        if (on_off->param_type == PARAM_LIST) {
-            if (optarg)
+        if (optarg) {
+            if (on_off->param_type == PARAM_LIST) {
                 llist_add_to_end((llist_t **)(on_off->optarg), optarg);
-        } else if (on_off->param_type == PARAM_INT) {
-            if (optarg)
+            } else if (on_off->param_type == PARAM_INT) {
 //TODO: xatoi_positive indirectly pulls in printf machinery
                 *(unsigned*)(on_off->optarg) = xatoi_positive(optarg);
-        } else if (on_off->optarg) {
-            if (optarg)
+            } else if (on_off->optarg) {
                 *(char **)(on_off->optarg) = optarg;
-        }
-        if (pargv != NULL)
-            break;
+            }
+        }
     }
 

branches/3.2/mindi-busybox/libbb/getpty.c

@@ -20 +20 @@
         grantpt(p); /* chmod+chown corresponding slave pty */
         unlockpt(p); /* (what does this do?) */
-#if 0 /* if ptsname_r is not available... */
-        const char *name;
-        name = ptsname(p); /* find out the name of slave pty */
-        if (!name) {
-            bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+# ifndef HAVE_PTSNAME_R
+        {
+            const char *name;
+            name = ptsname(p); /* find out the name of slave pty */
+            if (!name) {
+                bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+            }
+            safe_strncpy(line, name, GETPTY_BUFSIZE);
         }
-        safe_strncpy(line, name, GETPTY_BUFSIZE);
-#else
+# else
         /* find out the name of slave pty */
         if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) {
@@ -33 +35 @@
         }
         line[GETPTY_BUFSIZE-1] = '\0';
-#endif
+# endif
         return p;
     }

branches/3.2/mindi-busybox/libbb/hash_md5_sha.c

@@ -32 +32 @@
 }
 
+/* rotl64 only used for sha3 currently */
+static ALWAYS_INLINE uint64_t rotl64(uint64_t x, unsigned n)
+{
+    return (x << n) | (x >> (64 - n));
+}
 
 /* Feed data through a temporary buffer.
@@ -52 +57 @@
         buffer = (const char *)buffer + remaining;
         bufpos += remaining;
-        /* clever way to do "if (bufpos != 64) break; ... ; bufpos = 0;" */
+        /* Clever way to do "if (bufpos != N) break; ... ; bufpos = 0;" */
         bufpos -= 64;
         if (bufpos != 0)
@@ -105 +110 @@
 
 /* 0: fastest, 3: smallest */
-#if CONFIG_MD5_SIZE_VS_SPEED < 0
-# define MD5_SIZE_VS_SPEED 0
-#elif CONFIG_MD5_SIZE_VS_SPEED > 3
-# define MD5_SIZE_VS_SPEED 3
+#if CONFIG_MD5_SMALL < 0
+# define MD5_SMALL 0
+#elif CONFIG_MD5_SMALL > 3
+# define MD5_SMALL 3
 #else
-# define MD5_SIZE_VS_SPEED CONFIG_MD5_SIZE_VS_SPEED
+# define MD5_SMALL CONFIG_MD5_SMALL
 #endif
 
@@ -130 +135 @@
 static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
 {
-#if MD5_SIZE_VS_SPEED > 0
+#if MD5_SMALL > 0
     /* Before we start, one word to the strange constants.
        They are defined in RFC 1321 as
@@ -158 +163 @@
     };
     static const char P_array[] ALIGN1 = {
-# if MD5_SIZE_VS_SPEED > 1
+# if MD5_SMALL > 1
         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */
 # endif
@@ -172 +177 @@
     uint32_t D = ctx->hash[3];
 
-#if MD5_SIZE_VS_SPEED >= 2  /* 2 or 3 */
+#if MD5_SMALL >= 2  /* 2 or 3 */
 
     static const char S_array[] ALIGN1 = {
@@ -186 +191 @@
     uint32_t temp;
 
-# if BB_BIG_ENDIAN
-    for (i = 0; i < 16; i++)
-        words[i] = SWAP_LE32(words[i]);
-# endif
-
-# if MD5_SIZE_VS_SPEED == 3
+    if (BB_BIG_ENDIAN)
+        for (i = 0; i < 16; i++)
+            words[i] = SWAP_LE32(words[i]);
+
+# if MD5_SMALL == 3
     pc = C_array;
     pp = P_array;
@@ -221 +225 @@
         B = temp;
     }
-# else  /* MD5_SIZE_VS_SPEED == 2 */
+# else  /* MD5_SMALL == 2 */
     pc = C_array;
     pp = P_array;
@@ -272 +276 @@
     ctx->hash[3] += D;
 
-#else  /* MD5_SIZE_VS_SPEED == 0 or 1 */
+#else  /* MD5_SMALL == 0 or 1 */
 
     uint32_t A_save = A;
@@ -278 +282 @@
     uint32_t C_save = C;
     uint32_t D_save = D;
-# if MD5_SIZE_VS_SPEED == 1
+# if MD5_SMALL == 1
     const uint32_t *pc;
     const char *pp;
@@ -300 +304 @@
 
     /* Round 1 */
-# if MD5_SIZE_VS_SPEED == 1
+# if MD5_SMALL == 1
     pc = C_array;
     for (i = 0; i < 4; i++) {
@@ -340 +344 @@
 
     /* Round 2 */
-# if MD5_SIZE_VS_SPEED == 1
+# if MD5_SMALL == 1
     pp = P_array;
     for (i = 0; i < 4; i++) {
@@ -368 +372 @@
 
     /* Round 3 */
-# if MD5_SIZE_VS_SPEED == 1
+# if MD5_SMALL == 1
     for (i = 0; i < 4; i++) {
         OP(FH, A, B, C, D, (int) (*pp++), 4, *pc++);
@@ -395 +399 @@
 
     /* Round 4 */
-# if MD5_SIZE_VS_SPEED == 1
+# if MD5_SMALL == 1
     for (i = 0; i < 4; i++) {
         OP(FI, A, B, C, D, (int) (*pp++), 6, *pc++);
@@ -463 +467 @@
 
     /* The MD5 result is in little endian byte order */
-#if BB_BIG_ENDIAN
-    ctx->hash[0] = SWAP_LE32(ctx->hash[0]);
-    ctx->hash[1] = SWAP_LE32(ctx->hash[1]);
-    ctx->hash[2] = SWAP_LE32(ctx->hash[2]);
-    ctx->hash[3] = SWAP_LE32(ctx->hash[3]);
-#endif
+    if (BB_BIG_ENDIAN) {
+        ctx->hash[0] = SWAP_LE32(ctx->hash[0]);
+        ctx->hash[1] = SWAP_LE32(ctx->hash[1]);
+        ctx->hash[2] = SWAP_LE32(ctx->hash[2]);
+        ctx->hash[3] = SWAP_LE32(ctx->hash[3]);
+    }
+
     memcpy(resbuf, ctx->hash, sizeof(ctx->hash[0]) * 4);
 }
@@ -835 +840 @@
         buffer = (const char *)buffer + remaining;
         bufpos += remaining;
-        /* clever way to do "if (bufpos != 128) break; ... ; bufpos = 0;" */
+        /* Clever way to do "if (bufpos != N) break; ... ; bufpos = 0;" */
         bufpos -= 128;
         if (bufpos != 0)
@@ -897 +902 @@
     memcpy(resbuf, ctx->hash, sizeof(ctx->hash));
 }
+
+
+/*
+ * The Keccak sponge function, designed by Guido Bertoni, Joan Daemen,
+ * Michael Peeters and Gilles Van Assche. For more information, feedback or
+ * questions, please refer to our website: http://keccak.noekeon.org/
+ *
+ * Implementation by Ronny Van Keer,
+ * hereby denoted as "the implementer".
+ *
+ * To the extent possible under law, the implementer has waived all copyright
+ * and related or neighboring rights to the source code in this file.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * Busybox modifications (C) Lauri Kasanen, under the GPLv2.
+ */
+
+#if CONFIG_SHA3_SMALL < 0
+# define SHA3_SMALL 0
+#elif CONFIG_SHA3_SMALL > 1
+# define SHA3_SMALL 1
+#else
+# define SHA3_SMALL CONFIG_SHA3_SMALL
+#endif
+
+enum {
+    SHA3_IBLK_BYTES = 72, /* 576 bits / 8 */
+};
+
+/*
+ * In the crypto literature this function is usually called Keccak-f().
+ */
+static void sha3_process_block72(uint64_t *state)
+{
+    enum { NROUNDS = 24 };
+
+    /* Elements should be 64-bit, but top half is always zero or 0x80000000.
+     * We encode 63rd bits in a separate word below.
+     * Same is true for 31th bits, which lets us use 16-bit table instead of 64-bit.
+     * The speed penalty is lost in the noise.
+     */
+    static const uint16_t IOTA_CONST[NROUNDS] = {
+        0x0001,
+        0x8082,
+        0x808a,
+        0x8000,
+        0x808b,
+        0x0001,
+        0x8081,
+        0x8009,
+        0x008a,
+        0x0088,
+        0x8009,
+        0x000a,
+        0x808b,
+        0x008b,
+        0x8089,
+        0x8003,
+        0x8002,
+        0x0080,
+        0x800a,
+        0x000a,
+        0x8081,
+        0x8080,
+        0x0001,
+        0x8008,
+    };
+    /* bit for CONST[0] is in msb: 0011 0011 0000 0111 1101 1101 */
+    const uint32_t IOTA_CONST_bit63 = (uint32_t)(0x3307dd00);
+    /* bit for CONST[0] is in msb: 0001 0110 0011 1000 0001 1011 */
+    const uint32_t IOTA_CONST_bit31 = (uint32_t)(0x16381b00);
+
+    static const uint8_t ROT_CONST[24] = {
+        1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 2, 14,
+        27, 41, 56, 8, 25, 43, 62, 18, 39, 61, 20, 44,
+    };
+    static const uint8_t PI_LANE[24] = {
+        10, 7, 11, 17, 18, 3, 5, 16, 8, 21, 24, 4,
+        15, 23, 19, 13, 12, 2, 20, 14, 22, 9, 6, 1,
+    };
+    /*static const uint8_t MOD5[10] = { 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, };*/
+
+    unsigned x, y;
+    unsigned round;
+
+    if (BB_BIG_ENDIAN) {
+        for (x = 0; x < 25; x++) {
+            state[x] = SWAP_LE64(state[x]);
+        }
+    }
+
+    for (round = 0; round < NROUNDS; ++round) {
+        /* Theta */
+        {
+            uint64_t BC[10];
+            for (x = 0; x < 5; ++x) {
+                BC[x + 5] = BC[x] = state[x]
+                    ^ state[x + 5] ^ state[x + 10]
+                    ^ state[x + 15] ^ state[x + 20];
+            }
+            /* Using 2x5 vector above eliminates the need to use
+             * BC[MOD5[x+N]] trick below to fetch BC[(x+N) % 5],
+             * and the code is a bit _smaller_.
+             */
+            for (x = 0; x < 5; ++x) {
+                uint64_t temp = BC[x + 4] ^ rotl64(BC[x + 1], 1);
+                state[x] ^= temp;
+                state[x + 5] ^= temp;
+                state[x + 10] ^= temp;
+                state[x + 15] ^= temp;
+                state[x + 20] ^= temp;
+            }
+        }
+
+        /* Rho Pi */
+        if (SHA3_SMALL) {
+            uint64_t t1 = state[1];
+            for (x = 0; x < 24; ++x) {
+                uint64_t t0 = state[PI_LANE[x]];
+                state[PI_LANE[x]] = rotl64(t1, ROT_CONST[x]);
+                t1 = t0;
+            }
+        } else {
+            /* Especially large benefit for 32-bit arch (75% faster):
+             * 64-bit rotations by non-constant usually are SLOW on those.
+             * We resort to unrolling here.
+             * This optimizes out PI_LANE[] and ROT_CONST[],
+             * but generates 300-500 more bytes of code.
+             */
+            uint64_t t0;
+            uint64_t t1 = state[1];
+#define RhoPi_twice(x) \
+    t0 = state[PI_LANE[x  ]]; \
+    state[PI_LANE[x  ]] = rotl64(t1, ROT_CONST[x  ]); \
+    t1 = state[PI_LANE[x+1]]; \
+    state[PI_LANE[x+1]] = rotl64(t0, ROT_CONST[x+1]);
+            RhoPi_twice(0); RhoPi_twice(2);
+            RhoPi_twice(4); RhoPi_twice(6);
+            RhoPi_twice(8); RhoPi_twice(10);
+            RhoPi_twice(12); RhoPi_twice(14);
+            RhoPi_twice(16); RhoPi_twice(18);
+            RhoPi_twice(20); RhoPi_twice(22);
+#undef RhoPi_twice
+        }
+
+        /* Chi */
+        for (y = 0; y <= 20; y += 5) {
+            uint64_t BC0, BC1, BC2, BC3, BC4;
+            BC0 = state[y + 0];
+            BC1 = state[y + 1];
+            BC2 = state[y + 2];
+            state[y + 0] = BC0 ^ ((~BC1) & BC2);
+            BC3 = state[y + 3];
+            state[y + 1] = BC1 ^ ((~BC2) & BC3);
+            BC4 = state[y + 4];
+            state[y + 2] = BC2 ^ ((~BC3) & BC4);
+            state[y + 3] = BC3 ^ ((~BC4) & BC0);
+            state[y + 4] = BC4 ^ ((~BC0) & BC1);
+        }
+
+        /* Iota */
+        state[0] ^= IOTA_CONST[round]
+            | (uint32_t)((IOTA_CONST_bit31 << round) & 0x80000000)
+            | (uint64_t)((IOTA_CONST_bit63 << round) & 0x80000000) << 32;
+    }
+
+    if (BB_BIG_ENDIAN) {
+        for (x = 0; x < 25; x++) {
+            state[x] = SWAP_LE64(state[x]);
+        }
+    }
+}
+
+void FAST_FUNC sha3_begin(sha3_ctx_t *ctx)
+{
+    memset(ctx, 0, sizeof(*ctx));
+}
+
+void FAST_FUNC sha3_hash(sha3_ctx_t *ctx, const void *buffer, size_t len)
+{
+#if SHA3_SMALL
+    const uint8_t *data = buffer;
+    unsigned bufpos = ctx->bytes_queued;
+
+    while (1) {
+        unsigned remaining = SHA3_IBLK_BYTES - bufpos;
+        if (remaining > len)
+            remaining = len;
+        len -= remaining;
+        /* XOR data into buffer */
+        while (remaining != 0) {
+            uint8_t *buf = (uint8_t*)ctx->state;
+            buf[bufpos] ^= *data++;
+            bufpos++;
+            remaining--;
+        }
+        /* Clever way to do "if (bufpos != N) break; ... ; bufpos = 0;" */
+        bufpos -= SHA3_IBLK_BYTES;
+        if (bufpos != 0)
+            break;
+        /* Buffer is filled up, process it */
+        sha3_process_block72(ctx->state);
+        /*bufpos = 0; - already is */
+    }
+    ctx->bytes_queued = bufpos + SHA3_IBLK_BYTES;
+#else
+    /* +50 bytes code size, but a bit faster because of long-sized XORs */
+    const uint8_t *data = buffer;
+    unsigned bufpos = ctx->bytes_queued;
+
+    /* If already data in queue, continue queuing first */
+    while (len != 0 && bufpos != 0) {
+        uint8_t *buf = (uint8_t*)ctx->state;
+        buf[bufpos] ^= *data++;
+        len--;
+        bufpos++;
+        if (bufpos == SHA3_IBLK_BYTES) {
+            bufpos = 0;
+            goto do_block;
+        }
+    }
+
+    /* Absorb complete blocks */
+    while (len >= SHA3_IBLK_BYTES) {
+        /* XOR data onto beginning of state[].
+         * We try to be efficient - operate one word at a time, not byte.
+         * Careful wrt unaligned access: can't just use "*(long*)data"!
+         */
+        unsigned count = SHA3_IBLK_BYTES / sizeof(long);
+        long *buf = (long*)ctx->state;
+        do {
+            long v;
+            move_from_unaligned_long(v, (long*)data);
+            *buf++ ^= v;
+            data += sizeof(long);
+        } while (--count);
+        len -= SHA3_IBLK_BYTES;
+ do_block:
+        sha3_process_block72(ctx->state);
+    }
+
+    /* Queue remaining data bytes */
+    while (len != 0) {
+        uint8_t *buf = (uint8_t*)ctx->state;
+        buf[bufpos] ^= *data++;
+        bufpos++;
+        len--;
+    }
+
+    ctx->bytes_queued = bufpos;
+#endif
+}
+
+void FAST_FUNC sha3_end(sha3_ctx_t *ctx, void *resbuf)
+{
+    /* Padding */
+    uint8_t *buf = (uint8_t*)ctx->state;
+    buf[ctx->bytes_queued]   ^= 1;
+    buf[SHA3_IBLK_BYTES - 1] ^= 0x80;
+
+    sha3_process_block72(ctx->state);
+
+    /* Output */
+    memcpy(resbuf, ctx->state, 64);
+}

branches/3.2/mindi-busybox/libbb/hash_md5prime.c

@@ -60 +60 @@
  *
  * Reintroduced the loop unrolling in md5_transform and added the
- * MD5_SIZE_VS_SPEED option for configurability.  Define below as:
+ * MD5_SMALL option for configurability.  Define below as:
  *       0    fully unrolled loops
  *       1    partially unrolled (4 ops per loop)
@@ -76 +76 @@
 
 /* 1: fastest, 3: smallest */
-#if CONFIG_MD5_SIZE_VS_SPEED < 1
-# define MD5_SIZE_VS_SPEED 1
-#elif CONFIG_MD5_SIZE_VS_SPEED > 3
-# define MD5_SIZE_VS_SPEED 3
+#if CONFIG_MD5_SMALL < 1
+# define MD5_SMALL 1
+#elif CONFIG_MD5_SMALL > 3
+# define MD5_SMALL 3
 #else
-# define MD5_SIZE_VS_SPEED CONFIG_MD5_SIZE_VS_SPEED
+# define MD5_SMALL CONFIG_MD5_SMALL
 #endif
 
@@ -153 +153 @@
 {
     uint32_t a, b, c, d, x[16];
-#if MD5_SIZE_VS_SPEED > 1
+#if MD5_SMALL > 1
     uint32_t temp;
     const unsigned char *ps;
@@ -163 +163 @@
         6, 10, 15, 21
     };
-#endif /* MD5_SIZE_VS_SPEED > 1 */
-
-#if MD5_SIZE_VS_SPEED > 0
+#endif /* MD5_SMALL > 1 */
+
+#if MD5_SMALL > 0
     const uint32_t *pc;
     const unsigned char *pp;
@@ -199 +199 @@
     };
 
-#endif /* MD5_SIZE_VS_SPEED > 0 */
+#endif /* MD5_SMALL > 0 */
 
     memcpy32_le2cpu(x, block, 64);
@@ -208 +208 @@
     d = state[3];
 
-#if MD5_SIZE_VS_SPEED > 2
+#if MD5_SMALL > 2
     pc = C;
     pp = P;
@@ -234 +234 @@
         a = d; d = c; c = b; b = temp;
     }
-#elif MD5_SIZE_VS_SPEED > 1
+#elif MD5_SMALL > 1
     pc = C;
     pp = P;
@@ -261 +261 @@
         temp = d; d = c; c = b; b = a; a = temp;
     }
-#elif MD5_SIZE_VS_SPEED > 0
+#elif MD5_SMALL > 0
     pc = C;
     pp = P;

branches/3.2/mindi-busybox/libbb/inet_common.c

@@ -98 +98 @@
 #ifdef DEBUG
         bb_error_msg("rresolve: unsupported address family %d!",
-                  s_in->sin_family);
+                s_in->sin_family);
 #endif
         errno = EAFNOSUPPORT;
@@ -165 +165 @@
 int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
 {
-    struct addrinfo req, *ai;
+    struct addrinfo req, *ai = NULL;
     int s;
 
-    memset(&req, '\0', sizeof req);
+    memset(&req, 0, sizeof(req));
     req.ai_family = AF_INET6;
     s = getaddrinfo(name, NULL, &req, &ai);
-    if (s) {
+    if (s != 0) {
         bb_error_msg("getaddrinfo: %s: %d", name, s);
         return -1;
     }
-    memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6));
-    freeaddrinfo(ai);
+    memcpy(sin6, ai->ai_addr, sizeof(*sin6));
+    if (ai)
+        freeaddrinfo(ai);
     return 0;
 }
@@ -195 +196 @@
 #ifdef DEBUG
         bb_error_msg("rresolve: unsupported address family %d!",
-                  sin6->sin6_family);
+                sin6->sin6_family);
 #endif
         errno = EAFNOSUPPORT;
@@ -210 +211 @@
     }
 
-    s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6),
-                name, sizeof(name), NULL, 0, 0);
-    if (s) {
+    s = getnameinfo((struct sockaddr *) sin6, sizeof(*sin6),
+                name, sizeof(name),
+                /*serv,servlen:*/ NULL, 0,
+                0);
+    if (s != 0) {
         bb_error_msg("getnameinfo failed");
         return NULL;

branches/3.2/mindi-busybox/libbb/isdirectory.c

@@ -16 +16 @@
  * Nonexistent files return FALSE.
  */
-int FAST_FUNC is_directory(const char *fileName, int followLinks, struct stat *statBuf)
+int FAST_FUNC is_directory(const char *fileName, int followLinks)
 {
     int status;
-    struct stat astatBuf;
-
-    if (statBuf == NULL) {
-        /* use auto stack buffer */
-        statBuf = &astatBuf;
-    }
+    struct stat statBuf;
 
     if (followLinks)
-        status = stat(fileName, statBuf);
+        status = stat(fileName, &statBuf);
     else
-        status = lstat(fileName, statBuf);
+        status = lstat(fileName, &statBuf);
 
-    status = (status == 0 && S_ISDIR(statBuf->st_mode));
+    status = (status == 0 && S_ISDIR(statBuf.st_mode));
 
     return status;

branches/3.2/mindi-busybox/libbb/kernel_version.c

@@ -21 +21 @@
 {
     struct utsname name;
-    char *s;
+    char *s, *t;
     int i, r;
 
-    if (uname(&name) == -1) {
-        bb_perror_msg("can't get system information");
-        return 0;
-    }
-
+    uname(&name); /* never fails */
     s = name.release;
     r = 0;
     for (i = 0; i < 3; i++) {
-        r = r * 256 + atoi(strtok(s, "."));
+        t = strtok(s, ".");
+        r = r * 256 + (t ? atoi(t) : 0);
         s = NULL;
     }

branches/3.2/mindi-busybox/libbb/lineedit.c

@@ -42 +42 @@
 #include "libbb.h"
 #include "unicode.h"
+#ifndef _POSIX_VDISABLE
+# define _POSIX_VDISABLE '\0'
+#endif
+
 
 #ifdef TEST
@@ -185 +189 @@
     IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
 } while (0)
+
 static void deinit_S(void)
 {
@@ -203 +208 @@
 
 #if ENABLE_UNICODE_SUPPORT
-static size_t load_string(const char *src, int maxsize)
-{
-    ssize_t len = mbstowcs(command_ps, src, maxsize - 1);
-    if (len < 0)
-        len = 0;
-    command_ps[len] = BB_NUL;
-    return len;
+static size_t load_string(const char *src)
+{
+    if (unicode_status == UNICODE_ON) {
+        ssize_t len = mbstowcs(command_ps, src, S.maxsize - 1);
+        if (len < 0)
+            len = 0;
+        command_ps[len] = BB_NUL;
+        return len;
+    } else {
+        unsigned i = 0;
+        while (src[i] && i < S.maxsize - 1) {
+            command_ps[i] = src[i];
+            i++;
+        }
+        command_ps[i] = BB_NUL;
+        return i;
+    }
 }
 static unsigned save_string(char *dst, unsigned maxsize)
 {
+    if (unicode_status == UNICODE_ON) {
 # if !ENABLE_UNICODE_PRESERVE_BROKEN
-    ssize_t len = wcstombs(dst, command_ps, maxsize - 1);
-    if (len < 0)
-        len = 0;
-    dst[len] = '\0';
-    return len;
+        ssize_t len = wcstombs(dst, command_ps, maxsize - 1);
+        if (len < 0)
+            len = 0;
+        dst[len] = '\0';
+        return len;
 # else
-    unsigned dstpos = 0;
-    unsigned srcpos = 0;
-
-    maxsize--;
-    while (dstpos < maxsize) {
-        wchar_t wc;
-        int n = srcpos;
-
-        /* Convert up to 1st invalid byte (or up to end) */
-        while ((wc = command_ps[srcpos]) != BB_NUL
-            && !unicode_is_raw_byte(wc)
-        ) {
+        unsigned dstpos = 0;
+        unsigned srcpos = 0;
+
+        maxsize--;
+        while (dstpos < maxsize) {
+            wchar_t wc;
+            int n = srcpos;
+
+            /* Convert up to 1st invalid byte (or up to end) */
+            while ((wc = command_ps[srcpos]) != BB_NUL
+                && !unicode_is_raw_byte(wc)
+            ) {
+                srcpos++;
+            }
+            command_ps[srcpos] = BB_NUL;
+            n = wcstombs(dst + dstpos, command_ps + n, maxsize - dstpos);
+            if (n < 0) /* should not happen */
+                break;
+            dstpos += n;
+            if (wc == BB_NUL) /* usually is */
+                break;
+
+            /* We do have invalid byte here! */
+            command_ps[srcpos] = wc; /* restore it */
             srcpos++;
-        }
-        command_ps[srcpos] = BB_NUL;
-        n = wcstombs(dst + dstpos, command_ps + n, maxsize - dstpos);
-        if (n < 0) /* should not happen */
-            break;
-        dstpos += n;
-        if (wc == BB_NUL) /* usually is */
-            break;
-
-        /* We do have invalid byte here! */
-        command_ps[srcpos] = wc; /* restore it */
-        srcpos++;
-        if (dstpos == maxsize)
-            break;
-        dst[dstpos++] = (char) wc;
-    }
-    dst[dstpos] = '\0';
-    return dstpos;
+            if (dstpos == maxsize)
+                break;
+            dst[dstpos++] = (char) wc;
+        }
+        dst[dstpos] = '\0';
+        return dstpos;
 # endif
+    } else {
+        unsigned i = 0;
+        while ((dst[i] = command_ps[i]) != 0)
+            i++;
+        return i;
+    }
 }
 /* I thought just fputwc(c, stdout) would work. But no... */
 static void BB_PUTCHAR(wchar_t c)
 {
-    char buf[MB_CUR_MAX + 1];
-    mbstate_t mbst = { 0 };
-    ssize_t len;
-
-    len = wcrtomb(buf, c, &mbst);
-    if (len > 0) {
-        buf[len] = '\0';
-        fputs(buf, stdout);
+    if (unicode_status == UNICODE_ON) {
+        char buf[MB_CUR_MAX + 1];
+        mbstate_t mbst = { 0 };
+        ssize_t len = wcrtomb(buf, c, &mbst);
+        if (len > 0) {
+            buf[len] = '\0';
+            fputs(buf, stdout);
+        }
+    } else {
+        /* In this case, c is always one byte */
+        putchar(c);
     }
 }
@@ -298 +323 @@
 }
 #else /* !UNICODE */
-static size_t load_string(const char *src, int maxsize)
-{
-    safe_strncpy(command_ps, src, maxsize);
+static size_t load_string(const char *src)
+{
+    safe_strncpy(command_ps, src, S.maxsize);
     return strlen(command_ps);
 }
@@ -1203 +1228 @@
             /* where do we want to have cursor after all? */
             strcpy(&command[cursor_mb], chosen_match + match_pfx_len);
-            len = load_string(command, S.maxsize);
+            len = load_string(command);
             /* add match and tail */
             sprintf(&command[cursor_mb], "%s%s", chosen_match + match_pfx_len, match_buf);
-            command_len = load_string(command, S.maxsize);
+            command_len = load_string(command);
             /* write out the matched command */
             /* paranoia: load_string can return 0 on conv error,
@@ -1227 +1252 @@
     line_input_t *n = xzalloc(sizeof(*n));
     n->flags = flags;
+    n->max_history = MAX_HISTORY;
     return n;
 }
@@ -1232 +1258 @@
 
 #if MAX_HISTORY > 0
+
+unsigned size_from_HISTFILESIZE(const char *hp)
+{
+    int size = MAX_HISTORY;
+    if (hp) {
+        size = atoi(hp);
+        if (size <= 0)
+            return 1;
+        if (size > MAX_HISTORY)
+            return MAX_HISTORY;
+    }
+    return size;
+}
 
 static void save_command_ps_at_cur_history(void)
@@ -1313 +1352 @@
         /* fill temp_h[], retaining only last MAX_HISTORY lines */
         memset(temp_h, 0, sizeof(temp_h));
-        st_parm->cnt_history_in_file = idx = 0;
+        idx = 0;
+        st_parm->cnt_history_in_file = 0;
         while ((line = xmalloc_fgetline(fp)) != NULL) {
             if (line[0] == '\0') {
@@ -1323 +1363 @@
             st_parm->cnt_history_in_file++;
             idx++;
-            if (idx == MAX_HISTORY)
+            if (idx == st_parm->max_history)
                 idx = 0;
         }
@@ -1332 +1372 @@
             while (temp_h[idx] == NULL) {
                 idx++;
-                if (idx == MAX_HISTORY)
+                if (idx == st_parm->max_history)
                     idx = 0;
             }
@@ -1338 +1378 @@
 
         /* copy temp_h[] to st_parm->history[] */
-        for (i = 0; i < MAX_HISTORY;) {
+        for (i = 0; i < st_parm->max_history;) {
             line = temp_h[idx];
             if (!line)
                 break;
             idx++;
-            if (idx == MAX_HISTORY)
+            if (idx == st_parm->max_history)
                 idx = 0;
             line_len = strlen(line);
@@ -1351 +1391 @@
         }
         st_parm->cnt_history = i;
-    }
-}
-
-/* state->flags is already checked to be nonzero */
+        if (ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
+            st_parm->cnt_history_in_file = i;
+    }
+}
+
+#  if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+void save_history(line_input_t *st)
+{
+    FILE *fp;
+
+    if (!st->hist_file)
+        return;
+    if (st->cnt_history <= st->cnt_history_in_file)
+        return;
+
+    fp = fopen(st->hist_file, "a");
+    if (fp) {
+        int i, fd;
+        char *new_name;
+        line_input_t *st_temp;
+
+        for (i = st->cnt_history_in_file; i < st->cnt_history; i++)
+            fprintf(fp, "%s\n", st->history[i]);
+        fclose(fp);
+
+        /* we may have concurrently written entries from others.
+         * load them */
+        st_temp = new_line_input_t(st->flags);
+        st_temp->hist_file = st->hist_file;
+        st_temp->max_history = st->max_history;
+        load_history(st_temp);
+
+        /* write out temp file and replace hist_file atomically */
+        new_name = xasprintf("%s.%u.new", st->hist_file, (int) getpid());
+        fd = open(new_name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+        if (fd >= 0) {
+            fp = xfdopen_for_write(fd);
+            for (i = 0; i < st_temp->cnt_history; i++)
+                fprintf(fp, "%s\n", st_temp->history[i]);
+            fclose(fp);
+            if (rename(new_name, st->hist_file) == 0)
+                st->cnt_history_in_file = st_temp->cnt_history;
+        }
+        free(new_name);
+        free_line_input_t(st_temp);
+    }
+}
+#  else
 static void save_history(char *str)
 {
     int fd;
     int len, len2;
+
+    if (!state->hist_file)
+        return;
 
     fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0600);
@@ -1374 +1461 @@
     /* did we write so much that history file needs trimming? */
     state->cnt_history_in_file++;
-    if (state->cnt_history_in_file > MAX_HISTORY * 4) {
+    if (state->cnt_history_in_file > state->max_history * 4) {
         char *new_name;
         line_input_t *st_temp;
@@ -1382 +1469 @@
         st_temp = new_line_input_t(state->flags);
         st_temp->hist_file = state->hist_file;
+        st_temp->max_history = state->max_history;
         load_history(st_temp);
 
         /* write out temp file and replace hist_file atomically */
         new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid());
-        fd = open(state->hist_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+        fd = open(new_name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
         if (fd >= 0) {
             FILE *fp;
@@ -1402 +1490 @@
     }
 }
+#  endif
 # else
 #  define load_history(a) ((void)0)
@@ -1420 +1509 @@
         return;
 
-    free(state->history[MAX_HISTORY]); /* redundant, paranoia */
-    state->history[MAX_HISTORY] = NULL; /* redundant, paranoia */
+    free(state->history[state->max_history]); /* redundant, paranoia */
+    state->history[state->max_history] = NULL; /* redundant, paranoia */
 
     /* If history[] is full, remove the oldest command */
-    /* we need to keep history[MAX_HISTORY] empty, hence >=, not > */
-    if (i >= MAX_HISTORY) {
+    /* we need to keep history[state->max_history] empty, hence >=, not > */
+    if (i >= state->max_history) {
         free(state->history[0]);
-        for (i = 0; i < MAX_HISTORY-1; i++)
+        for (i = 0; i < state->max_history-1; i++)
             state->history[i] = state->history[i+1];
-        /* i == MAX_HISTORY-1 */
-    }
-    /* i <= MAX_HISTORY-1 */
+        /* i == state->max_history-1 */
+# if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+        if (state->cnt_history_in_file)
+            state->cnt_history_in_file--;
+# endif
+    }
+    /* i <= state->max_history-1 */
     state->history[i++] = xstrdup(str);
-    /* i <= MAX_HISTORY */
+    /* i <= state->max_history */
     state->cur_history = i;
     state->cnt_history = i;
-# if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
-    if ((state->flags & SAVE_HISTORY) && state->hist_file)
-        save_history(str);
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY && !ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+    save_history(str);
 # endif
     IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;)
@@ -1645 +1737 @@
      * poll([{fd=0, events=POLLIN}], 1, 0) = 0 (Timeout)  <-- no input exists
      * write(1, "\33[6n", 4) = 4  <-- send the ESC sequence, quick!
-     * poll([{fd=0, events=POLLIN}], 1, 4294967295) = 1 ([{fd=0, revents=POLLIN}])
+     * poll([{fd=0, events=POLLIN}], 1, -1) = 1 ([{fd=0, revents=POLLIN}])
      * read(0, "\n", 1)      = 1  <-- oh crap, user's input got in first
      */
@@ -1803 +1895 @@
     int sv_errno = errno;
     unsigned width;
+
     get_terminal_width_height(0, &width, NULL);
-    cmdedit_setwidth(width, nsig /* - just a yes/no flag */);
-    if (nsig == SIGWINCH)
-        signal(SIGWINCH, win_changed); /* rearm ourself */
+//FIXME: cmdedit_setwidth() -> redraw() -> printf() -> KABOOM! (we are in signal handler!)
+    cmdedit_setwidth(width, /*redraw_flg:*/ nsig);
+
     errno = sv_errno;
 }
 
-static int lineedit_read_key(char *read_key_buffer)
+static int lineedit_read_key(char *read_key_buffer, int timeout)
 {
     int64_t ic;
-    int timeout = -1;
 #if ENABLE_UNICODE_SUPPORT
     char unicode_buf[MB_CUR_MAX + 1];
@@ -1912 +2004 @@
 #define CTRL(a) ((a) & ~0x40)
 
+enum {
+    VI_CMDMODE_BIT = 0x40000000,
+    /* 0x80000000 bit flags KEYCODE_xxx */
+};
+
+#if ENABLE_FEATURE_REVERSE_SEARCH
+/* Mimic readline Ctrl-R reverse history search.
+ * When invoked, it shows the following prompt:
+ * (reverse-i-search)'': user_input [cursor pos unchanged by Ctrl-R]
+ * and typing results in search being performed:
+ * (reverse-i-search)'tmp': cd /tmp [cursor under t in /tmp]
+ * Search is performed by looking at progressively older lines in history.
+ * Ctrl-R again searches for the next match in history.
+ * Backspace deletes last matched char.
+ * Control keys exit search and return to normal editing (at current history line).
+ */
+static int32_t reverse_i_search(void)
+{
+    char match_buf[128]; /* for user input */
+    char read_key_buffer[KEYCODE_BUFFER_SIZE];
+    const char *matched_history_line;
+    const char *saved_prompt;
+    int32_t ic;
+
+    matched_history_line = NULL;
+    read_key_buffer[0] = 0;
+    match_buf[0] = '\0';
+
+    /* Save and replace the prompt */
+    saved_prompt = cmdedit_prompt;
+    goto set_prompt;
+
+    while (1) {
+        int h;
+        unsigned match_buf_len = strlen(match_buf);
+
+        fflush_all();
+//FIXME: correct timeout?
+        ic = lineedit_read_key(read_key_buffer, -1);
+
+        switch (ic) {
+        case CTRL('R'): /* searching for the next match */
+            break;
+
+        case '\b':
+        case '\x7f':
+            /* Backspace */
+            if (unicode_status == UNICODE_ON) {
+                while (match_buf_len != 0) {
+                    uint8_t c = match_buf[--match_buf_len];
+                    if ((c & 0xc0) != 0x80) /* start of UTF-8 char? */
+                        break; /* yes */
+                }
+            } else {
+                if (match_buf_len != 0)
+                    match_buf_len--;
+            }
+            match_buf[match_buf_len] = '\0';
+            break;
+
+        default:
+            if (ic < ' '
+             || (!ENABLE_UNICODE_SUPPORT && ic >= 256)
+             || (ENABLE_UNICODE_SUPPORT && ic >= VI_CMDMODE_BIT)
+            ) {
+                goto ret;
+            }
+
+            /* Append this char */
+#if ENABLE_UNICODE_SUPPORT
+            if (unicode_status == UNICODE_ON) {
+                mbstate_t mbstate = { 0 };
+                char buf[MB_CUR_MAX + 1];
+                int len = wcrtomb(buf, ic, &mbstate);
+                if (len > 0) {
+                    buf[len] = '\0';
+                    if (match_buf_len + len < sizeof(match_buf))
+                        strcpy(match_buf + match_buf_len, buf);
+                }
+            } else
+#endif
+            if (match_buf_len < sizeof(match_buf) - 1) {
+                match_buf[match_buf_len] = ic;
+                match_buf[match_buf_len + 1] = '\0';
+            }
+            break;
+        } /* switch (ic) */
+
+        /* Search in history for match_buf */
+        h = state->cur_history;
+        if (ic == CTRL('R'))
+            h--;
+        while (h >= 0) {
+            if (state->history[h]) {
+                char *match = strstr(state->history[h], match_buf);
+                if (match) {
+                    state->cur_history = h;
+                    matched_history_line = state->history[h];
+                    command_len = load_string(matched_history_line);
+                    cursor = match - matched_history_line;
+//FIXME: cursor position for Unicode case
+
+                    free((char*)cmdedit_prompt);
+ set_prompt:
+                    cmdedit_prompt = xasprintf("(reverse-i-search)'%s': ", match_buf);
+                    cmdedit_prmt_len = strlen(cmdedit_prompt);
+                    goto do_redraw;
+                }
+            }
+            h--;
+        }
+
+        /* Not found */
+        match_buf[match_buf_len] = '\0';
+        beep();
+        continue;
+
+ do_redraw:
+        redraw(cmdedit_y, command_len - cursor);
+    } /* while (1) */
+
+ ret:
+    if (matched_history_line)
+        command_len = load_string(matched_history_line);
+
+    free((char*)cmdedit_prompt);
+    cmdedit_prompt = saved_prompt;
+    cmdedit_prmt_len = strlen(cmdedit_prompt);
+    redraw(cmdedit_y, command_len - cursor);
+
+    return ic;
+}
+#endif
+
 /* maxsize must be >= 2.
  * Returns:
@@ -1918 +2144 @@
  * >0 length of input string, including terminating '\n'
  */
-int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
+int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout)
 {
     int len;
@@ -1955 +2181 @@
     S.maxsize = maxsize;
 
-    /* With null flags, no other fields are ever used */
+    /* With zero flags, no other fields are ever used */
     state = st ? st : (line_input_t*) &const_int_0;
 #if MAX_HISTORY > 0
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
-    if ((state->flags & SAVE_HISTORY) && state->hist_file)
+    if (state->hist_file)
         if (state->cnt_history == 0)
             load_history(state);
@@ -1979 +2205 @@
 
     new_settings = initial_settings;
-    new_settings.c_lflag &= ~ICANON;        /* unbuffered input */
-    /* Turn off echoing and CTRL-C, so we can trap it */
-    new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
-    /* Hmm, in linux c_cc[] is not parsed if ICANON is off */
+    /* ~ICANON: unbuffered input (most c_cc[] are disabled, VMIN/VTIME are enabled) */
+    /* ~ECHO, ~ECHONL: turn off echoing, including newline echoing */
+    /* ~ISIG: turn off INTR (ctrl-C), QUIT, SUSP */
+    new_settings.c_lflag &= ~(ICANON | ECHO | ECHONL | ISIG);
+    /* reads would block only if < 1 char is available */
     new_settings.c_cc[VMIN] = 1;
+    /* no timeout (reads block forever) */
     new_settings.c_cc[VTIME] = 0;
-    /* Turn off CTRL-C, so we can trap it */
-#ifndef _POSIX_VDISABLE
-# define _POSIX_VDISABLE '\0'
-#endif
-    new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
+    /* Should be not needed if ISIG is off: */
+    /* Turn off CTRL-C */
+    /* new_settings.c_cc[VINTR] = _POSIX_VDISABLE; */
     tcsetattr_stdin_TCSANOW(&new_settings);
 
-    /* Now initialize things */
-    previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
-    win_changed(0); /* do initial resizing */
 #if ENABLE_USERNAME_OR_HOMEDIR
     {
@@ -2008 +2231 @@
 
 #if 0
-    for (i = 0; i <= MAX_HISTORY; i++)
+    for (i = 0; i <= state->max_history; i++)
         bb_error_msg("history[%d]:'%s'", i, state->history[i]);
     bb_error_msg("cur_history:%d cnt_history:%d", state->cur_history, state->cnt_history);
@@ -2016 +2239 @@
     parse_and_put_prompt(prompt);
     ask_terminal();
+
+    /* Install window resize handler (NB: after *all* init is complete) */
+//FIXME: save entire sigaction!
+    previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
+    win_changed(0); /* get initial window size */
 
     read_key_buffer[0] = 0;
@@ -2027 +2255 @@
          * in one place.
          */
-        enum {
-            VI_CMDMODE_BIT = 0x40000000,
-            /* 0x80000000 bit flags KEYCODE_xxx */
-        };
         int32_t ic, ic_raw;
 
         fflush_all();
-        ic = ic_raw = lineedit_read_key(read_key_buffer);
-
+        ic = ic_raw = lineedit_read_key(read_key_buffer, timeout);
+
+#if ENABLE_FEATURE_REVERSE_SEARCH
+ again:
+#endif
 #if ENABLE_FEATURE_EDITING_VI
         newdelflag = 1;
@@ -2139 +2366 @@
                 input_backspace();
             break;
+#if ENABLE_FEATURE_REVERSE_SEARCH
+        case CTRL('R'):
+            ic = ic_raw = reverse_i_search();
+            goto again;
+#endif
 
 #if ENABLE_FEATURE_EDITING_VI
@@ -2195 +2427 @@
             int nc, sc;
 
-            ic = lineedit_read_key(read_key_buffer);
+            ic = lineedit_read_key(read_key_buffer, timeout);
             if (errno) /* error */
                 goto return_error_indicator;
@@ -2259 +2491 @@
         case 'r'|VI_CMDMODE_BIT:
 //FIXME: unicode case?
-            ic = lineedit_read_key(read_key_buffer);
+            ic = lineedit_read_key(read_key_buffer, timeout);
             if (errno) /* error */
                 goto return_error_indicator;
@@ -2276 +2508 @@
                 input_backward(1);
             }
+            /* Handle a few ESC-<key> combinations the same way
+             * standard readline bindings (IOW: bash) do.
+             * Often, Alt-<key> generates ESC-<key>.
+             */
+            ic = lineedit_read_key(read_key_buffer, timeout);
+            switch (ic) {
+                //case KEYCODE_LEFT: - bash doesn't do this
+                case 'b':
+                    ctrl_left();
+                    break;
+                //case KEYCODE_RIGHT: - bash doesn't do this
+                case 'f':
+                    ctrl_right();
+                    break;
+                //case KEYCODE_DELETE: - bash doesn't do this
+                case 'd':  /* Alt-D */
+                {
+                    /* Delete word forward */
+                    int nc, sc = cursor;
+                    ctrl_right();
+                    nc = cursor - sc;
+                    input_backward(nc);
+                    while (--nc >= 0)
+                        input_delete(1);
+                    break;
+                }
+                case '\b':   /* Alt-Backspace(?) */
+                case '\x7f': /* Alt-Backspace(?) */
+                //case 'w': - bash doesn't do this
+                {
+                    /* Delete word backward */
+                    int sc = cursor;
+                    ctrl_left();
+                    while (sc-- > cursor)
+                        input_delete(1);
+                    break;
+                }
+            }
             break;
 #endif /* FEATURE_COMMAND_EDITING_VI */
@@ -2292 +2562 @@
             /* change command */
             command_len = load_string(state->history[state->cur_history] ?
-                    state->history[state->cur_history] : "", maxsize);
+                    state->history[state->cur_history] : "");
             /* redraw and go to eol (bol, in vi) */
             redraw(cmdedit_y, (state->flags & VI_MODE) ? 9999 : 0);
@@ -2304 +2574 @@
             break;
         case KEYCODE_CTRL_LEFT:
+        case KEYCODE_ALT_LEFT: /* bash doesn't do it */
             ctrl_left();
             break;
         case KEYCODE_CTRL_RIGHT:
+        case KEYCODE_ALT_RIGHT: /* bash doesn't do it */
             ctrl_right();
             break;
@@ -2458 +2730 @@
     fputs(prompt, stdout);
     fflush_all();
-    fgets(command, maxsize, stdin);
+    if (!fgets(command, maxsize, stdin))
+        return -1;
     return strlen(command);
 }

branches/3.2/mindi-busybox/libbb/llist.c

@@ -63 +63 @@
 /* Recursively free all elements in the linked list.  If freeit != NULL
  * call it on each datum in the list */
-void FAST_FUNC llist_free(llist_t *elm, void (*freeit) (void *data))
+void FAST_FUNC llist_free(llist_t *elm, void (*freeit)(void *data))
 {
     while (elm) {

branches/3.2/mindi-busybox/libbb/loop.c

@@ -85 +85 @@
    file/offset if it finds one.
  */
-int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset)
+int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset, int ro)
 {
     char dev[LOOP_NAMESIZE];
@@ -94 +94 @@
 
     /* Open the file.  Barf if this doesn't work.  */
-    mode = O_RDWR;
+    mode = ro ? O_RDONLY : O_RDWR;
     ffd = open(file, mode);
     if (ffd < 0) {
-        mode = O_RDONLY;
-        ffd = open(file, mode);
+        if (mode != O_RDONLY) {
+            mode = O_RDONLY;
+            ffd = open(file, mode);
+        }
         if (ffd < 0)
             return -errno;
@@ -149 +151 @@
 
         /* If this block device already set up right, re-use it.
-           (Yes this is racy, but associating two loop devices with the same
-           file isn't pretty either.  In general, mounting the same file twice
-           without using losetup manually is problematic.)
+         * (Yes this is racy, but associating two loop devices with the same
+         * file isn't pretty either.  In general, mounting the same file twice
+         * without using losetup manually is problematic.)
          */
         } else

branches/3.2/mindi-busybox/libbb/make_directory.c

@@ -108 +108 @@
             if ((mode != -1) && (chmod(path, mode) < 0)) {
                 fail_msg = "set permissions of";
+                if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
+                    flags = 0;
+                    goto print_err;
+                }
                 break;
             }
@@ -117 +121 @@
     } /* while (1) */
 
+    flags = -1;
+ print_err:
     bb_perror_msg("can't %s directory '%s'", fail_msg, path);
-    flags = -1;
     goto ret;
  ret0:

branches/3.2/mindi-busybox/libbb/makedev.c

@@ -9 +9 @@
 /* We do not include libbb.h - #define makedev() is there! */
 #include "platform.h"
-#include <features.h>
-#include <sys/sysmacros.h>
+
+/* Different Unixes want different headers for makedev */
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+ || defined(__APPLE__)
+# include <sys/types.h>
+#else
+# include <features.h>
+# include <sys/sysmacros.h>
+#endif
 
 #ifdef __GLIBC__
-/* At least glibc has horrendously large inline for this, so wrap it */
+/* At least glibc has horrendously large inline for this, so wrap it. */
 /* uclibc people please check - do we need "&& !__UCLIBC__" above? */
 
-/* suppress gcc "no previous prototype" warning */
-unsigned long long FAST_FUNC bb_makedev(unsigned int major, unsigned int minor);
-unsigned long long FAST_FUNC bb_makedev(unsigned int major, unsigned int minor)
+/* Suppress gcc "no previous prototype" warning */
+unsigned long long FAST_FUNC bb_makedev(unsigned major, unsigned minor);
+unsigned long long FAST_FUNC bb_makedev(unsigned major, unsigned minor)
 {
     return makedev(major, minor);

branches/3.2/mindi-busybox/libbb/match_fstype.c

@@ -12 +12 @@
 
 #include "libbb.h"
+
+#ifdef HAVE_MNTENT_H
 
 int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype)
@@ -41 +43 @@
     return !match;
 }
+
+#endif /* HAVE_MNTENT_H */

branches/3.2/mindi-busybox/libbb/messages.c

@@ -23 +23 @@
 
 
-const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted";
+const char bb_msg_memory_exhausted[] ALIGN1 = "out of memory";
 const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'";
 const char bb_msg_unknown[] ALIGN1 = "(unknown)";
@@ -49 +49 @@
 const int const_int_0 = 0;
 
-#include <utmp.h>
+#if ENABLE_FEATURE_WTMP
 /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
 const char bb_path_wtmp_file[] ALIGN1 =
-#if defined _PATH_WTMP
+# if defined _PATH_WTMP
     _PATH_WTMP;
-#elif defined WTMP_FILE
+# elif defined WTMP_FILE
     WTMP_FILE;
-#else
-#error unknown path to wtmp file
+# else
+#  error unknown path to wtmp file
+# endif
 #endif
 

branches/3.2/mindi-busybox/libbb/obscure.c

@@ -110 +110 @@
         return "similar to username";
     }
+#ifndef __BIONIC__
     /* no gecos as-is, as sub-string, reversed, capitalized, doubled */
     if (pw->pw_gecos[0] && string_checker(new_p, pw->pw_gecos)) {
         return "similar to gecos";
     }
+#endif
     /* hostname as-is, as sub-string, reversed, capitalized, doubled */
     hostname = safe_gethostname();

branches/3.2/mindi-busybox/libbb/parse_config.c

@@ -9 +9 @@
  */
 
+/* Uncomment to enable test applet */
+////config:config PARSE
+////config: bool "Uniform config file parser debugging applet: parse"
+////config: default n
+////config: help
+////config:   Typical usage of parse API:
+////config:     char *t[3];
+////config:     parser_t *p = config_open(filename);
+////config:     while (config_read(p, t, 3, 0, delimiters, flags)) { // 1..3 tokens
+////config:         bb_error_msg("TOKENS: '%s''%s''%s'", t[0], t[1], t[2]);
+////config:     }
+////config:     config_close(p);
+
+////applet:IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-y += parse_config.o
+
+//usage:#define parse_trivial_usage
+//usage:       "[-x] [-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
+//usage:#define parse_full_usage "\n\n"
+//usage:       "    -x  Suppress output (for benchmarking)"
+
 #include "libbb.h"
 
@@ -16 +38 @@
 {
     const char *delims = "# \t";
+    char **t;
     unsigned flags = PARSE_NORMAL;
     int mintokens = 0, ntokens = 128;
+    unsigned noout;
 
     opt_complementary = "-1:n+:m+:f+";
-    getopt32(argv, "n:m:d:f:", &ntokens, &mintokens, &delims, &flags);
+    noout = 1 & getopt32(argv, "xn:m:d:f:", &ntokens, &mintokens, &delims, &flags);
     //argc -= optind;
     argv += optind;
+
+    t = xmalloc(sizeof(t[0]) * ntokens);
     while (*argv) {
+        int n;
         parser_t *p = config_open(*argv);
-        if (p) {
-            int n;
-            char **t = xmalloc(sizeof(char *) * ntokens);
-            while ((n = config_read(p, t, ntokens, mintokens, delims, flags)) != 0) {
+        while ((n = config_read(p, t, ntokens, mintokens, delims, flags)) != 0) {
+            if (!noout) {
                 for (int i = 0; i < n; ++i)
                     printf("[%s]", t[i]);
                 puts("");
             }
-            config_close(p);
-        }
+        }
+        config_close(p);
         argv++;
     }
@@ -40 +65 @@
 }
 #endif
-
-/*
-
-Typical usage:
-
------ CUT -----
-    char *t[3];  // tokens placeholder
-    parser_t *p = config_open(filename);
-    if (p) {
-        // parse line-by-line
-        while (config_read(p, t, 3, 0, delimiters, flags)) { // 1..3 tokens
-            // use tokens
-            bb_error_msg("TOKENS: [%s][%s][%s]", t[0], t[1], t[2]);
-        }
-        ...
-        // free parser
-        config_close(p);
-    }
------ CUT -----
-
-*/
 
 parser_t* FAST_FUNC config_open2(const char *filename, FILE* FAST_FUNC (*fopen_func)(const char *path))
@@ -80 +84 @@
 }
 
-static void config_free_data(parser_t *parser)
-{
-    free(parser->line);
-    parser->line = NULL;
-    if (PARSE_KEEP_COPY) { /* compile-time constant */
-        free(parser->data);
-        parser->data = NULL;
-    }
-}
-
 void FAST_FUNC config_close(parser_t *parser)
 {
     if (parser) {
-        config_free_data(parser);
+        if (PARSE_KEEP_COPY) /* compile-time constant */
+            free(parser->data);
         fclose(parser->fp);
+        free(parser->line);
+        free(parser->nline);
         free(parser);
     }
 }
+
+/* This function reads an entire line from a text file,
+ * up to a newline, exclusive.
+ * Trailing '\' is recognized as line continuation.
+ * Returns -1 if EOF/error.
+ */
+static int get_line_with_continuation(parser_t *parser)
+{
+    ssize_t len, nlen;
+    char *line;
+
+    len = getline(&parser->line, &parser->line_alloc, parser->fp);
+    if (len <= 0)
+        return len;
+
+    line = parser->line;
+    for (;;) {
+        parser->lineno++;
+        if (line[len - 1] == '\n')
+            len--;
+        if (len == 0 || line[len - 1] != '\\')
+            break;
+        len--;
+
+        nlen = getline(&parser->nline, &parser->nline_alloc, parser->fp);
+        if (nlen <= 0)
+            break;
+
+        if (parser->line_alloc < len + nlen + 1) {
+            parser->line_alloc = len + nlen + 1;
+            line = parser->line = xrealloc(line, parser->line_alloc);
+        }
+        memcpy(&line[len], parser->nline, nlen);
+        len += nlen;
+    }
+
+    line[len] = '\0';
+    return len;
+}
+
 
 /*
@@ -127 +164 @@
     char *line;
     int ntokens, mintokens;
-    int t, len;
+    int t;
+
+    if (!parser)
+        return 0;
 
     ntokens = (uint8_t)flags;
     mintokens = (uint8_t)(flags >> 8);
 
-    if (parser == NULL)
+ again:
+    memset(tokens, 0, sizeof(tokens[0]) * ntokens);
+
+    /* Read one line (handling continuations with backslash) */
+    if (get_line_with_continuation(parser) < 0)
         return 0;
 
-again:
-    memset(tokens, 0, sizeof(tokens[0]) * ntokens);
-    config_free_data(parser);
-
-    /* Read one line (handling continuations with backslash) */
-    line = bb_get_chunk_with_continuation(parser->fp, &len, &parser->lineno);
-    if (line == NULL)
-        return 0;
-    parser->line = line;
-
-    /* Strip trailing line-feed if any */
-    if (len && line[len-1] == '\n')
-        line[len-1] = '\0';
+    line = parser->line;
 
     /* Skip token in the start of line? */
@@ -156 +188 @@
         goto again;
 
-    if (flags & PARSE_KEEP_COPY)
+    if (flags & PARSE_KEEP_COPY) {
+        free(parser->data);
         parser->data = xstrdup(line);
+    }
 
     /* Tokenize the line */
@@ -171 +205 @@
         } else {
             /* Combining, find comment char if any */
-            line = strchrnul(line, delims[0]);
+            line = strchrnul(line, PARSE_EOL_COMMENTS ? delims[0] : '\0');
 
             /* Trim any extra delimiters from the end */
@@ -203 +237 @@
         if (flags & PARSE_MIN_DIE)
             xfunc_die();
-        if (flags & PARSE_KEEP_COPY)
-            free(parser->data);
         goto again;
     }

branches/3.2/mindi-busybox/libbb/platform.c

@@ -43 +43 @@
 #endif
 
-#ifndef HAVE_FDPRINTF
-/* dprintf is now actually part of POSIX.1, but was only added in 2008 */
-int fdprintf(int fd, const char *format, ...)
+#ifndef HAVE_DPRINTF
+/* dprintf is now part of POSIX.1, but was only added in 2008 */
+int dprintf(int fd, const char *format, ...)
 {
     va_list p;
@@ -135 +135 @@
 }
 #endif
+
+#ifndef HAVE_STPCPY
+char* FAST_FUNC stpcpy(char *p, const char *to_add)
+{
+    while ((*p = *to_add) != '\0') {
+        p++;
+        to_add++;
+    }
+    return p;
+}
+#endif
+
+#ifndef HAVE_GETLINE
+ssize_t FAST_FUNC getline(char **lineptr, size_t *n, FILE *stream)
+{
+    int ch;
+    char *line = *lineptr;
+    size_t alloced = *n;
+    size_t len = 0;
+
+    do {
+        ch = fgetc(stream);
+        if (ch == EOF)
+            break;
+        if (len + 1 >= alloced) {
+            alloced += alloced/4 + 64;
+            line = xrealloc(line, alloced);
+        }
+        line[len++] = ch;
+    } while (ch != '\n');
+
+    if (len == 0)
+        return -1;
+
+    line[len] = '\0';
+    *lineptr = line;
+    *n = alloced;
+    return len;
+}
+#endif

branches/3.2/mindi-busybox/libbb/procps.c

@@ -13 +13 @@
 
 
-typedef struct unsigned_to_name_map_t {
-    long id;
+typedef struct id_to_name_map_t {
+    uid_t id;
     char name[USERNAME_MAX_SIZE];
-} unsigned_to_name_map_t;
+} id_to_name_map_t;
 
 typedef struct cache_t {
-    unsigned_to_name_map_t *cache;
+    id_to_name_map_t *cache;
     int size;
 } cache_t;
@@ -40 +40 @@
 /* Returns -N-1 if not found. */
 /* cp->cache[N] is allocated and must be filled in this case */
-static int get_cached(cache_t *cp, unsigned id)
+static int get_cached(cache_t *cp, uid_t id)
 {
     int i;
@@ -53 +53 @@
 #endif
 
-static char* get_cached(cache_t *cp, long id,
-            char* FAST_FUNC x2x_utoa(long id))
+static char* get_cached(cache_t *cp, uid_t id,
+            char* FAST_FUNC x2x_utoa(uid_t id))
 {
     int i;
@@ -128 +128 @@
     unsigned long n = 0;
 
-    while ((c = *str++) != ' ') {
+    /* Need to stop on both ' ' and '\n' */
+    while ((c = *str++) > ' ') {
         c = ((c|0x20) - '0');
         if (c > 9)
-            // c = c + '0' - 'a' + 10:
+            /* c = c + '0' - 'a' + 10: */
             c = c - ('a' - '0' - 10);
         n = n*16 + c;
@@ -144 +145 @@
 static unsigned long fast_strtoul_10(char **endptr)
 {
-    char c;
+    unsigned char c;
     char *str = *endptr;
     unsigned long n = *str - '0';
 
-    while ((c = *++str) != ' ')
+    /* Need to stop on both ' ' and '\n' */
+    while ((c = *++str) > ' ')
         n = n*10 + (c - '0');
 
@@ -179 +181 @@
 #if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
 int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
-              void (*cb)(struct smaprec *, void *), void *data)
+        void (*cb)(struct smaprec *, void *), void *data)
 {
     FILE *file;
@@ -199 +201 @@
     while (fgets(buf, PROCPS_BUFSIZE, file)) {
         // Each mapping datum has this form:
-        // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+        // f7d29000-f7d39000 rw-s FILEOFS M:m INODE FILENAME
         // Size:                nnn kB
         // Rss:                 nnn kB
@@ -224 +226 @@
         if (tp) {
             // We reached next mapping - the line of this form:
-            // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+            // f7d29000-f7d39000 rw-s FILEOFS M:m INODE FILENAME
 
             if (cb) {
@@ -243 +245 @@
             strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1);
 
-            // skipping "rw-s ADR M:m OFS "
+            // skipping "rw-s FILEOFS M:m INODE "
             tp = skip_whitespace(skip_fields(tp, 4));
             // filter out /dev/something (something != zero)
@@ -285 +287 @@
 procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
 {
-    struct dirent *entry;
-    char buf[PROCPS_BUFSIZE];
-    char filename[sizeof("/proc//cmdline") + sizeof(int)*3];
-    char *filename_tail;
-    long tasknice;
-    unsigned pid;
-    int n;
-    struct stat sb;
-
     if (!sp)
         sp = alloc_procps_scan();
 
     for (;;) {
+        struct dirent *entry;
+        char buf[PROCPS_BUFSIZE];
+        long tasknice;
+        unsigned pid;
+        int n;
+        char filename[sizeof("/proc/%u/task/%u/cmdline") + sizeof(int)*3 * 2];
+        char *filename_tail;
+
 #if ENABLE_FEATURE_SHOW_THREADS
-        if ((flags & PSSCAN_TASKS) && sp->task_dir) {
+        if (sp->task_dir) {
             entry = readdir(sp->task_dir);
             if (entry)
@@ -321 +322 @@
              * there will be /proc/PID/task/PID (same PID!),
              * so just go ahead and dive into /proc/PID/task. */
-            char task_dir[sizeof("/proc/%u/task") + sizeof(int)*3];
-            sprintf(task_dir, "/proc/%u/task", pid);
-            sp->task_dir = xopendir(task_dir);
+            sprintf(filename, "/proc/%u/task", pid);
+            /* Note: if opendir fails, we just go to next /proc/XXX */
+            sp->task_dir = opendir(filename);
+            sp->main_thread_pid = pid;
             continue;
         }
@@ -346 +348 @@
 #endif
 
-        filename_tail = filename + sprintf(filename, "/proc/%u/", pid);
+#if ENABLE_FEATURE_SHOW_THREADS
+        if (sp->task_dir)
+            filename_tail = filename + sprintf(filename, "/proc/%u/task/%u/", sp->main_thread_pid, pid);
+        else
+#endif
+            filename_tail = filename + sprintf(filename, "/proc/%u/", pid);
 
         if (flags & PSSCAN_UIDGID) {
+            struct stat sb;
             if (stat(filename, &sb))
                 continue; /* process probably exited */
@@ -356 +364 @@
         }
 
-        if (flags & PSSCAN_STAT) {
+        /* These are all retrieved from proc/NN/stat in one go: */
+        if (flags & (PSSCAN_PPID | PSSCAN_PGID | PSSCAN_SID
+            | PSSCAN_COMM | PSSCAN_STATE
+            | PSSCAN_VSZ | PSSCAN_RSS
+            | PSSCAN_STIME | PSSCAN_UTIME | PSSCAN_START_TIME
+            | PSSCAN_TTY | PSSCAN_NICE
+            | PSSCAN_CPU)
+        ) {
             char *cp, *comm1;
             int tty;
@@ -411 +426 @@
                 continue; /* bogus data, get next /proc/XXX */
 # if ENABLE_FEATURE_TOP_SMP_PROCESS
-            if (n < 11+15)
+            if (n == 11)
                 sp->last_seen_on_cpu = 0;
 # endif
@@ -558 +573 @@
 {
     int sz;
-    char filename[sizeof("/proc//cmdline") + sizeof(int)*3];
+    char filename[sizeof("/proc/%u/cmdline") + sizeof(int)*3];
 
     sprintf(filename, "/proc/%u/cmdline", pid);
     sz = open_read_close(filename, buf, col - 1);
     if (sz > 0) {
+        const char *base;
+        int comm_len;
+
         buf[sz] = '\0';
         while (--sz >= 0 && buf[sz] == '\0')
             continue;
-        do {
+        /* Prevent basename("process foo/bar") = "bar" */
+        strchrnul(buf, ' ')[0] = '\0';
+        base = bb_basename(buf); /* before we replace argv0's NUL with space */
+        while (sz >= 0) {
             if ((unsigned char)(buf[sz]) < ' ')
                 buf[sz] = ' ';
-        } while (--sz >= 0);
+            sz--;
+        }
+
+        /* If comm differs from argv0, prepend "{comm} ".
+         * It allows to see thread names set by prctl(PR_SET_NAME).
+         */
+        if (base[0] == '-') /* "-sh" (login shell)? */
+            base++;
+        comm_len = strlen(comm);
+        /* Why compare up to comm_len, not COMM_LEN-1?
+         * Well, some processes rewrite argv, and use _spaces_ there
+         * while rewriting. (KDE is observed to do it).
+         * I prefer to still treat argv0 "process foo bar"
+         * as 'equal' to comm "process".
+         */
+        if (strncmp(base, comm, comm_len) != 0) {
+            comm_len += 3;
+            if (col > comm_len)
+                memmove(buf + comm_len, buf, col - comm_len);
+            snprintf(buf, col, "{%s}", comm);
+            if (col <= comm_len)
+                return;
+            buf[comm_len - 1] = ' ';
+            buf[col - 1] = '\0';
+        }
+
     } else {
         snprintf(buf, col, "[%s]", comm);

branches/3.2/mindi-busybox/libbb/progress.c

@@ -53 +53 @@
 }
 
-void FAST_FUNC bb_progress_init(bb_progress_t *p)
+void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
 {
+#if ENABLE_UNICODE_SUPPORT
+    init_unicode();
+    p->curfile = unicode_conv_to_printable_fixedwidth(/*NULL,*/ curfile, 20);
+#else
+    p->curfile = curfile;
+#endif
     p->start_sec = monotonic_sec();
-    p->lastupdate_sec = p->start_sec;
-    p->lastsize = 0;
-    p->inited = 1;
+    p->last_update_sec = p->start_sec;
+    p->last_change_sec = p->start_sec;
+    p->last_size = 0;
 }
 
+/* File already had beg_size bytes.
+ * Then we started downloading.
+ * We downloaded "transferred" bytes so far.
+ * Download is expected to stop when total size (beg_size + transferred)
+ * will be "totalsize" bytes.
+ * If totalsize == 0, then it is unknown.
+ */
 void FAST_FUNC bb_progress_update(bb_progress_t *p,
-        const char *curfile,
-        off_t beg_range,
-        off_t transferred,
-        off_t totalsize)
+        uoff_t beg_size,
+        uoff_t transferred,
+        uoff_t totalsize)
 {
     uoff_t beg_and_transferred;
     unsigned since_last_update, elapsed;
-    unsigned ratio;
-    int barlength, i;
-
-    /* totalsize == 0 if it is unknown */
+    int barlength;
+    int kiloscale;
+
+    //transferred = 1234; /* use for stall detection testing */
+    //totalsize = 0; /* use for unknown size download testing */
 
     elapsed = monotonic_sec();
-    since_last_update = elapsed - p->lastupdate_sec;
-    /* Do not update on every call
-     * (we can be called on every network read!) */
-    if (since_last_update == 0 && !totalsize)
-            return;
-
-    beg_and_transferred = beg_range + transferred;
-    ratio = 100;
-    if (beg_and_transferred < totalsize) {
-        /* Do not update on every call
-         * (we can be called on every network read!) */
-        if (since_last_update == 0)
-            return;
-        /* long long helps to have it working even if !LFS */
-        ratio = 100ULL * beg_and_transferred / (uoff_t)totalsize;
-    }
-
-#if ENABLE_UNICODE_SUPPORT
-    init_unicode();
-    /* libbb candidate? */
-    {
-        wchar_t wbuf21[21];
-        char *buf = xstrdup(curfile);
-        unsigned len;
-
-        /* trim to 20 wide chars max (sets wbuf21[20] to 0)
-         * also, in case mbstowcs fails, we at least
-         * dont get garbage */
-        memset(wbuf21, 0, sizeof(wbuf21));
-        /* convert to wide chars, no more than 20 */
-        len = mbstowcs(wbuf21, curfile, 20); /* NB: may return -1 */
-        /* back to multibyte; cant overflow */
-        wcstombs(buf, wbuf21, INT_MAX);
-        len = (len > 20) ? 0 : 20 - len;
-        fprintf(stderr, "\r%s%*s%4u%% ", buf, len, "", ratio);
-        free(buf);
-    }
-#else
-    fprintf(stderr, "\r%-20.20s%4u%% ", curfile, ratio);
-#endif
-
-    barlength = get_tty2_width() - 49;
-    if (barlength > 0) {
-        /* god bless gcc for variable arrays :) */
-        char buf[barlength + 1];
-        unsigned stars = (unsigned)barlength * ratio / (unsigned)100;
-        memset(buf, ' ', barlength);
-        buf[barlength] = '\0';
-        memset(buf, '*', stars);
-        fprintf(stderr, "|%s|", buf);
-    }
-
-    i = 0;
+    since_last_update = elapsed - p->last_update_sec;
+    p->last_update_sec = elapsed;
+
+    if (totalsize != 0 && transferred >= totalsize - beg_size) {
+        /* Last call. Do not skip this update */
+        transferred = totalsize - beg_size; /* sanitize just in case */
+    }
+    else if (since_last_update == 0) {
+        /*
+         * Do not update on every call
+         * (we can be called on every network read!)
+         */
+        return;
+    }
+
+    kiloscale = 0;
+    /*
+     * Scale sizes down if they are close to overflowing.
+     * This allows calculations like (100 * transferred / totalsize)
+     * without risking overflow: we guarantee 10 highest bits to be 0.
+     * Introduced error is less than 1 / 2^12 ~= 0.025%
+     */
+    if (ULONG_MAX > 0xffffffff || sizeof(off_t) == 4 || sizeof(off_t) != 8) {
+        /*
+         * 64-bit CPU || small off_t: in either case,
+         * >> is cheap, single-word operation.
+         * ... || strange off_t: also use this code
+         * (it is safe, just suboptimal wrt code size),
+         * because 32/64 optimized one works only for 64-bit off_t.
+         */
+        if (totalsize >= (1 << 22)) {
+            totalsize >>= 10;
+            beg_size >>= 10;
+            transferred >>= 10;
+            kiloscale = 1;
+        }
+    } else {
+        /* 32-bit CPU and 64-bit off_t.
+         * Use a 40-bit shift, it is easier to do on 32-bit CPU.
+         */
+/* ONE suppresses "warning: shift count >= width of type" */
+#define ONE (sizeof(off_t) > 4)
+        if (totalsize >= (uoff_t)(1ULL << 54*ONE)) {
+            totalsize = (uint32_t)(totalsize >> 32*ONE) >> 8;
+            beg_size = (uint32_t)(beg_size >> 32*ONE) >> 8;
+            transferred = (uint32_t)(transferred >> 32*ONE) >> 8;
+            kiloscale = 4;
+        }
+    }
+
+    if (ENABLE_UNICODE_SUPPORT)
+        fprintf(stderr, "\r%s", p->curfile);
+    else
+        fprintf(stderr, "\r%-20.20s", p->curfile);
+
+    beg_and_transferred = beg_size + transferred;
+
+    if (totalsize != 0) {
+        unsigned ratio = 100 * beg_and_transferred / totalsize;
+        fprintf(stderr, "%4u%%", ratio);
+
+        barlength = get_tty2_width() - 49;
+        if (barlength > 0) {
+            /* god bless gcc for variable arrays :) */
+            char buf[barlength + 1];
+            unsigned stars = (unsigned)barlength * beg_and_transferred / totalsize;
+            memset(buf, ' ', barlength);
+            buf[barlength] = '\0';
+            memset(buf, '*', stars);
+            fprintf(stderr, " |%s|", buf);
+        }
+    }
+
     while (beg_and_transferred >= 100000) {
-        i++;
         beg_and_transferred >>= 10;
+        kiloscale++;
     }
     /* see http://en.wikipedia.org/wiki/Tera */
-    fprintf(stderr, "%6u%c ", (unsigned)beg_and_transferred, " kMGTPEZY"[i]);
-#define beg_and_transferred dont_use_beg_and_transferred_below
-
-    if (transferred > p->lastsize) {
-        p->lastupdate_sec = elapsed;
-        p->lastsize = transferred;
+    fprintf(stderr, "%6u%c", (unsigned)beg_and_transferred, " kMGTPEZY"[kiloscale]);
+#define beg_and_transferred dont_use_beg_and_transferred_below()
+
+    since_last_update = elapsed - p->last_change_sec;
+    if ((unsigned)transferred != p->last_size) {
+        p->last_change_sec = elapsed;
+        p->last_size = (unsigned)transferred;
         if (since_last_update >= STALLTIME) {
-            /* We "cut off" these seconds from elapsed time
+            /* We "cut out" these seconds from elapsed time
              * by adjusting start time */
             p->start_sec += since_last_update;
@@ -146 +180 @@
         since_last_update = 0; /* we are un-stalled now */
     }
+
     elapsed -= p->start_sec; /* now it's "elapsed since start" */
 
     if (since_last_update >= STALLTIME) {
-        fprintf(stderr, " - stalled -");
+        fprintf(stderr, "  - stalled -");
+    } else if (!totalsize || !transferred || (int)elapsed < 0) {
+        fprintf(stderr, " --:--:-- ETA");
     } else {
-        off_t to_download = totalsize - beg_range;
-        if (!totalsize || transferred <= 0 || (int)elapsed <= 0 || transferred > to_download) {
-            fprintf(stderr, "--:--:-- ETA");
-        } else {
-            /* to_download / (transferred/elapsed) - elapsed: */
-            /* (long long helps to have working ETA even if !LFS) */
-            unsigned eta = (unsigned long long)to_download*elapsed/(uoff_t)transferred - elapsed;
-            unsigned secs = eta % 3600;
-            fprintf(stderr, "%02u:%02u:%02u ETA", eta / 3600, secs / 60, secs % 60);
-        }
+        unsigned eta, secs, hours;
+
+        totalsize -= beg_size; /* now it's "total to upload" */
+
+        /* Estimated remaining time =
+         * estimated_sec_to_dl_totalsize_bytes - elapsed_sec =
+         * totalsize / average_bytes_sec_so_far - elapsed =
+         * totalsize / (transferred/elapsed) - elapsed =
+         * totalsize * elapsed / transferred - elapsed
+         */
+        eta = totalsize * elapsed / transferred - elapsed;
+        if (eta >= 1000*60*60)
+            eta = 1000*60*60 - 1;
+        secs = eta % 3600;
+        hours = eta / 3600;
+        fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);
     }
 }

branches/3.2/mindi-busybox/libbb/pw_encrypt.c

@@ -28 +28 @@
 }
 
-int FAST_FUNC crypt_make_salt(char *p, int cnt, int x)
+int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */)
 {
-    x += getpid() + time(NULL);
+    /* was: x += ... */
+    int x = getpid() + monotonic_us();
     do {
         /* x = (x*1664525 + 1013904223) % 2^32 generator is lame
@@ -46 +47 @@
     *p = '\0';
     return x;
+}
+
+char* FAST_FUNC crypt_make_pw_salt(char salt[MAX_PW_SALT_LEN], const char *algo)
+{
+    int len = 2/2;
+    char *salt_ptr = salt;
+    if (algo[0] != 'd') { /* not des */
+        len = 8/2; /* so far assuming md5 */
+        *salt_ptr++ = '$';
+        *salt_ptr++ = '1';
+        *salt_ptr++ = '$';
+#if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA
+        if (algo[0] == 's') { /* sha */
+            salt[1] = '5' + (strcmp(algo, "sha512") == 0);
+            len = 16/2;
+        }
+#endif
+    }
+    crypt_make_salt(salt_ptr, len);
+    return salt_ptr;
 }
 

branches/3.2/mindi-busybox/libbb/read_key.c

@@ -16 +16 @@
     int n;
 
-    /* Known escape sequences for cursor and function keys */
+    /* Known escape sequences for cursor and function keys.
+     * See "Xterm Control Sequences"
+     * http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
+     */
     static const char esccmds[] ALIGN1 = {
         'O','A'        |0x80,KEYCODE_UP      ,
@@ -41 +44 @@
         '[','D'        |0x80,KEYCODE_LEFT    ,
         /* ESC [ 1 ; 2 x, where x = A/B/C/D: Shift-<arrow> */
-        /* ESC [ 1 ; 3 x, where x = A/B/C/D: Alt-<arrow> */
+        /* ESC [ 1 ; 3 x, where x = A/B/C/D: Alt-<arrow> - implemented below */
         /* ESC [ 1 ; 4 x, where x = A/B/C/D: Alt-Shift-<arrow> */
         /* ESC [ 1 ; 5 x, where x = A/B/C/D: Ctrl-<arrow> - implemented below */
         /* ESC [ 1 ; 6 x, where x = A/B/C/D: Ctrl-Shift-<arrow> */
+        /* ESC [ 1 ; 7 x, where x = A/B/C/D: Ctrl-Alt-<arrow> */
+        /* ESC [ 1 ; 8 x, where x = A/B/C/D: Ctrl-Alt-Shift-<arrow> */
         '[','H'        |0x80,KEYCODE_HOME    , /* xterm */
-        /* [ESC] ESC [ [2] H - [Alt-][Shift-]Home */
         '[','F'        |0x80,KEYCODE_END     , /* xterm */
+        /* [ESC] ESC [ [2] H - [Alt-][Shift-]Home (End similarly?) */
+        /* '[','Z'        |0x80,KEYCODE_SHIFT_TAB, */
         '[','1','~'    |0x80,KEYCODE_HOME    , /* vt100? linux vt? or what? */
         '[','2','~'    |0x80,KEYCODE_INSERT  ,
@@ -64 +70 @@
         '[','8','~'    |0x80,KEYCODE_END     , /* vt100? linux vt? or what? */
 #if 0
-        '[','1','1','~'|0x80,KEYCODE_FUN1    ,
-        '[','1','2','~'|0x80,KEYCODE_FUN2    ,
-        '[','1','3','~'|0x80,KEYCODE_FUN3    ,
-        '[','1','4','~'|0x80,KEYCODE_FUN4    ,
+        '[','1','1','~'|0x80,KEYCODE_FUN1    , /* old xterm, deprecated by ESC O P */
+        '[','1','2','~'|0x80,KEYCODE_FUN2    , /* old xterm... */
+        '[','1','3','~'|0x80,KEYCODE_FUN3    , /* old xterm... */
+        '[','1','4','~'|0x80,KEYCODE_FUN4    , /* old xterm... */
         '[','1','5','~'|0x80,KEYCODE_FUN5    ,
         /* [ESC] ESC [ 1 5 [;2] ~ - [Alt-][Shift-]F5 */
@@ -87 +93 @@
         '[','1',';','5','C' |0x80,KEYCODE_CTRL_RIGHT,
         '[','1',';','5','D' |0x80,KEYCODE_CTRL_LEFT ,
+        /* '[','1',';','3','A' |0x80,KEYCODE_ALT_UP    , - unused */
+        /* '[','1',';','3','B' |0x80,KEYCODE_ALT_DOWN  , - unused */
+        '[','1',';','3','C' |0x80,KEYCODE_ALT_RIGHT,
+        '[','1',';','3','D' |0x80,KEYCODE_ALT_LEFT ,
+        /* '[','3',';','3','~' |0x80,KEYCODE_ALT_DELETE, - unused */
         0
-        /* ESC [ Z - Shift-Tab */
     };
 
@@ -215 +225 @@
         n++;
         /* Try to decipher "ESC [ NNN ; NNN R" sequence */
-        if ((ENABLE_FEATURE_EDITING_ASK_TERMINAL || ENABLE_FEATURE_VI_ASK_TERMINAL)
+        if ((ENABLE_FEATURE_EDITING_ASK_TERMINAL
+            || ENABLE_FEATURE_VI_ASK_TERMINAL
+            || ENABLE_FEATURE_LESS_ASK_TERMINAL
+            )
          && n >= 5
          && buffer[0] == '['

branches/3.2/mindi-busybox/libbb/read_printf.c

@@ -8 +8 @@
  */
 #include "libbb.h"
-
-#define ZIPPED (ENABLE_FEATURE_SEAMLESS_LZMA \
-    || ENABLE_FEATURE_SEAMLESS_BZ2 \
-    || ENABLE_FEATURE_SEAMLESS_GZ \
-    /* || ENABLE_FEATURE_SEAMLESS_Z */ \
-)
-
-#if ZIPPED
-# include "archive.h"
-#endif
 
 
@@ -56 +46 @@
  * Thankfully, poll() doesn't care about O_NONBLOCK flag.
  */
-ssize_t FAST_FUNC nonblock_safe_read(int fd, void *buf, size_t count)
+ssize_t FAST_FUNC nonblock_immune_read(int fd, void *buf, size_t count, int loop_on_EINTR)
 {
     struct pollfd pfd[1];
@@ -62 +52 @@
 
     while (1) {
-        n = safe_read(fd, buf, count);
+        n = loop_on_EINTR ? safe_read(fd, buf, count) : read(fd, buf, count);
         if (n >= 0 || errno != EAGAIN)
             return n;
@@ -68 +58 @@
         pfd[0].fd = fd;
         pfd[0].events = POLLIN;
-        safe_poll(pfd, 1, -1); /* note: this pulls in printf */
+        /* note: safe_poll pulls in printf */
+        loop_on_EINTR ? safe_poll(pfd, 1, -1) : poll(pfd, 1, -1);
     }
 }
@@ -75 +66 @@
 // Reads byte-by-byte. Useful when it is important to not read ahead.
 // Bytes are appended to pfx (which must be malloced, or NULL).
-char* FAST_FUNC xmalloc_reads(int fd, char *buf, size_t *maxsz_p)
+char* FAST_FUNC xmalloc_reads(int fd, size_t *maxsz_p)
 {
     char *p;
-    size_t sz = buf ? strlen(buf) : 0;
+    char *buf = NULL;
+    size_t sz = 0;
     size_t maxsz = maxsz_p ? *maxsz_p : (INT_MAX - 4095);
 
     goto jump_in;
+
     while (sz < maxsz) {
         if ((size_t)(p - buf) == sz) {
@@ -89 +82 @@
             sz += 128;
         }
-        /* nonblock_safe_read() because we are used by e.g. shells */
-        if (nonblock_safe_read(fd, p, 1) != 1) { /* EOF/error */
+        if (nonblock_immune_read(fd, p, 1, /*loop_on_EINTR:*/ 1) != 1) {
+            /* EOF/error */
             if (p == buf) { /* we read nothing */
                 free(buf);
@@ -242 +235 @@
     return buf;
 }
-
-/* Used by e.g. rpm which gives us a fd without filename,
- * thus we can't guess the format from filename's extension.
- */
-#if ZIPPED
-void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/)
-{
-    const int fail_if_not_detected = 1;
-    union {
-        uint8_t b[4];
-        uint16_t b16[2];
-        uint32_t b32[1];
-    } magic;
-    int offset = -2;
-# if BB_MMU
-    IF_DESKTOP(long long) int FAST_FUNC (*xformer)(int src_fd, int dst_fd);
-    enum { xformer_prog = 0 };
-# else
-    enum { xformer = 0 };
-    const char *xformer_prog;
-# endif
-
-    /* .gz and .bz2 both have 2-byte signature, and their
-     * unpack_XXX_stream wants this header skipped. */
-    xread(fd, magic.b16, sizeof(magic.b16[0]));
-    if (ENABLE_FEATURE_SEAMLESS_GZ
-     && magic.b16[0] == GZIP_MAGIC
-    ) {
-# if BB_MMU
-        xformer = unpack_gz_stream;
-# else
-        xformer_prog = "gunzip";
-# endif
-        goto found_magic;
-    }
-    if (ENABLE_FEATURE_SEAMLESS_BZ2
-     && magic.b16[0] == BZIP2_MAGIC
-    ) {
-# if BB_MMU
-        xformer = unpack_bz2_stream;
-# else
-        xformer_prog = "bunzip2";
-# endif
-        goto found_magic;
-    }
-    if (ENABLE_FEATURE_SEAMLESS_XZ
-     && magic.b16[0] == XZ_MAGIC1
-    ) {
-        offset = -6;
-        xread(fd, magic.b32, sizeof(magic.b32[0]));
-        if (magic.b32[0] == XZ_MAGIC2) {
-# if BB_MMU
-            xformer = unpack_xz_stream;
-            /* unpack_xz_stream wants fd at position 6, no need to seek */
-            //xlseek(fd, offset, SEEK_CUR);
-# else
-            xformer_prog = "unxz";
-# endif
-            goto found_magic;
-        }
-    }
-
-    /* No known magic seen */
-    if (fail_if_not_detected)
-        bb_error_msg_and_die("no gzip"
-            IF_FEATURE_SEAMLESS_BZ2("/bzip2")
-            IF_FEATURE_SEAMLESS_XZ("/xz")
-            " magic");
-    xlseek(fd, offset, SEEK_CUR);
-    return;
-
- found_magic:
-# if !BB_MMU
-    /* NOMMU version of open_transformer execs
-     * an external unzipper that wants
-     * file position at the start of the file */
-    xlseek(fd, offset, SEEK_CUR);
-# endif
-    open_transformer(fd, xformer, xformer_prog);
-}
-#endif /* ZIPPED */
-
-int FAST_FUNC open_zipped(const char *fname)
-{
-#if !ZIPPED
-    return open(fname, O_RDONLY);
-#else
-    char *sfx;
-    int fd;
-
-    fd = open(fname, O_RDONLY);
-    if (fd < 0)
-        return fd;
-
-    sfx = strrchr(fname, '.');
-    if (sfx) {
-        sfx++;
-        if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
-            /* .lzma has no header/signature, just trust it */
-            open_transformer(fd, unpack_lzma_stream, "unlzma");
-        else
-        if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
-         || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
-         || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
-        ) {
-            setup_unzip_on_fd(fd /*, fail_if_not_detected: 1*/);
-        }
-    }
-
-    return fd;
-#endif
-}
-
-void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p)
-{
-    int fd;
-    char *image;
-
-    fd = open_zipped(fname);
-    if (fd < 0)
-        return NULL;
-
-    image = xmalloc_read(fd, maxsz_p);
-    if (!image)
-        bb_perror_msg("read error from '%s'", fname);
-    close(fd);
-
-    return image;
-}

branches/3.2/mindi-busybox/libbb/remove_file.c

@@ -34 +34 @@
 
         if (!(flags & FILEUTILS_RECUR)) {
-            bb_error_msg("%s: is a directory", path);
+            bb_error_msg("'%s' is a directory", path);
             return -1;
         }

branches/3.2/mindi-busybox/libbb/safe_gethostname.c

@@ -51 +51 @@
     return xstrndup(!uts.nodename[0] ? "?" : uts.nodename, sizeof(uts.nodename));
 }
-
-/*
- * On success return the current malloced and NUL terminated domainname.
- * On error return malloced and NUL terminated string "?".
- * This is an illegal first character for a domainname.
- * The returned malloced string must be freed by the caller.
- */
-char* FAST_FUNC safe_getdomainname(void)
-{
-#if defined(__linux__)
-/* The field domainname of struct utsname is Linux specific. */
-    struct utsname uts;
-    uname(&uts);
-    return xstrndup(!uts.domainname[0] ? "?" : uts.domainname, sizeof(uts.domainname));
-#else
-    /* We really don't care about people with domain names wider than most screens */
-    char buf[256];
-    int r = getdomainname(buf, sizeof(buf));
-    buf[sizeof(buf)-1] = '\0';
-    return xstrdup(r < 0 ? "?" : buf);
-#endif
-}

branches/3.2/mindi-busybox/libbb/selinux_common.c

@@ -11 +11 @@
 
 context_t FAST_FUNC set_security_context_component(security_context_t cur_context,
-                     char *user, char *role, char *type, char *range)
+            char *user, char *role, char *type, char *range)
 {
     context_t con = context_new(cur_context);

branches/3.2/mindi-busybox/libbb/setup_environment.c

@@ -33 +33 @@
 void FAST_FUNC setup_environment(const char *shell, int flags, const struct passwd *pw)
 {
+    if (!shell || !shell[0])
+        shell = DEFAULT_SHELL;
+
     /* Change the current working directory to be the home directory
      * of the user */
-    if (chdir(pw->pw_dir)) {
-        xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
-        bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
+    if (!(flags & SETUP_ENV_NO_CHDIR)) {
+        if (chdir(pw->pw_dir) != 0) {
+            bb_error_msg("can't change directory to '%s'", pw->pw_dir);
+            xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
+        }
     }
 

branches/3.2/mindi-busybox/libbb/signals.c

@@ -40 +40 @@
     while (sigs) {
         if (sigs & bit) {
-            sigs &= ~bit;
+            sigs -= bit;
             signal(sig_no, f);
         }
@@ -61 +61 @@
     while (sigs) {
         if (sigs & bit) {
-            sigs &= ~bit;
+            sigs -= bit;
             sigaction_set(sig_no, &sa);
         }
@@ -98 +98 @@
     sig_unblock(sig);
     raise(sig);
-    _exit(EXIT_FAILURE); /* Should not reach it */
+    _exit(sig | 128); /* Should not reach it */
 }
 

branches/3.2/mindi-busybox/libbb/single_argv.c

@@ -11 +11 @@
 char* FAST_FUNC single_argv(char **argv)
 {
+    if (argv[1] && strcmp(argv[1], "--") == 0)
+        argv++;
     if (!argv[1] || argv[2])
         bb_show_usage();

branches/3.2/mindi-busybox/libbb/time.c

@@ -92 +92 @@
          * Everything but the minutes is optional
          *
-         * This coincides with the format of "touch -t TIME"
+         * "touch -t DATETIME" format: [[[[[YY]YY]MM]DD]hh]mm[.ss]
+         * Some, but not all, Unix "date DATETIME" commands
+         * move [[YY]YY] past minutes mm field (!).
+         * Coreutils date does it, and SUS mandates it.
+         * (date -s DATETIME does not support this format. lovely!)
+         * In bbox, this format is special-cased in date applet
+         * (IOW: this function assumes "touch -t" format).
          */
+        unsigned cur_year = ptm->tm_year;
         int len = strchrnul(date_str, '.') - date_str;
 
@@ -134 +141 @@
             /* Adjust month from 1-12 to 0-11 */
             ptm->tm_mon -= 1;
+            if ((int)cur_year >= 50) { /* >= 1950 */
+                /* Adjust year: */
+                /* 1. Put it in the current century */
+                ptm->tm_year += (cur_year / 100) * 100;
+                /* 2. If too far in the past, +100 years */
+                if (ptm->tm_year < cur_year - 50)
+                    ptm->tm_year += 100;
+                /* 3. If too far in the future, -100 years */
+                if (ptm->tm_year > cur_year + 50)
+                    ptm->tm_year -= 100;
+            }
         } else
         /* ccyymmddHHMM[.SS] */

branches/3.2/mindi-busybox/libbb/u_signal_names.c

@@ -7 +7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//config:config FEATURE_RTMINMAX
+//config:   bool "Support RTMIN[+n] and RTMAX[-n] signal names"
+//config:   default y
+//config:   help
+//config:     Support RTMIN[+n] and RTMAX[-n] signal names
+//config:     in kill, killall etc. This costs ~250 bytes.
 
 #include "libbb.h"
@@ -118 +125 @@
     [SIGSYS   ] = "SYS",
 #endif
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMIN
+    [__SIGRTMIN] = "RTMIN",
+# endif
+// This makes array about x2 bigger.
+// More compact approach is to special-case SIGRTMAX in print_signames()
+//# ifdef __SIGRTMAX
+//  [__SIGRTMAX] = "RTMAX",
+//# endif
+#endif
 };
 
@@ -135 +152 @@
             return i;
 
-#if ENABLE_DESKTOP && (defined(SIGIOT) || defined(SIGIO))
+#if ENABLE_DESKTOP
+# if defined(SIGIOT) || defined(SIGIO)
     /* SIGIO[T] are aliased to other names,
      * thus cannot be stored in the signals[] array.
      * Need special code to recognize them */
     if ((name[0] | 0x20) == 'i' && (name[1] | 0x20) == 'o') {
-#ifdef SIGIO
+#  ifdef SIGIO
         if (!name[2])
             return SIGIO;
-#endif
-#ifdef SIGIOT
+#  endif
+#  ifdef SIGIOT
         if ((name[2] | 0x20) == 't' && !name[3])
             return SIGIOT;
-#endif
-    }
+#  endif
+    }
+# endif
+#endif
+
+#if ENABLE_FEATURE_RTMINMAX
+# if defined(SIGRTMIN) && defined(SIGRTMAX)
+/* libc may use some rt sigs for pthreads and therefore "remap" SIGRTMIN/MAX,
+ * but we want to use "raw" SIGRTMIN/MAX. Underscored names, if exist, provide
+ * them. If they don't exist, fall back to non-underscored ones: */
+#  if !defined(__SIGRTMIN)
+#   define __SIGRTMIN SIGRTMIN
+#  endif
+#  if !defined(__SIGRTMAX)
+#   define __SIGRTMAX SIGRTMAX
+#  endif
+    if (strncasecmp(name, "RTMIN", 5) == 0) {
+        if (!name[5])
+            return __SIGRTMIN;
+        if (name[5] == '+') {
+            i = bb_strtou(name + 6, NULL, 10);
+            if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                return __SIGRTMIN + i;
+        }
+    }
+    else if (strncasecmp(name, "RTMAX", 5) == 0) {
+        if (!name[5])
+            return __SIGRTMAX;
+        if (name[5] == '-') {
+            i = bb_strtou(name + 6, NULL, 10);
+            if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                return __SIGRTMAX - i;
+        }
+    }
+# endif
 #endif
 
@@ -176 +227 @@
         const char *name = signals[signo];
         if (name[0])
-            puts(name);
-    }
+            printf("%2u) %s\n", signo, name);
+    }
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMAX
+    printf("%2u) %s\n", __SIGRTMAX, "RTMAX");
+# endif
+#endif
 }

branches/3.2/mindi-busybox/libbb/udp_io.c

@@ -14 +14 @@
  */
 void FAST_FUNC
-socket_want_pktinfo(int fd)
+socket_want_pktinfo(int fd UNUSED_PARAM)
 {
 #ifdef IP_PKTINFO

branches/3.2/mindi-busybox/libbb/unicode.c

@@ -24 +24 @@
 /* Unicode support using libc locale support. */
 
-void FAST_FUNC init_unicode(void)
+void FAST_FUNC reinit_unicode(const char *LANG)
 {
     static const char unicode_0x394[] = { 0xce, 0x94, 0 };
     size_t width;
 
-    if (unicode_status != UNICODE_UNKNOWN)
-        return;
+//TODO: avoid repeated calls by caching last string?
+    setlocale(LC_ALL, (LANG && LANG[0]) ? LANG : "C");
+
     /* In unicode, this is a one character string */
 // can use unicode_strlen(string) too, but otherwise unicode_strlen() is unused
@@ -37 +38 @@
 }
 
+void FAST_FUNC init_unicode(void)
+{
+    if (unicode_status == UNICODE_UNKNOWN)
+        reinit_unicode(getenv("LANG"));
+}
+
 #else
 
@@ -42 +49 @@
 
 # if ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
-void FAST_FUNC init_unicode(void)
-{
-    char *lang;
-
-    if (unicode_status != UNICODE_UNKNOWN)
-        return;
-
+void FAST_FUNC reinit_unicode(const char *LANG)
+{
     unicode_status = UNICODE_OFF;
-    lang = getenv("LANG");
-    if (!lang || !(strstr(lang, ".utf") || strstr(lang, ".UTF")))
+    if (!LANG || !(strstr(LANG, ".utf") || strstr(LANG, ".UTF")))
         return;
     unicode_status = UNICODE_ON;
+}
+
+void FAST_FUNC init_unicode(void)
+{
+    if (unicode_status == UNICODE_UNKNOWN)
+        reinit_unicode(getenv("LANG"));
 }
 # endif
@@ -1108 +1115 @@
     return unicode_conv_to_printable2(stats, src, INT_MAX, 0);
 }
+char* FAST_FUNC unicode_conv_to_printable_fixedwidth(/*uni_stat_t *stats,*/ const char *src, unsigned width)
+{
+    return unicode_conv_to_printable2(/*stats:*/ NULL, src, width, UNI_FLAG_PAD);
+}
+
+#ifdef UNUSED
 char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth)
 {
     return unicode_conv_to_printable2(stats, src, maxwidth, 0);
 }
-char* FAST_FUNC unicode_conv_to_printable_fixedwidth(uni_stat_t *stats, const char *src, unsigned width)
-{
-    return unicode_conv_to_printable2(stats, src, width, UNI_FLAG_PAD);
-}
-
-#ifdef UNUSED
+
 unsigned FAST_FUNC unicode_padding_to_width(unsigned width, const char *src)
 {

branches/3.2/mindi-busybox/libbb/utmp.c

@@ -8 +8 @@
  */
 #include "libbb.h"
-#include <utmp.h>
 
 static void touch(const char *filename)

branches/3.2/mindi-busybox/libbb/uuencode.c

@@ -11 +11 @@
 
 /* Conversion table.  for base 64 */
-const char bb_uuenc_tbl_base64[65 + 2] ALIGN1 = {
+const char bb_uuenc_tbl_base64[65 + 1] ALIGN1 = {
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
     'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
@@ -21 +21 @@
     '4', '5', '6', '7', '8', '9', '+', '/',
     '=' /* termination character */,
-    '\n', '\0' /* needed for uudecode.c */
+    '\0' /* needed for uudecode.c only */
 };
 
@@ -74 +74 @@
 
 /*
+ * Decode base64 encoded string. Stops on '\0'.
+ *
+ * Returns: pointer to the undecoded part of source.
+ * If points to '\0', then the source was fully decoded.
+ * (*pp_dst): advanced past the last written byte.
+ */
+const char* FAST_FUNC decode_base64(char **pp_dst, const char *src)
+{
+    char *dst = *pp_dst;
+    const char *src_tail;
+
+    while (1) {
+        unsigned char six_bit[4];
+        int count = 0;
+
+        /* Fetch up to four 6-bit values */
+        src_tail = src;
+        while (count < 4) {
+            char *table_ptr;
+            int ch;
+
+            /* Get next _valid_ character.
+             * bb_uuenc_tbl_base64[] contains this string:
+             *  0         1         2         3         4         5         6
+             *  01234567890123456789012345678901234567890123456789012345678901234
+             * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
+             */
+            do {
+                ch = *src;
+                if (ch == '\0') {
+                    if (count == 0) {
+                        /* Example:
+                         * If we decode "QUJD <NUL>", we want
+                         * to return ptr to NUL, not to ' ',
+                         * because we did fully decode
+                         * the string (to "ABC").
+                         */
+                        src_tail = src;
+                    }
+                    goto ret;
+                }
+                src++;
+                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
+//TODO: add BASE64_FLAG_foo to die on bad char?
+            } while (!table_ptr);
+
+            /* Convert encoded character to decimal */
+            ch = table_ptr - bb_uuenc_tbl_base64;
+
+            /* ch is 64 if char was '=', otherwise 0..63 */
+            if (ch == 64)
+                break;
+            six_bit[count] = ch;
+            count++;
+        }
+
+        /* Transform 6-bit values to 8-bit ones.
+         * count can be < 4 when we decode the tail:
+         * "eQ==" -> "y", not "y NUL NUL".
+         * Note that (count > 1) is always true,
+         * "x===" encoding is not valid:
+         * even a single zero byte encodes as "AA==".
+         * However, with current logic we come here with count == 1
+         * when we decode "==" tail.
+         */
+        if (count > 1)
+            *dst++ = six_bit[0] << 2 | six_bit[1] >> 4;
+        if (count > 2)
+            *dst++ = six_bit[1] << 4 | six_bit[2] >> 2;
+        if (count > 3)
+            *dst++ = six_bit[2] << 6 | six_bit[3];
+        /* Note that if we decode "AA==" and ate first '=',
+         * we just decoded one char (count == 2) and now we'll
+         * do the loop once more to decode second '='.
+         */
+    } /* while (1) */
+ ret:
+    *pp_dst = dst;
+    return src_tail;
+}
+
+/*
  * Decode base64 encoded stream.
  * Can stop on EOF, specified char, or on uuencode-style "====" line:
@@ -84 +166 @@
 #define uu_style_end (flags & BASE64_FLAG_UU_STOP)
 
-    int term_count = 0;
+    /* uuencoded files have 61 byte lines. Use 64 byte buffer
+     * to process line at a time.
+     */
+    enum { BUFFER_SIZE = 64 };
+
+    char in_buf[BUFFER_SIZE + 2];
+    char out_buf[BUFFER_SIZE / 4 * 3 + 2];
+    char *out_tail;
+    const char *in_tail;
+    int term_seen = 0;
+    int in_count = 0;
 
     while (1) {
-        unsigned char translated[4];
-        int count = 0;
-
-        /* Process one group of 4 chars */
-        while (count < 4) {
-            char *table_ptr;
-            int ch;
-
-            /* Get next _valid_ character.
-             * bb_uuenc_tbl_base64[] contains this string:
-             *  0         1         2         3         4         5         6
-             *  012345678901234567890123456789012345678901234567890123456789012345
-             * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
+        while (in_count < BUFFER_SIZE) {
+            int ch = fgetc(src_stream);
+            if (ch == exit_char) {
+                if (in_count == 0)
+                    return;
+                term_seen = 1;
+                break;
+            }
+            if (ch == EOF) {
+                term_seen = 1;
+                break;
+            }
+            /* Prevent "====" line to be split: stop if we see '\n'.
+             * We can also skip other whitespace and skirt the problem
+             * of files with NULs by stopping on any control char or space:
              */
-            do {
-                ch = fgetc(src_stream);
-                if (ch == exit_char && count == 0)
-                    return;
-                if (ch == EOF)
-                    bb_error_msg_and_die("truncated base64 input");
-                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
-//TODO: add BASE64_FLAG_foo to die on bad char?
-//Note that then we may need to still allow '\r' (for mail processing)
-            } while (!table_ptr);
-
-            /* Convert encoded character to decimal */
-            ch = table_ptr - bb_uuenc_tbl_base64;
-
-            if (ch == 65 /* '\n' */) {
-                /* Terminating "====" line? */
-                if (uu_style_end && term_count == 4)
-                    return; /* yes */
-                term_count = 0;
-                continue;
-            }
-            /* ch is 64 if char was '=', otherwise 0..63 */
-            translated[count] = ch & 63; /* 64 -> 0 */
-            if (ch == 64) {
-                term_count++;
-                break;
-            }
-            count++;
-            term_count = 0;
-        }
-
-        /* Merge 6 bit chars to 8 bit.
-         * count can be < 4 when we decode the tail:
-         * "eQ==" -> "y", not "y NUL NUL"
-         */
-        if (count > 1)
-            fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
-        if (count > 2)
-            fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
-        if (count > 3)
-            fputc(translated[2] << 6 | translated[3], dst_stream);
-    } /* while (1) */
+            if (ch <= ' ')
+                break;
+            in_buf[in_count++] = ch;
+        }
+        in_buf[in_count] = '\0';
+
+        /* Did we encounter "====" line? */
+        if (uu_style_end && strcmp(in_buf, "====") == 0)
+            return;
+
+        out_tail = out_buf;
+        in_tail = decode_base64(&out_tail, in_buf);
+
+        fwrite(out_buf, (out_tail - out_buf), 1, dst_stream);
+
+        if (term_seen) {
+            /* Did we consume ALL characters? */
+            if (*in_tail == '\0')
+                return;
+            /* No */
+            bb_error_msg_and_die("truncated base64 input");
+        }
+
+        /* It was partial decode */
+        in_count = strlen(in_tail);
+        memmove(in_buf, in_tail, in_count);
+    }
 }

branches/3.2/mindi-busybox/libbb/vdprintf.c

@@ -13 +13 @@
 int FAST_FUNC vdprintf(int d, const char *format, va_list ap)
 {
-    char buf[BUF_SIZE];
+    char buf[8 * 1024];
     int len;
 
-    len = vsnprintf(buf, BUF_SIZE, format, ap);
+    len = vsnprintf(buf, sizeof(buf), format, ap);
     return write(d, buf, len);
 }

branches/3.2/mindi-busybox/libbb/vfork_daemon_rexec.c

@@ -70 +70 @@
 
 #if ENABLE_FEATURE_PREFER_APPLETS
-void FAST_FUNC save_nofork_data(struct nofork_save_area *save)
+struct nofork_save_area {
+    jmp_buf die_jmp;
+    const char *applet_name;
+    uint32_t option_mask32;
+    int die_sleep;
+    uint8_t xfunc_error_retval;
+};
+static void save_nofork_data(struct nofork_save_area *save)
 {
     memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp));
@@ -77 +84 @@
     save->option_mask32 = option_mask32;
     save->die_sleep = die_sleep;
-    save->saved = 1;
-}
-
-void FAST_FUNC restore_nofork_data(struct nofork_save_area *save)
+}
+static void restore_nofork_data(struct nofork_save_area *save)
 {
     memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp));
@@ -89 +94 @@
 }
 
-int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv)
+int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
 {
     int rc, argc;
+    struct nofork_save_area old;
+
+    save_nofork_data(&old);
 
     applet_name = APPLET_NAME(applet_no);
 
     xfunc_error_retval = EXIT_FAILURE;
-
-    /* Special flag for xfunc_die(). If xfunc will "die"
-     * in NOFORK applet, xfunc_die() sees negative
-     * die_sleep and longjmp here instead. */
-    die_sleep = -1;
 
     /* In case getopt() or getopt32() was already called:
@@ -131 +134 @@
         argc++;
 
+    /* Special flag for xfunc_die(). If xfunc will "die"
+     * in NOFORK applet, xfunc_die() sees negative
+     * die_sleep and longjmp here instead. */
+    die_sleep = -1;
+
     rc = setjmp(die_jmp);
     if (!rc) {
@@ -139 +147 @@
         /* Finally we can call NOFORK applet's main() */
         rc = applet_main[applet_no](argc, tmp_argv);
-
-    /* The whole reason behind nofork_save_area is that <applet>_main
-     * may exit non-locally! For example, in hush Ctrl-Z tries
-     * (modulo bugs) to dynamically create a child (backgrounded task)
-     * if it detects that Ctrl-Z was pressed when a NOFORK was running.
-     * Testcase: interactive "rm -i".
-     * Don't fool yourself into thinking "and <applet>_main() returns
-     * quickly here" and removing "useless" nofork_save_area code. */
-
     } else { /* xfunc died in NOFORK applet */
         /* in case they meant to return 0... */
@@ -155 +154 @@
 
     /* Restoring some globals */
-    restore_nofork_data(old);
+    restore_nofork_data(&old);
 
     /* Other globals can be simply reset to defaults */
@@ -166 +165 @@
     return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
 }
-
-int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
-{
-    struct nofork_save_area old;
-
-    /* Saving globals */
-    save_nofork_data(&old);
-    return run_nofork_applet_prime(&old, applet_no, argv);
-}
 #endif /* FEATURE_PREFER_APPLETS */
 
@@ -184 +174 @@
 
     if (a >= 0 && (APPLET_IS_NOFORK(a)
-#if BB_MMU
+# if BB_MMU
             || APPLET_IS_NOEXEC(a) /* NOEXEC trick needs fork() */
-#endif
+# endif
     )) {
-#if BB_MMU
+# if BB_MMU
         if (APPLET_IS_NOFORK(a))
-#endif
+# endif
         {
             return run_nofork_applet(a, argv);
         }
-#if BB_MMU
+# if BB_MMU
         /* MMU only */
         /* a->noexec is true */
@@ -203 +193 @@
         xfunc_error_retval = EXIT_FAILURE;
         run_applet_no_and_exit(a, argv);
-#endif
+# endif
     }
 #endif /* FEATURE_PREFER_APPLETS */
@@ -264 +254 @@
         if (fork_or_rexec(argv))
             exit(EXIT_SUCCESS); /* parent */
-        /* if daemonizing, make sure we detach from stdio & ctty */
+        /* if daemonizing, detach from stdio & ctty */
         setsid();
         dup2(fd, 0);
         dup2(fd, 1);
         dup2(fd, 2);
+        if (flags & DAEMON_DOUBLE_FORK) {
+            /* On Linux, session leader can acquire ctty
+             * unknowingly, by opening a tty.
+             * Prevent this: stop being a session leader.
+             */
+            if (fork_or_rexec(argv))
+                exit(EXIT_SUCCESS); /* parent */
+        }
     }
     while (fd > 2) {

branches/3.2/mindi-busybox/libbb/xatonum_template.c

@@ -60 +60 @@
 
     /* Note: trailing space is an error.
-       It would be easy enough to allow though if desired. */
+     * It would be easy enough to allow though if desired. */
     if (*e)
         goto inval;

branches/3.2/mindi-busybox/libbb/xconnect.c

@@ -135 +135 @@
 }
 
-void FAST_FUNC set_nport(len_and_sockaddr *lsa, unsigned port)
-{
-#if ENABLE_FEATURE_IPV6
-    if (lsa->u.sa.sa_family == AF_INET6) {
-        lsa->u.sin6.sin6_port = port;
+void FAST_FUNC set_nport(struct sockaddr *sa, unsigned port)
+{
+#if ENABLE_FEATURE_IPV6
+    if (sa->sa_family == AF_INET6) {
+        struct sockaddr_in6 *sin6 = (void*) sa;
+        sin6->sin6_port = port;
         return;
     }
 #endif
-    if (lsa->u.sa.sa_family == AF_INET) {
-        lsa->u.sin.sin_port = port;
+    if (sa->sa_family == AF_INET) {
+        struct sockaddr_in *sin = (void*) sa;
+        sin->sin_port = port;
         return;
     }
@@ -256 +258 @@
     memset(&hint, 0 , sizeof(hint));
     hint.ai_family = af;
-    /* Needed. Or else we will get each address thrice (or more)
+    /* Need SOCK_STREAM, or else we get each address thrice (or more)
      * for each possible socket type (tcp,udp,raw...): */
     hint.ai_socktype = SOCK_STREAM;
@@ -284 +286 @@
 
  set_port:
-    set_nport(r, htons(port));
+    set_nport(&r->u.sa, htons(port));
  ret:
-    freeaddrinfo(result);
+    if (result)
+        freeaddrinfo(result);
     return r;
 }
@@ -320 +323 @@
 }
 
-#undef xsocket_type
-int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,) int sock_type)
-{
-    IF_NOT_FEATURE_IPV6(enum { family = AF_INET };)
+int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, int family, int sock_type)
+{
     len_and_sockaddr *lsa;
     int fd;
     int len;
 
-#if ENABLE_FEATURE_IPV6
     if (family == AF_UNSPEC) {
+#if ENABLE_FEATURE_IPV6
         fd = socket(AF_INET6, sock_type, 0);
         if (fd >= 0) {
@@ -335 +336 @@
             goto done;
         }
+#endif
         family = AF_INET;
     }
-#endif
+
     fd = xsocket(family, sock_type, 0);
+
     len = sizeof(struct sockaddr_in);
+    if (family == AF_UNIX)
+        len = sizeof(struct sockaddr_un);
 #if ENABLE_FEATURE_IPV6
     if (family == AF_INET6) {
@@ -355 +360 @@
 int FAST_FUNC xsocket_stream(len_and_sockaddr **lsap)
 {
-    return xsocket_type(lsap, IF_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM);
+    return xsocket_type(lsap, AF_UNSPEC, SOCK_STREAM);
 }
 
@@ -368 +373 @@
         fd = xsocket(lsa->u.sa.sa_family, sock_type, 0);
     } else {
-        fd = xsocket_type(&lsa, IF_FEATURE_IPV6(AF_UNSPEC,) sock_type);
-        set_nport(lsa, htons(port));
+        fd = xsocket_type(&lsa, AF_UNSPEC, sock_type);
+        set_nport(&lsa->u.sa, htons(port));
     }
     setsockopt_reuseaddr(fd);

branches/3.2/mindi-busybox/libbb/xfuncs.c

@@ -26 +26 @@
 
 /* Turn on nonblocking I/O on a fd */
-int FAST_FUNC ndelay_on(int fd)
-{
-    return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
-}
-
-int FAST_FUNC ndelay_off(int fd)
-{
-    return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_NONBLOCK);
-}
-
-int FAST_FUNC close_on_exec_on(int fd)
-{
-    return fcntl(fd, F_SETFD, FD_CLOEXEC);
+void FAST_FUNC ndelay_on(int fd)
+{
+    int flags = fcntl(fd, F_GETFL);
+    if (flags & O_NONBLOCK)
+        return;
+    fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+}
+
+void FAST_FUNC ndelay_off(int fd)
+{
+    int flags = fcntl(fd, F_GETFL);
+    if (!(flags & O_NONBLOCK))
+        return;
+    fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
+}
+
+void FAST_FUNC close_on_exec_on(int fd)
+{
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
 }
 
@@ -235 +241 @@
         if (s) {
             value = atoi(s);
-            /* If LINES/COLUMNS are set, pretent that there is
+            /* If LINES/COLUMNS are set, pretend that there is
              * no error getting w/h, this prevents some ugly
              * cursor tricks by our callers */

branches/3.2/mindi-busybox/libbb/xfuncs_printf.c

@@ -356 +356 @@
 {
     if (chdir(path))
-        bb_perror_msg_and_die("chdir(%s)", path);
+        bb_perror_msg_and_die("can't change directory to '%s'", path);
 }
 
@@ -362 +362 @@
 {
     if (chroot(path))
-        bb_perror_msg_and_die("can't change root directory to %s", path);
+        bb_perror_msg_and_die("can't change root directory to '%s'", path);
+    xchdir("/");
 }