Merge branch 'busybox' into merge

4 files changed, 34 insertions, 39 deletions

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;