/* A tar (tape archiver) program.
Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
- 2001, 2003, 2004 Free Software Foundation, Inc.
+ 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
Written by John Gilmore, starting 1985-08-25.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <system.h>
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,
SHOW_OMITTED_DIRS_OPTION,
STRIP_COMPONENTS_OPTION,
SUFFIX_OPTION,
+ TO_COMMAND_OPTION,
TOTALS_OPTION,
UNQUOTE_OPTION,
USAGE_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");
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 */
static struct argp_option options[] = {
{NULL, 0, NULL, 0,
N_("Main operation mode:"), 0},
-
+
{"list", 't', 0, 0,
N_("list the contents of an archive"), 10 },
{"extract", 'x', 0, 0,
{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_("Handling of file attributes:"), 30 },
+ 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:"), 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 information about file permissions (default for superuser)"), 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_("apply the user's umask when extracting permissions from the archive (default for ordinary users)"), 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 it 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 },
-#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 },
-
+ N_("specify drive and density"), 61 },
+#endif
+ {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_("NUMBER of 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)"), 71},
+ N_("add given FILE to the archive (useful if its 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"), 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)"), 71 },
+ N_("unquote filenames read with -T (default)"), 91 },
{"no-unquote", NO_UNQUOTE_OPTION, 0, 0,
- N_("Do not unquote filenames read with -T"), 71 },
+ 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_("follow symlinks; archive and dump the files they 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},
" GNU General Public License for more details.\n"
"\n"
" You should have received a copy of the GNU General Public License\n"
- " along with GNU tar; if not, write to the Free Software\n"
- " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n"));
+ " along with GNU tar; if not, write to the Free Software Foundation,\n"
+ " Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\n\n"));
exit (0);
}
static volatile int _argp_hang;
-static bool
+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 */
+ };
+
+/* Read from FP a sequence of characters up to FILENAME_TERMINATOR and put them
+ into STK.
+ */
+static enum read_file_list_state
read_name_from_file (FILE *fp, struct obstack *stk)
{
int c;
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")));
+ {
+ /* 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++;
}
obstack_1grow (stk, 0);
- return !(counter == 0 && c == EOF);
+ return (counter == 0 && c == EOF) ? file_list_end : file_list_success;
}
\f
p->dev = st.st_dev;
file_id_list = p;
}
-
-static int
+
+static void
update_argv (const char *filename, struct argp_state *state)
{
FILE *fp;
char **new_argv;
size_t new_argc;
bool is_stdin = false;
-
+ enum read_file_list_state read_state;
+
if (!strcmp (filename, "-"))
{
is_stdin = true;
if ((fp = fopen (filename, "r")) == NULL)
open_fatal (filename);
}
-
- while (read_name_from_file (fp, &argv_stk))
+
+ while ((read_state = read_name_from_file (fp, &argv_stk)) == file_list_success)
count++;
+ if (read_state == 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 */
+ filename_terminator = 0;
+ while (read_name_from_file (fp, &argv_stk) == file_list_success)
+ 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));
parse_opt (int key, char *arg, struct argp_state *state)
{
struct tar_args *args = state->input;
-
+
switch (key)
{
case ARGP_KEY_ARG:
case 'A':
set_subcommand_option (CAT_SUBCOMMAND);
break;
-
+
case 'b':
{
uintmax_t u;
case 'B':
/* Try to reblock input records. For reading 4.2BSD pipes. */
-
+
/* 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 and most
BSD-derived systems. This is a consequence of the block/record
terminology confusion. */
-
+
read_full_records_option = true;
break;
case 'F':
/* Since -F is only useful with -M, make it implied. Run this
script at the end of each tape. */
-
+
info_script_option = arg;
multi_volume_option = true;
break;
-
+
case 'g':
listed_incremental_option = arg;
after_date_option = true;
/* Fall through. */
-
+
case 'G':
/* We are making an incremental dump (FIXME: are we?); save
directories at the beginning of the archive, and include in each
directory its contents. */
-
+
incremental_option = true;
break;
-
+
case 'h':
/* Follow symbolic links. */
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
the record with garbage. */
-
+
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 'k':
/* Don't replace existing files. */
old_files_option = KEEP_OLD_FILES;
break;
-
+
case 'K':
starting_file_option = true;
addname (arg, 0);
break;
-
+
case 'l':
/* Historically equivalent to --one-file-system. This usage is
incompatible with UNIX98 and POSIX specs and therefore is
that are on other filesystems. */
one_file_system_option = true;
break;
-
+
case 'L':
{
uintmax_t u;
multi_volume_option = true;
}
break;
-
+
case 'm':
touch_option = true;
break;
-
+
case 'M':
/* Make multivolume archive: when we can't write any more into
the archive, re-open it, and continue writing. */
-
+
multi_volume_option = true;
break;
case 'n':
seekable_archive = true;
break;
-
+
#if !MSDOS
case 'N':
after_date_option = true;
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 == '.')
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);
+ 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.tv_sec), quote (arg)));
+ tartime (newer_mtime_option, false), quote (arg)));
newer_mtime_option.tv_nsec = 0;
}
else
args->textual_date_option = arg;
}
-
+
break;
#endif /* not MSDOS */
-
+
case 'o':
args->o_option = true;
break;
-
+
case 'O':
to_stdout_option = true;
break;
case 'p':
same_permissions_option = true;
break;
-
+
case 'P':
absolute_names_option = true;
break;
-
+
case 'r':
set_subcommand_option (APPEND_SUBCOMMAND);
break;
-
+
case 'R':
/* 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
BSD-derived systems. This is a consequence of the block/record
terminology confusion. */
-
+
block_number_option = true;
break;
-
+
case 's':
/* Names to extr are sorted. */
-
+
same_order_option = true;
break;
-
+
case 'S':
sparse_option = true;
break;
-
+
case 't':
set_subcommand_option (LIST_SUBCOMMAND);
verbose_option++;
/* 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;
+ files_from_option = true;
break;
-
+
case 'u':
set_subcommand_option (UPDATE_SUBCOMMAND);
break;
-
+
case 'U':
old_files_option = UNLINK_FIRST_OLD_FILES;
break;
-
+
case UTC_OPTION:
utc_option = true;
break;
-
+
case 'v':
verbose_option++;
break;
-
+
case 'V':
volume_label_option = arg;
break;
-
+
case 'w':
interactive_option = true;
break;
-
+
case 'W':
verify_option = true;
break;
-
+
case 'x':
set_subcommand_option (EXTRACT_SUBCOMMAND);
break;
-
+
case 'X':
if (add_exclude_file (add_exclude, excluded, arg,
args->exclude_options | recursion_option, '\n')
FATAL_ERROR ((0, e, "%s", quotearg_colon (arg)));
}
break;
-
+
case 'y':
USAGE_ERROR ((0, 0,
_("Warning: the -y option is not supported;"
" perhaps you meant -j?")));
break;
-
+
case 'z':
set_use_compress_program_option ("gzip");
break;
-
+
case 'Z':
set_use_compress_program_option ("compress");
break;
case ANCHORED_OPTION:
args->exclude_options |= EXCLUDE_ANCHORED;
break;
-
+
case ATIME_PRESERVE_OPTION:
atime_preserve_option = true;
break;
-
+
case CHECKPOINT_OPTION:
checkpoint_option = true;
break;
-
+
case BACKUP_OPTION:
backup_option = true;
if (arg)
args->version_control_string = arg;
break;
-
+
case DELETE_OPTION:
set_subcommand_option (DELETE_SUBCOMMAND);
break;
-
+
case EXCLUDE_OPTION:
add_exclude (excluded, arg, args->exclude_options | recursion_option);
break;
-
+
case EXCLUDE_CACHES_OPTION:
exclude_caches_option = true;
break;
case FORCE_LOCAL_OPTION:
force_local_option = true;
break;
-
+
case 'H':
set_archive_format (arg);
break;
-
+
case INDEX_FILE_OPTION:
index_file_name = arg;
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;
break;
-
+
case KEEP_NEWER_FILES_OPTION:
old_files_option = KEEP_NEWER_FILES;
break;
-
+
case GROUP_OPTION:
if (! (strlen (arg) < GNAME_FIELD_SIZE
&& gname_to_gid (arg, &group_option)))
_("%s: Invalid group")));
}
break;
-
+
case MODE_OPTION:
- mode_option
- = mode_compile (arg,
- MODE_MASK_EQUALS | MODE_MASK_PLUS | MODE_MASK_MINUS);
- if (mode_option == MODE_INVALID)
+ mode_option = mode_compile (arg);
+ if (!mode_option)
FATAL_ERROR ((0, 0, _("Invalid mode given on option")));
- if (mode_option == MODE_MEMORY_EXHAUSTED)
- xalloc_die ();
+ initial_umask = umask (0);
+ umask (initial_umask);
break;
-
+
case NO_ANCHORED_OPTION:
args->exclude_options &= ~ EXCLUDE_ANCHORED;
break;
-
+
case NO_IGNORE_CASE_OPTION:
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;
-
+
case NO_WILDCARDS_OPTION:
args->exclude_options &= ~ EXCLUDE_WILDCARDS;
break;
-
+
case NO_WILDCARDS_MATCH_SLASH_OPTION:
args->exclude_options |= FNM_FILE_NAME;
break;
-
+
case NULL_OPTION:
filename_terminator = '\0';
break;
-
+
case NUMERIC_OWNER_OPTION:
numeric_owner_option = true;
break;
-
+
case OCCURRENCE_OPTION:
if (!arg)
occurrence_option = 1;
_("Invalid number")));
}
break;
-
+
case OVERWRITE_OPTION:
old_files_option = OVERWRITE_OLD_FILES;
break;
_("Invalid owner")));
}
break;
-
+
case PAX_OPTION:
args->pax_option++;
xheader_set_option (arg);
break;
-
+
case POSIX_OPTION:
set_archive_format ("posix");
break;
-
+
case PRESERVE_OPTION:
same_permissions_option = true;
same_order_option = true;
break;
-
+
case RECORD_SIZE_OPTION:
{
uintmax_t u;
blocking_factor = record_size / BLOCKSIZE;
}
break;
-
+
case RECURSIVE_UNLINK_OPTION:
recursive_unlink_option = true;
break;
-
+
case REMOVE_FILES_OPTION:
remove_files_option = true;
break;
-
+
case RMT_COMMAND_OPTION:
rmt_command = arg;
break;
-
+
case RSH_COMMAND_OPTION:
rsh_command_option = arg;
break;
-
+
case SHOW_DEFAULTS_OPTION:
show_default_settings (stdout);
exit(0);
-
+
case STRIP_COMPONENTS_OPTION:
{
uintmax_t u;
case SHOW_OMITTED_DIRS_OPTION:
show_omitted_dirs_option = true;
break;
-
+
case SUFFIX_OPTION:
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;
break;
-
+
case USE_COMPRESS_PROGRAM_OPTION:
set_use_compress_program_option (arg);
break;
-
+
case VOLNO_FILE_OPTION:
volno_file_option = arg;
break;
-
+
case WILDCARDS_OPTION:
args->exclude_options |= EXCLUDE_WILDCARDS;
break;
-
+
case WILDCARDS_MATCH_SLASH_OPTION:
args->exclude_options &= ~ FNM_FILE_NAME;
break;
case CHECK_LINKS_OPTION:
check_links_option = 1;
break;
-
+
case NO_RECURSION_OPTION:
recursion_option = 0;
break;
case NO_UNQUOTE_OPTION:
unquote_option = false;
break;
-
+
case '0':
case '1':
case '2':
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);
#ifdef DENSITY_LETTER
sprintf (cursor, "%d%c", device, arg[0]);
-
+
#else /* not DENSITY_LETTER */
switch (arg[0])
device += LOW_NUM;
#endif
break;
-
+
case 'm':
#ifdef MID_NUM
device += MID_NUM;
device += 8;
#endif
break;
-
+
case 'h':
#ifdef HGH_NUM
device += HGH_NUM;
break;
default:
- argp_error (state, _("Unknown density: '%c'"), arg[0]);
+ argp_error (state, _("Unknown density: `%c'"), arg[0]);
}
sprintf (cursor, "%d", device);
-
+
#endif /* not DENSITY_LETTER */
if (archive_names == allocated_archive_names)
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;
#else /* not DEVICE_PREFIX */
- argp_error (state,
+ argp_error (state,
_("Options `-[0-7][lmh]' not supported by *this* tar"));
-
+
#endif /* not DEVICE_PREFIX */
-
+
case '?':
state->flags |= ARGP_NO_EXIT;
argp_state_help (state, 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"),
+ fprintf (state->out_stream, _("Report bugs to %s.\n"),
argp_program_bug_address);
exit (0);
while (_argp_hang-- > 0)
sleep (1);
break;
-
+
default:
return ARGP_ERR_UNKNOWN;
}
{
int index;
struct tar_args args;
-
+
/* Set some default option values. */
args.textual_date_option = NULL;
args.exclude_options = EXCLUDE_WILDCARDS;
newer_mtime_option.tv_nsec = -1;
recursion_option = FNM_LEADING_DIR;
unquote_option = true;
-
+
owner_option = -1;
group_option = -1;
for (letter = *in++; *letter; letter++)
{
struct argp_option *opt;
-
+
buffer[1] = *letter;
*out++ = xstrdup (buffer);
opt = find_argp_option (options, *letter);
if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP,
&index, &args))
exit (1);
-
+
/* Special handling for 'o' option:
problem. */
seekable_archive = false;
}
-
+
if (archive_names == 0)
{
/* If no archive file name given, try TAPE from the environment, or
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)
{
- /* FIXME: tartime should support nanoseconds, too, so that this
- comparison doesn't complain about lost nanoseconds. */
- char const *treated_as = tartime (newer_mtime_option.tv_sec);
+ char const *treated_as = tartime (newer_mtime_option, true);
if (strcmp (args.textual_date_option, treated_as) != 0)
- WARN ((0, 0,
- ngettext ("Treating date `%s' as %s + %ld nanosecond",
- "Treating date `%s' as %s + %ld nanoseconds",
- newer_mtime_option.tv_nsec),
- args.textual_date_option, treated_as,
- newer_mtime_option.tv_nsec));
+ WARN ((0, 0, _("Treating date `%s' as %s"),
+ args.textual_date_option, treated_as));
}
}
archive_names = 0;
obstack_init (&argv_stk);
-
+
#ifdef SIGCHLD
/* System V fork+wait does not work if SIGCHLD is ignored. */
signal (SIGCHLD, SIG_DFL);
projects / chaz / tar / blobdiff