aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorGravatar "Vladimir N. Oleynik" <dzo@simtreas.ru>2005-10-14 09:56:52 +0000
committerGravatar "Vladimir N. Oleynik" <dzo@simtreas.ru>2005-10-14 09:56:52 +0000
commitf704b27b5bb8bd5acaed9464714db34ccef06cc8 (patch)
tree06f15d778a64ba361219d8227f87422173bf0da8 /archival
parent8c7a7e6e63c01d2d575bbaa43e1768ad2b97179b (diff)
downloadbusybox-f704b27b5bb8bd5acaed9464714db34ccef06cc8.tar.gz
busybox-f704b27b5bb8bd5acaed9464714db34ccef06cc8.tar.bz2
- new bb_opt_complementally syntax, use [-:?] only - 'free' chars
- new bb_getopt_ulflags features: check max and min args, convert first argv to options special for ar and tar applets - use bb_default_error_retval for env applet
Diffstat (limited to 'archival')
-rw-r--r--archival/ar.c9
-rw-r--r--archival/dpkg_deb.c2
-rw-r--r--archival/tar.c10
3 files changed, 6 insertions, 15 deletions
diff --git a/archival/ar.c b/archival/ar.c
index de5bc9b84..983b5ae2c 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -68,16 +68,9 @@ extern int ar_main(int argc, char **argv)
archive_handle = init_handle();
/* Prepend '-' to the first argument if required */
- if (argv[1][0] != '-')
- argv[1] = bb_xasprintf("-%s", argv[1]);
-
- bb_opt_complementally = "?p~tx:t~px:x~pt";
+ bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt";
opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
- if ((opt == 0) || (optind == argc)) {
- bb_show_usage();
- }
-
if (opt & AR_CTX_PRINT) {
archive_handle->action_data = data_extract_to_stdout;
}
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index f38fb6195..29e9719cb 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -55,7 +55,7 @@ extern int dpkg_deb_main(int argc, char **argv)
control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2");
#endif
- bb_opt_complementally = "?c~efXx:e~cfXx:f~ceXx:X~cefx:x~cefX";
+ bb_opt_complementally = "?c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
opt = bb_getopt_ulflags(argc, argv, "cefXx");
if (opt & DPKG_DEB_OPT_CONTENTS) {
diff --git a/archival/tar.c b/archival/tar.c
index 32e9cbaa6..7cfb495e5 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -690,18 +690,16 @@ int tar_main(int argc, char **argv)
unsigned long opt;
unsigned long ctx_flag = 0;
- /* Prepend '-' to the first argument if required */
- if (argv[1][0] != '-')
- argv[1] = bb_xasprintf("-%s", argv[1]);
-
+
/* Initialise default values */
tar_handle = init_handle();
tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL;
+ /* Prepend '-' to the first argument if required */
#ifdef CONFIG_FEATURE_TAR_CREATE
- bb_opt_complementally = "?:c?c:t?t:x?x:c~tx:t~cx:x~ct:X*:T*";
+ bb_opt_complementally = "--:-1:X::T::c:t:x:?:c--tx:t--cx:x--ct";
#else
- bb_opt_complementally = "?:t?t:x?x:t~x:x~t:X*:T*";
+ bb_opt_complementally = "--:-1:X::T::t:x:?:t--x:x--t";
#endif
#ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS
bb_applet_long_options = tar_long_options;