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

tar: fix misplaced --exclude long option definition

Browse Source
This commit is contained in:
Denis Vlasenko 2006-11-27 20:24:40 +00:00
parent 5e90e10647
commit 30d7a346e6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archival/tar.c
View File

@ -704,7 +704,6 @@ static const struct option tar_long_options[] = {
# if ENABLE_FEATURE_TAR_FROM # if ENABLE_FEATURE_TAR_FROM
{ "files-from", 1, NULL, 'T' }, { "files-from", 1, NULL, 'T' },
{ "exclude-from", 1, NULL, 'X' }, { "exclude-from", 1, NULL, 'X' },
{ "exclude", 1, NULL, 0xfd },
# endif # endif
# if ENABLE_FEATURE_TAR_GZIP # if ENABLE_FEATURE_TAR_GZIP
{ "gzip", 0, NULL, 'z' }, { "gzip", 0, NULL, 'z' },
@ -712,8 +711,14 @@ static const struct option tar_long_options[] = {
# if ENABLE_FEATURE_TAR_COMPRESS # if ENABLE_FEATURE_TAR_COMPRESS
{ "compress", 0, NULL, 'Z' }, { "compress", 0, NULL, 'Z' },
# endif # endif
{ "no-same-owner", 0, NULL, 0xfe }, { "no-same-owner", 0, NULL, 0xfd },
{ "no-same-permissions",0, NULL, 0xff }, { "no-same-permissions",0, NULL, 0xfe },
/* --exclude takes next bit position in option mask, */
/* therefore we have to either put it _after_ --no-same-perm */
/* or add OPT[BIT]_EXCLUDE before OPT[BIT]_NOPRESERVE_OWN */
# if ENABLE_FEATURE_TAR_FROM
{ "exclude", 1, NULL, 0xff },
# endif
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
#else #else
@ -741,7 +746,7 @@ int tar_main(int argc, char **argv)
"tt:vv:" // count -t,-v "tt:vv:" // count -t,-v
"?:" // bail out with usage instead of error return "?:" // bail out with usage instead of error return
"X::T::" // cumulative lists "X::T::" // cumulative lists
"\xfd::" // cumulative lists for --exclude "\xff::" // cumulative lists for --exclude
USE_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd USE_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
USE_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive USE_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
SKIP_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive SKIP_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive