From f704b27b5bb8bd5acaed9464714db34ccef06cc8 Mon Sep 17 00:00:00 2001 From: "\"Vladimir N. Oleynik\"" Date: Fri, 14 Oct 2005 09:56:52 +0000 Subject: - 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 --- archival/tar.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'archival/tar.c') 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; -- cgit v1.2.3