X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=8396ad5e4e4e753f2c6284643b1939b7a52e3887;hb=7b68ef3d918603f3afb03e939ba72f5cad10edf4;hp=e859f49b2573f67b149596a0f538f9a8d16fa565;hpb=f2bf9f2ffa06c0a89a799e64672f58a8e7d0efc7;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index e859f49..8396ad5 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,13 +1,13 @@ /* A tar (tape archiver) program. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, - 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. Written by John Gilmore, starting 1985-08-25. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any later + Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful, but @@ -22,9 +22,9 @@ #include #include -#include #include #include +#include #include #if ! defined SIGCHLD && defined SIGCLD @@ -40,10 +40,11 @@ #include #include +#include #include #include -#include #include +#include #include #include #include @@ -217,12 +218,12 @@ subcommand_string (enum subcommand c) } void -tar_list_quoting_styles (FILE *fp, char *prefix) +tar_list_quoting_styles (argp_fmtstream_t fs, char *prefix) { int i; for (i = 0; quoting_style_args[i]; i++) - fprintf (fp, "%s%s\n", prefix, quoting_style_args[i]); + argp_fmtstream_printf (fs, "%s%s\n", prefix, quoting_style_args[i]); } void @@ -248,12 +249,20 @@ enum ANCHORED_OPTION = CHAR_MAX + 1, ATIME_PRESERVE_OPTION, BACKUP_OPTION, + CHECK_DEVICE_OPTION, CHECKPOINT_OPTION, - CHECK_LINKS_OPTION, + CHECKPOINT_ACTION_OPTION, DELAY_DIRECTORY_RESTORE_OPTION, + HARD_DEREFERENCE_OPTION, DELETE_OPTION, EXCLUDE_CACHES_OPTION, + EXCLUDE_CACHES_UNDER_OPTION, + EXCLUDE_CACHES_ALL_OPTION, EXCLUDE_OPTION, + EXCLUDE_TAG_OPTION, + EXCLUDE_TAG_UNDER_OPTION, + EXCLUDE_TAG_ALL_OPTION, + EXCLUDE_VCS_OPTION, FORCE_LOCAL_OPTION, GROUP_OPTION, HANG_OPTION, @@ -262,12 +271,17 @@ enum IGNORE_FAILED_READ_OPTION, INDEX_FILE_OPTION, KEEP_NEWER_FILES_OPTION, + LZOP_OPTION, MODE_OPTION, + MTIME_OPTION, NEWER_MTIME_OPTION, NO_ANCHORED_OPTION, + NO_AUTO_COMPRESS_OPTION, + NO_CHECK_DEVICE_OPTION, NO_DELAY_DIRECTORY_RESTORE_OPTION, NO_IGNORE_CASE_OPTION, NO_IGNORE_COMMAND_ERROR_OPTION, + NO_NULL_OPTION, NO_OVERWRITE_DIR_OPTION, NO_QUOTE_CHARS_OPTION, NO_RECURSION_OPTION, @@ -281,6 +295,7 @@ enum OCCURRENCE_OPTION, OLD_ARCHIVE_OPTION, ONE_FILE_SYSTEM_OPTION, + OVERWRITE_DIR_OPTION, OVERWRITE_OPTION, OWNER_OPTION, PAX_OPTION, @@ -298,15 +313,16 @@ enum SAME_OWNER_OPTION, SHOW_DEFAULTS_OPTION, SHOW_OMITTED_DIRS_OPTION, - SHOW_STORED_NAMES_OPTION, + SHOW_TRANSFORMED_NAMES_OPTION, + SPARSE_VERSION_OPTION, STRIP_COMPONENTS_OPTION, SUFFIX_OPTION, TEST_LABEL_OPTION, TOTALS_OPTION, TO_COMMAND_OPTION, + TRANSFORM_OPTION, UNQUOTE_OPTION, USAGE_OPTION, - USE_COMPRESS_PROGRAM_OPTION, UTC_OPTION, VERSION_OPTION, VOLNO_FILE_OPTION, @@ -316,13 +332,16 @@ enum const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION; const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; -static char doc[] = N_("GNU `tar' saves many files together into a single tape or disk archive, and can restore individual files from the archive.\n\ +static char const doc[] = N_("\ +GNU `tar' saves many files together into a single tape or disk archive, \ +and can restore individual files from the archive.\n\ \n\ Examples:\n\ tar -cf archive.tar foo bar # Create archive.tar from files foo and bar.\n\ tar -tvf archive.tar # List all files in archive.tar verbosely.\n\ - tar -xf archive.tar # Extract all files from archive.tar.\n\ -\vThe backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\ + tar -xf archive.tar # Extract all files from archive.tar.\n") +"\v" +N_("The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n\ none, off never make backups\n\ t, numbered make numbered backups\n\ @@ -332,7 +351,7 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n /* NOTE: - Available option letters are DEIJQY and aeqy. Consider the following + Available option letters are DEQY and eqy. Consider the following assignments: [For Solaris tar compatibility =/= Is it important at all?] @@ -340,7 +359,6 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n E use extended headers (--format=posix) [q alias for --occurrence=1 =/= this would better be used for quiet?] - [I same as T =/= will harm star compatibility] y per-file gzip compression Y per-block gzip compression */ @@ -370,7 +388,7 @@ static struct argp_option options[] = { {"delete", DELETE_OPTION, 0, 0, N_("delete from the archive (not on mag tapes!)"), GRID+1 }, {"test-label", TEST_LABEL_OPTION, NULL, 0, - N_("Test archive volume label and exit"), GRID+1 }, + N_("test the archive volume label and exit"), GRID+1 }, #undef GRID #define GRID 20 @@ -379,6 +397,8 @@ static struct argp_option options[] = { {"sparse", 'S', 0, 0, N_("handle sparse files efficiently"), GRID+1 }, + {"sparse-version", SPARSE_VERSION_OPTION, N_("MAJOR[.MINOR]"), 0, + N_("set version of the sparse format to use (implies --sparse)"), GRID+1}, {"incremental", 'G', 0, 0, N_("handle old GNU-format incremental backup"), GRID+1 }, {"listed-incremental", 'g', N_("FILE"), 0, @@ -386,14 +406,24 @@ static struct argp_option options[] = { {"ignore-failed-read", IGNORE_FAILED_READ_OPTION, 0, 0, N_("do not exit with nonzero on unreadable files"), GRID+1 }, {"occurrence", OCCURRENCE_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL, - N_("process only the NUMBERth occurrence of each file in the archive. This option is valid only in conjunction with one of the subcommands --delete, --diff, --extract or --list and when a list of files is given either on the command line or via -T option. NUMBER defaults to 1."), GRID+1 }, + N_("process only the NUMBERth occurrence of each file in the archive;" + " this option is valid only in conjunction with one of the subcommands" + " --delete, --diff, --extract or --list and when a list of files" + " is given either on the command line or via the -T option;" + " NUMBER defaults to 1"), GRID+1 }, {"seek", 'n', NULL, 0, N_("archive is seekable"), GRID+1 }, + {"no-check-device", NO_CHECK_DEVICE_OPTION, NULL, 0, + N_("do not check device numbers when creating incremental archives"), + GRID+1 }, + {"check-device", CHECK_DEVICE_OPTION, NULL, 0, + N_("check device numbers when creating incremental archives (default)"), + GRID+1 }, #undef GRID #define GRID 30 {NULL, 0, NULL, 0, - N_("Overwrite control:\n"), GRID+1 }, + N_("Overwrite control:"), GRID }, {"verify", 'W', 0, 0, N_("attempt to verify the archive after writing it"), GRID+1 }, @@ -411,6 +441,9 @@ static struct argp_option options[] = { N_("empty hierarchies prior to extracting directory"), GRID+1 }, {"no-overwrite-dir", NO_OVERWRITE_DIR_OPTION, 0, 0, N_("preserve metadata of existing directories"), GRID+1 }, + {"overwrite-dir", OVERWRITE_DIR_OPTION, 0, 0, + N_("overwrite metadata of existing directories when extracting (default)"), + GRID+1 }, #undef GRID #define GRID 40 @@ -435,6 +468,8 @@ static struct argp_option options[] = { N_("force NAME as owner for added files"), GRID+1 }, {"group", GROUP_OPTION, N_("NAME"), 0, N_("force NAME as group for added files"), GRID+1 }, + {"mtime", MTIME_OPTION, N_("DATE-OR-FILE"), 0, + N_("set mtime for added files from DATE-OR-FILE"), GRID+1 }, {"mode", MODE_OPTION, N_("CHANGES"), 0, N_("force (symbolic) mode CHANGES for added files"), GRID+1 }, {"atime-preserve", ATIME_PRESERVE_OPTION, @@ -462,14 +497,15 @@ static struct argp_option options[] = { {"preserve", PRESERVE_OPTION, 0, 0, N_("same as both -p and -s"), GRID+1 }, {"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0, - N_("Delay setting modification times and permissions of extracted directories until the end of extraction."), GRID+1 }, + N_("delay setting modification times and permissions of extracted" + " directories until the end of extraction"), GRID+1 }, {"no-delay-directory-restore", NO_DELAY_DIRECTORY_RESTORE_OPTION, 0, 0, - N_("Cancel the effect of --delay-directory-restore option."), GRID+1 }, + N_("cancel the effect of --delay-directory-restore option"), GRID+1 }, #undef GRID #define GRID 60 {NULL, 0, NULL, 0, - N_("Device selection and switching:\n"), GRID+1 }, + N_("Device selection and switching:"), GRID }, {"file", 'f', N_("ARCHIVE"), 0, N_("use archive file or device ARCHIVE"), GRID+1 }, @@ -508,7 +544,7 @@ static struct argp_option options[] = { #define GRID 70 {NULL, 0, NULL, 0, - N_("Device blocking:"), GRID+1 }, + N_("Device blocking:"), GRID }, {"blocking-factor", 'b', N_("BLOCKS"), 0, N_("BLOCKS x 512 bytes per record"), GRID+1 }, @@ -525,7 +561,7 @@ static struct argp_option options[] = { N_("Archive format selection:"), GRID }, {"format", 'H', N_("FORMAT"), 0, - N_("create archive of the given format."), GRID+1 }, + N_("create archive of the given format"), GRID+1 }, {NULL, 0, NULL, 0, N_("FORMAT is one of the following:"), GRID+2 }, {" v7", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("old V7 tar format"), @@ -545,24 +581,38 @@ static struct argp_option options[] = { {"portability", 0, 0, OPTION_ALIAS, NULL, GRID+8 }, {"posix", POSIX_OPTION, 0, 0, N_("same as --format=posix"), GRID+8 }, - {"pax-option", PAX_OPTION, N_("keyword[[:]=value][,keyword[[:]=value], ...]"), 0, + {"pax-option", PAX_OPTION, N_("keyword[[:]=value][,keyword[[:]=value]]..."), 0, N_("control pax keywords"), GRID+8 }, {"label", 'V', N_("TEXT"), 0, - N_("create archive with volume name TEXT. At list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 }, + N_("create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 }, +#undef GRID + +#define GRID 90 + {NULL, 0, NULL, 0, + N_("Compression options:"), GRID }, + {"auto-compress", 'a', 0, 0, + N_("use archive suffix to determine the compression program"), GRID+1 }, + {"no-auto-compress", NO_AUTO_COMPRESS_OPTION, 0, 0, + N_("do not use use archive suffix to determine the compression program"), + GRID+1 }, {"bzip2", 'j', 0, 0, - N_("filter the archive through bzip2"), GRID+8 }, + N_("filter the archive through bzip2"), GRID+1 }, {"gzip", 'z', 0, 0, - N_("filter the archive through gzip"), GRID+8 }, - {"gunzip", 0, 0, OPTION_ALIAS, NULL, GRID+8 }, - {"ungzip", 0, 0, OPTION_ALIAS, NULL, GRID+8 }, + N_("filter the archive through gzip"), GRID+1 }, + {"gunzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, + {"ungzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"compress", 'Z', 0, 0, - N_("filter the archive through compress"), GRID+8 }, - {"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+8 }, - {"use-compress-program", USE_COMPRESS_PROGRAM_OPTION, N_("PROG"), 0, - N_("filter through PROG (must accept -d)"), GRID+8 }, + N_("filter the archive through compress"), GRID+1 }, + {"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, + {"lzma", 'J', 0, 0, + N_("filter the archive through lzma"), GRID+1 }, + {"lzop", LZOP_OPTION, 0, 0, + N_("filter the archive through lzop"), GRID+8 }, + {"use-compress-program", 'I', N_("PROG"), 0, + N_("filter through PROG (must accept -d)"), GRID+1 }, #undef GRID - -#define GRID 90 + +#define GRID 100 {NULL, 0, NULL, 0, N_("Local file selection:"), GRID }, @@ -574,6 +624,8 @@ static struct argp_option options[] = { N_("get names to extract or create from FILE"), GRID+1 }, {"null", NULL_OPTION, 0, 0, N_("-T reads null-terminated names, disable -C"), GRID+1 }, + {"no-null", NO_NULL_OPTION, 0, 0, + N_("disable the effect of the previous --null option"), GRID+1 }, {"unquote", UNQUOTE_OPTION, 0, 0, N_("unquote filenames read with -T (default)"), GRID+1 }, {"no-unquote", NO_UNQUOTE_OPTION, 0, 0, @@ -583,62 +635,99 @@ static struct argp_option options[] = { {"exclude-from", 'X', N_("FILE"), 0, N_("exclude patterns listed in FILE"), GRID+1 }, {"exclude-caches", EXCLUDE_CACHES_OPTION, 0, 0, - N_("exclude directories containing a cache tag"), GRID+1 }, - {"ignore-case", IGNORE_CASE_OPTION, 0, 0, - N_("exclusion ignores case"), GRID+1 }, - {"anchored", ANCHORED_OPTION, 0, 0, - N_("exclude patterns match file name start"), GRID+1 }, - {"no-anchored", NO_ANCHORED_OPTION, 0, 0, - N_("exclude patterns match after any `/' (default)"), GRID+1 }, - {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0, - N_("exclusion is case sensitive (default)"), GRID+1 }, - {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0, - N_("exclude patterns are plain strings"), GRID+1 }, - {"no-wildcards-match-slash", NO_WILDCARDS_MATCH_SLASH_OPTION, 0, 0, - N_("exclude pattern wildcards do not match `/'"), GRID+1 }, + N_("exclude contents of directories containing CACHEDIR.TAG, " + "except for the tag file itself"), GRID+1 }, + {"exclude-caches-under", EXCLUDE_CACHES_UNDER_OPTION, 0, 0, + N_("exclude everything under directories containing CACHEDIR.TAG"), + GRID+1 }, + {"exclude-caches-all", EXCLUDE_CACHES_ALL_OPTION, 0, 0, + N_("exclude directories containing CACHEDIR.TAG"), GRID+1 }, + {"exclude-tag", EXCLUDE_TAG_OPTION, N_("FILE"), 0, + N_("exclude contents of directories containing FILE, except" + " for FILE itself"), GRID+1 }, + {"exclude-tag-under", EXCLUDE_TAG_UNDER_OPTION, N_("FILE"), 0, + N_("exclude everything under directories containing FILE"), GRID+1 }, + {"exclude-tag-all", EXCLUDE_TAG_ALL_OPTION, N_("FILE"), 0, + N_("exclude directories containing FILE"), GRID+1 }, + {"exclude-vcs", EXCLUDE_VCS_OPTION, NULL, 0, + N_("exclude version control system directories"), GRID+1 }, {"no-recursion", NO_RECURSION_OPTION, 0, 0, N_("avoid descending automatically in directories"), GRID+1 }, {"one-file-system", ONE_FILE_SYSTEM_OPTION, 0, 0, N_("stay in local file system when creating archive"), GRID+1 }, - {NULL, 'l', 0, OPTION_HIDDEN, "", GRID+1 }, {"recursion", RECURSION_OPTION, 0, 0, N_("recurse into directories (default)"), GRID+1 }, {"absolute-names", 'P', 0, 0, N_("don't strip leading `/'s from file names"), GRID+1 }, {"dereference", 'h', 0, 0, N_("follow symlinks; archive and dump the files they point to"), GRID+1 }, + {"hard-dereference", HARD_DEREFERENCE_OPTION, 0, 0, + N_("follow hard links; archive and dump the files they refer to"), GRID+1 }, {"starting-file", 'K', N_("MEMBER-NAME"), 0, N_("begin at member MEMBER-NAME in the archive"), GRID+1 }, - {"strip-components", STRIP_COMPONENTS_OPTION, N_("NUMBER"), 0, - N_("strip NUMBER leading components from file names"), GRID+1 }, {"newer", 'N', N_("DATE-OR-FILE"), 0, N_("only store files newer than DATE-OR-FILE"), GRID+1 }, + {"after-date", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"newer-mtime", NEWER_MTIME_OPTION, N_("DATE"), 0, N_("compare date and time when data changed only"), GRID+1 }, - {"after-date", 'N', N_("DATE"), 0, - N_("same as -N"), GRID+1 }, {"backup", BACKUP_OPTION, N_("CONTROL"), OPTION_ARG_OPTIONAL, N_("backup before removal, choose version CONTROL"), GRID+1 }, {"suffix", SUFFIX_OPTION, N_("STRING"), 0, N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)"), GRID+1 }, +#undef GRID + +#define GRID 110 + {NULL, 0, NULL, 0, + N_("File name transformations:"), GRID }, + {"strip-components", STRIP_COMPONENTS_OPTION, N_("NUMBER"), 0, + N_("strip NUMBER leading components from file names on extraction"), + GRID+1 }, + {"transform", TRANSFORM_OPTION, N_("EXPRESSION"), 0, + N_("use sed replace EXPRESSION to transform file names"), GRID+1 }, + {"xform", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, +#undef GRID + +#define GRID 120 + {NULL, 0, NULL, 0, + N_("File name matching options (affect both exclude and include patterns):"), + GRID }, + {"ignore-case", IGNORE_CASE_OPTION, 0, 0, + N_("ignore case"), GRID+1 }, + {"anchored", ANCHORED_OPTION, 0, 0, + N_("patterns match file name start"), GRID+1 }, + {"no-anchored", NO_ANCHORED_OPTION, 0, 0, + N_("patterns match after any `/' (default for exclusion)"), GRID+1 }, + {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0, + N_("case sensitive matching (default)"), GRID+1 }, {"wildcards", WILDCARDS_OPTION, 0, 0, - N_("exclude patterns use wildcards (default)"), GRID+1 }, + N_("use wildcards (default for exclusion)"), GRID+1 }, + {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0, + N_("verbatim string matching"), GRID+1 }, + {"no-wildcards-match-slash", NO_WILDCARDS_MATCH_SLASH_OPTION, 0, 0, + N_("wildcards do not match `/'"), GRID+1 }, {"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0, - N_("exclude pattern wildcards match `/' (default)"), GRID+1 }, + N_("wildcards match `/' (default for exclusion)"), GRID+1 }, #undef GRID -#define GRID 100 +#define GRID 130 {NULL, 0, NULL, 0, N_("Informative output:"), GRID }, {"verbose", 'v', 0, 0, N_("verbosely list files processed"), GRID+1 }, - {"checkpoint", CHECKPOINT_OPTION, 0, 0, - N_("display progress messages every 10th record"), GRID+1 }, - {"check-links", CHECK_LINKS_OPTION, 0, 0, + {"checkpoint", CHECKPOINT_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL, + N_("display progress messages every NUMBERth record (default 10)"), + GRID+1 }, + {"checkpoint-action", CHECKPOINT_ACTION_OPTION, N_("ACTION"), 0, + N_("execute ACTION on each checkpoint"), + GRID+1 }, + {"check-links", 'l', 0, 0, N_("print a message if not all links are dumped"), GRID+1 }, - {"totals", TOTALS_OPTION, 0, 0, - N_("print total bytes written while creating archive"), GRID+1 }, + {"totals", TOTALS_OPTION, N_("SIGNAL"), OPTION_ARG_OPTIONAL, + N_("print total bytes after processing the archive; " + "with an argument - print total bytes when this SIGNAL is delivered; " + "Allowed signals are: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; " + "the names without SIG prefix are also accepted"), GRID+1 }, {"utc", UTC_OPTION, 0, 0, N_("print file modification dates in UTC"), GRID+1 }, {"index-file", INDEX_FILE_OPTION, N_("FILE"), 0, @@ -649,42 +738,43 @@ static struct argp_option options[] = { N_("ask for confirmation for every action"), GRID+1 }, {"confirmation", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"show-defaults", SHOW_DEFAULTS_OPTION, 0, 0, - N_("Show tar defaults"), GRID+1 }, + N_("show tar defaults"), GRID+1 }, {"show-omitted-dirs", SHOW_OMITTED_DIRS_OPTION, 0, 0, - N_("When listing or extracting, list each directory that does not match search criteria"), GRID+1 }, - {"show-stored-names", SHOW_STORED_NAMES_OPTION, 0, 0, - N_("When creating archive in verbose mode, list member names as stored in the archive"), + N_("when listing or extracting, list each directory that does not match search criteria"), GRID+1 }, + {"show-transformed-names", SHOW_TRANSFORMED_NAMES_OPTION, 0, 0, + N_("show file or archive names after transformation"), GRID+1 }, + {"show-stored-names", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"quoting-style", QUOTING_STYLE_OPTION, N_("STYLE"), 0, - N_("Set name quoting style. See below for valid STYLE values."), GRID+1 }, + N_("set name quoting style; see below for valid STYLE values"), GRID+1 }, {"quote-chars", QUOTE_CHARS_OPTION, N_("STRING"), 0, - N_("Additionally quote characters from STRING"), GRID+1 }, + N_("additionally quote characters from STRING"), GRID+1 }, {"no-quote-chars", NO_QUOTE_CHARS_OPTION, N_("STRING"), 0, - N_("Disable quoting for characters from STRING"), GRID+1 }, + N_("disable quoting for characters from STRING"), GRID+1 }, #undef GRID -#define GRID 110 +#define GRID 140 {NULL, 0, NULL, 0, N_("Compatibility options:"), GRID }, {NULL, 'o', 0, 0, - N_("when creating, same as --old-archive. When extracting, same as --no-same-owner"), GRID+1 }, + N_("when creating, same as --old-archive; when extracting, same as --no-same-owner"), GRID+1 }, #undef GRID -#define GRID 120 +#define GRID 150 {NULL, 0, NULL, 0, N_("Other options:"), GRID }, {"restrict", RESTRICT_OPTION, 0, 0, - N_("Restrict use of some potentially harmful options"), -1 }, + N_("disable use of some potentially harmful options"), -1 }, - {"help", '?', 0, 0, N_("Give this help list"), -1}, - {"usage", USAGE_OPTION, 0, 0, N_("Give a short usage message"), -1}, - {"version", VERSION_OPTION, 0, 0, N_("Print program version"), -1}, + {"help", '?', 0, 0, N_("give this help list"), -1}, + {"usage", USAGE_OPTION, 0, 0, N_("give a short usage message"), -1}, + {"version", VERSION_OPTION, 0, 0, N_("print program version"), -1}, /* FIXME -V (--label) conflicts with the default short option for --version */ {"HANG", HANG_OPTION, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN, - N_("Hang for SECS seconds (default 3600)"), 0}, + N_("hang for SECS seconds (default 3600)"), 0}, #undef GRID {0, 0, 0, 0, 0, 0} @@ -694,37 +784,129 @@ static char const *const atime_preserve_args[] = { "replace", "system", NULL }; + static enum atime_preserve const atime_preserve_types[] = { replace_atime_preserve, system_atime_preserve }; + +/* Make sure atime_preserve_types has as much entries as atime_preserve_args + (minus 1 for NULL guard) */ ARGMATCH_VERIFY (atime_preserve_args, atime_preserve_types); +/* Wildcard matching settings */ +enum wildcards + { + default_wildcards, /* For exclusion == enable_wildcards, + for inclusion == disable_wildcards */ + disable_wildcards, + enable_wildcards + }; -struct tar_args { - char const *textual_date_option; - int exclude_options; - bool o_option; - int pax_option; - char const *backup_suffix_string; - char const *version_control_string; - int input_files; +struct tar_args /* Variables used during option parsing */ +{ + struct textual_date *textual_date; /* Keeps the arguments to --newer-mtime + and/or --date option if they are + textual dates */ + enum wildcards wildcards; /* Wildcard settings (--wildcards/ + --no-wildcards) */ + int matching_flags; /* exclude_fnmatch options */ + int include_anchored; /* Pattern anchoring options used for + file inclusion */ + bool o_option; /* True if -o option was given */ + bool pax_option; /* True if --pax-option was given */ + char const *backup_suffix_string; /* --suffix option argument */ + char const *version_control_string; /* --backup option argument */ + bool input_files; /* True if some input files where given */ + int compress_autodetect; /* True if compression autodetection should + be attempted when creating archives */ }; -static void -show_default_settings (FILE *stream) + +#define MAKE_EXCL_OPTIONS(args) \ + ((((args)->wildcards != disable_wildcards) ? EXCLUDE_WILDCARDS : 0) \ + | (args)->matching_flags \ + | recursion_option) + +#define MAKE_INCL_OPTIONS(args) \ + ((((args)->wildcards == enable_wildcards) ? EXCLUDE_WILDCARDS : 0) \ + | (args)->include_anchored \ + | (args)->matching_flags \ + | recursion_option) + +void +exclude_vcs_files () { - fprintf (stream, - "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s", - archive_format_string (DEFAULT_ARCHIVE_FORMAT), - DEFAULT_ARCHIVE, DEFAULT_BLOCKING, - quoting_style_args[DEFAULT_QUOTING_STYLE], - DEFAULT_RMT_COMMAND); + int i; + static char *vcs_file[] = { + /* CVS: */ + "CVS", + ".cvsignore", + /* RCS: */ + "RCS", + /* SCCS: */ + "SCCS", + /* SVN: */ + ".svn", + /* git: */ + ".git", + ".gitignore", + /* Arch: */ + ".arch-ids", + "{arch}", + "=RELEASE-ID", + "=meta-update", + "=update", + /* Bazaar */ + ".bzr", + ".bzrignore", + ".bzrtags", + /* Mercurial */ + ".hg", + ".hgignore", + ".hgtags", + /* darcs */ + "_darcs", + NULL + }; + + for (i = 0; vcs_file[i]; i++) + add_exclude (excluded, vcs_file[i], 0); +} + + #ifdef REMOTE_SHELL - fprintf (stream, " --rsh-command=%s", REMOTE_SHELL); -#endif - fprintf (stream, "\n"); +# define DECL_SHOW_DEFAULT_SETTINGS(stream, printer) \ +{ \ + printer (stream, \ + "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s", \ + archive_format_string (DEFAULT_ARCHIVE_FORMAT), \ + DEFAULT_ARCHIVE, DEFAULT_BLOCKING, \ + quoting_style_args[DEFAULT_QUOTING_STYLE], \ + DEFAULT_RMT_COMMAND); \ + printer (stream, " --rsh-command=%s", REMOTE_SHELL); \ + printer (stream, "\n"); \ } +#else +# define DECL_SHOW_DEFAULT_SETTINGS(stream, printer) \ +{ \ + printer (stream, \ + "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s", \ + archive_format_string (DEFAULT_ARCHIVE_FORMAT), \ + DEFAULT_ARCHIVE, DEFAULT_BLOCKING, \ + quoting_style_args[DEFAULT_QUOTING_STYLE], \ + DEFAULT_RMT_COMMAND); \ + printer (stream, "\n"); \ +} +#endif + +static void +show_default_settings (FILE *fp) + DECL_SHOW_DEFAULT_SETTINGS(fp, fprintf) + +static void +show_default_settings_fs (argp_fmtstream_t fs) + DECL_SHOW_DEFAULT_SETTINGS(fs, argp_fmtstream_printf) static void set_subcommand_option (enum subcommand subcommand) @@ -746,38 +928,160 @@ set_use_compress_program_option (const char *string) use_compress_program_option = string; } + +static RETSIGTYPE +sigstat (int signo) +{ + compute_duration (); + print_total_stats (); +#ifndef HAVE_SIGACTION + signal (signo, sigstat); +#endif +} + +static void +stat_on_signal (int signo) +{ +#ifdef HAVE_SIGACTION + struct sigaction act; + act.sa_handler = sigstat; + sigemptyset (&act.sa_mask); + act.sa_flags = 0; + sigaction (signo, &act, NULL); +#else + signal (signo, sigstat); +#endif +} + +void +set_stat_signal (const char *name) +{ + static struct sigtab + { + char *name; + int signo; + } sigtab[] = { + { "SIGUSR1", SIGUSR1 }, + { "USR1", SIGUSR1 }, + { "SIGUSR2", SIGUSR2 }, + { "USR2", SIGUSR2 }, + { "SIGHUP", SIGHUP }, + { "HUP", SIGHUP }, + { "SIGINT", SIGINT }, + { "INT", SIGINT }, + { "SIGQUIT", SIGQUIT }, + { "QUIT", SIGQUIT } + }; + struct sigtab *p; + + for (p = sigtab; p < sigtab + sizeof (sigtab) / sizeof (sigtab[0]); p++) + if (strcmp (p->name, name) == 0) + { + stat_on_signal (p->signo); + return; + } + FATAL_ERROR ((0, 0, _("Unknown signal name: %s"), name)); +} + + +struct textual_date +{ + struct textual_date *next; + struct timespec *ts; + const char *option; + const char *date; +}; + +static void +get_date_or_file (struct tar_args *args, const char *option, + const char *str, struct timespec *ts) +{ + if (FILE_SYSTEM_PREFIX_LEN (str) != 0 + || ISSLASH (*str) + || *str == '.') + { + struct stat st; + if (deref_stat (dereference_option, str, &st) != 0) + { + stat_error (str); + USAGE_ERROR ((0, 0, _("Date sample file not found"))); + } + *ts = get_stat_mtime (&st); + } + else + { + if (! get_date (ts, str, NULL)) + { + WARN ((0, 0, _("Substituting %s for unknown date format %s"), + tartime (*ts, false), quote (str))); + ts->tv_nsec = 0; + } + else + { + struct textual_date *p = xmalloc (sizeof (*p)); + p->ts = ts; + p->option = option; + p->date = str; + p->next = args->textual_date; + args->textual_date = p; + } + } +} + +static void +report_textual_dates (struct tar_args *args) +{ + struct textual_date *p; + for (p = args->textual_date; p; ) + { + struct textual_date *next = p->next; + char const *treated_as = tartime (*p->ts, true); + if (strcmp (p->date, treated_as) != 0) + WARN ((0, 0, _("Option %s: Treating date `%s' as %s"), + p->option, p->date, treated_as)); + free (p); + p = next; + } +} + static volatile int _argp_hang; +/* Either NL or NUL, as decided by the --null option. */ +static char filename_terminator; + enum read_file_list_state /* Result of reading file name from the list file */ { file_list_success, /* OK, name read successfully */ file_list_end, /* End of list file */ - file_list_zero /* Zero separator encountered where it should not */ + file_list_zero, /* Zero separator encountered where it should not */ + file_list_skip /* Empty (zero-length) entry encountered, skip it */ }; -/* Read from FP a sequence of characters up to FILENAME_TERMINATOR and put them +/* Read from FP a sequence of characters up to TERM and put them into STK. */ static enum read_file_list_state -read_name_from_file (FILE *fp, struct obstack *stk) +read_name_from_file (FILE *fp, struct obstack *stk, int term) { int c; size_t counter = 0; - for (c = getc (fp); c != EOF && c != filename_terminator; c = getc (fp)) + for (c = getc (fp); c != EOF && c != term; c = getc (fp)) { if (c == 0) { /* We have read a zero separator. The file possibly is zero-separated */ - /* FATAL_ERROR((0, 0, N_("file name contains null character"))); */ return file_list_zero; } obstack_1grow (stk, c); counter++; } + if (counter == 0 && c != EOF) + return file_list_skip; + obstack_1grow (stk, 0); return (counter == 0 && c == EOF) ? file_list_end : file_list_success; @@ -844,7 +1148,8 @@ update_argv (const char *filename, struct argp_state *state) size_t new_argc; bool is_stdin = false; enum read_file_list_state read_state; - + int term = filename_terminator; + if (!strcmp (filename, "-")) { is_stdin = true; @@ -858,31 +1163,43 @@ update_argv (const char *filename, struct argp_state *state) open_fatal (filename); } - while ((read_state = read_name_from_file (fp, &argv_stk)) == file_list_success) - count++; - - if (read_state == file_list_zero) + while ((read_state = read_name_from_file (fp, &argv_stk, term)) + != file_list_end) { - size_t size; + switch (read_state) + { + case file_list_success: + count++; + break; - WARN ((0, 0, N_("%s: file name read contains nul character"), - quotearg_colon (filename))); + case file_list_end: /* won't happen, just to pacify gcc */ + break; - /* Prepare new stack contents */ - size = obstack_object_size (&argv_stk); - p = obstack_finish (&argv_stk); - for (; size > 0; size--, p++) - if (*p) - obstack_1grow (&argv_stk, *p); - else - obstack_1grow (&argv_stk, '\n'); - obstack_1grow (&argv_stk, 0); - count = 1; - - /* Read rest of files using new filename terminator */ - filename_terminator = 0; - while (read_name_from_file (fp, &argv_stk) == file_list_success) - count++; + case file_list_zero: + { + size_t size; + + WARN ((0, 0, N_("%s: file name read contains nul character"), + quotearg_colon (filename))); + + /* Prepare new stack contents */ + size = obstack_object_size (&argv_stk); + p = obstack_finish (&argv_stk); + for (; size > 0; size--, p++) + if (*p) + obstack_1grow (&argv_stk, *p); + else + obstack_1grow (&argv_stk, '\n'); + obstack_1grow (&argv_stk, 0); + count = 1; + /* Read rest of files using new filename terminator */ + term = 0; + break; + } + + case file_list_skip: + break; + } } if (!is_stdin) @@ -893,7 +1210,7 @@ update_argv (const char *filename, struct argp_state *state) start = obstack_finish (&argv_stk); - if (filename_terminator == 0) + if (term == 0) for (p = start; *p; p += strlen (p) + 1) if (p[0] == '-') count++; @@ -909,12 +1226,34 @@ update_argv (const char *filename, struct argp_state *state) for (i = state->next, p = start; *p; p += strlen (p) + 1, i++) { - if (filename_terminator == 0 && p[0] == '-') + if (term == 0 && p[0] == '-') state->argv[i++] = "--add-file"; state->argv[i] = p; } } + +static void +tar_help (struct argp_state *state) +{ + argp_fmtstream_t fs; + state->flags |= ARGP_NO_EXIT; + argp_state_help (state, state->out_stream, + ARGP_HELP_STD_HELP & ~ARGP_HELP_BUG_ADDR); + /* FIXME: use struct uparams.rmargin (from argp-help.c) instead of 79 */ + fs = argp_make_fmtstream (state->out_stream, 0, 79, 0); + + argp_fmtstream_printf (fs, "\n%s\n\n", + _("Valid arguments for --quoting-style options are:")); + tar_list_quoting_styles (fs, " "); + + argp_fmtstream_puts (fs, _("\n*This* tar defaults to:\n")); + show_default_settings_fs (fs); + argp_fmtstream_putc (fs, '\n'); + argp_fmtstream_printf (fs, _("Report bugs to %s.\n"), + argp_program_bug_address); + argp_fmtstream_free (fs); +} static error_t parse_opt (int key, char *arg, struct argp_state *state) @@ -923,16 +1262,24 @@ parse_opt (int key, char *arg, struct argp_state *state) switch (key) { - case ARGP_KEY_ARG: - /* File name or non-parsed option, because of ARGP_IN_ORDER */ - name_add (arg); - args->input_files++; - break; + case ARGP_KEY_ARG: + /* File name or non-parsed option, because of ARGP_IN_ORDER */ + name_add_name (arg, MAKE_INCL_OPTIONS (args)); + args->input_files = true; + break; case 'A': set_subcommand_option (CAT_SUBCOMMAND); break; + case 'a': + args->compress_autodetect = true; + break; + + case NO_AUTO_COMPRESS_OPTION: + args->compress_autodetect = false; + break; + case 'b': { uintmax_t u; @@ -961,8 +1308,7 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case 'C': - name_add ("-C"); - name_add (arg); + name_add_dir (arg); break; case 'd': @@ -971,12 +1317,10 @@ parse_opt (int key, char *arg, struct argp_state *state) case 'f': if (archive_names == allocated_archive_names) - { - allocated_archive_names *= 2; - archive_name_array = - xrealloc (archive_name_array, - sizeof (const char *) * allocated_archive_names); - } + archive_name_array = x2nrealloc (archive_name_array, + &allocated_archive_names, + sizeof (archive_name_array[0])); + archive_name_array[archive_names++] = arg; break; @@ -1006,6 +1350,10 @@ parse_opt (int key, char *arg, struct argp_state *state) dereference_option = true; break; + case HARD_DEREFERENCE_OPTION: + hard_dereference_option = true; + break; + case 'i': /* Ignore zero blocks (eofs). This can't be the default, because Unix tar writes two blocks of zeros, then pads out @@ -1014,16 +1362,14 @@ parse_opt (int key, char *arg, struct argp_state *state) ignore_zeros_option = true; break; - case 'I': - USAGE_ERROR ((0, 0, - _("Warning: the -I option is not supported;" - " perhaps you meant -j or -T?"))); - break; - case 'j': set_use_compress_program_option ("bzip2"); break; + case 'J': + set_use_compress_program_option ("lzma"); + break; + case 'k': /* Don't replace existing files. */ old_files_option = KEEP_OLD_FILES; @@ -1034,23 +1380,16 @@ parse_opt (int key, char *arg, struct argp_state *state) addname (arg, 0); break; - case 'l': - /* Historically equivalent to --one-file-system. This usage is - incompatible with UNIX98 and POSIX specs and therefore is - deprecated. The semantics of -l option will be changed in - future versions. See TODO. - */ - WARN ((0, 0, - _("Semantics of -l option will change in the future releases."))); - WARN ((0, 0, - _("Please use --one-file-system option instead."))); - /* FALL THROUGH */ case ONE_FILE_SYSTEM_OPTION: /* When dumping directories, don't dump files/subdirectories that are on other filesystems. */ one_file_system_option = true; break; + case 'l': + check_links_option = 1; + break; + case 'L': { uintmax_t u; @@ -1062,6 +1401,10 @@ parse_opt (int key, char *arg, struct argp_state *state) } break; + case LZOP_OPTION: + set_use_compress_program_option ("lzop"); + break; + case 'm': touch_option = true; break; @@ -1073,6 +1416,11 @@ parse_opt (int key, char *arg, struct argp_state *state) multi_volume_option = true; break; + case MTIME_OPTION: + get_date_or_file (args, "--mtime", arg, &mtime_option); + set_mtime_option = true; + break; + case 'n': seekable_archive = true; break; @@ -1084,31 +1432,9 @@ parse_opt (int key, char *arg, struct argp_state *state) case NEWER_MTIME_OPTION: if (NEWER_OPTION_INITIALIZED (newer_mtime_option)) USAGE_ERROR ((0, 0, _("More than one threshold date"))); - - if (FILE_SYSTEM_PREFIX_LEN (arg) != 0 - || ISSLASH (*arg) - || *arg == '.') - { - struct stat st; - if (deref_stat (dereference_option, arg, &st) != 0) - { - stat_error (arg); - USAGE_ERROR ((0, 0, _("Date sample file not found"))); - } - newer_mtime_option = get_stat_mtime (&st); - } - else - { - if (! get_date (&newer_mtime_option, arg, NULL)) - { - WARN ((0, 0, _("Substituting %s for unknown date format %s"), - tartime (newer_mtime_option, false), quote (arg))); - newer_mtime_option.tv_nsec = 0; - } - else - args->textual_date_option = arg; - } - + get_date_or_file (args, + key == NEWER_MTIME_OPTION ? "--newer-mtime" + : "--after-date", arg, &newer_mtime_option); break; case 'o': @@ -1135,7 +1461,7 @@ parse_opt (int key, char *arg, struct argp_state *state) /* Print block numbers for debugging bad tar archives. */ /* It would surely make sense to exchange -B and -R, but it seems - that -B has been used for a long while in Sun tar ans most + that -B has been used for a long while in Sun tar and most BSD-derived systems. This is a consequence of the block/record terminology confusion. */ @@ -1143,7 +1469,7 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case 's': - /* Names to extr are sorted. */ + /* Names to extract are sorted. */ same_order_option = true; break; @@ -1152,6 +1478,22 @@ parse_opt (int key, char *arg, struct argp_state *state) sparse_option = true; break; + case SPARSE_VERSION_OPTION: + sparse_option = true; + { + char *p; + tar_sparse_major = strtoul (arg, &p, 10); + if (*p) + { + if (*p != '.') + USAGE_ERROR ((0, 0, _("Invalid sparse version value"))); + tar_sparse_minor = strtoul (p + 1, &p, 10); + if (*p) + USAGE_ERROR ((0, 0, _("Invalid sparse version value"))); + } + } + break; + case 't': set_subcommand_option (LIST_SUBCOMMAND); verbose_option++; @@ -1204,7 +1546,7 @@ parse_opt (int key, char *arg, struct argp_state *state) case 'X': if (add_exclude_file (add_exclude, excluded, arg, - args->exclude_options | recursion_option, '\n') + MAKE_EXCL_OPTIONS (args), '\n') != 0) { int e = errno; @@ -1221,7 +1563,7 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case ANCHORED_OPTION: - args->exclude_options |= EXCLUDE_ANCHORED; + args->matching_flags |= EXCLUDE_ANCHORED; break; case ATIME_PRESERVE_OPTION: @@ -1236,10 +1578,37 @@ parse_opt (int key, char *arg, struct argp_state *state) " on this platform"))); break; + case CHECK_DEVICE_OPTION: + check_device_option = true; + break; + + case NO_CHECK_DEVICE_OPTION: + check_device_option = false; + break; + case CHECKPOINT_OPTION: - checkpoint_option = true; + if (arg) + { + char *p; + + if (*arg == '.') + { + checkpoint_compile_action ("."); + arg++; + } + checkpoint_option = strtoul (arg, &p, 0); + if (*p) + FATAL_ERROR ((0, 0, + _("--checkpoint value is not an integer"))); + } + else + checkpoint_option = DEFAULT_CHECKPOINT; break; + case CHECKPOINT_ACTION_OPTION: + checkpoint_compile_action (arg); + break; + case BACKUP_OPTION: backup_option = true; if (arg) @@ -1259,13 +1628,40 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case EXCLUDE_OPTION: - add_exclude (excluded, arg, args->exclude_options | recursion_option); + add_exclude (excluded, arg, MAKE_EXCL_OPTIONS (args)); break; case EXCLUDE_CACHES_OPTION: - exclude_caches_option = true; + add_exclusion_tag ("CACHEDIR.TAG", exclusion_tag_contents, + cachedir_file_p); + break; + + case EXCLUDE_CACHES_UNDER_OPTION: + add_exclusion_tag ("CACHEDIR.TAG", exclusion_tag_under, + cachedir_file_p); + break; + + case EXCLUDE_CACHES_ALL_OPTION: + add_exclusion_tag ("CACHEDIR.TAG", exclusion_tag_all, + cachedir_file_p); + break; + + case EXCLUDE_TAG_OPTION: + add_exclusion_tag (arg, exclusion_tag_contents, NULL); + break; + + case EXCLUDE_TAG_UNDER_OPTION: + add_exclusion_tag (arg, exclusion_tag_under, NULL); + break; + + case EXCLUDE_TAG_ALL_OPTION: + add_exclusion_tag (arg, exclusion_tag_all, NULL); break; + case EXCLUDE_VCS_OPTION: + exclude_vcs_files (); + break; + case FORCE_LOCAL_OPTION: force_local_option = true; break; @@ -1279,7 +1675,7 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case IGNORE_CASE_OPTION: - args->exclude_options |= FNM_CASEFOLD; + args->matching_flags |= FNM_CASEFOLD; break; case IGNORE_COMMAND_ERROR_OPTION: @@ -1317,11 +1713,12 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case NO_ANCHORED_OPTION: - args->exclude_options &= ~ EXCLUDE_ANCHORED; + args->include_anchored = 0; /* Clear the default for comman line args */ + args->matching_flags &= ~ EXCLUDE_ANCHORED; break; case NO_IGNORE_CASE_OPTION: - args->exclude_options &= ~ FNM_CASEFOLD; + args->matching_flags &= ~ FNM_CASEFOLD; break; case NO_IGNORE_COMMAND_ERROR_OPTION: @@ -1338,17 +1735,21 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case NO_WILDCARDS_OPTION: - args->exclude_options &= ~ EXCLUDE_WILDCARDS; + args->wildcards = disable_wildcards; break; case NO_WILDCARDS_MATCH_SLASH_OPTION: - args->exclude_options |= FNM_FILE_NAME; + args->matching_flags |= FNM_FILE_NAME; break; case NULL_OPTION: filename_terminator = '\0'; break; + case NO_NULL_OPTION: + filename_terminator = '\n'; + break; + case NUMERIC_OWNER_OPTION: numeric_owner_option = true; break; @@ -1367,6 +1768,10 @@ parse_opt (int key, char *arg, struct argp_state *state) } break; + case OVERWRITE_DIR_OPTION: + old_files_option = DEFAULT_OLD_FILES; + break; + case OVERWRITE_OPTION: old_files_option = OVERWRITE_OLD_FILES; break; @@ -1395,7 +1800,7 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case PAX_OPTION: - args->pax_option++; + args->pax_option = true; xheader_set_option (arg); break; @@ -1404,8 +1809,11 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case PRESERVE_OPTION: + /* FIXME: What it is good for? */ same_permissions_option = true; same_order_option = true; + WARN ((0, 0, _("The --preserve option is deprecated, " + "use --preserve-permissions --preserve-order instead"))); break; case RECORD_SIZE_OPTION: @@ -1463,8 +1871,8 @@ parse_opt (int key, char *arg, struct argp_state *state) show_omitted_dirs_option = true; break; - case SHOW_STORED_NAMES_OPTION: - show_stored_names_option = true; + case SHOW_TRANSFORMED_NAMES_OPTION: + show_transformed_names_option = true; break; case SUFFIX_OPTION: @@ -1479,10 +1887,17 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case TOTALS_OPTION: - totals_option = true; + if (arg) + set_stat_signal (arg); + else + totals_option = true; break; - case USE_COMPRESS_PROGRAM_OPTION: + case TRANSFORM_OPTION: + set_transform_expr (arg); + break; + + case 'I': set_use_compress_program_option (arg); break; @@ -1491,15 +1906,11 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case WILDCARDS_OPTION: - args->exclude_options |= EXCLUDE_WILDCARDS; + args->wildcards = enable_wildcards; break; case WILDCARDS_MATCH_SLASH_OPTION: - args->exclude_options &= ~ FNM_FILE_NAME; - break; - - case CHECK_LINKS_OPTION: - check_links_option = 1; + args->matching_flags &= ~ FNM_FILE_NAME; break; case NO_RECURSION_OPTION: @@ -1580,12 +1991,9 @@ parse_opt (int key, char *arg, struct argp_state *state) #endif /* not DENSITY_LETTER */ if (archive_names == allocated_archive_names) - { - allocated_archive_names *= 2; - archive_name_array = - xrealloc (archive_name_array, - sizeof (const char *) * allocated_archive_names); - } + archive_name_array = x2nrealloc (archive_name_array, + &allocated_archive_names, + sizeof (archive_name_array[0])); archive_name_array[archive_names++] = xstrdup (buf); } break; @@ -1598,18 +2006,7 @@ parse_opt (int key, char *arg, struct argp_state *state) #endif /* not DEVICE_PREFIX */ case '?': - state->flags |= ARGP_NO_EXIT; - argp_state_help (state, state->out_stream, - ARGP_HELP_STD_HELP & ~ARGP_HELP_BUG_ADDR); - fprintf (state->out_stream, "\n%s\n\n", - _("Valid arguments for --quoting-style options are:")); - tar_list_quoting_styles (state->out_stream, " "); - - fprintf (state->out_stream, _("\n*This* tar defaults to:\n")); - show_default_settings (state->out_stream); - fprintf (state->out_stream, "\n"); - fprintf (state->out_stream, _("Report bugs to %s.\n"), - argp_program_bug_address); + tar_help (state); close_stdout (); exit (0); @@ -1657,34 +2054,37 @@ usage (int status) /* Parse the options for tar. */ static struct argp_option * -find_argp_option (struct argp_option *options, int letter) +find_argp_option (struct argp_option *o, int letter) { for (; - !(options->name == NULL - && options->key == 0 - && options->arg == 0 - && options->flags == 0 - && options->doc == NULL); options++) - if (options->key == letter) - return options; + !(o->name == NULL + && o->key == 0 + && o->arg == 0 + && o->flags == 0 + && o->doc == NULL); o++) + if (o->key == letter) + return o; return NULL; } static void decode_options (int argc, char **argv) { - int index; + int idx; struct tar_args args; /* Set some default option values. */ - args.textual_date_option = NULL; - args.exclude_options = EXCLUDE_WILDCARDS; - args.o_option = 0; - args.pax_option = 0; + args.textual_date = NULL; + args.wildcards = default_wildcards; + args.matching_flags = 0; + args.include_anchored = EXCLUDE_ANCHORED; + args.o_option = false; + args.pax_option = false; args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); args.version_control_string = 0; - args.input_files = 0; - + args.input_files = false; + args.compress_autodetect = false; + subcommand_option = UNKNOWN_SUBCOMMAND; archive_format = DEFAULT_FORMAT; blocking_factor = DEFAULT_BLOCKING; @@ -1694,10 +2094,14 @@ decode_options (int argc, char **argv) newer_mtime_option.tv_nsec = -1; recursion_option = FNM_LEADING_DIR; unquote_option = true; + tar_sparse_major = 1; + tar_sparse_minor = 0; owner_option = -1; group_option = -1; + check_device_option = true; + /* Convert old-style tar call by exploding option element and rearranging options accordingly. */ @@ -1760,7 +2164,7 @@ decode_options (int argc, char **argv) prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv); if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP, - &index, &args)) + &idx, &args)) exit (TAREXIT_FAILURE); @@ -1788,12 +2192,16 @@ decode_options (int argc, char **argv) } /* Handle operands after any "--" argument. */ - for (; index < argc; index++) + for (; idx < argc; idx++) { - name_add (argv[index]); - args.input_files++; + name_add_name (argv[idx], MAKE_INCL_OPTIONS (&args)); + args.input_files = true; } + /* Warn about implicit use of the wildcards in command line arguments. + See TODO */ + warn_regex_usage = args.wildcards == default_wildcards; + /* Derive option values and check option consistency. */ if (archive_format == DEFAULT_FORMAT) @@ -1812,13 +2220,6 @@ decode_options (int argc, char **argv) | FORMAT_MASK (GNU_FORMAT) | FORMAT_MASK (POSIX_FORMAT)); - if (multi_volume_option - && archive_format == POSIX_FORMAT - && subcommand_option == CREATE_SUBCOMMAND - && !tape_length_option) - USAGE_ERROR ((0, 0, - _("creating multi-volume archives in posix format requires using --tape-length (-L) option"))); - if (occurrence_option) { if (!args.input_files) @@ -1931,21 +2332,32 @@ decode_options (int argc, char **argv) { /* --test-label is silent if the user has specified the label name to compare against. */ - if (args.input_files == 0) + if (!args.input_files) verbose_option++; } else if (utc_option) verbose_option = 2; + if (tape_length_option && tape_length_option < record_size) + USAGE_ERROR ((0, 0, _("Volume length cannot be less than record size"))); + + if (same_order_option && listed_incremental_option) + USAGE_ERROR ((0, 0, _("--preserve-order is not compatible with " + "--listed-incremental"))); + /* Forbid using -c with no input files whatsoever. Check that `-f -', explicit or implied, is used correctly. */ switch (subcommand_option) { case CREATE_SUBCOMMAND: - if (args.input_files == 0 && !files_from_option) + if (!args.input_files && !files_from_option) USAGE_ERROR ((0, 0, _("Cowardly refusing to create an empty archive"))); + if (args.compress_autodetect && archive_names + && strcmp (archive_name_array[0], "-")) + set_comression_program_by_suffix (archive_name_array[0], + use_compress_program_option); break; case EXTRACT_SUBCOMMAND: @@ -1972,6 +2384,16 @@ decode_options (int argc, char **argv) break; } + /* Initialize stdlis */ + if (index_file_name) + { + stdlis = fopen (index_file_name, "w"); + if (! stdlis) + open_error (index_file_name); + } + else + stdlis = to_stdout_option ? stderr : stdout; + archive_name_cursor = archive_name_array; /* Prepare for generating backup names. */ @@ -1988,13 +2410,10 @@ decode_options (int argc, char **argv) backup_option = false; } - if (verbose_option && args.textual_date_option) - { - char const *treated_as = tartime (newer_mtime_option, true); - if (strcmp (args.textual_date_option, treated_as) != 0) - WARN ((0, 0, _("Treating date `%s' as %s"), - args.textual_date_option, treated_as)); - } + checkpoint_finish_compile (); + + if (verbose_option) + report_textual_dates (&args); } @@ -2033,11 +2452,10 @@ main (int argc, char **argv) signal (SIGCHLD, SIG_DFL); #endif - init_names (); - /* Decode options. */ decode_options (argc, argv); + name_init (); /* Main command execution. */ @@ -2063,8 +2481,6 @@ main (int argc, char **argv) case CREATE_SUBCOMMAND: create_archive (); - if (totals_option) - print_total_written (); break; case EXTRACT_SUBCOMMAND: @@ -2087,6 +2503,9 @@ main (int argc, char **argv) break; } + if (totals_option) + print_total_stats (); + if (check_links_option) check_links (); @@ -2098,13 +2517,14 @@ main (int argc, char **argv) free (archive_name_array); name_term (); + if (exit_status == TAREXIT_FAILURE) + error (0, 0, _("Exiting with failure status due to previous errors")); + if (stdlis == stdout) close_stdout (); - - if (exit_status == TAREXIT_FAILURE) - error (0, 0, _("Error exit delayed from previous errors")); - if (ferror (stderr) || fclose (stderr) != 0) + else if (ferror (stderr) || fclose (stderr) != 0) exit_status = TAREXIT_FAILURE; + return exit_status; } @@ -2124,6 +2544,7 @@ tar_stat_destroy (struct tar_stat_info *st) free (st->gname); free (st->sparse_map); free (st->dumpdir); + xheader_destroy (&st->xhdr); memset (st, 0, sizeof (*st)); }