emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- new bb_opt_complementally syntax, use [-:?] only - 'free' chars

Browse Source 
- 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
This commit is contained in:
"Vladimir N. Oleynik"
2005-10-14 09:56:52 +00:00
parent 8c7a7e6e63
commit f704b27b5b
15 changed files with 153 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
archival/ar.c
View File

@@ -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;
}

2
archival/dpkg_deb.c
View File

@@ -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) {

10
archival/tar.c
View File

@@ -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;