diff options
| author | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-11 14:38:01 +0000 |
|---|---|---|
| committer | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-11 14:38:01 +0000 |
| commit | 7b5bcb9d3f7691ee325ad704d76590bb939c5020 (patch) | |
| tree | dcf88d0a287b1f154984bfc0acb292631df2f1f3 /archival | |
| parent | b30a4590a2a185ed36221548661507f65345b0ac (diff) | |
| download | busybox-w32-7b5bcb9d3f7691ee325ad704d76590bb939c5020.tar.gz busybox-w32-7b5bcb9d3f7691ee325ad704d76590bb939c5020.tar.bz2 busybox-w32-7b5bcb9d3f7691ee325ad704d76590bb939c5020.zip | |
- use complementally '!' to '?' - 'ask' is best 'free' char for this.
- more long opt compatibility, can set flag for long opt struct now
- more logic: check opt-depend requires and global requires, special for 'id' and 'start-stop-daemon' applets.
git-svn-id: svn://busybox.net/trunk/busybox@11828 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/ar.c | 2 | ||||
| -rw-r--r-- | archival/dpkg_deb.c | 2 | ||||
| -rw-r--r-- | archival/tar.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/archival/ar.c b/archival/ar.c index 411a25e0a..70deb5cbb 100644 --- a/archival/ar.c +++ b/archival/ar.c | |||
| @@ -66,7 +66,7 @@ extern int ar_main(int argc, char **argv) | |||
| 66 | 66 | ||
| 67 | archive_handle = init_handle(); | 67 | archive_handle = init_handle(); |
| 68 | 68 | ||
| 69 | bb_opt_complementally = "!p~tx:t~px:x~pt"; | 69 | bb_opt_complementally = "?p~tx:t~px:x~pt"; |
| 70 | opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); | 70 | opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); |
| 71 | 71 | ||
| 72 | if ((opt == 0) || (optind == argc)) { | 72 | if ((opt == 0) || (optind == argc)) { |
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 1ceaa60e0..f38fb6195 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c | |||
| @@ -55,7 +55,7 @@ extern int dpkg_deb_main(int argc, char **argv) | |||
| 55 | control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2"); | 55 | control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2"); |
| 56 | #endif | 56 | #endif |
| 57 | 57 | ||
| 58 | bb_opt_complementally = "!c~efXx:e~cfXx:f~ceXx:X~cefx:x~cefX"; | 58 | bb_opt_complementally = "?c~efXx:e~cfXx:f~ceXx:X~cefx:x~cefX"; |
| 59 | opt = bb_getopt_ulflags(argc, argv, "cefXx"); | 59 | opt = bb_getopt_ulflags(argc, argv, "cefXx"); |
| 60 | 60 | ||
| 61 | if (opt & DPKG_DEB_OPT_CONTENTS) { | 61 | if (opt & DPKG_DEB_OPT_CONTENTS) { |
diff --git a/archival/tar.c b/archival/tar.c index f6750ae33..d98426748 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -702,7 +702,7 @@ int tar_main(int argc, char **argv) | |||
| 702 | tar_handle = init_handle(); | 702 | tar_handle = init_handle(); |
| 703 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; | 703 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; |
| 704 | 704 | ||
| 705 | bb_opt_complementally = "!c~tx:t~cx:x~ct:X*:T*"; | 705 | bb_opt_complementally = "?c~tx:t~cx:x~ct:X*:T*"; |
| 706 | #ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS | 706 | #ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS |
| 707 | bb_applet_long_options = tar_long_options; | 707 | bb_applet_long_options = tar_long_options; |
| 708 | #endif | 708 | #endif |