summaryrefslogtreecommitdiff
path: root/coreutils/mv.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/mv.c')
-rw-r--r--coreutils/mv.c38
1 files changed, 12 insertions, 26 deletions
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 147dd3b..7f6e9fe 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -16,11 +16,6 @@
//config: default y
//config: help
//config: mv is used to move or rename files or directories.
-//config:
-//config:config FEATURE_MV_LONG_OPTIONS
-//config: bool "Enable long options"
-//config: default y
-//config: depends on MV && LONG_OPTS
//applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
@@ -41,23 +36,6 @@
#include "libbb.h"
#include "libcoreutils/coreutils.h"
-#if ENABLE_FEATURE_MV_LONG_OPTIONS
-static const char mv_longopts[] ALIGN1 =
- "interactive\0" No_argument "i"
- "force\0" No_argument "f"
- "no-clobber\0" No_argument "n"
- IF_FEATURE_VERBOSE(
- "verbose\0" No_argument "v"
- )
- ;
-#endif
-
-#define OPT_FORCE (1 << 0)
-#define OPT_INTERACTIVE (1 << 1)
-#define OPT_NOCLOBBER (1 << 2)
-#define OPT_VERBOSE ((1 << 3) * ENABLE_FEATURE_VERBOSE)
-
-
int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int mv_main(int argc, char **argv)
{
@@ -69,15 +47,23 @@ int mv_main(int argc, char **argv)
int status = 0;
int copy_flag = 0;
-#if ENABLE_FEATURE_MV_LONG_OPTIONS
- applet_long_options = mv_longopts;
-#endif
+#define OPT_FORCE (1 << 0)
+#define OPT_INTERACTIVE (1 << 1)
+#define OPT_NOCLOBBER (1 << 2)
+#define OPT_VERBOSE ((1 << 3) * ENABLE_FEATURE_VERBOSE)
/* 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).
*/
opt_complementary = "-2:f-in:i-fn:n-fi";
- flags = getopt32(argv, "finv");
+ flags = getopt32long(argv, "finv",
+ "interactive\0" No_argument "i"
+ "force\0" No_argument "f"
+ "no-clobber\0" No_argument "n"
+ IF_FEATURE_VERBOSE(
+ "verbose\0" No_argument "v"
+ )
+ );
argc -= optind;
argv += optind;
last = argv[argc - 1];