X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=c8eeaa4fb84c7393bd4a4f736ab537475fcc5385;hb=78b078b455b834695ebd3104ec3dbe8a4ac9f3a3;hp=f42de53147e9609ebb73d964a05c2a1d8ebff66e;hpb=6938706958d135e9b791d77e2b9e251abb673caa;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index f42de53..c8eeaa4 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,7 +1,7 @@ /* 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, 2006 Free Software Foundation, Inc. Written by John Gilmore, starting 1985-08-25. @@ -17,9 +17,9 @@ 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" +#include #include #include @@ -36,11 +36,15 @@ #define GLOBAL #include "common.h" +#include #include #include +#include #include #include +#include #include +#include /* Local declarations. */ @@ -73,12 +77,15 @@ request_stdin (const char *option) stdin_used_by = option; } -/* Returns true if and only if the user typed 'y' or 'Y'. */ +extern int rpmatch (char const *response); + +/* Returns true if and only if the user typed an affirmative response. */ int confirm (const char *message_action, const char *message_name) { static FILE *confirm_file; static int confirm_file_EOF; + bool status = false; if (!confirm_file) { @@ -98,22 +105,24 @@ confirm (const char *message_action, const char *message_name) fprintf (stdlis, "%s %s?", message_action, quote (message_name)); fflush (stdlis); - { - int reply = confirm_file_EOF ? EOF : getc (confirm_file); - int character; + if (!confirm_file_EOF) + { + char *response = NULL; + size_t response_size = 0; + if (getline (&response, &response_size, confirm_file) < 0) + confirm_file_EOF = 1; + else + status = rpmatch (response) > 0; + free (response); + } - for (character = reply; - character != '\n'; - character = getc (confirm_file)) - if (character == EOF) - { - confirm_file_EOF = 1; - fputc ('\n', stdlis); - fflush (stdlis); - break; - } - return reply == 'y' || reply == 'Y'; - } + if (confirm_file_EOF) + { + fputc ('\n', stdlis); + fflush (stdlis); + } + + return status; } static struct fmttab { @@ -129,7 +138,7 @@ static struct fmttab { #endif { "gnu", GNU_FORMAT }, { "pax", POSIX_FORMAT }, /* An alias for posix */ - { NULL, 0 } + { NULL, 0 } }; static void @@ -145,7 +154,7 @@ set_archive_format (char const *name) archive_format = p->fmt; } -static const char * +const char * archive_format_string (enum archive_format fmt) { struct fmttab const *p; @@ -161,22 +170,75 @@ archive_format_string (enum archive_format fmt) static void assert_format(unsigned fmt_mask) { - if ((FORMAT_MASK(archive_format) & fmt_mask) == 0) + if ((FORMAT_MASK (archive_format) & fmt_mask) == 0) USAGE_ERROR ((0, 0, _("GNU features wanted on incompatible archive format"))); } +const char * +subcommand_string (enum subcommand c) +{ + switch (c) + { + case UNKNOWN_SUBCOMMAND: + return "unknown?"; + + case APPEND_SUBCOMMAND: + return "-r"; + + case CAT_SUBCOMMAND: + return "-A"; + + case CREATE_SUBCOMMAND: + return "-c"; + + case DELETE_SUBCOMMAND: + return "-D"; + + case DIFF_SUBCOMMAND: + return "-d"; + + case EXTRACT_SUBCOMMAND: + return "-x"; + + case LIST_SUBCOMMAND: + return "-t"; + + case UPDATE_SUBCOMMAND: + return "-u"; + + default: + abort (); + } +} + +void +tar_list_quoting_styles (FILE *fp, char *prefix) +{ + int i; + + for (i = 0; quoting_style_args[i]; i++) + fprintf (fp, "%s%s\n", prefix, quoting_style_args[i]); +} + +void +tar_set_quoting_style (char *arg) +{ + int i; + + for (i = 0; quoting_style_args[i]; i++) + if (strcmp (arg, quoting_style_args[i]) == 0) + { + set_quoting_style (NULL, i); + return; + } + FATAL_ERROR ((0, 0, + _("Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list."), arg)); +} /* Options. */ -/* For long options that unconditionally set a single flag, we have getopt - do it. For the others, we share the code for the equivalent short - named option, the name of which is stored in the otherwise-unused `val' - field of the `struct option'; for long options that have no equivalent - short option, we use non-characters as pseudo short options, - starting at CHAR_MAX + 1 and going upwards. */ - enum { ANCHORED_OPTION = CHAR_MAX + 1, @@ -184,56 +246,71 @@ enum BACKUP_OPTION, CHECKPOINT_OPTION, CHECK_LINKS_OPTION, + DELAY_DIRECTORY_RESTORE_OPTION, DELETE_OPTION, + EXCLUDE_CACHES_OPTION, EXCLUDE_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, - LICENSE_OPTION, MODE_OPTION, NEWER_MTIME_OPTION, NO_ANCHORED_OPTION, + NO_DELAY_DIRECTORY_RESTORE_OPTION, NO_IGNORE_CASE_OPTION, + NO_IGNORE_COMMAND_ERROR_OPTION, NO_OVERWRITE_DIR_OPTION, + NO_QUOTE_CHARS_OPTION, NO_RECURSION_OPTION, NO_SAME_OWNER_OPTION, NO_SAME_PERMISSIONS_OPTION, - NO_WILDCARDS_OPTION, + NO_UNQUOTE_OPTION, NO_WILDCARDS_MATCH_SLASH_OPTION, + NO_WILDCARDS_OPTION, NULL_OPTION, NUMERIC_OWNER_OPTION, OCCURRENCE_OPTION, OLD_ARCHIVE_OPTION, + ONE_FILE_SYSTEM_OPTION, OVERWRITE_OPTION, OWNER_OPTION, PAX_OPTION, POSIX_OPTION, PRESERVE_OPTION, + QUOTE_CHARS_OPTION, + QUOTING_STYLE_OPTION, RECORD_SIZE_OPTION, RECURSION_OPTION, RECURSIVE_UNLINK_OPTION, REMOVE_FILES_OPTION, + RESTRICT_OPTION, RMT_COMMAND_OPTION, RSH_COMMAND_OPTION, SAME_OWNER_OPTION, SHOW_DEFAULTS_OPTION, SHOW_OMITTED_DIRS_OPTION, + SHOW_STORED_NAMES_OPTION, STRIP_COMPONENTS_OPTION, SUFFIX_OPTION, + TEST_LABEL_OPTION, TOTALS_OPTION, + TO_COMMAND_OPTION, + UNQUOTE_OPTION, USAGE_OPTION, USE_COMPRESS_PROGRAM_OPTION, UTC_OPTION, VERSION_OPTION, VOLNO_FILE_OPTION, - WILDCARDS_OPTION, - WILDCARDS_MATCH_SLASH_OPTION + WILDCARDS_MATCH_SLASH_OPTION, + WILDCARDS_OPTION }; -const char *argp_program_version = "tar (" PACKAGE ") " VERSION; +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\ \n\ @@ -243,6 +320,7 @@ Examples:\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\ 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"); @@ -253,282 +331,371 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n Available option letters are DEIJQY and aeqy. Consider the following assignments: - [For Solaris tar compatibility] + [For Solaris tar compatibility =/= Is it important at all?] e exit immediately with a nonzero exit status if unexpected errors occur 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[] = { +#define GRID 10 {NULL, 0, NULL, 0, - N_("Main operation mode:"), 0}, - + N_("Main operation mode:"), GRID }, + {"list", 't', 0, 0, - N_("list the contents of an archive"), 10 }, + N_("list the contents of an archive"), GRID+1 }, {"extract", 'x', 0, 0, - N_("extract files from an archive"), 10 }, - {"get", 0, 0, OPTION_ALIAS, NULL}, + N_("extract files from an archive"), GRID+1 }, + {"get", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"create", 'c', 0, 0, - N_("create a new archive"), 10 }, + N_("create a new archive"), GRID+1 }, {"diff", 'd', 0, 0, - N_("find differences between archive and file system"), 10 }, - {"compare", 0, 0, OPTION_ALIAS, NULL, 10}, + N_("find differences between archive and file system"), GRID+1 }, + {"compare", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"append", 'r', 0, 0, - N_("append files to the end of an archive"), 10 }, + N_("append files to the end of an archive"), GRID+1 }, {"update", 'u', 0, 0, - N_("only append files newer than copy in archive"), 10 }, + N_("only append files newer than copy in archive"), GRID+1 }, {"catenate", 'A', 0, 0, - N_("append tar files to an archive"), 10 }, - {"concatenate", 0, 0, OPTION_ALIAS, NULL, 10}, + N_("append tar files to an archive"), GRID+1 }, + {"concatenate", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"delete", DELETE_OPTION, 0, 0, - N_("delete from the archive (not on mag tapes!)"), 10 }, + 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 }, +#undef GRID +#define GRID 20 {NULL, 0, NULL, 0, - N_("Operation modifiers:"), 20}, + N_("Operation modifiers:"), GRID }, + + {"sparse", 'S', 0, 0, + N_("handle sparse files efficiently"), GRID+1 }, + {"incremental", 'G', 0, 0, + N_("handle old GNU-format incremental backup"), GRID+1 }, + {"listed-incremental", 'g', N_("FILE"), 0, + N_("handle new GNU-format incremental backup"), GRID+1 }, + {"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 }, + {"seek", 'n', NULL, 0, + N_("archive is seekable"), GRID+1 }, +#undef GRID + +#define GRID 30 + {NULL, 0, NULL, 0, + N_("Overwrite control:\n"), GRID+1 }, {"verify", 'W', 0, 0, - N_("attempt to verify the archive after writing it"), 21 }, + N_("attempt to verify the archive after writing it"), GRID+1 }, {"remove-files", REMOVE_FILES_OPTION, 0, 0, - N_("remove files after adding them to the archive"), 21 }, + N_("remove files after adding them to the archive"), GRID+1 }, {"keep-old-files", 'k', 0, 0, - N_("don't replace existing files when extracting"), 21 }, + N_("don't replace existing files when extracting"), GRID+1 }, {"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 }, + N_("don't replace existing files that are newer than their archive copies"), GRID+1 }, {"overwrite", OVERWRITE_OPTION, 0, 0, - N_("overwrite existing files when extracting"), 21 }, + N_("overwrite existing files when extracting"), GRID+1 }, {"unlink-first", 'U', 0, 0, - N_("remove each file prior to extracting over it"), 21 }, + N_("remove each file prior to extracting over it"), GRID+1 }, {"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 }, + 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 }, +#undef GRID + +#define GRID 40 + {NULL, 0, NULL, 0, + N_("Select output stream:"), GRID }, + {"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, - N_("handle new GNU-format incremental backup"), 21 }, - {"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 }, - {"seek", 'n', NULL, 0, - N_("Archive is seekable"), 21 }, - + N_("extract files to standard output"), GRID+1 }, + {"to-command", TO_COMMAND_OPTION, N_("COMMAND"), 0, + N_("pipe extracted files to another program"), GRID+1 }, + {"ignore-command-error", IGNORE_COMMAND_ERROR_OPTION, 0, 0, + N_("ignore exit codes of children"), GRID+1 }, + {"no-ignore-command-error", NO_IGNORE_COMMAND_ERROR_OPTION, 0, 0, + N_("treat non-zero exit codes of children as error"), GRID+1 }, +#undef GRID + +#define GRID 50 {NULL, 0, NULL, 0, - N_("Handling of file attributes:"), 30 }, + N_("Handling of file attributes:"), GRID }, {"owner", OWNER_OPTION, N_("NAME"), 0, - N_("force NAME as owner for added files"), 31 }, + N_("force NAME as owner for added files"), GRID+1 }, {"group", GROUP_OPTION, N_("NAME"), 0, - N_("force NAME as group for added files"), 31 }, + N_("force NAME as group for added files"), GRID+1 }, {"mode", MODE_OPTION, N_("CHANGES"), 0, - N_("force (symbolic) mode CHANGES for added files"), 31 }, - {"atime-preserve", ATIME_PRESERVE_OPTION, 0, 0, - N_("don't change access times on dumped files"), 31 }, + N_("force (symbolic) mode CHANGES for added files"), GRID+1 }, + {"atime-preserve", ATIME_PRESERVE_OPTION, + N_("METHOD"), OPTION_ARG_OPTIONAL, + N_("preserve access times on dumped files, either by restoring the times" + " after reading (METHOD='replace'; default) or by not setting the times" + " in the first place (METHOD='system')"), GRID+1 }, {"touch", 'm', 0, 0, - N_("don't extract file modified time"), 31 }, + N_("don't extract file modified time"), GRID+1 }, {"same-owner", SAME_OWNER_OPTION, 0, 0, - N_("try extracting files with the same ownership"), 31 }, + N_("try extracting files with the same ownership"), GRID+1 }, {"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0, - N_("extract files as yourself"), 31 }, + N_("extract files as yourself"), GRID+1 }, {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0, - N_("always use numbers for user/group names"), 31 }, + N_("always use numbers for user/group names"), GRID+1 }, {"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)"), + GRID+1 }, + {"same-permissions", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"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)"), GRID+1 }, {"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"), GRID+1 }, + {"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"preserve", PRESERVE_OPTION, 0, 0, - N_("same as both -p and -s"), 31 }, - + 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 }, + {"no-delay-directory-restore", NO_DELAY_DIRECTORY_RESTORE_OPTION, 0, 0, + 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:"), 40 }, - + N_("Device selection and switching:\n"), GRID+1 }, + {"file", 'f', N_("ARCHIVE"), 0, - N_("use archive file or device ARCHIVE"), 41 }, + N_("use archive file or device ARCHIVE"), GRID+1 }, {"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"), GRID+1 }, {"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"), GRID+1 }, {"rsh-command", RSH_COMMAND_OPTION, N_("COMMAND"), 0, - N_("use remote COMMAND instead of rsh"), 41 }, + N_("use remote COMMAND instead of rsh"), GRID+1 }, #ifdef DEVICE_PREFIX - {"-[0-7][lmh]", 0, NULL, OPTION_DOC, - 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 }, - + {"-[0-7][lmh]", 0, NULL, OPTION_DOC, /* It is OK, since `name' will never be + translated */ + N_("specify drive and density"), GRID+1 }, +#endif + {NULL, '0', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '1', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '2', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '3', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '4', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '5', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '6', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '7', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '8', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {NULL, '9', NULL, OPTION_HIDDEN, NULL, GRID+1 }, + {"multi-volume", 'M', 0, 0, - N_("create/list/extract multi-volume archive"), 41 }, + N_("create/list/extract multi-volume archive"), GRID+1 }, {"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"), GRID+1 }, {"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)"), GRID+1 }, + {"new-volume-script", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"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"), GRID+1 }, +#undef GRID +#define GRID 70 {NULL, 0, NULL, 0, - N_("Device blocking:"), 50 }, + N_("Device blocking:"), GRID+1 }, {"blocking-factor", 'b', N_("BLOCKS"), 0, - N_("BLOCKS x 512 bytes per record"), 51 }, + N_("BLOCKS x 512 bytes per record"), GRID+1 }, {"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"), GRID+1 }, {"ignore-zeros", 'i', 0, 0, - N_("ignore zeroed blocks in archive (means EOF)"), 51 }, + N_("ignore zeroed blocks in archive (means EOF)"), GRID+1 }, {"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)"), GRID+1 }, +#undef GRID +#define GRID 80 {NULL, 0, NULL, 0, - N_("Archive format selection:"), 60 }, - - {"format", 'H', N_("FORMAT"), 0, - N_("create archive of the given format."), 61 }, + N_("Archive format selection:"), GRID }, - {"", 0, NULL, OPTION_DOC, N_("FORMAT is one of the following:"), 62}, - {"", 0, NULL, OPTION_DOC, N_("v7 old V7 tar format"), 63}, - {"", 0, NULL, OPTION_DOC, N_("oldgnu GNU format as per tar <= 1.12"), 63}, - {"", 0, NULL, OPTION_DOC, N_("gnu GNU tar 1.13.x format"), 63}, - {"", 0, NULL, OPTION_DOC, N_("ustar POSIX 1003.1-1988 (ustar) format"), 63 }, - {"", 0, NULL, OPTION_DOC, N_("posix POSIX 1003.1-2001 (pax) format"), 63 }, + {"format", 'H', N_("FORMAT"), 0, + 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"), + GRID+3 }, + {" oldgnu", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, + N_("GNU format as per tar <= 1.12"), GRID+3 }, + {" gnu", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, + N_("GNU tar 1.13.x format"), GRID+3 }, + {" ustar", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, + N_("POSIX 1003.1-1988 (ustar) format"), GRID+3 }, + {" pax", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, + N_("POSIX 1003.1-2001 (pax) format"), GRID+3 }, + {" posix", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("same as pax"), GRID+3 }, {"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"), GRID+8 }, + {"portability", 0, 0, OPTION_ALIAS, NULL, GRID+8 }, {"posix", POSIX_OPTION, 0, 0, - N_("same as --format=posix"), 68 }, + N_("same as --format=posix"), GRID+8 }, {"pax-option", PAX_OPTION, N_("keyword[[:]=value][,keyword[[:]=value], ...]"), 0, - N_("control pax keywords"), 68 }, + N_("control pax keywords"), GRID+8 }, {"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"), GRID+8 }, {"bzip2", 'j', 0, 0, - N_("filter the archive through bzip2"), 68 }, + N_("filter the archive through bzip2"), GRID+8 }, {"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"), GRID+8 }, + {"gunzip", 0, 0, OPTION_ALIAS, NULL, GRID+8 }, + {"ungzip", 0, 0, OPTION_ALIAS, NULL, GRID+8 }, {"compress", 'Z', 0, 0, - N_("filter the archive through compress"), 68 }, - {"uncompress", 0, 0, OPTION_ALIAS, NULL, 68 }, + 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)"), 68 }, + N_("filter through PROG (must accept -d)"), GRID+8 }, +#undef GRID +#define GRID 90 {NULL, 0, NULL, 0, - N_("Local file selection:"), 70 }, + N_("Local file selection:"), GRID }, + {"add-file", ARGP_KEY_ARG, N_("FILE"), 0, + N_("add given FILE to the archive (useful if its name starts with a dash)"), GRID+1 }, {"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"), GRID+1 }, + {"files-from", 'T', N_("FILE"), 0, + N_("get names to extract or create from FILE"), GRID+1 }, {"null", NULL_OPTION, 0, 0, - N_("-T reads null-terminated names, disable -C"), 71 }, + N_("-T reads null-terminated names, disable -C"), GRID+1 }, + {"unquote", UNQUOTE_OPTION, 0, 0, + N_("unquote filenames read with -T (default)"), GRID+1 }, + {"no-unquote", NO_UNQUOTE_OPTION, 0, 0, + N_("do not unquote filenames read with -T"), GRID+1 }, {"exclude", EXCLUDE_OPTION, N_("PATTERN"), 0, - N_("exclude files, given as a PATTERN"), 71 }, + N_("exclude files, given as a PATTERN"), GRID+1 }, {"exclude-from", 'X', N_("FILE"), 0, - N_("exclude patterns listed in FILE"), 71 }, + 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"), 71 }, + N_("exclusion ignores case"), GRID+1 }, {"anchored", ANCHORED_OPTION, 0, 0, - N_("exclude patterns match file name start"), 71 }, + N_("exclude patterns match file name start"), GRID+1 }, {"no-anchored", NO_ANCHORED_OPTION, 0, 0, - N_("exclude patterns match after any / (default)"), 71 }, + N_("exclude patterns match after any `/' (default)"), GRID+1 }, {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0, - N_("exclusion is case sensitive (default)"), 71 }, + N_("exclusion is case sensitive (default)"), GRID+1 }, {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0, - N_("exclude patterns are plain strings"), 71 }, + 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 '/'"), 71 }, + N_("exclude pattern wildcards do not match `/'"), GRID+1 }, {"no-recursion", NO_RECURSION_OPTION, 0, 0, - N_("avoid descending automatically in directories"), 71 }, - {"one-file-system", 'l', 0, 0, /* FIXME: emit warning */ - N_("stay in local file system when creating archive"), 71 }, + 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)"), 71 }, + N_("recurse into directories (default)"), GRID+1 }, {"absolute-names", 'P', 0, 0, - N_("don't strip leading `/'s from file names"), 71 }, + N_("don't strip leading `/'s from file names"), GRID+1 }, {"dereference", 'h', 0, 0, - N_("dump instead the files symlinks point to"), 71 }, + N_("follow symlinks; archive and dump the files they point to"), GRID+1 }, {"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"), GRID+1 }, {"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"), GRID+1 }, {"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"), GRID+1 }, {"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"), GRID+1 }, {"after-date", 'N', N_("DATE"), 0, - N_("same as -N"), 71 }, + N_("same as -N"), GRID+1 }, {"backup", BACKUP_OPTION, N_("CONTROL"), OPTION_ARG_OPTIONAL, - N_("backup before removal, choose version CONTROL"), 71 }, + 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"), 71 }, + N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)"), GRID+1 }, {"wildcards", WILDCARDS_OPTION, 0, 0, - N_("exclude patterns use wildcards (default)"), 71 }, + N_("exclude patterns use wildcards (default)"), GRID+1 }, {"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0, - N_("exclude pattern wildcards match '/' (default)"), 71 }, + N_("exclude pattern wildcards match `/' (default)"), GRID+1 }, +#undef GRID +#define GRID 100 {NULL, 0, NULL, 0, - N_("Informative output:"), 80 }, - + N_("Informative output:"), GRID }, + {"verbose", 'v', 0, 0, - N_("verbosely list files processed"), 81 }, + N_("verbosely list files processed"), GRID+1 }, {"checkpoint", CHECKPOINT_OPTION, 0, 0, - N_("display progress messages every 10th record"), 81 }, + N_("display progress messages every 10th record"), GRID+1 }, {"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"), GRID+1 }, {"totals", TOTALS_OPTION, 0, 0, - N_("print total bytes written while creating archive"), 82 }, + N_("print total bytes written while creating archive"), GRID+1 }, {"utc", UTC_OPTION, 0, 0, - N_("print file modification dates in UTC"), 82 }, + N_("print file modification dates in UTC"), GRID+1 }, {"index-file", INDEX_FILE_OPTION, N_("FILE"), 0, - N_("send verbose output to FILE"), 82 }, + N_("send verbose output to FILE"), GRID+1 }, {"block-number", 'R', 0, 0, - N_("show block number within archive with each message"), 82 }, + N_("show block number within archive with each message"), GRID+1 }, {"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"), GRID+1 }, + {"confirmation", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"show-defaults", SHOW_DEFAULTS_OPTION, 0, 0, - N_("Show tar defaults"), 82 }, + 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"), 82 }, - + 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"), + GRID+1 }, + {"quoting-style", QUOTING_STYLE_OPTION, N_("STYLE"), 0, + 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 }, + {"no-quote-chars", NO_QUOTE_CHARS_OPTION, N_("STRING"), 0, + N_("Disable quoting for characters from STRING"), GRID+1 }, +#undef GRID + +#define GRID 110 {NULL, 0, NULL, 0, - N_("Compatibility options:"), 90 }, + N_("Compatibility options:"), GRID }, {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"), GRID+1 }, +#undef GRID +#define GRID 120 {NULL, 0, NULL, 0, - N_("Other options:"), 100 }, + N_("Other options:"), GRID }, + + {"restrict", RESTRICT_OPTION, 0, 0, + N_("Restrict 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}, - {"license", LICENSE_OPTION, 0, 0, N_("Print license and exit"), -1}, {"version", VERSION_OPTION, 0, 0, N_("Print program version"), -1}, /* FIXME -V (--label) conflicts with the default short option for --version */ - - {0, 0, 0, 0} + {"HANG", HANG_OPTION, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN, + N_("Hang for SECS seconds (default 3600)"), 0}, +#undef GRID + + {0, 0, 0, 0, 0, 0} +}; + +static char const *const atime_preserve_args[] = +{ + "replace", "system", NULL +}; +static enum atime_preserve const atime_preserve_types[] = +{ + replace_atime_preserve, system_atime_preserve }; +ARGMATCH_VERIFY (atime_preserve_args, atime_preserve_types); + struct tar_args { char const *textual_date_option; @@ -544,10 +711,15 @@ static void show_default_settings (FILE *stream) { fprintf (stream, - "--format=%s -f%s -b%d --rmt-command=%s --rsh-command=%s\n", + "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s", archive_format_string (DEFAULT_ARCHIVE_FORMAT), DEFAULT_ARCHIVE, DEFAULT_BLOCKING, - DEFAULT_RMT_COMMAND, REMOTE_SHELL); + quoting_style_args[DEFAULT_QUOTING_STYLE], + DEFAULT_RMT_COMMAND); +#ifdef REMOTE_SHELL + fprintf (stream, " --rsh-command=%s", REMOTE_SHELL); +#endif + fprintf (stream, "\n"); } static void @@ -571,46 +743,192 @@ set_use_compress_program_option (const char *string) use_compress_program_option = string; } -void -license () +static volatile int _argp_hang; + +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; + size_t counter = 0; + + for (c = getc (fp); c != EOF && c != filename_terminator; 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++; + } + + obstack_1grow (stk, 0); + + return (counter == 0 && c == EOF) ? file_list_end : file_list_success; +} + + +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; +} + +/* Default density numbers for [0-9][lmh] device specifications */ + +#ifndef LOW_DENSITY_NUM +# define LOW_DENSITY_NUM 0 +#endif + +#ifndef MID_DENSITY_NUM +# define MID_DENSITY_NUM 8 +#endif + +#ifndef HIGH_DENSITY_NUM +# define HIGH_DENSITY_NUM 16 +#endif + +static void +update_argv (const char *filename, struct argp_state *state) { - printf ("tar (%s) %s\n%s\n", PACKAGE_NAME, PACKAGE_VERSION, - "Copyright (C) 2004 Free Software Foundation, Inc.\n"); - puts (_("Based on the work of John Gilmore and Jay Fenlason. See AUTHORS\n\ -for complete list of authors.\n")); - printf (_(" GNU tar is free software; you can redistribute it and/or modify\n" - " it under the terms of the GNU General Public License as published by\n" - " the Free Software Foundation; either version 2 of the License, or\n" - " (at your option) any later version.\n" - "\n" - " GNU Mailutils is distributed in the hope that it will be useful,\n" - " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - " 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 Mailutils; if not, write to the Free Software\n" - " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n")); - exit (0); + FILE *fp; + size_t count = 0, i; + char *start, *p; + char **new_argv; + size_t new_argc; + bool is_stdin = false; + enum read_file_list_state read_state; + + 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_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)); + 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; + } } + 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; case 'A': set_subcommand_option (CAT_SUBCOMMAND); break; - + case 'b': { uintmax_t u; @@ -625,12 +943,12 @@ parse_opt(int key, char *arg, struct argp_state *state) 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; @@ -661,64 +979,74 @@ parse_opt(int key, char *arg, struct argp_state *state) 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 + 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. */ - + that are on other filesystems. */ one_file_system_option = true; break; - + case 'L': { uintmax_t u; @@ -729,23 +1057,22 @@ parse_opt(int key, char *arg, struct argp_state *state) 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; /* Fall through. */ @@ -753,8 +1080,8 @@ 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 (FILESYSTEM_PREFIX_LEN (arg) != 0 + + if (FILE_SYSTEM_PREFIX_LEN (arg) != 0 || ISSLASH (*arg) || *arg == '.') { @@ -762,30 +1089,28 @@ parse_opt(int key, char *arg, struct argp_state *state) 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; @@ -793,77 +1118,86 @@ parse_opt(int key, char *arg, struct argp_state *state) 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++; break; + case TEST_LABEL_OPTION: + set_subcommand_option (LIST_SUBCOMMAND); + test_label_option = true; + 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': 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') @@ -873,71 +1207,89 @@ parse_opt(int key, char *arg, struct argp_state *state) 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; + atime_preserve_option = + (arg + ? XARGMATCH ("--atime-preserve", arg, + atime_preserve_args, atime_preserve_types) + : replace_atime_preserve); + if (! O_NOATIME && atime_preserve_option == system_atime_preserve) + FATAL_ERROR ((0, 0, + _("--atime-preserve='system' is not supported" + " on this platform"))); break; - + case CHECKPOINT_OPTION: checkpoint_option = true; break; - + case BACKUP_OPTION: backup_option = true; if (arg) args->version_control_string = arg; break; - + + case DELAY_DIRECTORY_RESTORE_OPTION: + delay_directory_restore_option = true; + break; + + case NO_DELAY_DIRECTORY_RESTORE_OPTION: + delay_directory_restore_option = false; + 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))) @@ -951,45 +1303,52 @@ parse_opt(int key, char *arg, struct argp_state *state) _("%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_QUOTE_CHARS_OPTION: + for (;*arg; arg++) + set_char_quoting (NULL, *arg, 0); + 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; @@ -1003,7 +1362,7 @@ parse_opt(int key, char *arg, struct argp_state *state) _("Invalid number"))); } break; - + case OVERWRITE_OPTION: old_files_option = OVERWRITE_OLD_FILES; break; @@ -1021,21 +1380,30 @@ parse_opt(int key, char *arg, struct argp_state *state) _("Invalid owner"))); } break; - + + case QUOTE_CHARS_OPTION: + for (;*arg; arg++) + set_char_quoting (NULL, *arg, 1); + break; + + case QUOTING_STYLE_OPTION: + tar_set_quoting_style (arg); + 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; @@ -1050,27 +1418,31 @@ parse_opt(int key, char *arg, struct argp_state *state) 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 RESTRICT_OPTION: + restrict_option = true; + break; + case RMT_COMMAND_OPTION: - rmt_command_option = arg; + 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; @@ -1085,28 +1457,38 @@ parse_opt(int key, char *arg, struct argp_state *state) case SHOW_OMITTED_DIRS_OPTION: show_omitted_dirs_option = true; break; - + + case SHOW_STORED_NAMES_OPTION: + show_stored_names_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; @@ -1114,7 +1496,7 @@ parse_opt(int key, char *arg, struct argp_state *state) case CHECK_LINKS_OPTION: check_links_option = 1; break; - + case NO_RECURSION_OPTION: recursion_option = 0; break; @@ -1134,7 +1516,15 @@ parse_opt(int key, char *arg, struct argp_state *state) 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': case '2': @@ -1152,46 +1542,36 @@ parse_opt(int key, char *arg, struct argp_state *state) 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]) { case 'l': -#ifdef LOW_NUM - device += LOW_NUM; -#endif + device += LOW_DENSITY_NUM; break; - + case 'm': -#ifdef MID_NUM - device += MID_NUM; -#else - device += 8; -#endif + device += MID_DENSITY_NUM; break; - + case 'h': -#ifdef HGH_NUM - device += HGH_NUM; -#else - device += 16; -#endif + device += HIGH_DENSITY_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) @@ -1201,25 +1581,29 @@ parse_opt(int key, char *arg, struct argp_state *state) 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, 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"), + fprintf (state->out_stream, _("Report bugs to %s.\n"), argp_program_bug_address); exit (0); @@ -1229,11 +1613,14 @@ parse_opt(int key, char *arg, struct argp_state *state) break; case VERSION_OPTION: - fprintf (state->out_stream, "%s\n", argp_program_version); + version_etc (state->out_stream, "tar", PACKAGE_NAME, VERSION, + "John Gilmore", "Jay Fenlason", (char *) NULL); exit (0); - case LICENSE_OPTION: - license (); + case HANG_OPTION: + _argp_hang = atoi (arg ? arg : "3600"); + while (_argp_hang-- > 0) + sleep (1); break; default: @@ -1255,7 +1642,7 @@ static struct argp argp = { void usage (int status) { - argp_help (&argp, stderr, ARGP_HELP_SEE, program_name); + argp_help (&argp, stderr, ARGP_HELP_SEE, (char*) program_name); exit (status); } @@ -1268,7 +1655,7 @@ find_argp_option (struct argp_option *options, int letter) !(options->name == NULL && options->key == 0 && options->arg == 0 - && options->flags + && options->flags == 0 && options->doc == NULL); options++) if (options->key == letter) return options; @@ -1278,10 +1665,9 @@ find_argp_option (struct argp_option *options, int letter) static void decode_options (int argc, char **argv) { - int optchar; /* option letter */ int index; struct tar_args args; - + /* Set some default option values. */ args.textual_date_option = NULL; args.exclude_options = EXCLUDE_WILDCARDS; @@ -1299,6 +1685,7 @@ decode_options (int argc, char **argv) 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; @@ -1334,7 +1721,7 @@ decode_options (int argc, char **argv) for (letter = *in++; *letter; letter++) { struct argp_option *opt; - + buffer[1] = *letter; *out++ = xstrdup (buffer); opt = find_argp_option (options, *letter); @@ -1366,8 +1753,8 @@ decode_options (int argc, char **argv) if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP, &index, &args)) - exit (1); /* FIXME */ - + exit (1); + /* Special handling for 'o' option: @@ -1388,7 +1775,7 @@ decode_options (int argc, char **argv) else { /* UNIX98 compatibility */ - same_owner_option = 1; + same_owner_option = -1; } } @@ -1409,22 +1796,24 @@ decode_options (int argc, char **argv) archive_format = DEFAULT_ARCHIVE_FORMAT; } - if (volume_label_option && subcommand_option == CREATE_SUBCOMMAND) - assert_format (FORMAT_MASK (OLDGNU_FORMAT) - | FORMAT_MASK (GNU_FORMAT)); - - - if (incremental_option || multi_volume_option) - assert_format (FORMAT_MASK (OLDGNU_FORMAT) | FORMAT_MASK (GNU_FORMAT)); - - if (sparse_option) + if ((volume_label_option && subcommand_option == CREATE_SUBCOMMAND) + || incremental_option + || multi_volume_option + || sparse_option) assert_format (FORMAT_MASK (OLDGNU_FORMAT) | 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 && !files_from_option) + if (!args.input_files) USAGE_ERROR ((0, 0, _("--occurrence is meaningless without a file list"))); if (subcommand_option != DELETE_SUBCOMMAND @@ -1435,6 +1824,18 @@ decode_options (int argc, char **argv) _("--occurrence cannot be used in the requested operation mode"))); } + if (seekable_archive && subcommand_option == DELETE_SUBCOMMAND) + { + /* The current code in delete.c is based on the assumption that + skip_member() reads all data from the archive. So, we should + make sure it won't use seeks. On the other hand, the same code + depends on the ability to backspace a record in the archive, + so setting seekable_archive to false is technically incorrect. + However, it is tested only in skip_member(), so it's not a + problem. */ + seekable_archive = false; + } + if (archive_names == 0) { /* If no archive file name given, try TAPE from the environment, or @@ -1459,22 +1860,27 @@ decode_options (int argc, char **argv) if (volume_label_option) { - size_t volume_label_max_len = - (sizeof current_header->header.name - - 1 /* for trailing '\0' */ - - (multi_volume_option - ? (sizeof " Volume " - - 1 /* for null at end of " Volume " */ - + INT_STRLEN_BOUND (int) /* for volume number */ - - 1 /* for sign, as 0 <= volno */) - : 0)); - if (volume_label_max_len < strlen (volume_label_option)) - USAGE_ERROR ((0, 0, - ngettext ("%s: Volume label is too long (limit is %lu byte)", - "%s: Volume label is too long (limit is %lu bytes)", - volume_label_max_len), - quotearg_colon (volume_label_option), - (unsigned long) volume_label_max_len)); + if (archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT) + { + size_t volume_label_max_len = + (sizeof current_header->header.name + - 1 /* for trailing '\0' */ + - (multi_volume_option + ? (sizeof " Volume " + - 1 /* for null at end of " Volume " */ + + INT_STRLEN_BOUND (int) /* for volume number */ + - 1 /* for sign, as 0 <= volno */) + : 0)); + if (volume_label_max_len < strlen (volume_label_option)) + USAGE_ERROR ((0, 0, + ngettext ("%s: Volume label is too long (limit is %lu byte)", + "%s: Volume label is too long (limit is %lu bytes)", + volume_label_max_len), + quotearg_colon (volume_label_option), + (unsigned long) volume_label_max_len)); + } + /* else FIXME + Label length in PAX format is limited by the volume size. */ } if (verify_option) @@ -1489,8 +1895,12 @@ decode_options (int argc, char **argv) { if (multi_volume_option) USAGE_ERROR ((0, 0, _("Cannot use multi-volume compressed archives"))); - if (subcommand_option == UPDATE_SUBCOMMAND) + if (subcommand_option == UPDATE_SUBCOMMAND + || subcommand_option == APPEND_SUBCOMMAND + || subcommand_option == DELETE_SUBCOMMAND) USAGE_ERROR ((0, 0, _("Cannot update compressed archives"))); + if (subcommand_option == CAT_SUBCOMMAND) + USAGE_ERROR ((0, 0, _("Cannot concatenate compressed archives"))); } /* It is no harm to use --pax-option on non-pax archives in archive @@ -1508,12 +1918,17 @@ decode_options (int argc, char **argv) if (recursive_unlink_option) old_files_option = UNLINK_FIRST_OLD_FILES; - if (utc_option) + + if (test_label_option) + { + /* --test-label is silent if the user has specified the label name to + compare against. */ + if (args.input_files == 0) + verbose_option++; + } + else if (utc_option) verbose_option = 2; - if (!rmt_command_option) - rmt_command_option = DEFAULT_RMT_COMMAND; - /* Forbid using -c with no input files whatsoever. Check that `-f -', explicit or implied, is used correctly. */ @@ -1557,20 +1972,20 @@ decode_options (int argc, char **argv) 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)); } } @@ -1581,18 +1996,19 @@ decode_options (int argc, char **argv) int main (int argc, char **argv) { -#if HAVE_CLOCK_GETTIME - if (clock_gettime (CLOCK_REALTIME, &start_timespec) != 0) -#endif - start_time = time (0); + set_start_time (); program_name = argv[0]; + setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); exit_status = TAREXIT_SUCCESS; filename_terminator = '\n'; - set_quoting_style (0, escape_quoting_style); + set_quoting_style (0, DEFAULT_QUOTING_STYLE); + + /* Make sure we have first three descriptors available */ + stdopen (); /* Pre-allocate a few structures. */ @@ -1601,6 +2017,8 @@ main (int argc, char **argv) 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); @@ -1636,8 +2054,6 @@ main (int argc, char **argv) case CREATE_SUBCOMMAND: create_archive (); - name_close (); - if (totals_option) print_total_written (); break; @@ -1697,5 +2113,20 @@ tar_stat_destroy (struct tar_stat_info *st) free (st->uname); free (st->gname); free (st->sparse_map); + free (st->dumpdir); memset (st, 0, sizeof (*st)); } + +/* Format mask for all available formats that support nanosecond + timestamp resolution. */ +#define NS_PRECISION_FORMAT_MASK FORMAT_MASK (POSIX_FORMAT) + +/* Same as timespec_cmp, but ignore nanoseconds if current archive + format does not provide sufficient resolution. */ +int +tar_timespec_cmp (struct timespec a, struct timespec b) +{ + if (!(FORMAT_MASK (current_format) & NS_PRECISION_FORMAT_MASK)) + a.tv_nsec = b.tv_nsec = 0; + return timespec_cmp (a, b); +}