diff options
author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-09-05 14:46:07 +0000 |
---|---|---|
committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-09-05 14:46:07 +0000 |
commit | 27421a1878847389391c1a43420baaccf57057a7 (patch) | |
tree | 73e57d430a5828d242b78deb0a591a99f0df44a9 /archival/tar.c | |
parent | bef14d7a878049a01f1fb9b412611a2d64c2b154 (diff) | |
download | busybox-w32-27421a1878847389391c1a43420baaccf57057a7.tar.gz busybox-w32-27421a1878847389391c1a43420baaccf57057a7.tar.bz2 busybox-w32-27421a1878847389391c1a43420baaccf57057a7.zip |
1) bb_opt_complementaly -> bb_opt_complementally
2) better support long options
3) new flag '!' for bb_opt_complementally: produce bb_show_usage() if BB_GETOPT_ERROR internally
Diffstat (limited to 'archival/tar.c')
-rw-r--r-- | archival/tar.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/archival/tar.c b/archival/tar.c index 585f0629f..a2623863d 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -706,7 +706,7 @@ int tar_main(int argc, char **argv) | |||
706 | tar_handle = init_handle(); | 706 | tar_handle = init_handle(); |
707 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; | 707 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; |
708 | 708 | ||
709 | bb_opt_complementaly = "c~tx:t~cx:x~ct:X*:T*"; | 709 | bb_opt_complementally = "!c~tx:t~cx:x~ct:X*:T*"; |
710 | #ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS | 710 | #ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS |
711 | bb_applet_long_options = tar_long_options; | 711 | bb_applet_long_options = tar_long_options; |
712 | #endif | 712 | #endif |
@@ -720,10 +720,6 @@ int tar_main(int argc, char **argv) | |||
720 | #endif | 720 | #endif |
721 | ); | 721 | ); |
722 | 722 | ||
723 | /* Check one and only one context option was given */ | ||
724 | if(opt & BB_GETOPT_ERROR) { | ||
725 | bb_show_usage(); | ||
726 | } | ||
727 | #ifdef CONFIG_FEATURE_TAR_CREATE | 723 | #ifdef CONFIG_FEATURE_TAR_CREATE |
728 | ctx_flag = opt & (CTX_CREATE | CTX_TEST | CTX_EXTRACT); | 724 | ctx_flag = opt & (CTX_CREATE | CTX_TEST | CTX_EXTRACT); |
729 | #else | 725 | #else |