Merge branch 'busybox' into merge

3 files changed, 85 insertions, 57 deletions

diff --git a/coreutils/df.c b/coreutils/df.c
index 5e9a8670f..d79c11a6c 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -25,6 +25,7 @@
 //usage:#define df_trivial_usage
 //usage:        "[-Pk"
 //usage:        IF_FEATURE_HUMAN_READABLE("mh")
+//usage:        "T"
 //usage:        IF_FEATURE_DF_FANCY("ai] [-B SIZE")
 //usage:        "] [FILESYSTEM]..."
 //usage:#define df_full_usage "\n\n"
@@ -35,6 +36,7 @@
 //usage:     "\n        -m      1M-byte blocks"
 //usage:     "\n        -h      Human readable (e.g. 1K 243M 2G)"
 //usage:        )
+//usage:     "\n        -T      Print filesystem type"
 //usage:        IF_FEATURE_DF_FANCY(
 //usage:     "\n        -a      Show all filesystems"
 //usage:     "\n        -i      Inodes"
@@ -83,11 +85,12 @@ int df_main(int argc UNUSED_PARAM, char **argv)
         enum {
                 OPT_KILO  = (1 << 0),
                 OPT_POSIX = (1 << 1),
-                OPT_ALL   = (1 << 2) * ENABLE_FEATURE_DF_FANCY,
-                OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
-                OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
-                OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
-                OPT_MEGA  = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+                OPT_FSTYPE  = (1 << 2),
+                OPT_ALL   = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
+                OPT_INODE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
+                OPT_BSIZE = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
+                OPT_HUMAN = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+                OPT_MEGA  = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
         };
         const char *disp_units_hdr = NULL;
         char *chp;
@@ -99,7 +102,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
 #elif ENABLE_FEATURE_HUMAN_READABLE
         opt_complementary = "k-m:m-k";
 #endif
-        opt = getopt32(argv, "kP"
+        opt = getopt32(argv, "kPT"
                         IF_FEATURE_DF_FANCY("aiB:")
                         IF_FEATURE_HUMAN_READABLE("hm")
                         IF_FEATURE_DF_FANCY(, &chp));
@@ -134,8 +137,11 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                 disp_units_hdr = xasprintf("%lu-blocks", df_disp_hr);
 #endif
         }
-        printf("Filesystem           %-15sUsed Available %s Mounted on\n",
-                        disp_units_hdr, (opt & OPT_POSIX) ? "Capacity" : "Use%");
+
+        printf("Filesystem           %s%-15sUsed Available %s Mounted on\n",
+                        (opt & OPT_FSTYPE) ? "Type       " : "",
+                        disp_units_hdr,
+                        (opt & OPT_POSIX) ? "Capacity" : "Use%");
 
         mount_table = NULL;
         argv += optind;
@@ -148,6 +154,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
         while (1) {
                 const char *device;
                 const char *mount_point;
+                const char *fs_type;
 
                 if (mount_table) {
                         mount_entry = getmntent(mount_table);
@@ -170,6 +177,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
 
                 device = mount_entry->mnt_fsname;
                 mount_point = mount_entry->mnt_dir;
+                fs_type = mount_entry->mnt_type;
 
                 if (statfs(mount_point, &s) != 0) {
                         bb_simple_perror_msg(mount_point);
@@ -218,10 +226,22 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                                         printf("%s%*s", uni_dev, 20 - (int)uni_stat.unicode_width, "");
                                 }
                                 free(uni_dev);
+                                if (opt & OPT_FSTYPE) {
+                                        char *uni_type = unicode_conv_to_printable(&uni_stat, fs_type);
+                                        if (uni_stat.unicode_width > 10 && !(opt & OPT_POSIX))
+                                                printf(" %s\n%31s", uni_type, "");
+                                        else
+                                                printf(" %s%*s", uni_type, 10 - (int)uni_stat.unicode_width, "");
+                                        free(uni_type);
+                                }
                         }
 #else
                         if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
                                 printf("\n%-20s", "");
+                        if (opt & OPT_FSTYPE) {
+                                if (printf(" %-10s", fs_type) > 11 && !(opt & OPT_POSIX))
+                                        printf("\n%-30s", "");
+                        }
 #endif
 
 #if ENABLE_FEATURE_HUMAN_READABLE
diff --git a/coreutils/install.c b/coreutils/install.c
index 6c88ae11c..73f9c70d5 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -8,7 +8,7 @@
 
 /* -v, -b, -c are ignored */
 //usage:#define install_trivial_usage
-//usage:        "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
+//usage:        "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [-t DIR] [SOURCE]... DEST"
 //usage:#define install_full_usage "\n\n"
 //usage:       "Copy files and set attributes\n"
 //usage:     "\n        -c      Just copy (default)"
@@ -19,6 +19,7 @@
 //usage:     "\n        -o USER Set ownership"
 //usage:     "\n        -g GRP  Set group ownership"
 //usage:     "\n        -m MODE Set permissions"
+//usage:     "\n        -t DIR  Install to DIR"
 //usage:        IF_SELINUX(
 //usage:     "\n        -Z      Set security context"
 //usage:        )
@@ -37,6 +38,7 @@ static const char install_longopts[] ALIGN1 =
         "group\0"               Required_argument "g"
         "mode\0"                Required_argument "m"
         "owner\0"               Required_argument "o"
+        "target-directory\0"    Required_argument "t"
 /* autofs build insists of using -b --suffix=.orig */
 /* TODO? (short option for --suffix is -S) */
 #if ENABLE_SELINUX
@@ -95,9 +97,8 @@ int install_main(int argc, char **argv)
         int mkdir_flags = FILEUTILS_RECUR;
         int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
         int opts;
-        int min_args = 1;
         int ret = EXIT_SUCCESS;
-        int isdir = 0;
+        int isdir;
 #if ENABLE_SELINUX
         security_context_t scontext;
         bool use_default_selinux_context = 1;
@@ -113,20 +114,22 @@ int install_main(int argc, char **argv)
                 OPT_GROUP         = 1 << 7,
                 OPT_MODE          = 1 << 8,
                 OPT_OWNER         = 1 << 9,
+                OPT_TARGET        = 1 << 10,
 #if ENABLE_SELINUX
-                OPT_SET_SECURITY_CONTEXT = 1 << 10,
-                OPT_PRESERVE_SECURITY_CONTEXT = 1 << 11,
+                OPT_SET_SECURITY_CONTEXT = 1 << 11,
+                OPT_PRESERVE_SECURITY_CONTEXT = 1 << 12,
 #endif
         };
 
 #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
         applet_long_options = install_longopts;
 #endif
-        opt_complementary = "s--d:d--s" IF_FEATURE_INSTALL_LONG_OPTIONS(IF_SELINUX(":Z--\xff:\xff--Z"));
+        opt_complementary = "t--d:d--t:s--d:d--s" IF_FEATURE_INSTALL_LONG_OPTIONS(IF_SELINUX(":Z--\xff:\xff--Z"));
         /* -c exists for backwards compatibility, it's needed */
         /* -b is ignored ("make a backup of each existing destination file") */
-        opts = getopt32(argv, "cvb" "Ddpsg:m:o:" IF_SELINUX("Z:"),
-                        &gid_str, &mode_str, &uid_str IF_SELINUX(, &scontext));
+        opts = getopt32(argv, "cvb" "Ddpsg:m:o:t:" IF_SELINUX("Z:"),
+                        &gid_str, &mode_str, &uid_str, &last
+                        IF_SELINUX(, &scontext));
         argc -= optind;
         argv += optind;
 
@@ -160,20 +163,23 @@ int install_main(int argc, char **argv)
         uid = (opts & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
         gid = (opts & OPT_GROUP) ? get_ug_id(gid_str, xgroup2gid) : getgid();
 
-        last = argv[argc - 1];
-        if (!(opts & OPT_DIRECTORY)) {
-                argv[argc - 1] = NULL;
-                min_args++;
-
+        /* If -t DIR is in use, then isdir=true, last="DIR" */
+        isdir = (opts & OPT_TARGET);
+        if (!(opts & (OPT_TARGET|OPT_DIRECTORY))) {
+                /* Neither -t DIR nor -d is in use */
+                argc--;
+                last = argv[argc];
+                argv[argc] = NULL;
                 /* coreutils install resolves link in this case, don't use lstat */
                 isdir = stat(last, &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode);
         }
 
-        if (argc < min_args)
+        if (argc < 1)
                 bb_show_usage();
 
         while ((arg = *argv++) != NULL) {
-                char *dest = last;
+                char *dest;
+
                 if (opts & OPT_DIRECTORY) {
                         dest = arg;
                         /* GNU coreutils 6.9 does not set uid:gid
@@ -184,6 +190,7 @@ int install_main(int argc, char **argv)
                                 goto next;
                         }
                 } else {
+                        dest = last;
                         if (opts & OPT_MKDIR_LEADING) {
                                 char *ddir = xstrdup(dest);
                                 bb_make_directory(dirname(ddir), 0755, mkdir_flags);
diff --git a/coreutils/test.c b/coreutils/test.c
index ba1dbaa2f..6b16ffeb1 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -845,7 +845,6 @@ int test_main(int argc, char **argv)
 {
         int res;
         const char *arg0;
-//      bool negate = 0;
 
         arg0 = bb_basename(argv[0]);
         if (arg0[0] == '[') {
@@ -863,6 +862,7 @@ int test_main(int argc, char **argv)
                 }
                 argv[argc] = NULL;
         }
+        /* argc is unused after this point */
 
         /* We must do DEINIT_S() prior to returning */
         INIT_S();
@@ -881,43 +881,45 @@ int test_main(int argc, char **argv)
          */
         /*ngroups = 0; - done by INIT_S() */
 
-        //argc--;
         argv++;
+        args = argv;
 
-        /* Implement special cases from POSIX.2, section 4.62.4 */
-        if (!argv[0]) { /* "test" */
-                res = 1;
-                goto ret;
-        }
-#if 0
-// Now it's fixed in the parser and should not be needed
-        if (LONE_CHAR(argv[0], '!') && argv[1]) {
-                negate = 1;
-                //argc--;
-                argv++;
-        }
-        if (!argv[1]) { /* "test [!] arg" */
-                res = (*argv[0] == '\0');
-                goto ret;
-        }
-        if (argv[2] && !argv[3]) {
-                check_operator(argv[1]);
-                if (last_operator->op_type == BINOP) {
-                        /* "test [!] arg1 <binary_op> arg2" */
-                        args = argv;
-                        res = (binop() == 0);
-                        goto ret;
+        /* Implement special cases from POSIX.2, section 4.62.4.
+         * Testcase: "test '(' = '('"
+         * The general parser would misinterpret '(' as group start.
+         */
+        if (1) {
+                int negate = 0;
+ again:
+                if (!argv[0]) {
+                        /* "test" */
+                        res = 1;
+                        goto ret_special;
+                }
+                if (!argv[1]) {
+                        /* "test [!] arg" */
+                        res = (argv[0][0] == '\0');
+                        goto ret_special;
+                }
+                if (argv[2] && !argv[3]) {
+                        check_operator(argv[1]);
+                        if (last_operator->op_type == BINOP) {
+                                /* "test [!] arg1 <binary_op> arg2" */
+                                args = argv;
+                                res = (binop() == 0);
+ ret_special:
+                                /* If there was leading "!" op... */
+                                res ^= negate;
+                                goto ret;
+                        }
+                }
+                if (LONE_CHAR(argv[0], '!')) {
+                        argv++;
+                        negate ^= 1;
+                        goto again;
                 }
         }
 
-        /* Some complex expression. Undo '!' removal */
-        if (negate) {
-                negate = 0;
-                //argc++;
-                argv--;
-        }
-#endif
-        args = argv;
         res = !oexpr(check_operator(*args));
 
         if (*args != NULL && *++args != NULL) {
@@ -930,6 +932,5 @@ int test_main(int argc, char **argv)
         }
  ret:
         DEINIT_S();
-//      return negate ? !res : res;
         return res;
 }