diff options
author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-14 09:56:52 +0000 |
---|---|---|
committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-14 09:56:52 +0000 |
commit | f704b27b5bb8bd5acaed9464714db34ccef06cc8 (patch) | |
tree | 06f15d778a64ba361219d8227f87422173bf0da8 /archival/ar.c | |
parent | 8c7a7e6e63c01d2d575bbaa43e1768ad2b97179b (diff) | |
download | busybox-w32-f704b27b5bb8bd5acaed9464714db34ccef06cc8.tar.gz busybox-w32-f704b27b5bb8bd5acaed9464714db34ccef06cc8.tar.bz2 busybox-w32-f704b27b5bb8bd5acaed9464714db34ccef06cc8.zip |
- 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/ar.c')
-rw-r--r-- | archival/ar.c | 9 |
1 files changed, 1 insertions, 8 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) | |||
68 | archive_handle = init_handle(); | 68 | archive_handle = init_handle(); |
69 | 69 | ||
70 | /* Prepend '-' to the first argument if required */ | 70 | /* Prepend '-' to the first argument if required */ |
71 | if (argv[1][0] != '-') | 71 | bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt"; |
72 | argv[1] = bb_xasprintf("-%s", argv[1]); | ||
73 | |||
74 | bb_opt_complementally = "?p~tx:t~px:x~pt"; | ||
75 | opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); | 72 | opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); |
76 | 73 | ||
77 | if ((opt == 0) || (optind == argc)) { | ||
78 | bb_show_usage(); | ||
79 | } | ||
80 | |||
81 | if (opt & AR_CTX_PRINT) { | 74 | if (opt & AR_CTX_PRINT) { |
82 | archive_handle->action_data = data_extract_to_stdout; | 75 | archive_handle->action_data = data_extract_to_stdout; |
83 | } | 76 | } |