Merge branch 'busybox' into merge

3 files changed, 10 insertions, 5 deletions

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,