Merge branch 'busybox' into merge

8 files changed, 78 insertions, 35 deletions

diff --git a/coreutils/ln.c b/coreutils/ln.c
index 0eb3e6579..3b822e8c7 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -20,6 +20,8 @@
 //usage:     "\n        -n      Don't dereference symlinks - treat like normal file"
 //usage:     "\n        -b      Make a backup of the target (if exists) before link operation"
 //usage:     "\n        -S suf  Use suffix instead of ~ when making backup files"
+//usage:     "\n        -T      2nd arg must be a DIR"
+//usage:     "\n        -v      Verbose"
 //usage:
 //usage:#define ln_example_usage
 //usage:       "$ ln -s BusyBox /tmp/ls\n"
@@ -31,11 +33,13 @@
 /* This is a NOEXEC applet. Be very careful! */
 
 
-#define LN_SYMLINK          1
-#define LN_FORCE            2
-#define LN_NODEREFERENCE    4
-#define LN_BACKUP           8
-#define LN_SUFFIX           16
+#define LN_SYMLINK          (1 << 0)
+#define LN_FORCE            (1 << 1)
+#define LN_NODEREFERENCE    (1 << 2)
+#define LN_BACKUP           (1 << 3)
+#define LN_SUFFIX           (1 << 4)
+#define LN_VERBOSE          (1 << 5)
+#define LN_LINKFILE         (1 << 6)
 
 int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ln_main(int argc, char **argv)
@@ -50,10 +54,15 @@ int ln_main(int argc, char **argv)
         int (*link_func)(const char *, const char *);
 
         opt_complementary = "-1"; /* min one arg */
-        opts = getopt32(argv, "sfnbS:", &suffix);
+        opts = getopt32(argv, "sfnbS:vT", &suffix);
 
         last = argv[argc - 1];
         argv += optind;
+        argc -= optind;
+
+        if ((opts & LN_LINKFILE) && argc > 2) {
+                bb_error_msg_and_die("-T accepts 2 args max");
+        }
 
         if (!argv[1]) {
                 /* "ln PATH/TO/FILE" -> "ln PATH/TO/FILE FILE" */
@@ -72,6 +81,9 @@ int ln_main(int argc, char **argv)
                                 (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE
                                 )
                 ) {
+                        if (opts & LN_LINKFILE) {
+                                bb_error_msg_and_die("'%s' is a directory", src);
+                        }
                         src_name = xstrdup(*argv);
                         src = concat_path_file(src, bb_get_last_path_component_strip(src_name));
                         free(src_name);
@@ -112,6 +124,10 @@ int ln_main(int argc, char **argv)
                         link_func = symlink;
                 }
 
+                if (opts & LN_VERBOSE) {
+                        printf("'%s' -> '%s'\n", src, *argv);
+                }
+
                 if (link_func(*argv, src) != 0) {
                         bb_simple_perror_msg(src);
                         status = EXIT_FAILURE;
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index b33b6bba3..4a8e43e43 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -48,6 +48,7 @@ static const char mkdir_longopts[] ALIGN1 =
 #if ENABLE_SELINUX
         "context\0" Required_argument "Z"
 #endif
+        "verbose\0" No_argument       "v"
         ;
 #endif
 
@@ -66,7 +67,7 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
         applet_long_options = mkdir_longopts;
 #endif
-        opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
+        opt = getopt32(argv, "m:p" IF_SELINUX("Z:") "v", &smode IF_SELINUX(,&scontext));
         if (opt & 1) {
                 mode_t mmode = 0777;
                 if (!bb_parse_mode(smode, &mmode)) {
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 87f4cd5a5..f127dfabd 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -33,12 +33,13 @@ static const char mv_longopts[] ALIGN1 =
         "interactive\0" No_argument "i"
         "force\0"       No_argument "f"
         "no-clobber\0"  No_argument "n"
+        "verbose\0"     No_argument "v"
         ;
 #endif
 
-#define OPT_FILEUTILS_FORCE       1
-#define OPT_FILEUTILS_INTERACTIVE 2
-#define OPT_FILEUTILS_NOCLOBBER   4
+#define OPT_FORCE       (1 << 0)
+#define OPT_INTERACTIVE (1 << 1)
+#define OPT_NOCLOBBER   (1 << 2)
 
 int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mv_main(int argc, char **argv)
@@ -56,9 +57,11 @@ int mv_main(int argc, char **argv)
 #endif
         /* Need at least two arguments.
          * If more than one of -f, -i, -n is specified , only the final one
-         * takes effect (it unsets previous options). */
+         * takes effect (it unsets previous options).
+         * -v is accepted but ignored.
+         */
         opt_complementary = "-2:f-in:i-fn:n-fi";
-        flags = getopt32(argv, "fin");
+        flags = getopt32(argv, "finv");
         argc -= optind;
         argv += optind;
         last = argv[argc - 1];
@@ -84,11 +87,11 @@ int mv_main(int argc, char **argv)
 
  DO_MOVE:
                 if (dest_exists) {
-                        if (flags & OPT_FILEUTILS_NOCLOBBER)
+                        if (flags & OPT_NOCLOBBER)
                                 goto RET_0;
-                        if (!(flags & OPT_FILEUTILS_FORCE)
+                        if (!(flags & OPT_FORCE)
                          && ((access(dest, W_OK) < 0 && isatty(0))
-                            || (flags & OPT_FILEUTILS_INTERACTIVE))
+                            || (flags & OPT_INTERACTIVE))
                         ) {
                                 if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) {
                                         goto RET_1;  /* Ouch! fprintf failed! */
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 2840d1cfa..cc2dea010 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -30,8 +30,9 @@
 /* This is a NOFORK applet. Be very careful! */
 
 
-#define PARENTS 0x01
-#define IGNORE_NON_EMPTY 0x02
+#define PARENTS          (1 << 0)
+//efine VERBOSE          (1 << 1) //accepted but ignored
+#define IGNORE_NON_EMPTY (1 << 2)
 
 int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rmdir_main(int argc UNUSED_PARAM, char **argv)
@@ -43,13 +44,14 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
         static const char rmdir_longopts[] ALIGN1 =
                 "parents\0"                  No_argument "p"
+                "verbose\0"                  No_argument "v"
                 /* Debian etch: many packages fail to be purged or installed
                  * because they desperately want this option: */
                 "ignore-fail-on-non-empty\0" No_argument "\xff"
                 ;
         applet_long_options = rmdir_longopts;
 #endif
-        flags = getopt32(argv, "p");
+        flags = getopt32(argv, "pv");
         argv += optind;
 
         if (!*argv) {
diff --git a/editors/sed.c b/editors/sed.c
index 3ee8edc43..a2df93165 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -62,7 +62,8 @@
 //usage:#define sed_full_usage "\n\n"
 //usage:       "        -e CMD  Add CMD to sed commands to be executed"
 //usage:     "\n        -f FILE Add FILE contents to sed commands to be executed"
-//usage:     "\n        -i      Edit files in-place (else sends result to stdout)"
+//usage:     "\n        -i[SFX] Edit files in-place (otherwise sends to stdout)"
+//usage:     "\n                Optionally backs files up, appending SFX"
 //usage:     "\n        -n      Suppress automatic printing of pattern space"
 //usage:     "\n        -r      Use extended regex syntax"
 //usage:     "\n"
@@ -1374,6 +1375,19 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opt;
         llist_t *opt_e, *opt_f;
+        char *opt_i;
+
+#if ENABLE_LONG_OPTS
+        static const char sed_longopts[] ALIGN1 =
+                /* name             has_arg             short */
+                "in-place\0"        Optional_argument   "i"
+                "regexp-extended\0" No_argument         "r"
+                "quiet\0"           No_argument         "n"
+                "silent\0"          No_argument         "n"
+                "expression\0"      Required_argument   "e"
+                "file\0"            Required_argument   "f";
+#endif
+
         int status = EXIT_SUCCESS;
 
         INIT_G();
@@ -1382,17 +1396,21 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
         if (ENABLE_FEATURE_CLEAN_UP) atexit(sed_free_and_close_stuff);
 
         /* Lie to autoconf when it starts asking stupid questions. */
-        if (argv[1] && !strcmp(argv[1], "--version")) {
+        if (argv[1] && strcmp(argv[1], "--version") == 0) {
                 puts("This is not GNU sed version 4.0");
                 return 0;
         }
 
         /* do normal option parsing */
         opt_e = opt_f = NULL;
+        opt_i = NULL;
         opt_complementary = "e::f::" /* can occur multiple times */
                             "nn"; /* count -n */
+
+        IF_LONG_OPTS(applet_long_options = sed_longopts);
+
         /* -i must be first, to match OPT_in_place definition */
-        opt = getopt32(argv, "irne:f:", &opt_e, &opt_f,
+        opt = getopt32(argv, "i::rne:f:", &opt_i, &opt_e, &opt_f,
                             &G.be_quiet); /* counter for -n */
         //argc -= optind;
         argv += optind;
@@ -1474,8 +1492,13 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
                         fclose(G.nonstdout);
                         G.nonstdout = stdout;
 
-                        /* unlink(argv[i]); */
-                        xrename(G.outname, argv[i]);
+                        if (opt_i) {
+                                char *backupname = xasprintf("%s%s", argv[i], opt_i);
+                                xrename(argv[i], backupname);
+                                free(backupname);
+                        }
+                        /* else unlink(argv[i]); - rename below does this */
+                        xrename(G.outname, argv[i]); //TODO: rollback backup on error?
                         free(G.outname);
                         G.outname = NULL;
 
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index a168a1e4e..738ed022b 100644
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -20,18 +20,15 @@
 int FAST_FUNC get_linux_version_code(void)
 {
         struct utsname name;
-        char *s;
+        char *s, *t;
         int i, r;
 
-        if (uname(&name) == -1) {
-                bb_perror_msg("can't get system information");
-                return 0;
-        }
-
+        uname(&name); /* never fails */
         s = name.release;
         r = 0;
         for (i = 0; i < 3; i++) {
-                r = r * 256 + atoi(strtok(s, "."));
+                t = strtok(s, ".");
+                r = r * 256 + (t ? atoi(t) : 0);
                 s = NULL;
         }
         return r;
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index c6531a0b9..5b75f7f30 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -33,7 +33,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
                 int status = 0;
 
                 if (!(flags & FILEUTILS_RECUR)) {
-                        bb_error_msg("%s: is a directory", path);
+                        bb_error_msg("'%s' is a directory", path);
                         return -1;
                 }
 
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index a792a9dca..7c9f52ae7 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -12,10 +12,11 @@
  */
 
 //config:config UDHCPC6
-//config:       bool "udhcp client for DHCPv6 (udhcpc6)"
-//config:       default n  # not yet ready
-//config:       help
-//config:         udhcpc6 is a DHCPv6 client
+//config:       bool "udhcp client for DHCPv6 (udhcpc6)"
+//config:       default n  # not yet ready
+//config:       depends on FEATURE_IPV6
+//config:       help
+//config:         udhcpc6 is a DHCPv6 client
 
 //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP))