Merge branch 'busybox' into merge

9 files changed, 41 insertions, 39 deletions

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 247ed0fda..2630c0d59 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -31,6 +31,7 @@
 //usage:     "\n        -f      Overwrite"
 //usage:     "\n        -i      Prompt before overwrite"
 //usage:     "\n        -l,-s   Create (sym)links"
+//usage:     "\n        -u      Copy only newer files"
 
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
@@ -49,12 +50,10 @@ int cp_main(int argc, char **argv)
         int flags;
         int status;
         enum {
-                OPT_a = 1 << (sizeof(FILEUTILS_CP_OPTSTR)-1),
-                OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)),
-                OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1),
-                OPT_v = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
+                FILEUTILS_CP_OPTNUM = sizeof(FILEUTILS_CP_OPTSTR)-1,
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
-                OPT_parents = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
+                /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTNUM */
+                OPT_parents = 1 << (FILEUTILS_CP_OPTNUM+1),
 #endif
         };
 
@@ -76,10 +75,12 @@ int cp_main(int argc, char **argv)
                 "recursive\0"      No_argument "R"
                 "symbolic-link\0"  No_argument "s"
                 "verbose\0"        No_argument "v"
-                "parents\0"        No_argument "\xff"
+                "update\0"         No_argument "u"
+                "remove-destination\0" No_argument "\xff"
+                "parents\0"        No_argument "\xfe"
                 ;
 #endif
-        flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPv");
+        flags = getopt32(argv, FILEUTILS_CP_OPTSTR);
         /* Options of cp from GNU coreutils 6.10:
          * -a, --archive
          * -f, --force
@@ -94,6 +95,11 @@ int cp_main(int argc, char **argv)
          * -d   same as --no-dereference --preserve=links
          * -p   same as --preserve=mode,ownership,timestamps
          * -c   same as --preserve=context
+         * -u, --update
+         *      copy only when the SOURCE file is newer than the destination
+         *      file or when the destination file is missing
+         * --remove-destination
+         *      remove each existing destination file before attempting to open
          * --parents
          *      use full source file name under DIRECTORY
          * NOT SUPPORTED IN BBOX:
@@ -106,8 +112,6 @@ int cp_main(int argc, char **argv)
          *      preserve attributes (default: mode,ownership,timestamps),
          *      if possible additional attributes: security context,links,all
          * --no-preserve=ATTR_LIST
-         * --remove-destination
-         *      remove  each existing destination file before attempting to open
          * --sparse=WHEN
          *      control creation of sparse files
          * --strip-trailing-slashes
@@ -118,9 +122,6 @@ int cp_main(int argc, char **argv)
          *      copy all SOURCE arguments into DIRECTORY
          * -T, --no-target-directory
          *      treat DEST as a normal file
-         * -u, --update
-         *      copy only when the SOURCE file is newer than the destination
-         *      file or when the destination file is missing
          * -x, --one-file-system
          *      stay on this file system
          * -Z, --context=CONTEXT
@@ -156,11 +157,16 @@ int cp_main(int argc, char **argv)
                         return EXIT_FAILURE;
 
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
+                //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
+                //      flags, FILEUTILS_RMDEST, OPT_parents);
                 if (flags & OPT_parents) {
                         if (!(d_flags & 2)) {
                                 bb_error_msg_and_die("with --parents, the destination must be a directory");
                         }
                 }
+                if (flags & FILEUTILS_RMDEST) {
+                        flags |= FILEUTILS_FORCE;
+                }
 #endif
 
                 /* ...if neither is a directory...  */
diff --git a/coreutils/df.c b/coreutils/df.c
index d79c11a6c..06b292018 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -188,7 +188,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                         if (opt & OPT_INODE) {
                                 s.f_blocks = s.f_files;
                                 s.f_bavail = s.f_bfree = s.f_ffree;
-                                s.f_bsize = 1;
+                                s.f_frsize = 1;
 
                                 if (df_disp_hr)
                                         df_disp_hr = 1;
@@ -246,26 +246,26 @@ int df_main(int argc UNUSED_PARAM, char **argv)
 
 #if ENABLE_FEATURE_HUMAN_READABLE
                         printf(" %9s ",
-                                /* f_blocks x f_bsize / df_disp_hr, show one fractional,
+                                /* f_blocks x f_frsize / df_disp_hr, show one fractional,
                                  * use suffixes if df_disp_hr == 0 */
-                                make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
+                                make_human_readable_str(s.f_blocks, s.f_frsize, df_disp_hr));
 
                         printf(" %9s " + 1,
-                                /* EXPR x f_bsize / df_disp_hr, show one fractional,
+                                /* EXPR x f_frsize / df_disp_hr, show one fractional,
                                  * use suffixes if df_disp_hr == 0 */
                                 make_human_readable_str((s.f_blocks - s.f_bfree),
-                                                s.f_bsize, df_disp_hr));
+                                                s.f_frsize, df_disp_hr));
 
                         printf("%9s %3u%% %s\n",
-                                /* f_bavail x f_bsize / df_disp_hr, show one fractional,
+                                /* f_bavail x f_frsize / df_disp_hr, show one fractional,
                                  * use suffixes if df_disp_hr == 0 */
-                                make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+                                make_human_readable_str(s.f_bavail, s.f_frsize, df_disp_hr),
                                 blocks_percent_used, mount_point);
 #else
                         printf(" %9lu %9lu %9lu %3u%% %s\n",
-                                kscale(s.f_blocks, s.f_bsize),
-                                kscale(s.f_blocks - s.f_bfree, s.f_bsize),
-                                kscale(s.f_bavail, s.f_bsize),
+                                kscale(s.f_blocks, s.f_frsize),
+                                kscale(s.f_blocks - s.f_bfree, s.f_frsize),
+                                kscale(s.f_bavail, s.f_frsize),
                                 blocks_percent_used, mount_point);
 #endif
                 }
diff --git a/coreutils/du.c b/coreutils/du.c
index 1240bcbbc..5f104736b 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -226,8 +226,8 @@ int du_main(int argc UNUSED_PARAM, char **argv)
          * ignore -a.  This is consistent with -s being equivalent to -d 0.
          */
 #if ENABLE_FEATURE_HUMAN_READABLE
-        opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s:d+";
-        opt = getopt32(argv, "aHkLsx" "d:" "lc" "hm", &G.max_print_depth);
+        opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
+        opt = getopt32(argv, "aHkLsx" "d:+" "lc" "hm", &G.max_print_depth);
         argv += optind;
         if (opt & OPT_h_for_humans) {
                 G.disp_unit = 0;
@@ -239,8 +239,8 @@ int du_main(int argc UNUSED_PARAM, char **argv)
                 G.disp_unit = 1024;
         }
 #else
-        opt_complementary = "H-L:L-H:s-d:d-s:d+";
-        opt = getopt32(argv, "aHkLsx" "d:" "lc", &G.max_print_depth);
+        opt_complementary = "H-L:L-H:s-d:d-s";
+        opt = getopt32(argv, "aHkLsx" "d:+" "lc", &G.max_print_depth);
         argv += optind;
 #if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
         if (opt & OPT_k_kbytes) {
diff --git a/coreutils/env.c b/coreutils/env.c
index 807ef13e9..cdfc30e14 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -54,11 +54,10 @@ int env_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         llist_t *unset_env = NULL;
 
-        opt_complementary = "u::";
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
         applet_long_options = env_longopts;
 #endif
-        opts = getopt32(argv, "+iu:", &unset_env);
+        opts = getopt32(argv, "+iu:+", &unset_env);
         argv += optind;
         if (argv[0] && LONE_DASH(argv[0])) {
                 opts |= 1;
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index a5b3e99f7..b02fb09bd 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -62,7 +62,7 @@ enum {
 };
 
 #define OD_GETOPT32() getopt32(argv, \
-        "A:N:abcdfhij:lot:vxsS:w::", \
+        "A:N:abcdfhij:lot:*vxsS:w:+:", \
         /* -w with optional param */ \
         /* -S was -s and also had optional parameter */ \
         /* but in coreutils 6.3 it was renamed and now has */ \
@@ -1219,7 +1219,6 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         address_pad_len_char = '7';
 
         /* Parse command line */
-        opt_complementary = "w+:t::"; /* -w N, -t is a list */
 #if ENABLE_LONG_OPTS
         applet_long_options = od_longopts;
 #endif
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 9139d9f47..34a41999b 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -73,7 +73,7 @@
 */
 
 /* These are sort types */
-static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:t:";
+static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:*t:";
 enum {
         FLAG_n  = 1,            /* Numeric sort */
         FLAG_g  = 2,            /* Sort using strtod() */
@@ -358,8 +358,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 
         /* Parse command line options */
         /* -o and -t can be given at most once */
-        opt_complementary = "o--o:t--t:" /* -t, -o: at most one of each */
-                        "k::"; /* -k takes list */
+        opt_complementary = "o--o:t--t"; /* -t, -o: at most one of each */
         opts = getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t);
         /* global b strips leading and trailing spaces */
         if (opts & FLAG_b)
diff --git a/coreutils/split.c b/coreutils/split.c
index e67c3de66..19d58a21b 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -81,8 +81,8 @@ int split_main(int argc UNUSED_PARAM, char **argv)
 
         setup_common_bufsiz();
 
-        opt_complementary = "?2:a+"; /* max 2 args; -a N */
-        opt = getopt32(argv, "l:b:a:", &count_p, &count_p, &suffix_len);
+        opt_complementary = "?2"; /* max 2 args; -a N */
+        opt = getopt32(argv, "l:b:a:+", &count_p, &count_p, &suffix_len);
 
         if (opt & SPLIT_OPT_l)
                 cnt = XATOOFF(count_p);
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 39f87679e..57ad0f3b7 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -121,8 +121,8 @@ int tail_main(int argc, char **argv)
 #endif
 
         /* -s NUM, -F imlies -f */
-        IF_FEATURE_FANCY_TAIL(opt_complementary = "s+:Ff";)
-        opt = getopt32(argv, "fc:n:" IF_FEATURE_FANCY_TAIL("qs:vF"),
+        IF_FEATURE_FANCY_TAIL(opt_complementary = "Ff";)
+        opt = getopt32(argv, "fc:n:" IF_FEATURE_FANCY_TAIL("qs:+vF"),
                         &str_c, &str_n IF_FEATURE_FANCY_TAIL(,&sleep_period));
 #define FOLLOW (opt & 0x1)
 #define COUNT_BYTES (opt & 0x2)
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index e0133998a..ec7bde418 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -50,8 +50,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
         skip_fields = skip_chars = 0;
         max_chars = INT_MAX;
 
-        opt_complementary = "f+:s+:w+";
-        opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars);
+        opt = getopt32(argv, "cduf:+s:+w:+", &skip_fields, &skip_chars, &max_chars);
         argv += optind;
 
         input_filename = argv[0];