Merge branch 'busybox' into merge

6 files changed, 122 insertions, 68 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 21b97d382..619c2efe8 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -543,21 +543,6 @@ config FEATURE_SPLIT_FANCY
           Supports additional suffixes 'b' for 512 bytes,
           'g' for 1GiB for the -b option.
 
-config STAT
-        bool "stat"
-        default y
-        help
-          display file or filesystem status.
-
-config FEATURE_STAT_FORMAT
-        bool "Enable custom formats (-c)"
-        default y
-        depends on STAT
-        help
-          Without this, stat will not support the '-c format' option where
-          users can pass a custom format string for output. This adds about
-          7k to a nonstatic build on amd64.
-
 config STTY
         bool "stty"
         default y
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 14c8beaff..c48498858 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1105,7 +1105,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 
 #if ENABLE_FEATURE_AUTOWIDTH
         /* obtain the terminal width */
-        get_terminal_width_height(STDIN_FILENO, &G_terminal_width, NULL);
+        G_terminal_width = get_terminal_width(STDIN_FILENO);
         /* go one less... */
         G_terminal_width--;
 #endif
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 36f02543b..07d903388 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -106,7 +106,9 @@ static struct sort_key {
 
 static char *get_key(char *str, struct sort_key *key, int flags)
 {
-        int start = 0, end = 0, len, j;
+        int start = start; /* for compiler */
+        int end;
+        int len, j;
         unsigned i;
 
         /* Special case whole string, so we don't have to make a copy */
@@ -123,12 +125,15 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                         end = len;
                 /* Loop through fields */
                 else {
+                        unsigned char ch = 0;
+
                         end = 0;
                         for (i = 1; i < key->range[2*j] + j; i++) {
                                 if (key_separator) {
                                         /* Skip body of key and separator */
-                                        while (str[end]) {
-                                                if (str[end++] == key_separator)
+                                        while ((ch = str[end]) != '\0') {
+                                                        end++;
+                                                if (ch == key_separator)
                                                         break;
                                         }
                                 } else {
@@ -136,7 +141,7 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                                         while (isspace(str[end]))
                                                 end++;
                                         /* Skip body of key */
-                                        while (str[end]) {
+                                        while (str[end] != '\0') {
                                                 if (isspace(str[end]))
                                                         break;
                                                 end++;
@@ -144,23 +149,29 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                                 }
                         }
                         /* Remove last delim: "abc:def:" => "abc:def" */
-                        if (key_separator && j && end != 0)
+                        if (j && ch) {
+                                //if (str[end-1] != key_separator)
+                                //  bb_error_msg(_and_die("BUG! "
+                                //  "str[start:%d,end:%d]:'%.*s'",
+                                //  start, end, (int)(end-start), &str[start]);
                                 end--;
+                        }
                 }
                 if (!j) start = end;
         }
         /* Strip leading whitespace if necessary */
-//XXX: skip_whitespace()
         if (flags & FLAG_b)
+                /* not using skip_whitespace() for speed */
                 while (isspace(str[start])) start++;
         /* Strip trailing whitespace if necessary */
         if (flags & FLAG_bb)
                 while (end > start && isspace(str[end-1])) end--;
-        /* Handle offsets on start and end */
+        /* -kSTART,N.ENDCHAR: honor ENDCHAR (1-based) */
         if (key->range[3]) {
-                end += key->range[3] - 1;
+                end = key->range[3];
                 if (end > len) end = len;
         }
+        /* -kN.STARTCHAR[,...]: honor STARTCHAR (1-based) */
         if (key->range[1]) {
                 start += key->range[1] - 1;
                 if (start > len) start = len;
@@ -281,7 +292,7 @@ static int compare_keys(const void *xarg, const void *yarg)
                         else if (!yy)
                                 retval = 1;
                         else
-                                retval = (dx == thyme.tm_mon) ? 0 : dx - thyme.tm_mon;
+                                retval = dx - thyme.tm_mon;
                         break;
                 }
                 /* Full floating point version of -n */
@@ -307,8 +318,8 @@ static int compare_keys(const void *xarg, const void *yarg)
 
         /* Perform fallback sort if necessary */
         if (!retval && !(option_mask32 & FLAG_s)) {
-                retval = strcmp(*(char **)xarg, *(char **)yarg);
                 flags = option_mask32;
+                retval = strcmp(*(char **)xarg, *(char **)yarg);
         }
 
         if (flags & FLAG_r)
@@ -336,7 +347,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
         char *line, **lines;
         char *str_ignored, *str_o, *str_t;
         llist_t *lst_k = NULL;
-        int i, flag;
+        int i;
         int linecount;
         unsigned opts;
 
@@ -359,7 +370,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
         /* note: below this point we use option_mask32, not opts,
          * since that reduces register pressure and makes code smaller */
 
-        /* parse sort key */
+        /* Parse sort key */
         while (lst_k) {
                 enum {
                         FLAG_allowed_for_k =
@@ -386,17 +397,18 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
                                 key->range[2*i+1] = str2u(&str_k);
                         }
                         while (*str_k) {
-                                const char *temp2;
+                                int flag;
+                                const char *idx;
 
                                 if (*str_k == ',' && !i++) {
                                         str_k++;
                                         break;
                                 } /* no else needed: fall through to syntax error
                                         because comma isn't in OPT_STR */
-                                temp2 = strchr(OPT_STR, *str_k);
-                                if (!temp2)
+                                idx = strchr(OPT_STR, *str_k);
+                                if (!idx)
                                         bb_error_msg_and_die("unknown key option");
-                                flag = 1 << (temp2 - OPT_STR);
+                                flag = 1 << (idx - OPT_STR);
                                 if (flag & ~FLAG_allowed_for_k)
                                         bb_error_msg_and_die("unknown sort type");
                                 /* b after ',' means strip _trailing_ space */
@@ -430,10 +442,10 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
         } while (*++argv);
 
 #if ENABLE_FEATURE_SORT_BIG
-        /* if no key, perform alphabetic sort */
+        /* If no key, perform alphabetic sort */
         if (!key_list)
                 add_key()->range[0] = 1;
-        /* handle -c */
+        /* Handle -c */
         if (option_mask32 & FLAG_c) {
                 int j = (option_mask32 & FLAG_u) ? -1 : 0;
                 for (i = 1; i < linecount; i++) {
@@ -447,20 +459,21 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 #endif
         /* Perform the actual sort */
         qsort(lines, linecount, sizeof(lines[0]), compare_keys);
-        /* handle -u */
+
+        /* Handle -u */
         if (option_mask32 & FLAG_u) {
-                flag = 0;
+                int j = 0;
                 /* coreutils 6.3 drop lines for which only key is the same */
                 /* -- disabling last-resort compare... */
                 option_mask32 |= FLAG_s;
                 for (i = 1; i < linecount; i++) {
-                        if (compare_keys(&lines[flag], &lines[i]) == 0)
+                        if (compare_keys(&lines[j], &lines[i]) == 0)
                                 free(lines[i]);
                         else
-                                lines[++flag] = lines[i];
+                                lines[++j] = lines[i];
                 }
                 if (linecount)
-                        linecount = flag+1;
+                        linecount = j+1;
         }
 
         /* Print it */
@@ -469,9 +482,11 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
         if (option_mask32 & FLAG_o)
                 xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO);
 #endif
-        flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
-        for (i = 0; i < linecount; i++)
-                printf("%s%c", lines[i], flag);
+        {
+                int ch = (option_mask32 & FLAG_z) ? '\0' : '\n';
+                for (i = 0; i < linecount; i++)
+                        printf("%s%c", lines[i], ch);
+        }
 
         fflush_stdout_and_exit(EXIT_SUCCESS);
 }
diff --git a/coreutils/stat.c b/coreutils/stat.c
index f7fd227bb..1a490fef7 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -12,54 +12,83 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config STAT
+//config:       bool "stat"
+//config:       default y
+//config:       help
+//config:         display file or filesystem status.
+//config:
+//config:config FEATURE_STAT_FORMAT
+//config:       bool "Enable custom formats (-c)"
+//config:       default y
+//config:       depends on STAT
+//config:       help
+//config:         Without this, stat will not support the '-c format' option where
+//config:         users can pass a custom format string for output. This adds about
+//config:         7k to a nonstatic build on amd64.
+//config:
+//config:config FEATURE_STAT_FILESYSTEM
+//config:       bool "Enable display of filesystem status (-f)"
+//config:       default y
+//config:       depends on STAT
+//config:       select PLATFORM_LINUX # statfs()
+//config:       help
+//config:         Without this, stat will not support the '-f' option to display
+//config:         information about filesystem status.
+
 
 //usage:#define stat_trivial_usage
 //usage:       "[OPTIONS] FILE..."
 //usage:#define stat_full_usage "\n\n"
-//usage:       "Display file (default) or filesystem status\n"
+//usage:       "Display file"
+//usage:            IF_FEATURE_STAT_FILESYSTEM(" (default) or filesystem")
+//usage:            " status\n"
 //usage:        IF_FEATURE_STAT_FORMAT(
-//usage:     "\n        -c fmt  Use the specified format"
+//usage:     "\n        -c FMT  Use the specified format"
 //usage:        )
+//usage:        IF_FEATURE_STAT_FILESYSTEM(
 //usage:     "\n        -f      Display filesystem status"
+//usage:        )
 //usage:     "\n        -L      Follow links"
-//usage:     "\n        -t      Display info in terse form"
+//usage:     "\n        -t      Terse display"
 //usage:        IF_SELINUX(
 //usage:     "\n        -Z      Print security context"
 //usage:        )
 //usage:        IF_FEATURE_STAT_FORMAT(
-//usage:       "\n\nValid format sequences for files:\n"
+//usage:       "\n\nFMT sequences"IF_FEATURE_STAT_FILESYSTEM(" for files")":\n"
 //usage:       " %a     Access rights in octal\n"
 //usage:       " %A     Access rights in human readable form\n"
 //usage:       " %b     Number of blocks allocated (see %B)\n"
-//usage:       " %B     The size in bytes of each block reported by %b\n"
+//usage:       " %B     Size in bytes of each block reported by %b\n"
 //usage:       " %d     Device number in decimal\n"
 //usage:       " %D     Device number in hex\n"
 //usage:       " %f     Raw mode in hex\n"
 //usage:       " %F     File type\n"
-//usage:       " %g     Group ID of owner\n"
-//usage:       " %G     Group name of owner\n"
+//usage:       " %g     Group ID\n"
+//usage:       " %G     Group name\n"
 //usage:       " %h     Number of hard links\n"
 //usage:       " %i     Inode number\n"
 //usage:       " %n     File name\n"
 //usage:       " %N     File name, with -> TARGET if symlink\n"
 //usage:       " %o     I/O block size\n"
-//usage:       " %s     Total size, in bytes\n"
+//usage:       " %s     Total size in bytes\n"
 //usage:       " %t     Major device type in hex\n"
 //usage:       " %T     Minor device type in hex\n"
-//usage:       " %u     User ID of owner\n"
-//usage:       " %U     User name of owner\n"
+//usage:       " %u     User ID\n"
+//usage:       " %U     User name\n"
 //usage:       " %x     Time of last access\n"
 //usage:       " %X     Time of last access as seconds since Epoch\n"
 //usage:       " %y     Time of last modification\n"
 //usage:       " %Y     Time of last modification as seconds since Epoch\n"
 //usage:       " %z     Time of last change\n"
 //usage:       " %Z     Time of last change as seconds since Epoch\n"
-//usage:       "\nValid format sequences for file systems:\n"
+//usage:        IF_FEATURE_STAT_FILESYSTEM(
+//usage:       "\nFMT sequences for file systems:\n"
 //usage:       " %a     Free blocks available to non-superuser\n"
-//usage:       " %b     Total data blocks in file system\n"
-//usage:       " %c     Total file nodes in file system\n"
-//usage:       " %d     Free file nodes in file system\n"
-//usage:       " %f     Free blocks in file system\n"
+//usage:       " %b     Total data blocks\n"
+//usage:       " %c     Total file nodes\n"
+//usage:       " %d     Free file nodes\n"
+//usage:       " %f     Free blocks\n"
 //usage:        IF_SELINUX(
 //usage:       " %C     Security context in selinux\n"
 //usage:        )
@@ -71,13 +100,16 @@
 //usage:       " %t     Type in hex\n"
 //usage:       " %T     Type in human readable form"
 //usage:        )
+//usage:        )
 
 #include "libbb.h"
 
-#define OPT_FILESYS     (1 << 0)
-#define OPT_TERSE       (1 << 1)
-#define OPT_DEREFERENCE (1 << 2)
-#define OPT_SELINUX     (1 << 3)
+enum {
+        OPT_TERSE       = (1 << 0),
+        OPT_DEREFERENCE = (1 << 1),
+        OPT_FILESYS     = (1 << 2) * ENABLE_FEATURE_STAT_FILESYSTEM,
+        OPT_SELINUX     = (1 << (2+ENABLE_FEATURE_STAT_FILESYSTEM)) * ENABLE_SELINUX,
+};
 
 #if ENABLE_FEATURE_STAT_FORMAT
 typedef bool (*statfunc_ptr)(const char *, const char *);
@@ -132,6 +164,7 @@ static const char *human_time(time_t t)
 #undef buf
 }
 
+#if ENABLE_FEATURE_STAT_FILESYSTEM
 /* Return the type of the specified file system.
  * Some systems have statfvs.f_basetype[FSTYPSZ]. (AIX, HP-UX, and Solaris)
  * Others have statfs.f_fstypename[MFSNAMELEN]. (NetBSD 1.5.2)
@@ -202,6 +235,7 @@ static unsigned long long get_f_fsid(const struct statfs *statfsbuf)
         while (--sz > 0);
         return r;
 }
+#endif  /* FEATURE_STAT_FILESYSTEM */
 
 #if ENABLE_FEATURE_STAT_FORMAT
 static void strcatc(char *str, char c)
@@ -217,6 +251,7 @@ static void printfs(char *pformat, const char *msg)
         printf(pformat, msg);
 }
 
+#if ENABLE_FEATURE_STAT_FILESYSTEM
 /* print statfs info */
 static void FAST_FUNC print_statfs(char *pformat, const char m,
                 const char *const filename, const void *data
@@ -263,6 +298,7 @@ static void FAST_FUNC print_statfs(char *pformat, const char m,
                 printf(pformat, m);
         }
 }
+#endif
 
 /* print stat info */
 static void FAST_FUNC print_stat(char *pformat, const char m,
@@ -423,6 +459,7 @@ static void print_it(const char *masterformat,
 }
 #endif  /* FEATURE_STAT_FORMAT */
 
+#if ENABLE_FEATURE_STAT_FILESYSTEM
 /* Stat the file system and print what we find.  */
 #if !ENABLE_FEATURE_STAT_FORMAT
 #define do_statfs(filename, format) do_statfs(filename)
@@ -538,6 +575,7 @@ static bool do_statfs(const char *filename, const char *format)
 #endif  /* FEATURE_STAT_FORMAT */
         return 1;
 }
+#endif  /* FEATURE_STAT_FILESYSTEM */
 
 /* stat the file and print what we find */
 #if !ENABLE_FEATURE_STAT_FORMAT
@@ -721,12 +759,15 @@ int stat_main(int argc UNUSED_PARAM, char **argv)
         statfunc_ptr statfunc = do_stat;
 
         opt_complementary = "-1"; /* min one arg */
-        opts = getopt32(argv, "ftL"
+        opts = getopt32(argv, "tL"
+                IF_FEATURE_STAT_FILESYSTEM("f")
                 IF_SELINUX("Z")
                 IF_FEATURE_STAT_FORMAT("c:", &format)
         );
+#if ENABLE_FEATURE_STAT_FILESYSTEM
         if (opts & OPT_FILESYS) /* -f */
                 statfunc = do_statfs;
+#endif
 #if ENABLE_SELINUX
         if (opts & OPT_SELINUX) {
                 selinux_or_die();
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 378a848e7..b63b0b91a 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1403,7 +1403,7 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
                 perror_on_device_and_die("%s");
 
         if (stty_state & (STTY_verbose_output | STTY_recoverable_output | STTY_noargs)) {
-                get_terminal_width_height(STDOUT_FILENO, &G.max_col, NULL);
+                G.max_col = get_terminal_width(STDOUT_FILENO);
                 output_func(&mode, display_all);
                 return EXIT_SUCCESS;
         }
diff --git a/coreutils/tr.c b/coreutils/tr.c
index e67948a36..2f49d5a86 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -91,7 +91,6 @@ static void map(char *pvector,
  *   Character classes, e.g. [:upper:] ==> A...Z
  *   Equiv classess, e.g. [=A=] ==> A   (hmmmmmmm?)
  * not supported:
- *   \ooo-\ooo - octal ranges
  *   [x*N] - repeat char x N times
  *   [x*] - repeat char x until it fills STRING2:
  * # echo qwe123 | /usr/bin/tr 123456789 '[d]'
@@ -99,7 +98,7 @@ static void map(char *pvector,
  * # echo qwe123 | /usr/bin/tr 123456789 '[d*]'
  * qweddd
  */
-static unsigned expand(const char *arg, char **buffer_p)
+static unsigned expand(char *arg, char **buffer_p)
 {
         char *buffer = *buffer_p;
         unsigned pos = 0;
@@ -113,9 +112,17 @@ static unsigned expand(const char *arg, char **buffer_p)
                         *buffer_p = buffer = xrealloc(buffer, size);
                 }
                 if (*arg == '\\') {
+                        const char *z;
                         arg++;
-                        buffer[pos++] = bb_process_escape_sequence(&arg);
-                        continue;
+                        z = arg;
+                        ac = bb_process_escape_sequence(&z);
+                        arg = (char *)z;
+                        arg--;
+                        *arg = ac;
+                        /*
+                         * fall through, there may be a range.
+                         * If not, current char will be treated anyway.
+                         */
                 }
                 if (arg[1] == '-') { /* "0-9..." */
                         ac = arg[2];
@@ -124,9 +131,15 @@ static unsigned expand(const char *arg, char **buffer_p)
                                 continue; /* next iter will copy '-' and stop */
                         }
                         i = (unsigned char) *arg;
+                        arg += 3; /* skip 0-9 or 0-\ */
+                        if (ac == '\\') {
+                                const char *z;
+                                z = arg;
+                                ac = bb_process_escape_sequence(&z);
+                                arg = (char *)z;
+                        }
                         while (i <= ac) /* ok: i is unsigned _int_ */
                                 buffer[pos++] = i++;
-                        arg += 3; /* skip 0-9 */
                         continue;
                 }
                 if ((ENABLE_FEATURE_TR_CLASSES || ENABLE_FEATURE_TR_EQUIV)