bc: convert to "G trick" - this returns bc to zero bss increase

[oweals/busybox.git] / coreutils / mv.c

diff --git a/coreutils/mv.c b/coreutils/mv.c
index 7f6e9fef56648c24e566985e9baea488a6538876..6e11197a1d35a926ce7e8a747220606aadfca8ef 100644 (file)
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -17,7 +17,8 @@
 //config:      help
 //config:      mv is used to move or rename files or directories.
 
-//applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_MV(APPLET_NOEXEC(mv, mv, BB_DIR_BIN, BB_SUID_DROP, mv))
+/* NOEXEC despite cases when it can be a "runner" (mv LARGE_DIR OTHER_FS) */
 
 //kbuild:lib-$(CONFIG_MV) += mv.o
 
@@ -55,8 +56,10 @@ int mv_main(int argc, char **argv)
         * If more than one of -f, -i, -n is specified , only the final one
         * takes effect (it unsets previous options).
         */
-       opt_complementary = "-2:f-in:i-fn:n-fi";
-       flags = getopt32long(argv, "finv",
+       flags = getopt32long(argv, "^"
+                       "finv"
+                       "\0"
+                       "-2:f-in:i-fn:n-fi",
                        "interactive\0" No_argument "i"
                        "force\0"       No_argument "f"
                        "no-clobber\0"  No_argument "n"
@@ -98,7 +101,7 @@ int mv_main(int argc, char **argv)
                                if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) {
                                        goto RET_1;  /* Ouch! fprintf failed! */
                                }
-                               if (!bb_ask_confirmation()) {
+                               if (!bb_ask_y_confirmation()) {
                                        goto RET_0;
                                }
                        }