11 files changed, 73 insertions, 49 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 6297f43a3..2769aa07d 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -594,7 +594,7 @@ config FEATURE_SPLIT_FANCY
 config STAT
         bool "stat"
         default y
-        depends on PLATFORM_LINUX # statfs()
+        select PLATFORM_LINUX # statfs()
         help
           display file or filesystem status.
 
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index b80a12ee0..5ac2e890e 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -23,11 +23,9 @@ int chroot_main(int argc UNUSED_PARAM, char **argv)
         ++argv;
         if (!*argv) { /* no 2nd param (PROG), use shell */
                 argv -= 2;
-                argv[0] = getenv("SHELL");
-                if (!argv[0]) {
-                        argv[0] = (char *) DEFAULT_SHELL;
-                }
-                argv[1] = (char *) "-i";
+                argv[0] = (char *) get_shell_name();
+                argv[1] = (char *) "-i"; /* GNU coreutils 8.4 compat */
+                /*argv[2] = NULL; - already is */
         }
 
         BB_EXECVP_or_die(argv);
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 7a37e6add..53fb87a78 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -38,6 +38,7 @@ int cksum_main(int argc UNUSED_PARAM, char **argv)
 
 #define read_buf bb_common_bufsiz1
                 while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) {
+                        length += bytes_read;
                         crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
                 }
                 close(fd);
diff --git a/coreutils/date.c b/coreutils/date.c
index d36ed83fd..497031991 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -42,7 +42,8 @@
 //config:config FEATURE_DATE_NANO
 //config:       bool "Support %[num]N nanosecond format specifier"
 //config:       default n
-//config:       depends on DATE && PLATFORM_LINUX # syscall(__NR_clock_gettime)
+//config:       depends on DATE  # syscall(__NR_clock_gettime)
+//config:       select PLATFORM_LINUX
 //config:       help
 //config:         Support %[num]N format specifier. Adds ~250 bytes of code.
 //config:
diff --git a/coreutils/dd.c b/coreutils/dd.c
index da205ec69..544ece051 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -409,5 +409,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
  out_status:
         dd_output_status(0);
 
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                free(obuf);
+                if (flags & FLAG_TWOBUFS)
+                        free(ibuf);
+        }
+
         return exitcode;
 }
diff --git a/coreutils/ln.c b/coreutils/ln.c
index ddad120d1..6da290c11 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -40,8 +40,12 @@ int ln_main(int argc, char **argv)
         last = argv[argc - 1];
         argv += optind;
 
-        if (argc == optind + 1) {
+        if (!argv[1]) {
+                /* "ln PATH/TO/FILE" -> "ln PATH/TO/FILE FILE" */
                 *--argv = last;
+                /* xstrdup is needed: "ln -s PATH/TO/FILE/" is equivalent to
+                 * "ln -s PATH/TO/FILE/ FILE", not "ln -s PATH/TO/FILE FILE"
+                 */
                 last = bb_get_last_path_component_strip(xstrdup(last));
         }
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 1afe28c8d..4a41db76a 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1,6 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * tiny-ls.c version 0.1.0: A minimalist 'ls'
  * Copyright (C) 1996 Brian Candler <B.Candler@pobox.com>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
@@ -159,7 +158,7 @@ STYLE_MASK      = STYLE_SINGLE,
 
 /* which of the three times will be used */
 TIME_CHANGE     = (1 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS,
-TIME_ACCESS     = (1 << 22) * ENABLE_FEATURE_LS_TIMESTAMPS,
+TIME_ACCESS     = (2 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS,
 TIME_MASK       = (3 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS,
 
 /* how will the files be sorted (CONFIG_FEATURE_LS_SORTFILES) */
@@ -189,10 +188,11 @@ LIST_LONG       = LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
 /*          Not fully compatible - we show not only '/' but other chars too */
 /* -SXvhTw  GNU options, busybox optionally supports */
 /*          -T TABWIDTH is ignored (we don't use tabs on output) */
-/* -K       SELinux mandated options, busybox optionally supports */
+/* -KZ      SELinux mandated options, busybox optionally supports */
+/*          (coreutils 8.4 has no -K, remove it?) */
 /* -e       I think we made this one up (looks similar to GNU --full-time) */
-/* Std opts we do not support: */
-/* -H       Follow the links on command line only */
+/* We already used up all 32 bits, if we need to add more, candidates for removal: */
+/* -K, -T, -e (add --full-time instead) */
 static const char ls_options[] ALIGN1 =
         "Cadil1gnsxQAk"      /* 13 opts, total 13 */
         IF_FEATURE_LS_TIMESTAMPS("cetu") /* 4, 17 */
@@ -203,7 +203,7 @@ static const char ls_options[] ALIGN1 =
         IF_FEATURE_LS_FOLLOWLINKS("LH")  /* 2, 28 */
         IF_FEATURE_HUMAN_READABLE("h")   /* 1, 29 */
         IF_FEATURE_AUTOWIDTH("T:w:")     /* 2, 31 */
-        ;
+        /* with --color, we use all 32 bits */;
 enum {
         //OPT_C = (1 << 0),
         //OPT_a = (1 << 1),
@@ -234,8 +234,8 @@ enum {
         OPTBIT_Z, /* 25 */
         OPTBIT_L = OPTBIT_K + 2 * ENABLE_SELINUX,
         OPTBIT_H, /* 27 */
-        OPTBIT_h = OPTBIT_L + 1 * ENABLE_FEATURE_LS_FOLLOWLINKS,
-        OPTBIT_T = OPTBIT_h + 2 * ENABLE_FEATURE_HUMAN_READABLE,
+        OPTBIT_h = OPTBIT_L + 2 * ENABLE_FEATURE_LS_FOLLOWLINKS,
+        OPTBIT_T = OPTBIT_h + 1 * ENABLE_FEATURE_HUMAN_READABLE,
         OPTBIT_w, /* 30 */
         OPTBIT_color = OPTBIT_T + 2 * ENABLE_FEATURE_AUTOWIDTH,
 
@@ -268,13 +268,13 @@ static const uint32_t opt_flags[] = {
         LIST_INO,                    /* i */
         LIST_LONG | STYLE_LONG,      /* l */
         STYLE_SINGLE,                /* 1 */
-        0,                           /* g (don't show owner) - handled via OPT_g */
-        LIST_ID_NUMERIC,             /* n */
+        LIST_LONG | STYLE_LONG,      /* g (don't show owner) - handled via OPT_g. assumes l */
+        LIST_ID_NUMERIC | LIST_LONG | STYLE_LONG, /* n (assumes l) */
         LIST_BLOCKS,                 /* s */
         DISP_ROWS | STYLE_COLUMNAR,  /* x */
         0,                           /* Q (quote filename) - handled via OPT_Q */
         DISP_HIDDEN,                 /* A */
-        ENABLE_SELINUX * LIST_CONTEXT, /* k (ignored if !SELINUX) */
+        ENABLE_SELINUX * (LIST_CONTEXT|STYLE_SINGLE), /* k (ignored if !SELINUX) */
 #if ENABLE_FEATURE_LS_TIMESTAMPS
         TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */
         LIST_FULLTIME,               /* e */
@@ -295,8 +295,8 @@ static const uint32_t opt_flags[] = {
         DISP_RECURSIVE,              /* R */
 #endif
 #if ENABLE_SELINUX
-        LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
-        LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */
+        LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME|STYLE_SINGLE, /* K */
+        LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT|STYLE_SINGLE, /* Z */
 #endif
         (1U << 31)
         /* options after Z are not processed through opt_flags */
@@ -682,19 +682,28 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
 
         if (all_fmt & LIST_INO)
                 column += printf("%7llu ", (long long) dn->dstat.st_ino);
+//TODO: -h should affect -s too:
         if (all_fmt & LIST_BLOCKS)
 #if ENABLE_PLATFORM_MINGW32
                 /* MinGW does not have st_blocks */
-                column += printf("%4"OFF_FMT"u ", (off_t)0);
+                column += printf("%6"OFF_FMT"u ", (off_t)0);
 #else
-                column += printf("%4"OFF_FMT"u ", (off_t) (dn->dstat.st_blocks >> 1));
+                column += printf("%6"OFF_FMT"u ", (off_t) (dn->dstat.st_blocks >> 1));
 #endif
         if (all_fmt & LIST_MODEBITS)
                 column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode));
         if (all_fmt & LIST_NLINKS)
                 column += printf("%4lu ", (long) dn->dstat.st_nlink);
+        if (all_fmt & LIST_ID_NUMERIC) {
+                if (option_mask32 & OPT_g)
+                        column += printf("%-8u ", (int) dn->dstat.st_gid);
+                else
+                        column += printf("%-8u %-8u ",
+                                        (int) dn->dstat.st_uid,
+                                        (int) dn->dstat.st_gid);
+        }
 #if ENABLE_FEATURE_LS_USERNAME
-        if (all_fmt & LIST_ID_NAME) {
+        else if (all_fmt & LIST_ID_NAME) {
                 if (option_mask32 & OPT_g) {
                         column += printf("%-8.8s ",
                                 get_cached_groupname(dn->dstat.st_gid));
@@ -705,14 +714,6 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
                 }
         }
 #endif
-        if (all_fmt & LIST_ID_NUMERIC) {
-                if (option_mask32 & OPT_g)
-                        column += printf("%-8u ", (int) dn->dstat.st_gid);
-                else
-                        column += printf("%-8u %-8u ",
-                                        (int) dn->dstat.st_uid,
-                                        (int) dn->dstat.st_gid);
-        }
         if (all_fmt & LIST_SIZE) {
                 if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) {
                         column += printf("%4u, %3u ",
@@ -739,9 +740,12 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
                         ttime = dn->dstat.st_ctime;
                 filetime = ctime(&ttime);
                 /* filetime's format: "Wed Jun 30 21:49:08 1993\n" */
-                if (all_fmt & LIST_FULLTIME)
+                if (all_fmt & LIST_FULLTIME) { /* -e */
+                        /* Note: coreutils 8.4 ls --full-time prints:
+                         * 2009-07-13 17:49:27.000000000 +0200
+                         */
                         column += printf("%.24s ", filetime);
-                else { /* LIST_DATE_TIME */
+                } else { /* LIST_DATE_TIME */
                         /* current_time_t ~== time(NULL) */
                         time_t age = current_time_t - ttime;
                         printf("%.6s ", filetime + 4); /* "Jun 30" */
@@ -1049,7 +1053,8 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 
         init_unicode();
 
-        all_fmt = ENABLE_FEATURE_LS_SORTFILES * SORT_NAME;
+        if (ENABLE_FEATURE_LS_SORTFILES)
+                all_fmt = SORT_NAME;
 
 #if ENABLE_FEATURE_AUTOWIDTH
         /* obtain the terminal width */
@@ -1090,14 +1095,12 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                         if (flags & TIME_MASK)
                                 all_fmt &= ~TIME_MASK;
 
-                        if (flags & LIST_CONTEXT)
-                                all_fmt |= STYLE_SINGLE;
                         all_fmt |= flags;
                 }
         }
 
 #if ENABLE_FEATURE_LS_COLOR
-        /* find color bit value - last position for short getopt */
+        /* set show_color = 1/0 */
         if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && isatty(STDOUT_FILENO)) {
                 char *p = getenv("LS_COLORS");
                 /* LS_COLORS is unset, or (not empty && not "none") ? */
@@ -1130,11 +1133,8 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                 if (all_fmt & TIME_ACCESS)
                         all_fmt = (all_fmt & ~SORT_MASK) | SORT_ATIME;
         }
-        if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */
+        if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* not -l? */
                 all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME);
-        if (ENABLE_FEATURE_LS_USERNAME)
-                if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
-                        all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */
 
         /* choose a display format if one was not already specified by an option */
         if (!(all_fmt & STYLE_MASK))
@@ -1153,7 +1153,10 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         do {
                 cur = my_stat(*argv, *argv,
                         /* follow links on command line unless -l, -s or -F: */
-                        !((all_fmt & (STYLE_LONG|LIST_BLOCKS)) || (option_mask32 & OPT_F))
+                        !((all_fmt & STYLE_MASK) == STYLE_LONG
+                          || (all_fmt & LIST_BLOCKS)
+                          || (option_mask32 & OPT_F)
+                        )
                         /* ... or if -H: */
                         || (option_mask32 & OPT_H)
                 );
diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index 33be5c096..d0fb71636 100644
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -19,9 +19,14 @@ int printenv_main(int argc UNUSED_PARAM, char **argv)
 
         /* no variables specified, show whole env */
         if (!argv[1]) {
-                int e = 0;
-                while (environ[e])
-                        puts(environ[e++]);
+                char **e = environ;
+
+                /* environ can be NULL! (for example, after clearenv())
+                 * Check for that:
+                 */
+                if (e)
+                        while (*e)
+                                puts(*e++);
         } else {
                 /* search for specified variables and print them out if found */
                 char *arg, *env;
diff --git a/coreutils/split.c b/coreutils/split.c
index db5a1727a..79316ed74 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -32,7 +32,7 @@ static char *next_file(char *old, unsigned suffix_len)
         unsigned i = 1;
         char *curr;
 
-        do {
+        while (1) {
                 curr = old + end - i;
                 if (*curr < 'z') {
                         *curr += 1;
@@ -43,7 +43,7 @@ static char *next_file(char *old, unsigned suffix_len)
                         return NULL;
                 }
                 *curr = 'a';
-        } while (1);
+        }
 
         return old;
 }
diff --git a/coreutils/test.c b/coreutils/test.c
index caecd7d02..cb15ed725 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -45,7 +45,7 @@
 /* This is a NOFORK applet. Be very careful! */
 
 /* test_main() is called from shells, and we need to be extra careful here.
- * This is true regardless of PREFER_APPLETS and STANDALONE_SHELL
+ * This is true regardless of PREFER_APPLETS and SH_STANDALONE
  * state. */
 
 /* test(1) accepts the following grammar:
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 21d77ef95..5b2b9a9a4 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -324,5 +324,11 @@ int tr_main(int argc UNUSED_PARAM, char **argv)
                 str2[out_index++] = last = coded;
         }
 
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                free(vector);
+                free(str2);
+                free(str1);
+        }
+
         return EXIT_SUCCESS;
 }