X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=059e0c99ce11606332ce7a2a441a8aad2e6a2312;hb=88ffc1355e95a1bbc8d1db7abf667aa3164e95e5;hp=0095701d68ca9ec836590b0c9369d37b722ec7a9;hpb=d32dfe5d5e657d584c58b46c8307596f5912332f;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 0095701..059e0c9 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,5 +1,8 @@ /* A tar (tape archiver) program. - Copyright 1988,92,93,94,95,96,97,99,2000,2001 Free Software Foundation, Inc. + + Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, + 2001, 2003 Free Software Foundation, Inc. + Written by John Gilmore, starting 1985-08-25. This program is free software; you can redistribute it and/or modify it @@ -33,13 +36,12 @@ #define GLOBAL #include "common.h" +#include #include #include #include #include -time_t get_date (); - /* Local declarations. */ #ifndef DEFAULT_ARCHIVE @@ -50,7 +52,7 @@ time_t get_date (); # define DEFAULT_BLOCKING 20 #endif -static void usage PARAMS ((int)) __attribute__ ((noreturn)); +static void usage (int) __attribute__ ((noreturn)); /* Miscellaneous. */ @@ -122,22 +124,41 @@ confirm (const char *message_action, const char *message_name) enum { - BACKUP_OPTION = CHAR_MAX + 1, + ANCHORED_OPTION = CHAR_MAX + 1, + ATIME_PRESERVE_OPTION, + BACKUP_OPTION, + CHECKPOINT_OPTION, DELETE_OPTION, EXCLUDE_OPTION, + FORCE_LOCAL_OPTION, GROUP_OPTION, + IGNORE_CASE_OPTION, + IGNORE_FAILED_READ_OPTION, + INDEX_FILE_OPTION, MODE_OPTION, NEWER_MTIME_OPTION, + NO_ANCHORED_OPTION, + NO_IGNORE_CASE_OPTION, + NO_OVERWRITE_DIR_OPTION, + NO_WILDCARDS_OPTION, + NO_WILDCARDS_MATCH_SLASH_OPTION, NULL_OPTION, + NUMERIC_OWNER_OPTION, OVERWRITE_OPTION, OWNER_OPTION, POSIX_OPTION, PRESERVE_OPTION, RECORD_SIZE_OPTION, + RECURSIVE_UNLINK_OPTION, + REMOVE_FILES_OPTION, RSH_COMMAND_OPTION, + SHOW_OMITTED_DIRS_OPTION, SUFFIX_OPTION, + TOTALS_OPTION, USE_COMPRESS_PROGRAM_OPTION, VOLNO_FILE_OPTION, + WILDCARDS_OPTION, + WILDCARDS_MATCH_SLASH_OPTION, /* Some cleanup is being made in GNU tar long options. Using old names is allowed for a while, but will also send a warning to stderr. Take old @@ -163,8 +184,9 @@ static struct option long_options[] = {"absolute-names", no_argument, 0, 'P'}, {"absolute-paths", no_argument, 0, OBSOLETE_ABSOLUTE_NAMES}, {"after-date", required_argument, 0, 'N'}, + {"anchored", no_argument, 0, ANCHORED_OPTION}, {"append", no_argument, 0, 'r'}, - {"atime-preserve", no_argument, &atime_preserve_option, 1}, + {"atime-preserve", no_argument, 0, ATIME_PRESERVE_OPTION}, {"backup", optional_argument, 0, BACKUP_OPTION}, {"block-compress", no_argument, 0, OBSOLETE_BLOCK_COMPRESS}, {"block-number", no_argument, 0, 'R'}, @@ -172,7 +194,7 @@ static struct option long_options[] = {"blocking-factor", required_argument, 0, 'b'}, {"bzip2", no_argument, 0, 'j'}, {"catenate", no_argument, 0, 'A'}, - {"checkpoint", no_argument, &checkpoint_option, 1}, + {"checkpoint", no_argument, 0, CHECKPOINT_OPTION}, {"compare", no_argument, 0, 'd'}, {"compress", no_argument, 0, 'Z'}, {"concatenate", no_argument, 0, 'A'}, @@ -188,16 +210,18 @@ static struct option long_options[] = {"extract", no_argument, 0, 'x'}, {"file", required_argument, 0, 'f'}, {"files-from", required_argument, 0, 'T'}, - {"force-local", no_argument, &force_local_option, 1}, + {"force-local", no_argument, 0, FORCE_LOCAL_OPTION}, {"get", no_argument, 0, 'x'}, {"group", required_argument, 0, GROUP_OPTION}, {"gunzip", no_argument, 0, 'z'}, {"gzip", no_argument, 0, 'z'}, {"help", no_argument, &show_help, 1}, - {"ignore-failed-read", no_argument, &ignore_failed_read_option, 1}, + {"ignore-case", no_argument, 0, IGNORE_CASE_OPTION}, + {"ignore-failed-read", no_argument, 0, IGNORE_FAILED_READ_OPTION}, {"ignore-zeros", no_argument, 0, 'i'}, /* FIXME: --ignore-end as a new name for --ignore-zeros? */ {"incremental", no_argument, 0, 'G'}, + {"index-file", required_argument, 0, INDEX_FILE_OPTION}, {"info-script", required_argument, 0, 'F'}, {"interactive", no_argument, 0, 'w'}, {"keep-old-files", no_argument, 0, 'k'}, @@ -211,10 +235,15 @@ static struct option long_options[] = {"newer", required_argument, 0, 'N'}, {"newer-mtime", required_argument, 0, NEWER_MTIME_OPTION}, {"null", no_argument, 0, NULL_OPTION}, + {"no-anchored", no_argument, 0, NO_ANCHORED_OPTION}, + {"no-ignore-case", no_argument, 0, NO_IGNORE_CASE_OPTION}, + {"no-overwrite-dir", no_argument, 0, NO_OVERWRITE_DIR_OPTION}, + {"no-wildcards", no_argument, 0, NO_WILDCARDS_OPTION}, + {"no-wildcards-match-slash", no_argument, 0, NO_WILDCARDS_MATCH_SLASH_OPTION}, {"no-recursion", no_argument, &recursion_option, 0}, {"no-same-owner", no_argument, &same_owner_option, -1}, {"no-same-permissions", no_argument, &same_permissions_option, -1}, - {"numeric-owner", no_argument, &numeric_owner_option, 1}, + {"numeric-owner", no_argument, 0, NUMERIC_OWNER_OPTION}, {"old-archive", no_argument, 0, 'o'}, {"one-file-system", no_argument, 0, 'l'}, {"overwrite", no_argument, 0, OVERWRITE_OPTION}, @@ -224,24 +253,25 @@ static struct option long_options[] = {"preserve", no_argument, 0, PRESERVE_OPTION}, {"preserve-order", no_argument, 0, 's'}, {"preserve-permissions", no_argument, 0, 'p'}, - {"recursive-unlink", no_argument, &recursive_unlink_option, 1}, + {"recursion", no_argument, &recursion_option, FNM_LEADING_DIR}, + {"recursive-unlink", no_argument, 0, RECURSIVE_UNLINK_OPTION}, {"read-full-blocks", no_argument, 0, OBSOLETE_READ_FULL_RECORDS}, {"read-full-records", no_argument, 0, 'B'}, /* FIXME: --partial-blocks might be a synonym for --read-full-records? */ {"record-number", no_argument, 0, OBSOLETE_BLOCK_NUMBER}, {"record-size", required_argument, 0, RECORD_SIZE_OPTION}, - {"remove-files", no_argument, &remove_files_option, 1}, + {"remove-files", no_argument, 0, REMOVE_FILES_OPTION}, {"rsh-command", required_argument, 0, RSH_COMMAND_OPTION}, {"same-order", no_argument, 0, 's'}, {"same-owner", no_argument, &same_owner_option, 1}, {"same-permissions", no_argument, 0, 'p'}, - {"show-omitted-dirs", no_argument, &show_omitted_dirs_option, 1}, + {"show-omitted-dirs", no_argument, 0, SHOW_OMITTED_DIRS_OPTION}, {"sparse", no_argument, 0, 'S'}, {"starting-file", required_argument, 0, 'K'}, {"suffix", required_argument, 0, SUFFIX_OPTION}, {"tape-length", required_argument, 0, 'L'}, {"to-stdout", no_argument, 0, 'O'}, - {"totals", no_argument, &totals_option, 1}, + {"totals", no_argument, 0, TOTALS_OPTION}, {"touch", no_argument, 0, 'm'}, {"uncompress", no_argument, 0, 'Z'}, {"ungzip", no_argument, 0, 'z'}, @@ -253,6 +283,8 @@ static struct option long_options[] = {"version", no_argument, &show_version, 1}, {"version-control", required_argument, 0, OBSOLETE_VERSION_CONTROL}, {"volno-file", required_argument, 0, VOLNO_FILE_OPTION}, + {"wildcards", no_argument, 0, WILDCARDS_OPTION}, + {"wildcards-match-slash", no_argument, 0, WILDCARDS_MATCH_SLASH_OPTION}, {0, 0, 0, 0} }; @@ -302,6 +334,7 @@ Operation modifiers:\n\ --remove-files remove files after adding them to the archive\n\ -k, --keep-old-files don't replace existing files when extracting\n\ --overwrite overwrite existing files when extracting\n\ + --no-overwrite-dir preserve metadata of existing directories\n\ -U, --unlink-first remove each file prior to extracting over it\n\ --recursive-unlink empty hierarchies prior to extracting directory\n\ -S, --sparse handle sparse files efficiently\n\ @@ -368,8 +401,16 @@ Local file selection:\n\ -C, --directory=DIR change to directory DIR\n\ -T, --files-from=NAME get names to extract or create from file NAME\n\ --null -T reads null-terminated names, disable -C\n\ - --exclude=PATTERN exclude files, given as a globbing PATTERN\n\ - -X, --exclude-from=FILE exclude globbing patterns listed in FILE\n\ + --exclude=PATTERN exclude files, given as a PATTERN\n\ + -X, --exclude-from=FILE exclude patterns listed in FILE\n\ + --anchored exclude patterns match file name start (default)\n\ + --no-anchored exclude patterns match after any /\n\ + --ignore-case exclusion ignores case\n\ + --no-ignore-case exclusion is case sensitive (default)\n\ + --wildcards exclude patterns use wildcards (default)\n\ + --no-wildcards exclude patterns are plain strings\n\ + --wildcards-match-slash exclude pattern wildcards match '/' (default)\n\ + --no-wildcards-match-slash exclude pattern wildcards do not match '/'\n\ -P, --absolute-names don't strip leading `/'s from file names\n\ -h, --dereference dump instead the files symlinks point to\n\ --no-recursion avoid descending automatically in directories\n\ @@ -379,7 +420,7 @@ Local file selection:\n\ #if !MSDOS fputs (_("\ -N, --newer=DATE only store files newer than DATE\n\ - --newer-mtime compare date and time when data changed only\n\ + --newer-mtime=DATE compare date and time when data changed only\n\ --after-date=DATE same as -N\n"), stdout); #endif @@ -395,6 +436,7 @@ Informative output:\n\ -v, --verbose verbosely list files processed\n\ --checkpoint print directory names while reading the archive\n\ --totals print total bytes written while creating archive\n\ + --index-file=FILE send verbose output to FILE\n\ -R, --block-number show block number within archive with each message\n\ -w, --interactive ask for confirmation for every action\n\ --confirmation same as -w\n"), @@ -413,10 +455,11 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\ GNU tar cannot read nor produce `--posix' archives. If POSIXLY_CORRECT\n\ is set in the environment, GNU extensions are disallowed with `--posix'.\n\ Support for POSIX is only partially implemented, don't count on it yet.\n\ -ARCHIVE may be FILE, HOST:FILE or USER@HOST:FILE; and FILE may be a file\n\ -or a device. *This* `tar' defaults to `-f%s -b%d'.\n"), +ARCHIVE may be FILE, HOST:FILE or USER@HOST:FILE; DATE may be a textual date\n\ +or a file name starting with `/' or `.', in which case the file's date is used.\n\ +*This* `tar' defaults to `-f%s -b%d'.\n"), DEFAULT_ARCHIVE, DEFAULT_BLOCKING); - fputs (_("\nReport bugs to .\n"), stdout); + printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } exit (status); } @@ -434,7 +477,7 @@ or a device. *This* `tar' defaults to `-f%s -b%d'.\n"), Y per-block gzip compression */ #define OPTION_STRING \ - "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxz" + "-01234567ABC:F:GIK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxyz" static void set_subcommand_option (enum subcommand subcommand) @@ -456,25 +499,15 @@ set_use_compress_program_option (const char *string) use_compress_program_option = string; } -/* Ignore DUMMY (which will always be null in practice), and add - PATTERN to the proper set of patterns to be excluded -- either - patterns with slashes, or patterns without. */ -static void -add_filtered_exclude (struct exclude *dummy, char const *pattern) -{ - add_exclude ((strchr (pattern, '/') - ? excluded_with_slash - : excluded_without_slash), - pattern); -} - static void decode_options (int argc, char **argv) { int optchar; /* option letter */ int input_files; /* number of input files */ - const char *backup_suffix_string; - const char *version_control_string = 0; + char const *textual_date_option = 0; + char const *backup_suffix_string; + char const *version_control_string = 0; + int exclude_options = EXCLUDE_WILDCARDS; /* Set some default option values. */ @@ -482,8 +515,7 @@ decode_options (int argc, char **argv) archive_format = DEFAULT_FORMAT; blocking_factor = DEFAULT_BLOCKING; record_size = DEFAULT_BLOCKING * BLOCKSIZE; - excluded_with_slash = new_exclude (); - excluded_without_slash = new_exclude (); + excluded = new_exclude (); newer_mtime_option = TYPE_MINIMUM (time_t); recursion_option = FNM_LEADING_DIR; @@ -513,7 +545,7 @@ decode_options (int argc, char **argv) /* Allocate a new argument array, and copy program name in it. */ new_argc = argc - 1 + strlen (argv[1]); - new_argv = xmalloc (new_argc * sizeof (char *)); + new_argv = xmalloc ((new_argc + 1) * sizeof (char *)); in = argv; out = new_argv; *out++ = *in++; @@ -540,6 +572,7 @@ decode_options (int argc, char **argv) while (in < argv + argc) *out++ = *in++; + *out = 0; /* Replace the old option list by the new one. */ @@ -670,6 +703,12 @@ decode_options (int argc, char **argv) ignore_zeros_option = 1; 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; @@ -744,6 +783,8 @@ decode_options (int argc, char **argv) if (newer_mtime_option == (time_t) -1) WARN ((0, 0, _("Substituting %s for unknown date format %s"), tartime (newer_mtime_option), quote (optarg))); + else + textual_date_option = optarg; } break; @@ -839,13 +880,21 @@ decode_options (int argc, char **argv) break; case 'X': - if (add_exclude_file (add_filtered_exclude, 0, optarg, '\n') != 0) + if (add_exclude_file (add_exclude, excluded, optarg, + exclude_options | recursion_option, '\n') + != 0) { int e = errno; FATAL_ERROR ((0, e, "%s", quotearg_colon (optarg))); } 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; @@ -858,6 +907,18 @@ decode_options (int argc, char **argv) WARN ((0, 0, _("Obsolete option name replaced by --backup"))); /* Fall through. */ + case ANCHORED_OPTION: + exclude_options |= EXCLUDE_ANCHORED; + break; + + case ATIME_PRESERVE_OPTION: + atime_preserve_option = 1; + break; + + case CHECKPOINT_OPTION: + checkpoint_option = 1; + break; + case BACKUP_OPTION: backup_option = 1; if (optarg) @@ -869,7 +930,23 @@ decode_options (int argc, char **argv) break; case EXCLUDE_OPTION: - add_filtered_exclude (0, optarg); + add_exclude (excluded, optarg, exclude_options | recursion_option); + break; + + case FORCE_LOCAL_OPTION: + force_local_option = 1; + break; + + case INDEX_FILE_OPTION: + index_file_name = optarg; + break; + + case IGNORE_CASE_OPTION: + exclude_options |= FNM_CASEFOLD; + break; + + case IGNORE_FAILED_READ_OPTION: + ignore_failed_read_option = 1; break; case GROUP_OPTION: @@ -896,10 +973,34 @@ decode_options (int argc, char **argv) xalloc_die (); break; + case NO_ANCHORED_OPTION: + exclude_options &= ~ EXCLUDE_ANCHORED; + break; + + case NO_IGNORE_CASE_OPTION: + exclude_options &= ~ FNM_CASEFOLD; + break; + + case NO_OVERWRITE_DIR_OPTION: + old_files_option = NO_OVERWRITE_DIR_OLD_FILES; + break; + + case NO_WILDCARDS_OPTION: + exclude_options &= ~ EXCLUDE_WILDCARDS; + break; + + case NO_WILDCARDS_MATCH_SLASH_OPTION: + exclude_options |= FNM_FILE_NAME; + break; + case NULL_OPTION: filename_terminator = '\0'; break; + case NUMERIC_OWNER_OPTION: + numeric_owner_option = 1; + break; + case OVERWRITE_OPTION: old_files_option = OVERWRITE_OLD_FILES; break; @@ -952,6 +1053,14 @@ decode_options (int argc, char **argv) } break; + case RECURSIVE_UNLINK_OPTION: + recursive_unlink_option = 1; + break; + + case REMOVE_FILES_OPTION: + remove_files_option = 1; + break; + case RSH_COMMAND_OPTION: rsh_command_option = optarg; break; @@ -961,12 +1070,20 @@ decode_options (int argc, char **argv) backup_suffix_string = optarg; break; + case USE_COMPRESS_PROGRAM_OPTION: + set_use_compress_program_option (optarg); + break; + case VOLNO_FILE_OPTION: volno_file_option = optarg; break; - case USE_COMPRESS_PROGRAM_OPTION: - set_use_compress_program_option (optarg); + case WILDCARDS_OPTION: + exclude_options |= EXCLUDE_WILDCARDS; + break; + + case WILDCARDS_MATCH_SLASH_OPTION: + exclude_options &= ~ FNM_FILE_NAME; break; case '0': @@ -1059,13 +1176,15 @@ decode_options (int argc, char **argv) if (show_version) { - printf ("tar (GNU %s) %s\n%s\n%s\n%s\n", PACKAGE, VERSION, - "Copyright 2001 Free Software Foundation, Inc.", - _("\ + printf ("tar (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); + printf (_("Copyright (C) %d Free Software Foundation, Inc.\n"), 2003); + puts (_("\ This program comes with NO WARRANTY, to the extent permitted by law.\n\ You may redistribute it under the terms of the GNU General Public License;\n\ -see the file named COPYING for details."), - _("Written by John Gilmore and Jay Fenlason.")); +see the file named COPYING for details.")); + + puts (_("Written by John Gilmore and Jay Fenlason.")); + exit (TAREXIT_SUCCESS); } @@ -1180,6 +1299,14 @@ see the file named COPYING for details."), if (backup_option) backup_type = xget_version ("--backup", version_control_string); + + if (verbose_option && textual_date_option) + { + char const *treated_as = tartime (newer_mtime_option); + if (strcmp (textual_date_option, treated_as) != 0) + WARN ((0, 0, _("Treating date `%s' as %s"), + textual_date_option, treated_as)); + } } /* Tar proper. */ @@ -1252,7 +1379,11 @@ main (int argc, char **argv) case EXTRACT_SUBCOMMAND: extr_init (); read_and (extract_archive); + + /* FIXME: should extract_finish () even if an ordinary signal is + received. */ extract_finish (); + break; case LIST_SUBCOMMAND: @@ -1273,9 +1404,11 @@ main (int argc, char **argv) free (archive_name_array); name_term (); - if (stdlis == stdout && (ferror (stdout) || fclose (stdout) != 0)) + if (stdlis != stderr && (ferror (stdlis) || fclose (stdlis) != 0)) FATAL_ERROR ((0, 0, _("Error in writing to standard output"))); if (exit_status == TAREXIT_FAILURE) error (0, 0, _("Error exit delayed from previous errors")); + if (ferror (stderr) || fclose (stderr) != 0) + exit_status = TAREXIT_FAILURE; exit (exit_status); }