Merge branch 'busybox' into merge

7 files changed, 20 insertions, 11 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index f15e03990..68857b2cc 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -11,7 +11,7 @@ config CAL
         bool "cal"
         default y
         help
-          cal is used to display a monthly calender.
+          cal is used to display a monthly calendar.
 
 config CATV
         bool "catv"
diff --git a/coreutils/chown.c b/coreutils/chown.c
index cb07bbcbb..679c0d832 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -11,7 +11,7 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */
 
 //usage:#define chown_trivial_usage
-//usage:       "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
+//usage:       "[-Rh"IF_DESKTOP("LHPcvf")"]... OWNER[<.|:>[GROUP]] FILE..."
 //usage:#define chown_full_usage "\n\n"
 //usage:       "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
 //usage:     "\n        -R      Recurse"
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 3b822e8c7..168814801 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -134,7 +134,6 @@ int ln_main(int argc, char **argv)
                 }
 
                 free(src_name);
-
         } while ((++argv)[1]);
 
         return status;
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index 6d0a68fc1..9f61f2f7d 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -94,7 +94,7 @@ int shuf_main(int argc, char **argv)
                 *dash = '\0';
                 lo = xatou(opt_i_str);
                 hi = xatou(dash + 1);
-                *dash = '-';
+                *dash = '-';
                 if (hi < lo) {
                         bb_error_msg_and_die("bad range '%s'", opt_i_str);
                 }
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 769fac078..f7fd227bb 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -374,7 +374,7 @@ static void print_it(const char *masterformat,
 {
         /* Create a working copy of the format string */
         char *format = xstrdup(masterformat);
-        /* Add 2 to accomodate our conversion of the stat '%s' format string
+        /* Add 2 to accommodate our conversion of the stat '%s' format string
          * to the printf '%llu' one.  */
         char *dest = xmalloc(strlen(format) + 2 + 1);
         char *b;
diff --git a/coreutils/truncate.c b/coreutils/truncate.c
index 0e36daba3..e5fa656c8 100644
--- a/coreutils/truncate.c
+++ b/coreutils/truncate.c
@@ -64,12 +64,22 @@ int truncate_main(int argc UNUSED_PARAM, char **argv)
 
         argv += optind;
         while (*argv) {
-                int fd = xopen(*argv, flags);
-                if (ftruncate(fd, size) == -1) {
-                        bb_perror_msg("%s: ftruncate", *argv);
-                        ret = EXIT_FAILURE;
+                int fd = open(*argv, flags);
+                if (fd < 0) {
+                        if (errno != ENOENT || !(opts & OPT_NOCREATE)) {
+                                bb_perror_msg("%s: open", *argv);
+                                ret = EXIT_FAILURE;
+                        }
+                        /* else: ENOENT && OPT_NOCREATE:
+                         * do not report error, exitcode is also 0.
+                         */
+                } else {
+                        if (ftruncate(fd, size) == -1) {
+                                bb_perror_msg("%s: truncate", *argv);
+                                ret = EXIT_FAILURE;
+                        }
+                        xclose(fd);
                 }
-                xclose(fd);
                 ++argv;
         }
 
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 3f1227306..7aa5c67f2 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -46,7 +46,7 @@ static void FAST_FUNC read_stduu(FILE *src_stream, FILE *dst_stream, int flags U
 
                 encoded_len = line[0] * 4 / 3;
                 /* Check that line is not too short. (we tolerate
-                 * overly _long_ line to accomodate possible extra '`').
+                 * overly _long_ line to accommodate possible extra '`').
                  * Empty line case is also caught here. */
                 if (str_len <= encoded_len) {
                         break; /* go to bb_error_msg_and_die("short file"); */