EXCLUDE_CACHES_OPTION,
FORCE_LOCAL_OPTION,
GROUP_OPTION,
+ HANG_OPTION,
IGNORE_CASE_OPTION,
+ IGNORE_COMMAND_ERROR_OPTION,
IGNORE_FAILED_READ_OPTION,
INDEX_FILE_OPTION,
KEEP_NEWER_FILES_OPTION,
NEWER_MTIME_OPTION,
NO_ANCHORED_OPTION,
NO_IGNORE_CASE_OPTION,
+ NO_IGNORE_COMMAND_ERROR_OPTION,
NO_OVERWRITE_DIR_OPTION,
NO_RECURSION_OPTION,
NO_SAME_OWNER_OPTION,
NO_SAME_PERMISSIONS_OPTION,
+ NO_UNQUOTE_OPTION,
NO_WILDCARDS_OPTION,
NO_WILDCARDS_MATCH_SLASH_OPTION,
NULL_OPTION,
SHOW_OMITTED_DIRS_OPTION,
STRIP_COMPONENTS_OPTION,
SUFFIX_OPTION,
+ TO_COMMAND_OPTION,
TOTALS_OPTION,
+ UNQUOTE_OPTION,
USAGE_OPTION,
USE_COMPRESS_PROGRAM_OPTION,
UTC_OPTION,
tar -xf archive.tar # Extract all files from archive.tar.\n\
\vThe 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\
nil, existing numbered if numbered backups exist, simple otherwise\n\
never, simple always make simple backups\n");
{NULL, 0, NULL, 0,
N_("Operation modifiers:"), 20},
- {"verify", 'W', 0, 0,
- N_("attempt to verify the archive after writing it"), 21 },
- {"remove-files", REMOVE_FILES_OPTION, 0, 0,
- N_("remove files after adding them to the archive"), 21 },
- {"keep-old-files", 'k', 0, 0,
- N_("don't replace existing files when extracting"), 21 },
- {"keep-newer-files", KEEP_NEWER_FILES_OPTION, 0, 0,
- N_("don't replace existing files that are newer than their archive copies"), 21 },
- {"no-overwrite-dir", NO_OVERWRITE_DIR_OPTION, 0, 0,
- N_("preserve metadata of existing directories"), 21 },
- {"overwrite", OVERWRITE_OPTION, 0, 0,
- N_("overwrite existing files when extracting"), 21 },
- {"unlink-first", 'U', 0, 0,
- N_("remove each file prior to extracting over it"), 21 },
- {"recursive-unlink", RECURSIVE_UNLINK_OPTION, 0, 0,
- N_("empty hierarchies prior to extracting directory"), 21 },
{"sparse", 'S', 0, 0,
N_("handle sparse files efficiently"), 21 },
- {"to-stdout", 'O', 0, 0,
- N_("extract files to standard output"), 21 },
{"incremental", 'G', 0, 0,
N_("handle old GNU-format incremental backup"), 21 },
{"listed-incremental", 'g', N_("FILE"), 0,
{"ignore-failed-read", IGNORE_FAILED_READ_OPTION, 0, 0,
N_("do not exit with nonzero on unreadable files"), 21 },
{"occurrence", OCCURRENCE_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL,
- N_("process only the NUMth 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."), 21 },
+ 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."), 21 },
{"seek", 'n', NULL, 0,
- N_("Archive is seekable"), 21 },
+ N_("archive is seekable"), 21 },
+
+ {NULL, 0, NULL, 0,
+ N_("Overwrite control:"), 30},
+
+ {"verify", 'W', 0, 0,
+ N_("attempt to verify the archive after writing it"), 31 },
+ {"remove-files", REMOVE_FILES_OPTION, 0, 0,
+ N_("remove files after adding them to the archive"), 31 },
+ {"keep-old-files", 'k', 0, 0,
+ N_("don't replace existing files when extracting"), 31 },
+ {"keep-newer-files", KEEP_NEWER_FILES_OPTION, 0, 0,
+ N_("don't replace existing files that are newer than their archive copies"), 31 },
+ {"overwrite", OVERWRITE_OPTION, 0, 0,
+ N_("overwrite existing files when extracting"), 31 },
+ {"unlink-first", 'U', 0, 0,
+ N_("remove each file prior to extracting over it"), 31 },
+ {"recursive-unlink", RECURSIVE_UNLINK_OPTION, 0, 0,
+ N_("empty hierarchies prior to extracting directory"), 31 },
+ {"no-overwrite-dir", NO_OVERWRITE_DIR_OPTION, 0, 0,
+ N_("preserve metadata of existing directories"), 31 },
+
+ {NULL, 0, NULL, 0,
+ N_("Select output stream:"), 40},
+
+ {"to-stdout", 'O', 0, 0,
+ N_("extract files to standard output"), 41 },
+ {"to-command", TO_COMMAND_OPTION, N_("COMMAND"), 0,
+ N_("pipe extracted files to another program"), 41 },
+ {"ignore-command-error", IGNORE_COMMAND_ERROR_OPTION, 0, 0,
+ N_("ignore exit codes of children"), 41 },
+ {"no-ignore-command-error", NO_IGNORE_COMMAND_ERROR_OPTION, 0, 0,
+ N_("treat non-zero exit codes of children as error"), 41 },
{NULL, 0, NULL, 0,
- N_("Handling of file attributes:"), 30 },
+ N_("Handling of file attributes:"), 50 },
{"owner", OWNER_OPTION, N_("NAME"), 0,
- N_("force NAME as owner for added files"), 31 },
+ N_("force NAME as owner for added files"), 51 },
{"group", GROUP_OPTION, N_("NAME"), 0,
- N_("force NAME as group for added files"), 31 },
+ N_("force NAME as group for added files"), 51 },
{"mode", MODE_OPTION, N_("CHANGES"), 0,
- N_("force (symbolic) mode CHANGES for added files"), 31 },
+ N_("force (symbolic) mode CHANGES for added files"), 51 },
{"atime-preserve", ATIME_PRESERVE_OPTION, 0, 0,
- N_("don't change access times on dumped files"), 31 },
+ N_("don't change access times on dumped files"), 51 },
{"touch", 'm', 0, 0,
- N_("don't extract file modified time"), 31 },
+ N_("don't extract file modified time"), 51 },
{"same-owner", SAME_OWNER_OPTION, 0, 0,
- N_("try extracting files with the same ownership"), 31 },
+ N_("try extracting files with the same ownership"), 51 },
{"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0,
- N_("extract files as yourself"), 31 },
+ N_("extract files as yourself"), 51 },
{"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
- N_("always use numbers for user/group names"), 31 },
+ N_("always use numbers for user/group names"), 51 },
{"preserve-permissions", 'p', 0, 0,
- N_("extract permissions information"), 31 },
- {"same-permissions", 0, 0, OPTION_ALIAS, NULL, 31 },
+ N_("extract information about file permissions (default for superuser)"),
+ 51 },
+ {"same-permissions", 0, 0, OPTION_ALIAS, NULL, 51 },
{"no-same-permissions", NO_SAME_PERMISSIONS_OPTION, 0, 0,
- N_("do not extract permissions information"), 31 },
+ N_("apply the user's umask when extracting permissions from the archive (default for ordinary users)"), 51 },
{"preserve-order", 's', 0, 0,
- N_("sort names to extract to match archive"), 31 },
- {"same-order", 0, 0, OPTION_ALIAS, NULL, 31 },
+ N_("sort names to extract to match archive"), 51 },
+ {"same-order", 0, 0, OPTION_ALIAS, NULL, 51 },
{"preserve", PRESERVE_OPTION, 0, 0,
- N_("same as both -p and -s"), 31 },
+ N_("same as both -p and -s"), 51 },
{NULL, 0, NULL, 0,
- N_("Device selection and switching:"), 40 },
+ N_("Device selection and switching:"), 60 },
{"file", 'f', N_("ARCHIVE"), 0,
- N_("use archive file or device ARCHIVE"), 41 },
+ N_("use archive file or device ARCHIVE"), 61 },
{"force-local", FORCE_LOCAL_OPTION, 0, 0,
- N_("archive file is local even if has a colon"), 41 },
+ N_("archive file is local even if has a colon"), 61 },
{"rmt-command", RMT_COMMAND_OPTION, N_("COMMAND"), 0,
- N_("use given rmt COMMAND instead of rmt"), 41 },
+ N_("use given rmt COMMAND instead of rmt"), 61 },
{"rsh-command", RSH_COMMAND_OPTION, N_("COMMAND"), 0,
- N_("use remote COMMAND instead of rsh"), 41 },
+ N_("use remote COMMAND instead of rsh"), 61 },
#ifdef DEVICE_PREFIX
{"-[0-7][lmh]", 0, NULL, OPTION_DOC, /* It is OK, since `name' will never be
translated */
- N_("specify drive and density"), 41 },
+ N_("specify drive and density"), 61 },
#endif
- {NULL, '0', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '1', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '2', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '3', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '4', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '5', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '6', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '7', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '8', NULL, OPTION_HIDDEN, NULL, 41 },
- {NULL, '9', NULL, OPTION_HIDDEN, NULL, 41 },
+ {NULL, '0', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '1', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '2', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '3', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '4', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '5', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '6', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '7', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '8', NULL, OPTION_HIDDEN, NULL, 61 },
+ {NULL, '9', NULL, OPTION_HIDDEN, NULL, 61 },
{"multi-volume", 'M', 0, 0,
- N_("create/list/extract multi-volume archive"), 41 },
+ N_("create/list/extract multi-volume archive"), 61 },
{"tape-length", 'L', N_("NUMBER"), 0,
- N_("change tape after writing NUMBER x 1024 bytes"), 41 },
+ N_("change tape after writing NUMBER x 1024 bytes"), 61 },
{"info-script", 'F', N_("NAME"), 0,
- N_("run script at end of each tape (implies -M)"), 41 },
- {"new-volume-script", 0, 0, OPTION_ALIAS, NULL, 41 },
+ N_("run script at end of each tape (implies -M)"), 61 },
+ {"new-volume-script", 0, 0, OPTION_ALIAS, NULL, 61 },
{"volno-file", VOLNO_FILE_OPTION, N_("FILE"), 0,
- N_("use/update the volume number in FILE"), 41 },
+ N_("use/update the volume number in FILE"), 61 },
{NULL, 0, NULL, 0,
- N_("Device blocking:"), 50 },
+ N_("Device blocking:"), 70 },
{"blocking-factor", 'b', N_("BLOCKS"), 0,
- N_("BLOCKS x 512 bytes per record"), 51 },
+ N_("BLOCKS x 512 bytes per record"), 71 },
{"record-size", RECORD_SIZE_OPTION, N_("NUMBER"), 0,
- N_("SIZE bytes per record, multiple of 512"), 51 },
+ N_("SIZE bytes per record, multiple of 512"), 71 },
{"ignore-zeros", 'i', 0, 0,
- N_("ignore zeroed blocks in archive (means EOF)"), 51 },
+ N_("ignore zeroed blocks in archive (means EOF)"), 71 },
{"read-full-records", 'B', 0, 0,
- N_("reblock as we read (for 4.2BSD pipes)"), 51 },
+ N_("reblock as we read (for 4.2BSD pipes)"), 71 },
{NULL, 0, NULL, 0,
- N_("Archive format selection:"), 60 },
+ N_("Archive format selection:"), 80 },
{"format", 'H', N_("FORMAT"), 0,
- N_("create archive of the given format."), 61 },
+ N_("create archive of the given format."), 81 },
- {NULL, 0, NULL, 0, N_("FORMAT is one of the following:"), 62 },
- {" v7", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("old V7 tar format"), 63},
+ {NULL, 0, NULL, 0, N_("FORMAT is one of the following:"), 82 },
+ {" v7", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("old V7 tar format"), 83},
{" oldgnu", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
- N_("GNU format as per tar <= 1.12"), 63},
+ N_("GNU format as per tar <= 1.12"), 83},
{" gnu", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
- N_("GNU tar 1.13.x format"), 63},
+ N_("GNU tar 1.13.x format"), 83},
{" ustar", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
- N_("POSIX 1003.1-1988 (ustar) format"), 63 },
+ N_("POSIX 1003.1-1988 (ustar) format"), 83 },
{" pax", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
- N_("POSIX 1003.1-2001 (pax) format"), 63 },
- {" posix", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("Same as pax"), 63 },
+ N_("POSIX 1003.1-2001 (pax) format"), 83 },
+ {" posix", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("same as pax"), 83 },
{"old-archive", OLD_ARCHIVE_OPTION, 0, 0, /* FIXME */
- N_("same as --format=v7"), 68 },
- {"portability", 0, 0, OPTION_ALIAS, NULL, 68 },
+ N_("same as --format=v7"), 88 },
+ {"portability", 0, 0, OPTION_ALIAS, NULL, 88 },
{"posix", POSIX_OPTION, 0, 0,
- N_("same as --format=posix"), 68 },
+ N_("same as --format=posix"), 88 },
{"pax-option", PAX_OPTION, N_("keyword[[:]=value][,keyword[[:]=value], ...]"), 0,
- N_("control pax keywords"), 68 },
+ N_("control pax keywords"), 88 },
{"label", 'V', N_("TEXT"), 0,
- N_("create archive with volume name NAME. At list/extract time, use TEXT as a globbing pattern"), 68 },
+ N_("create archive with volume name TEXT. At list/extract time, use TEXT as a globbing pattern for volume name"), 88 },
{"bzip2", 'j', 0, 0,
- N_("filter the archive through bzip2"), 68 },
+ N_("filter the archive through bzip2"), 88 },
{"gzip", 'z', 0, 0,
- N_("filter the archive through gzip"), 68 },
- {"gunzip", 0, 0, OPTION_ALIAS, NULL, 68 },
- {"ungzip", 0, 0, OPTION_ALIAS, NULL, 68 },
+ N_("filter the archive through gzip"), 88 },
+ {"gunzip", 0, 0, OPTION_ALIAS, NULL, 88 },
+ {"ungzip", 0, 0, OPTION_ALIAS, NULL, 88 },
{"compress", 'Z', 0, 0,
- N_("filter the archive through compress"), 68 },
- {"uncompress", 0, 0, OPTION_ALIAS, NULL, 68 },
+ N_("filter the archive through compress"), 88 },
+ {"uncompress", 0, 0, OPTION_ALIAS, NULL, 88 },
{"use-compress-program", USE_COMPRESS_PROGRAM_OPTION, N_("PROG"), 0,
- N_("filter through PROG (must accept -d)"), 68 },
+ N_("filter through PROG (must accept -d)"), 88 },
{NULL, 0, NULL, 0,
- N_("Local file selection:"), 70 },
+ N_("Local file selection:"), 90 },
+ {"add-file", ARGP_KEY_ARG, N_("FILE"), 0,
+ N_("add given file to the archive (useful if FILE name starts with a dash)"), 91},
{"directory", 'C', N_("DIR"), 0,
- N_("change to directory DIR"), 71 },
- {"files-from", 'T', N_("FILE-OF-NAMES"), 0,
- N_("get names to extract or create from file NAME"), 71 },
+ N_("change to directory DIR"), 91 },
+ {"files-from", 'T', N_("FILE"), 0,
+ N_("get names to extract or create from file FILE"), 91 },
{"null", NULL_OPTION, 0, 0,
- N_("-T reads null-terminated names, disable -C"), 71 },
+ N_("-T reads null-terminated names, disable -C"), 91 },
+ {"unquote", UNQUOTE_OPTION, 0, 0,
+ N_("unquote filenames read with -T (default)"), 91 },
+ {"no-unquote", NO_UNQUOTE_OPTION, 0, 0,
+ N_("do not unquote filenames read with -T"), 91 },
{"exclude", EXCLUDE_OPTION, N_("PATTERN"), 0,
- N_("exclude files, given as a PATTERN"), 71 },
+ N_("exclude files, given as a PATTERN"), 91 },
{"exclude-from", 'X', N_("FILE"), 0,
- N_("exclude patterns listed in FILE"), 71 },
+ N_("exclude patterns listed in FILE"), 91 },
{"exclude-caches", EXCLUDE_CACHES_OPTION, 0, 0,
- N_("exclude directories containing a cache tag"), 71 },
+ N_("exclude directories containing a cache tag"), 91 },
{"ignore-case", IGNORE_CASE_OPTION, 0, 0,
- N_("exclusion ignores case"), 71 },
+ N_("exclusion ignores case"), 91 },
{"anchored", ANCHORED_OPTION, 0, 0,
- N_("exclude patterns match file name start"), 71 },
+ N_("exclude patterns match file name start"), 91 },
{"no-anchored", NO_ANCHORED_OPTION, 0, 0,
- N_("exclude patterns match after any / (default)"), 71 },
+ N_("exclude patterns match after any / (default)"), 91 },
{"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0,
- N_("exclusion is case sensitive (default)"), 71 },
+ N_("exclusion is case sensitive (default)"), 91 },
{"no-wildcards", NO_WILDCARDS_OPTION, 0, 0,
- N_("exclude patterns are plain strings"), 71 },
+ N_("exclude patterns are plain strings"), 91 },
{"no-wildcards-match-slash", NO_WILDCARDS_MATCH_SLASH_OPTION, 0, 0,
- N_("exclude pattern wildcards do not match '/'"), 71 },
+ N_("exclude pattern wildcards do not match '/'"), 91 },
{"no-recursion", NO_RECURSION_OPTION, 0, 0,
- N_("avoid descending automatically in directories"), 71 },
+ N_("avoid descending automatically in directories"), 91 },
{"one-file-system", ONE_FILE_SYSTEM_OPTION, 0, 0,
- N_("stay in local file system when creating archive"), 71 },
- {NULL, 'l', 0, OPTION_HIDDEN, "", 71},
+ N_("stay in local file system when creating archive"), 91 },
+ {NULL, 'l', 0, OPTION_HIDDEN, "", 91},
{"recursion", RECURSION_OPTION, 0, 0,
- N_("recurse into directories (default)"), 71 },
+ N_("recurse into directories (default)"), 91 },
{"absolute-names", 'P', 0, 0,
- N_("don't strip leading `/'s from file names"), 71 },
+ N_("don't strip leading `/'s from file names"), 91 },
{"dereference", 'h', 0, 0,
- N_("dump instead the files symlinks point to"), 71 },
+ N_("dump instead the files symlinks point to"), 91 },
{"starting-file", 'K', N_("MEMBER-NAME"), 0,
- N_("begin at member MEMBER-NAME in the archive"), 71 },
+ N_("begin at member MEMBER-NAME in the archive"), 91 },
{"strip-components", STRIP_COMPONENTS_OPTION, N_("NUMBER"), 0,
- N_("strip NUMBER leading components from file names"), 71 },
+ N_("strip NUMBER leading components from file names"), 91 },
{"newer", 'N', N_("DATE-OR-FILE"), 0,
- N_("only store files newer than DATE-OR-FILE"), 71 },
+ N_("only store files newer than DATE-OR-FILE"), 91 },
{"newer-mtime", NEWER_MTIME_OPTION, N_("DATE"), 0,
- N_("compare date and time when data changed only"), 71 },
+ N_("compare date and time when data changed only"), 91 },
{"after-date", 'N', N_("DATE"), 0,
- N_("same as -N"), 71 },
+ N_("same as -N"), 91 },
{"backup", BACKUP_OPTION, N_("CONTROL"), OPTION_ARG_OPTIONAL,
- N_("backup before removal, choose version CONTROL"), 71 },
+ N_("backup before removal, choose version CONTROL"), 91 },
{"suffix", SUFFIX_OPTION, N_("STRING"), 0,
- N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX"), 71 },
+ N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)"), 91 },
{"wildcards", WILDCARDS_OPTION, 0, 0,
- N_("exclude patterns use wildcards (default)"), 71 },
+ N_("exclude patterns use wildcards (default)"), 91 },
{"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0,
- N_("exclude pattern wildcards match '/' (default)"), 71 },
+ N_("exclude pattern wildcards match '/' (default)"), 91 },
{NULL, 0, NULL, 0,
- N_("Informative output:"), 80 },
+ N_("Informative output:"), 100 },
{"verbose", 'v', 0, 0,
- N_("verbosely list files processed"), 81 },
+ N_("verbosely list files processed"), 101 },
{"checkpoint", CHECKPOINT_OPTION, 0, 0,
- N_("display progress messages every 10th record"), 81 },
+ N_("display progress messages every 10th record"), 101 },
{"check-links", CHECK_LINKS_OPTION, 0, 0,
- N_("print a message if not all links are dumped"), 82 },
+ N_("print a message if not all links are dumped"), 102 },
{"totals", TOTALS_OPTION, 0, 0,
- N_("print total bytes written while creating archive"), 82 },
+ N_("print total bytes written while creating archive"), 102 },
{"utc", UTC_OPTION, 0, 0,
- N_("print file modification dates in UTC"), 82 },
+ N_("print file modification dates in UTC"), 102 },
{"index-file", INDEX_FILE_OPTION, N_("FILE"), 0,
- N_("send verbose output to FILE"), 82 },
+ N_("send verbose output to FILE"), 102 },
{"block-number", 'R', 0, 0,
- N_("show block number within archive with each message"), 82 },
+ N_("show block number within archive with each message"), 102 },
{"interactive", 'w', 0, 0,
- N_("ask for confirmation for every action"), 82 },
- {"confirmation", 0, 0, OPTION_ALIAS, NULL, 82 },
+ N_("ask for confirmation for every action"), 102 },
+ {"confirmation", 0, 0, OPTION_ALIAS, NULL, 102 },
{"show-defaults", SHOW_DEFAULTS_OPTION, 0, 0,
- N_("Show tar defaults"), 82 },
+ N_("Show tar defaults"), 102 },
{"show-omitted-dirs", SHOW_OMITTED_DIRS_OPTION, 0, 0,
- N_("When listing or extracting, list each directory that does not match search criteria"), 82 },
+ N_("When listing or extracting, list each directory that does not match search criteria"), 102 },
{NULL, 0, NULL, 0,
- N_("Compatibility options:"), 90 },
+ N_("Compatibility options:"), 110 },
{NULL, 'o', 0, 0,
- N_("when creating, same as --old-archive. When extracting, same as --no-same-owner"), 91 },
+ N_("when creating, same as --old-archive. When extracting, same as --no-same-owner"), 111 },
{NULL, 0, NULL, 0,
- N_("Other options:"), 100 },
+ N_("Other options:"), 120 },
{"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},
{0, 0, 0, 0, 0, 0}
};
exit (0);
}
+static volatile int _argp_hang;
+
+static bool
+read_name_from_file (FILE *fp, struct obstack *stk)
+{
+ int c;
+ size_t counter = 0;
+
+ for (c = getc (fp); c != EOF && c != filename_terminator; c = getc (fp))
+ {
+ if (c == 0)
+ FATAL_ERROR((0, 0, N_("file name contains null character")));
+ obstack_1grow (stk, c);
+ counter++;
+ }
+
+ obstack_1grow (stk, 0);
+
+ return !(counter == 0 && c == EOF);
+}
+
+\f
+static bool files_from_option; /* When set, tar will not refuse to create
+ empty archives */
+static struct obstack argv_stk; /* Storage for additional command line options
+ read using -T option */
+
+/* Prevent recursive inclusion of the same file */
+struct file_id_list
+{
+ struct file_id_list *next;
+ ino_t ino;
+ dev_t dev;
+};
+
+static struct file_id_list *file_id_list;
+
+static void
+add_file_id (const char *filename)
+{
+ struct file_id_list *p;
+ struct stat st;
+
+ if (stat (filename, &st))
+ stat_fatal (filename);
+ for (p = file_id_list; p; p = p->next)
+ if (p->ino == st.st_ino && p->dev == st.st_dev)
+ {
+ FATAL_ERROR ((0, 0, _("%s: file list already read"),
+ quotearg_colon (filename)));
+ }
+ p = xmalloc (sizeof *p);
+ p->next = file_id_list;
+ p->ino = st.st_ino;
+ p->dev = st.st_dev;
+ file_id_list = p;
+}
+
+static void
+update_argv (const char *filename, struct argp_state *state)
+{
+ FILE *fp;
+ size_t count = 0, i;
+ char *start, *p;
+ char **new_argv;
+ size_t new_argc;
+ bool is_stdin = false;
+
+ if (!strcmp (filename, "-"))
+ {
+ is_stdin = true;
+ request_stdin ("-T");
+ fp = stdin;
+ }
+ else
+ {
+ add_file_id (filename);
+ if ((fp = fopen (filename, "r")) == NULL)
+ open_fatal (filename);
+ }
+
+ while (read_name_from_file (fp, &argv_stk))
+ count++;
+
+ if (!is_stdin)
+ fclose (fp);
+
+ if (count == 0)
+ return;
+
+ start = obstack_finish (&argv_stk);
+
+ if (filename_terminator == 0)
+ for (p = start; *p; p += strlen (p) + 1)
+ if (p[0] == '-')
+ count++;
+
+ new_argc = state->argc + count;
+ new_argv = xmalloc (sizeof (state->argv[0]) * (new_argc + 1));
+ memcpy (new_argv, state->argv, sizeof (state->argv[0]) * (state->argc + 1));
+ state->argv = new_argv;
+ memmove (&state->argv[state->next + count], &state->argv[state->next],
+ (state->argc - state->next + 1) * sizeof (state->argv[0]));
+
+ state->argc = new_argc;
+
+ for (i = state->next, p = start; *p; p += strlen (p) + 1, i++)
+ {
+ if (filename_terminator == 0 && p[0] == '-')
+ state->argv[i++] = "--add-file";
+ state->argv[i] = p;
+ }
+}
+
+\f
static error_t
-parse_opt(int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg, struct argp_state *state)
{
struct tar_args *args = state->input;
switch (key)
{
- case 1:
+ case ARGP_KEY_ARG:
/* File name or non-parsed option, because of ARGP_IN_ORDER */
- name_add (optarg);
+ name_add (arg);
args->input_files++;
break;
if (deref_stat (dereference_option, arg, &st) != 0)
{
stat_error (arg);
- USAGE_ERROR ((0, 0, _("Date file not found")));
+ USAGE_ERROR ((0, 0, _("Date sample file not found")));
}
newer_mtime_option.tv_sec = st.st_mtime;
newer_mtime_option.tv_nsec = TIMESPEC_NS (st.st_mtim);
break;
case 'T':
- files_from_option = arg;
+ update_argv (arg, state);
+ /* Indicate we've been given -T option. This is for backward
+ compatibility only, so that `tar cfT archive /dev/null will
+ succeed */
+ files_from_option = true;
break;
case 'u':
case 'Z':
set_use_compress_program_option ("compress");
break;
-
+
case ANCHORED_OPTION:
args->exclude_options |= EXCLUDE_ANCHORED;
break;
case IGNORE_CASE_OPTION:
args->exclude_options |= FNM_CASEFOLD;
break;
+
+ case IGNORE_COMMAND_ERROR_OPTION:
+ ignore_command_error_option = true;
+ break;
case IGNORE_FAILED_READ_OPTION:
ignore_failed_read_option = true;
args->exclude_options &= ~ FNM_CASEFOLD;
break;
+ case NO_IGNORE_COMMAND_ERROR_OPTION:
+ ignore_command_error_option = false;
+ break;
+
case NO_OVERWRITE_DIR_OPTION:
old_files_option = NO_OVERWRITE_DIR_OLD_FILES;
break;
backup_option = true;
args->backup_suffix_string = arg;
break;
+
+ case TO_COMMAND_OPTION:
+ if (to_command_option)
+ USAGE_ERROR ((0, 0, _("Only one --to-command option allowed")));
+ to_command_option = arg;
+ break;
case TOTALS_OPTION:
totals_option = true;
case SAME_OWNER_OPTION:
same_owner_option = 1;
break;
+
+ case UNQUOTE_OPTION:
+ unquote_option = true;
+ break;
+
+ case NO_UNQUOTE_OPTION:
+ unquote_option = false;
+ break;
case '0':
case '1':
char *cursor;
if (arg[1])
- argp_error (state, _("Malformed density argument: '%s'"), arg);
+ argp_error (state, _("Malformed density argument: %s"), quote (arg));
strcpy (buf, DEVICE_PREFIX);
cursor = buf + strlen (buf);
xrealloc (archive_name_array,
sizeof (const char *) * allocated_archive_names);
}
- archive_name_array[archive_names++] = strdup (buf);
+ archive_name_array[archive_names++] = xstrdup (buf);
}
break;
license ();
break;
+ case HANG_OPTION:
+ _argp_hang = atoi (arg ? arg : "3600");
+ while (_argp_hang-- > 0)
+ sleep (1);
+ break;
+
default:
return ARGP_ERR_UNKNOWN;
}
newer_mtime_option.tv_sec = TYPE_MINIMUM (time_t);
newer_mtime_option.tv_nsec = -1;
recursion_option = FNM_LEADING_DIR;
-
+ unquote_option = true;
+
owner_option = -1;
group_option = -1;
if (occurrence_option)
{
- if (!args.input_files && !files_from_option)
+ if (!args.input_files)
USAGE_ERROR ((0, 0,
_("--occurrence is meaningless without a file list")));
if (subcommand_option != DELETE_SUBCOMMAND
simple_backup_suffix = xstrdup (args.backup_suffix_string);
if (backup_option)
- backup_type = xget_version ("--backup", args.version_control_string);
+ {
+ backup_type = xget_version ("--backup", args.version_control_string);
+ /* No backup is needed either if explicitely disabled or if
+ the extracted files are not being written to disk. */
+ if (backup_type == no_backups || EXTRACT_OVER_PIPE)
+ backup_option = false;
+ }
if (verbose_option && args.textual_date_option)
{
{
set_start_time ();
program_name = argv[0];
+
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
xmalloc (sizeof (const char *) * allocated_archive_names);
archive_names = 0;
+ obstack_init (&argv_stk);
+
#ifdef SIGCHLD
/* System V fork+wait does not work if SIGCHLD is ignored. */
signal (SIGCHLD, SIG_DFL);
case CREATE_SUBCOMMAND:
create_archive ();
- name_close ();
-
if (totals_option)
print_total_written ();
break;