Merge branch 'busybox' into merge

11 files changed, 77 insertions, 64 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 1879ec79f..beccab217 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -213,9 +213,10 @@ static int write_ar_archive(archive_handle_t *handle)
 
 static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
 {
-        const char *mode = bb_mode_string(file_header->mode);
+        char mode[12];
         char *mtime;
 
+        bb_mode_string(mode, file_header->mode);
         mtime = ctime(&file_header->mtime);
         mtime[16] = ' ';
         memmove(&mtime[17], &mtime[20], 4);
diff --git a/archival/libarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index be5140f8b..a575a08a0 100644
--- a/archival/libarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -9,6 +9,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 {
         struct tm tm_time;
         struct tm *ptm = &tm_time; //localtime(&file_header->mtime);
+        char modestr[12];
 
 #if ENABLE_FEATURE_TAR_UNAME_GNAME
         char uid[sizeof(int)*3 + 2];
@@ -29,7 +30,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
                 group = utoa(file_header->gid);
         }
         printf("%s %s/%s %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
-                bb_mode_string(file_header->mode),
+                bb_mode_string(modestr, file_header->mode),
                 user,
                 group,
                 file_header->size,
@@ -46,7 +47,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
         localtime_r(&file_header->mtime, ptm);
 
         printf("%s %u/%u %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
-                bb_mode_string(file_header->mode),
+                bb_mode_string(modestr, file_header->mode),
                 (unsigned)file_header->uid,
                 (unsigned)file_header->gid,
                 file_header->size,
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index e260adab2..5832cc51b 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -88,10 +88,12 @@ static int FAST_FUNC fileAction(struct recursive_state *state,
 
         if (chmod(fileName, newmode) == 0) {
                 if (OPT_VERBOSE
-                 || (OPT_CHANGED && statbuf->st_mode != newmode)
+                 || (OPT_CHANGED
+                     && (statbuf->st_mode & 07777) != (newmode & 07777))
                 ) {
+                        char modestr[12];
                         printf("mode of '%s' changed to %04o (%s)\n", fileName,
-                                newmode & 07777, bb_mode_string(newmode)+1);
+                                newmode & 07777, bb_mode_string(modestr, newmode)+1);
                 }
                 return TRUE;
         }
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 0330f62df..58b8fde75 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -510,7 +510,8 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
                 column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1));
         if (opt & OPT_l) {
                 /* long listing: show mode */
-                column += printf("%-10s ", (char *) bb_mode_string(dn->dn_mode));
+                char modestr[12];
+                column += printf("%-10s ", bb_mode_string(modestr, dn->dn_mode));
                 /* long listing: show number of links */
                 column += printf("%4lu ", (long) dn->dn_nlink);
                 /* long listing: show user/group */
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 96cbf6dc6..940ade89a 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -340,7 +340,8 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
                 strcat(pformat, "lo");
                 printf(pformat, (unsigned long) (statbuf->st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)));
         } else if (m == 'A') {
-                printfs(pformat, bb_mode_string(statbuf->st_mode));
+                char modestr[12];
+                printfs(pformat, bb_mode_string(modestr, statbuf->st_mode));
         } else if (m == 'f') {
                 strcat(pformat, "lx");
                 printf(pformat, (unsigned long) statbuf->st_mode);
@@ -703,6 +704,7 @@ static bool do_stat(const char *filename, const char *format)
                         bb_putchar('\n');
 # endif
         } else {
+                char modestr[12];
                 char *linkname = NULL;
                 struct passwd *pw_ent;
                 struct group *gw_ent;
@@ -737,7 +739,7 @@ static bool do_stat(const char *filename, const char *format)
                         bb_putchar('\n');
                 printf("Access: (%04lo/%10.10s)  Uid: (%5lu/%8s)   Gid: (%5lu/%8s)\n",
                        (unsigned long) (statbuf.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)),
-                       bb_mode_string(statbuf.st_mode),
+                       bb_mode_string(modestr, statbuf.st_mode),
                        (unsigned long) statbuf.st_uid,
                        (pw_ent != NULL) ? pw_ent->pw_name : "UNKNOWN",
                        (unsigned long) statbuf.st_gid,
diff --git a/include/libbb.h b/include/libbb.h
index cee37f9d8..3a958b555 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -459,9 +459,8 @@ void *xmmap_anon(size_t size) FAST_FUNC;
 # define cached_pagesize(var) (var)
 #endif
 
-
-//TODO: supply a pointer to char[11] buffer (avoid statics)?
-extern const char *bb_mode_string(mode_t mode) FAST_FUNC;
+/* Generate ls-style "mode string" like "-rwsr-xr-x" or "drwxrwxrwt" */
+extern char *bb_mode_string(char buf[11], mode_t mode) FAST_FUNC;
 extern int is_directory(const char *name, int followLinks) FAST_FUNC;
 enum {  /* cp.c, mv.c, install.c depend on these values. CAREFUL when changing them! */
         FILEUTILS_PRESERVE_STATUS = 1 << 0, /* -p */
@@ -1651,7 +1650,7 @@ char *bb_ask_noecho_stdin(const char *prompt) FAST_FUNC;
 int bb_ask_y_confirmation_FILE(FILE *fp) FAST_FUNC;
 int bb_ask_y_confirmation(void) FAST_FUNC;
 
-/* Returns -1 if input is invalid. current_mode is a base for e.g. "u+rw" */
+/* Returns -1 if input is invalid. cur_mode is a base for e.g. "u+rw" */
 int bb_parse_mode(const char* s, unsigned cur_mode) FAST_FUNC;
 
 /*
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index f17c9a215..7c46fa5db 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1219,7 +1219,16 @@ static void showfiles(void)
 
 static const char *is_special_char(char c)
 {
-        return strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", c);
+        // {: It's mandatory to escape { only if entire name is "{"
+        // (otherwise it's not special. Example: file named "{ "
+        // can be escaped simply as "{\ "; "{a" or "a{" need no escaping),
+        // or if shell supports brace expansion
+        // (ash doesn't, hush optionally does).
+        // (): unlike {, shell treats () specially even in contexts
+        // where they clearly are not valid (e.g. "echo )" is an error).
+        // #: needs escaping to not start a shell comment.
+        return strchr(" `'\"\\#$~?*[{()&;|<>", c);
+        // Used to also have %^=+}]: but not necessary to escape?
 }
 
 static char *quote_special_chars(char *found)
diff --git a/libbb/mode_string.c b/libbb/mode_string.c
index dc3f9f88c..906c03964 100644
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -16,16 +16,18 @@
 #error permission bitflag value assumption(s) violated!
 #endif
 
+/* Generate ls-style "mode string" like "-rwsr-xr-x" or "drwxrwxrwt" */
+
 #if ( S_IFSOCK!= 0140000 ) || ( S_IFLNK != 0120000 ) \
  || ( S_IFREG != 0100000 ) || ( S_IFBLK != 0060000 && S_IFBLK != 0030000 ) \
  || ( S_IFDIR != 0040000 ) || ( S_IFCHR != 0020000 ) \
  || ( S_IFIFO != 0010000 )
-#warning mode type bitflag value assumption(s) violated! falling back to larger version
+# warning mode type bitflag value assumption(s) violated! falling back to larger version
 
-#if (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX) == 07777
-#undef mode_t
-#define mode_t unsigned short
-#endif
+# if (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX) == 07777
+#  undef mode_t
+#  define mode_t unsigned short
+# endif
 
 static const mode_t mode_flags[] ALIGN4 = {
         S_IRUSR, S_IWUSR, S_IXUSR, S_ISUID,
@@ -33,19 +35,14 @@ static const mode_t mode_flags[] ALIGN4 = {
         S_IROTH, S_IWOTH, S_IXOTH, S_ISVTX
 };
 
-/* The static const char arrays below are duplicated for the two cases
- * because moving them ahead of the mode_flags declaration cause a text
- * size increase with the gcc version I'm using. */
-
 /* The previous version used "0pcCd?bB-?l?s???".  However, the '0', 'C',
  * and 'B' types don't appear to be available on linux.  So I removed them. */
 static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
 /***************************************** 0123456789abcdef */
 static const char mode_chars[7] ALIGN1 = "rwxSTst";
 
-const char* FAST_FUNC bb_mode_string(mode_t mode)
+char* FAST_FUNC bb_mode_string(char buf[11], mode_t mode)
 {
-        static char buf[12];
         char *p = buf;
 
         int i, j, k;
@@ -67,10 +64,7 @@ const char* FAST_FUNC bb_mode_string(mode_t mode)
                 i += 4;
         } while (i < 12);
 
-        /* Note: We don't bother with nul termination because bss initialization
-         * should have taken care of that for us.  If the user scribbled in buf
-         * memory, they deserve whatever happens.  But we'll at least assert. */
-        assert(buf[10] == 0);
+        buf[10] = '\0';
 
         return buf;
 }
@@ -80,12 +74,11 @@ const char* FAST_FUNC bb_mode_string(mode_t mode)
 /* The previous version used "0pcCd?bB-?l?s???".  However, the '0', 'C',
  * and 'B' types don't appear to be available on linux.  So I removed them. */
 static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
-/********************************** 0123456789abcdef */
+/***************************************** 0123456789abcdef */
 static const char mode_chars[7] ALIGN1 = "rwxSTst";
 
-const char* FAST_FUNC bb_mode_string(mode_t mode)
+char* FAST_FUNC bb_mode_string(char buf[11], mode_t mode)
 {
-        static char buf[12];
         char *p = buf;
 
         int i, j, k, m;
@@ -109,10 +102,7 @@ const char* FAST_FUNC bb_mode_string(mode_t mode)
                 }
         } while (i < 3);
 
-        /* Note: We don't bother with nul termination because bss initialization
-         * should have taken care of that for us.  If the user scribbled in buf
-         * memory, they deserve whatever happens.  But we'll at least assert. */
-        assert(buf[10] == 0);
+        buf[10] = '\0';
 
         return buf;
 }
diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c
index dc65860f6..1d238e1e0 100644
--- a/libbb/parse_mode.c
+++ b/libbb/parse_mode.c
@@ -16,13 +16,14 @@
 
 int FAST_FUNC bb_parse_mode(const char *s, unsigned current_mode)
 {
-        static const mode_t who_mask[] = {
+/* should be mode_t really, but in all Unixes these constants fit into uint16 */
+        static const uint16_t who_mask[] ALIGN2 = {
                 S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO, /* a */
                 S_ISUID | S_IRWXU,           /* u */
                 S_ISGID | S_IRWXG,           /* g */
                 S_IRWXO                      /* o */
         };
-        static const mode_t perm_mask[] = {
+        static const uint16_t perm_mask[] ALIGN2 = {
                 S_IRUSR | S_IRGRP | S_IROTH, /* r */
                 S_IWUSR | S_IWGRP | S_IWOTH, /* w */
                 S_IXUSR | S_IXGRP | S_IXOTH, /* x */
diff --git a/libbb/time.c b/libbb/time.c
index ed4f50470..e7c9fa65e 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -13,6 +13,7 @@
 int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
 {
         char end = '\0';
+        time_t t;
 #if ENABLE_DESKTOP
 /*
  * strptime is BIG: ~1k in uclibc, ~10k in glibc
@@ -29,10 +30,10 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 "%b %d %T %Y" "\0"      /* month_name d HH:MM:SS YYYY */
                 "%Y-%m-%d %R" "\0"      /* yyyy-mm-dd HH:MM */
                 "%Y-%m-%d %T" "\0"      /* yyyy-mm-dd HH:MM:SS */
-#if ENABLE_FEATURE_TIMEZONE
+# if ENABLE_FEATURE_TIMEZONE
                 "%Y-%m-%d %R %z" "\0"   /* yyyy-mm-dd HH:MM TZ */
                 "%Y-%m-%d %T %z" "\0"   /* yyyy-mm-dd HH:MM:SS TZ */
-#endif
+# endif
                 "%Y-%m-%d %H" "\0"      /* yyyy-mm-dd HH */
                 "%Y-%m-%d" "\0"         /* yyyy-mm-dd */
                 /* extra NUL */;
@@ -50,11 +51,8 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 endp = strptime(date_str, fmt, ptm);
 #endif
                 if (endp && *endp == '\0') {
-#if ENABLE_FEATURE_TIMEZONE
+# if ENABLE_FEATURE_TIMEZONE
                         if (strchr(fmt, 'z')) {
-                                time_t t;
-                                struct tm *utm;
-
                                 /* we have timezone offset: obtain Unix time_t */
 #if ENABLE_PLATFORM_MINGW32
                                 ptm->tm_sec -= gmtoff;
@@ -66,13 +64,9 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                 if (t == (time_t)-1)
                                         break;
                                 /* convert Unix time_t to struct tm in user's locale */
-                                utm = localtime(&t);
-                                if (!utm)
-                                        break;
-                                *ptm = *utm;
-                                return 0;
+                                goto localise;
                         }
-#endif
+# endif
                         return 1;
                 }
                 *ptm = save;
@@ -150,13 +144,14 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
         } else
 #endif /* ENABLE_DESKTOP */
         if (date_str[0] == '@') {
-                time_t t;
                 if (sizeof(t) <= sizeof(long))
                         t = bb_strtol(date_str + 1, NULL, 10);
                 else /* time_t is 64 bits but longs are smaller */
                         t = bb_strtoll(date_str + 1, NULL, 10);
                 if (!errno) {
-                        struct tm *lt = localtime(&t);
+                        struct tm *lt;
+ IF_FEATURE_TIMEZONE(localise:)
+                        lt = localtime(&t);
                         if (lt) {
                                 *ptm = *lt;
                                 return 0;
diff --git a/util-linux/cal.c b/util-linux/cal.c
index 006bc817b..6ba6ebf98 100644
--- a/util-linux/cal.c
+++ b/util-linux/cal.c
@@ -27,10 +27,11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cal.html */
 
 //usage:#define cal_trivial_usage
-//usage:       "[-jy] [[MONTH] YEAR]"
+//usage:       "[-jmy] [[MONTH] YEAR]"
 //usage:#define cal_full_usage "\n\n"
 //usage:       "Display a calendar\n"
 //usage:     "\n        -j      Use julian dates"
+//usage:     "\n        -m      Week starts on Monday"
 //usage:     "\n        -y      Display the entire year"
 
 #include "libbb.h"
@@ -38,6 +39,8 @@
 
 /* We often use "unsigned" instead of "int", it's easier to div on most CPUs */
 
+#define SUNDAY                  0
+#define MONDAY                  1
 #define THURSDAY                4               /* for reformation */
 #define SATURDAY                6               /* 1 Jan 1 was a Saturday */
 
@@ -81,7 +84,7 @@ static int leap_year(unsigned yr)
         ((yr) / 4 - centuries_since_1700(yr) + quad_centuries_since_1700(yr))
 
 static void center(char *, unsigned, unsigned);
-static void day_array(unsigned, unsigned, unsigned *);
+static void day_array(unsigned, unsigned, unsigned, unsigned *);
 static void trim_trailing_spaces_and_print(char *);
 
 static void blank_string(char *buf, size_t buflen);
@@ -93,12 +96,18 @@ static char *build_row(char *p, unsigned *dp);
 #define J_WEEK_LEN      (WEEK_LEN + 7)
 #define HEAD_SEP        2               /* spaces between day headings */
 
+enum {
+        OPT_JULIAN = (1 << 0),
+        OPT_MONDAY = (1 << 1),
+        OPT_YEAR   = (1 << 2),
+};
+
 int cal_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cal_main(int argc UNUSED_PARAM, char **argv)
 {
         struct tm zero_tm;
         time_t now;
-        unsigned month, year, flags, i;
+        unsigned month, year, flags, i, weekstart;
         char *month_names[12];
         /* normal heading: */
         /* "Su Mo Tu We Th Fr Sa" */
@@ -110,10 +119,11 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
 
         init_unicode();
 
-        flags = getopt32(argv, "jy");
-        /* This sets julian = flags & 1: */
-        option_mask32 &= 1;
+        flags = getopt32(argv, "jmy");
+        /* This sets julian = flags & OPT_JULIAN: */
+        option_mask32 &= OPT_JULIAN;
         month = 0;
+        weekstart = (flags & OPT_MONDAY) ? MONDAY : SUNDAY;
         argv += optind;
 
         if (!argv[0]) {
@@ -122,7 +132,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                 time(&now);
                 ptm = localtime(&now);
                 year = ptm->tm_year + 1900;
-                if (!(flags & 2)) { /* no -y */
+                if (!(flags & OPT_YEAR)) { /* no -y */
                         month = ptm->tm_mon + 1;
                 }
         } else {
@@ -130,7 +140,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                         if (argv[2]) {
                                 bb_show_usage();
                         }
-                        if (!(flags & 2)) { /* no -y */
+                        if (!(flags & OPT_YEAR)) { /* no -y */
                                 month = xatou_range(*argv, 1, 12);
                         }
                         argv++;
@@ -148,7 +158,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                 month_names[i] = xstrdup(buf);
 
                 if (i < 7) {
-                        zero_tm.tm_wday = i;
+                        zero_tm.tm_wday = (i + weekstart) % 7;
                         /* abbreviated weekday name according to locale */
                         strftime(buf, sizeof(buf), "%a", &zero_tm);
 #if ENABLE_UNICODE_SUPPORT
@@ -173,7 +183,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                 unsigned *dp = days;
                 char lineout[30];
 
-                day_array(month, year, dp);
+                day_array(month, year, weekstart, dp);
                 len = sprintf(lineout, "%s %u", month_names[month - 1], year);
                 printf("%*s%s\n%s\n",
                                 ((7*julian + WEEK_LEN) - len) / 2, "",
@@ -197,7 +207,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                 );
                 puts("\n");             /* two \n's */
                 for (i = 0; i < 12; i++) {
-                        day_array(i + 1, year, days[i]);
+                        day_array(i + 1, year, weekstart, days[i]);
                 }
                 blank_string(lineout, sizeof(lineout));
                 week_len = WEEK_LEN + julian * (J_WEEK_LEN - WEEK_LEN);
@@ -233,7 +243,8 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
  *      out end to end.  You would have 42 numbers or spaces.  This routine
  *      builds that array for any month from Jan. 1 through Dec. 9999.
  */
-static void day_array(unsigned month, unsigned year, unsigned *days)
+static void day_array(unsigned month, unsigned year, unsigned weekstart,
+                                                unsigned *days)
 {
         unsigned long temp;
         unsigned i;
@@ -249,7 +260,7 @@ static void day_array(unsigned month, unsigned year, unsigned *days)
                 size_t oday = 0;
 
                 do {
-                        days[oday+2] = sep1752[oday] + j_offset;
+                        days[oday+2-weekstart] = sep1752[oday] + j_offset;
                 } while (++oday < sizeof(sep1752));
 
                 return;
@@ -280,6 +291,7 @@ static void day_array(unsigned month, unsigned year, unsigned *days)
         } else {
                 dw = (((temp - 1 + SATURDAY) - NUMBER_MISSING_DAYS) % 7);
         }
+        dw = (dw - weekstart + 7) % 7;
 
         if (!julian) {
                 day = 1;