Merge branch 'busybox' into merge

6 files changed, 119 insertions, 53 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 0e14e351e..39d9d907d 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -148,6 +148,7 @@ lib-$(CONFIG_FTPD) += correct_password.o
 lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
+lib-$(CONFIG_MKPASSWD) += pw_encrypt.o
 lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index c528c8a2c..28adf2740 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -52,7 +52,6 @@
 
 #include "usage_compressed.h"
 
-
 #if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
 static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #else
@@ -730,7 +729,7 @@ static void install_links(const char *busybox,
         }
 }
 #  endif
-# else
+# elif ENABLE_BUSYBOX
 static void install_links(const char *busybox UNUSED_PARAM,
                 int use_symbolic_links UNUSED_PARAM,
                 char *custom_install_dir UNUSED_PARAM)
@@ -738,6 +737,9 @@ static void install_links(const char *busybox UNUSED_PARAM,
 }
 # endif
 
+# if ENABLE_BUSYBOX
+static void run_applet_and_exit(const char *name, char **argv) NORETURN;
+
 /* If we were called as "busybox..." */
 static int busybox_main(char **argv)
 {
@@ -828,10 +830,10 @@ static int busybox_main(char **argv)
                 const char *a = applet_names;
                 dup2(1, 2);
                 while (*a) {
-# if ENABLE_FEATURE_INSTALLER && !ENABLE_PLATFORM_MINGW32
+#  if ENABLE_FEATURE_INSTALLER && !ENABLE_PLATFORM_MINGW32
                         if (argv[1][6]) /* --list-full? */
                                 full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
-# endif
+#  endif
                         full_write2_str(a);
                         full_write2_str("\n");
                         i++;
@@ -889,14 +891,10 @@ static int busybox_main(char **argv)
          * "#!/bin/busybox"-style wrappers */
         applet_name = bb_get_last_path_component_nostrip(argv[0]);
         run_applet_and_exit(applet_name, argv);
-
-        /*bb_error_msg_and_die("applet not found"); - sucks in printf */
-        full_write2_str(applet_name);
-        full_write2_str(": applet not found\n");
-        /* POSIX: "If a command is not found, the exit status shall be 127" */
-        exit(127);
 }
+# endif
 
+# if NUM_APPLETS > 0
 void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
 {
         int argc = 1;
@@ -914,15 +912,15 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
          * "true" and "false" are also special.
          */
         if (1
-#if defined APPLET_NO_test
+#  if defined APPLET_NO_test
          && applet_no != APPLET_NO_test
-#endif
-#if defined APPLET_NO_true
+#  endif
+#  if defined APPLET_NO_true
          && applet_no != APPLET_NO_true
-#endif
-#if defined APPLET_NO_false
+#  endif
+#  if defined APPLET_NO_false
          && applet_no != APPLET_NO_false
-#endif
+#  endif
         ) {
                 if (argc == 2 && strcmp(argv[1], "--help") == 0) {
                         /* Make "foo --help" exit with 0: */
@@ -934,17 +932,28 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
                 check_suid(applet_no);
         exit(applet_main[applet_no](argc, argv));
 }
+# endif /* NUM_APPLETS > 0 */
 
-void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
+static NORETURN void run_applet_and_exit(const char *name, char **argv)
 {
-        int applet;
-
+# if ENABLE_BUSYBOX
         if (is_prefixed_with(name, "busybox"))
                 exit(busybox_main(argv));
+# endif
+# if NUM_APPLETS > 0
         /* find_applet_by_name() search is more expensive, so goes second */
-        applet = find_applet_by_name(name);
-        if (applet >= 0)
-                run_applet_no_and_exit(applet, argv);
+        {
+                int applet = find_applet_by_name(name);
+                if (applet >= 0)
+                        run_applet_no_and_exit(applet, argv);
+        }
+# endif
+
+        /*bb_error_msg_and_die("applet not found"); - links in printf */
+        full_write2_str(applet_name);
+        full_write2_str(": applet not found\n");
+        /* POSIX: "If a command is not found, the exit status shall be 127" */
+        exit(127);
 }
 
 #endif /* !defined(SINGLE_APPLET_MAIN) */
@@ -1017,6 +1026,10 @@ int main(int argc UNUSED_PARAM, char **argv)
 #else
         lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
 
+# if !ENABLE_BUSYBOX
+        if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))
+                argv++;
+# endif
         applet_name = argv[0];
         if (applet_name[0] == '-')
                 applet_name++;
@@ -1048,11 +1061,5 @@ int main(int argc UNUSED_PARAM, char **argv)
         parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
 
         run_applet_and_exit(applet_name, argv);
-
-        /*bb_error_msg_and_die("applet not found"); - sucks in printf */
-        full_write2_str(applet_name);
-        full_write2_str(": applet not found\n");
-        /* POSIX: "If a command is not found, the exit status shall be 127" */
-        exit(127);
 #endif
 }
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index a427c441f..c52297376 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -64,6 +64,11 @@ static int ask_and_unlink(const char *dest, int flags)
                 bb_perror_msg("can't create '%s'", dest);
                 return -1; /* error */
         }
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+        if (flags & FILEUTILS_RMDEST)
+                if (flags & FILEUTILS_VERBOSE)
+                        printf("removed '%s'\n", dest);
+#endif
         return 1; /* ok (to try again) */
 }
 
@@ -213,6 +218,22 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                 goto preserve_mode_ugid_time;
         }
 
+        if (dest_exists) {
+                if (flags & FILEUTILS_UPDATE) {
+                        if (source_stat.st_mtime <= dest_stat.st_mtime) {
+                                return 0; /* source file must be newer */
+                        }
+                }
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+                if (flags & FILEUTILS_RMDEST) {
+                        ovr = ask_and_unlink(dest, flags);
+                        if (ovr <= 0)
+                                return ovr;
+                        dest_exists = 0;
+                }
+#endif
+        }
+
         if (flags & (FILEUTILS_MAKE_SOFTLINK|FILEUTILS_MAKE_HARDLINK)) {
                 int (*lf)(const char *oldpath, const char *newpath);
  make_links:
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index ae019b26b..ed9352191 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -17,23 +17,20 @@
 uint32_t
 getopt32(char **argv, const char *applet_opts, ...)
 
-        The command line options must be declared in const char
-        *applet_opts as a string of chars, for example:
-
-        flags = getopt32(argv, "rnug");
+        The command line options are passed as the applet_opts string.
 
         If one of the given options is found, a flag value is added to
-        the return value (an unsigned long).
+        the return value.
 
         The flag value is determined by the position of the char in
-        applet_opts string.  For example, in the above case:
+        applet_opts string.  For example:
 
         flags = getopt32(argv, "rnug");
 
-        "r" will add 1    (bit 0)
-        "n" will add 2    (bit 1)
-        "u" will add 4    (bit 2)
-        "g" will add 8    (bit 3)
+        "r" will set 1    (bit 0)
+        "n" will set 2    (bit 1)
+        "u" will set 4    (bit 2)
+        "g" will set 8    (bit 3)
 
         and so on.  You can also look at the return value as a bit
         field and each option sets one bit.
@@ -45,7 +42,7 @@ getopt32(char **argv, const char *applet_opts, ...)
         (options and their parameters will be moved into argv[]
         positions prior to argv[optind]).
 
- ":"    If one of the options requires an argument, then add a ":"
+ "o:"   If one of the options requires an argument, then add a ":"
         after the char in applet_opts and provide a pointer to store
         the argument.  For example:
 
@@ -58,15 +55,39 @@ getopt32(char **argv, const char *applet_opts, ...)
                         &pointer_to_arg_for_a, &pointer_to_arg_for_b,
                         &pointer_to_arg_for_c, &pointer_to_arg_for_d);
 
-        The type of the pointer (char* or llist_t*) may be controlled
-        by the "::" special separator that is set in the external string
-        opt_complementary (see below for more info).
+        The type of the pointer may be controlled by "o::" or "o+" in
+        the external string opt_complementary (see below for more info).
 
- "::"   If option can have an *optional* argument, then add a "::"
+ "o::"  If option can have an *optional* argument, then add a "::"
         after its char in applet_opts and provide a pointer to store
         the argument.  Note that optional arguments _must_
         immediately follow the option: -oparam, not -o param.
 
+ "o:+"  This means that the parameter for this option is a nonnegative integer.
+        It will be processed with xatoi_positive() - allowed range
+        is 0..INT_MAX.
+
+        int param;  // "unsigned param;" will also work
+        getopt32(argv, "p:+", &param);
+
+ "o:*"  This means that the option can occur multiple times. Each occurrence
+        will be saved as a llist_t element instead of char*.
+
+        For example:
+        The grep applet can have one or more "-e pattern" arguments.
+        In this case you should use getopt32() as follows:
+
+        llist_t *patterns = NULL;
+
+        (this pointer must be initializated to NULL if the list is empty
+        as required by llist_add_to_end(llist_t **old_head, char *new_item).)
+
+        getopt32(argv, "e:*", &patterns);
+
+        $ grep -e user -e root /etc/passwd
+        root:x:0:0:root:/root:/bin/bash
+        user:x:500:500::/home/user:/bin/bash
+
  "+"    If the first character in the applet_opts string is a plus,
         then option processing will stop as soon as a non-option is
         encountered in the argv array.  Useful for applets like env
@@ -82,7 +103,7 @@ const char *applet_long_options
         This struct allows you to define long options:
 
         static const char applet_longopts[] ALIGN1 =
-                //"name\0" has_arg val
+                //"name\0"  has_arg     val
                 "verbose\0" No_argument "v"
                 ;
         applet_long_options = applet_longopts;
@@ -90,7 +111,7 @@ const char *applet_long_options
         The last member of struct option (val) typically is set to
         matching short option from applet_opts. If there is no matching
         char in applet_opts, then:
-        - return bit have next position after short options
+        - return bit has next position after short options
         - if has_arg is not "No_argument", use ptr for arg also
         - opt_complementary affects it too
 
@@ -139,8 +160,8 @@ const char *opt_complementary
 
         llist_t *my_b = NULL;
         int verbose_level = 0;
-        opt_complementary = "vv:b::b-c:c-b";
-        f = getopt32(argv, "vb:c", &my_b, &verbose_level);
+        opt_complementary = "vv:b-c:c-b";
+        f = getopt32(argv, "vb:*c", &my_b, &verbose_level);
         if (f & 2)       // -c after -b unsets -b flag
                 while (my_b) dosomething_with(llist_pop(&my_b));
         if (my_b)        // but llist is stored if -b is specified
@@ -233,7 +254,7 @@ Special characters:
  "x--x" Variation of the above, it means that -x option should occur
         at most once.
 
- "a+"   A plus after a char in opt_complementary means that the parameter
+ "o+"   A plus after a char in opt_complementary means that the parameter
         for this option is a nonnegative integer. It will be processed
         with xatoi_positive() - allowed range is 0..INT_MAX.
 
@@ -241,7 +262,7 @@ Special characters:
         opt_complementary = "p+";
         getopt32(argv, "p:", &param);
 
- "a::"  A double colon after a char in opt_complementary means that the
+ "o::"  A double colon after a char in opt_complementary means that the
         option can occur multiple times. Each occurrence will be saved as
         a llist_t element instead of char*.
 
@@ -255,12 +276,17 @@ Special characters:
         as required by llist_add_to_end(llist_t **old_head, char *new_item).)
 
         opt_complementary = "e::";
-
         getopt32(argv, "e:", &patterns);
+
         $ grep -e user -e root /etc/passwd
         root:x:0:0:root:/root:/bin/bash
         user:x:500:500::/home/user:/bin/bash
 
+        "o+" and "o::" can be handled by "o:+" and "o:*" specifiers
+        in option string (and it is preferred), but this does not work
+        for "long options only" cases, such as tar --exclude=PATTERN,
+        wget --header=HDR cases.
+
  "a?b"  A "?" between an option and a group of options means that
         at least one of them is required to occur if the first option
         occurs in preceding command line arguments.
@@ -359,10 +385,11 @@ getopt32(char **argv, const char *applet_opts, ...)
 
         va_start(p, applet_opts);
 
-        c = 0;
         on_off = complementary;
         memset(on_off, 0, sizeof(complementary));
 
+        applet_opts = strcpy(alloca(strlen(applet_opts) + 1), applet_opts);
+
         /* skip bbox extension */
         first_char = applet_opts[0];
         if (first_char == '!')
@@ -372,6 +399,7 @@ getopt32(char **argv, const char *applet_opts, ...)
         s = (const unsigned char *)applet_opts;
         if (*s == '+' || *s == '-')
                 s++;
+        c = 0;
         while (*s) {
                 if (c >= 32)
                         break;
@@ -379,6 +407,13 @@ getopt32(char **argv, const char *applet_opts, ...)
                 on_off->switch_on = (1 << c);
                 if (*++s == ':') {
                         on_off->optarg = va_arg(p, void **);
+                        if (s[1] == '+' || s[1] == '*') {
+                                /* 'o:+' or 'o:*' */
+                                on_off->param_type = (s[1] == '+') ?
+                                        PARAM_INT : PARAM_LIST;
+                                overlapping_strcpy((char*)s + 1, (char*)s + 2);
+                        }
+                        /* skip possible 'o::' (or 'o:+:' !) */
                         while (*++s == ':')
                                 continue;
                 }
@@ -431,6 +466,7 @@ getopt32(char **argv, const char *applet_opts, ...)
                 applet_long_options = NULL;
         }
 #endif /* ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG */
+
         for (s = (const unsigned char *)opt_complementary; s && *s; s++) {
                 t_complementary *pair;
                 unsigned *pair_switch;
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 1590d9a4c..408439766 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -42,8 +42,8 @@ int parse_main(int argc UNUSED_PARAM, char **argv)
         int mintokens = 0, ntokens = 128;
         unsigned noout;
 
-        opt_complementary = "-1:n+:m+:f+";
-        noout = 1 & getopt32(argv, "xn:m:d:f:", &ntokens, &mintokens, &delims, &flags);
+        opt_complementary = "-1";
+        noout = 1 & getopt32(argv, "xn:+m:+d:f:+", &ntokens, &mintokens, &delims, &flags);
         //argc -= optind;
         argv += optind;
 
diff --git a/libbb/time.c b/libbb/time.c
index aa19a47d4..82e6cb172 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -186,6 +186,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 } else {
                         bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                 }
+                ptm->tm_sec = 0; /* assume zero if [.SS] is not given */
                 if (end == '.') {
                         /* xxx.SS */
                         if (sscanf(strchr(date_str, '.') + 1, "%u%c",