X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=35121ff28430bcd7f776c67427bf19e7cd0cb62d;hb=137ebf41fd97baa7e4f2a66e0da0bdb182ca6f7b;hp=ff3c5c957cf4270426b940335c4181d50aeb37a9;hpb=1421ee630dbefd54ff992056b875835062c596e9;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index ff3c5c9..35121ff 100644 --- a/src/tar.c +++ b/src/tar.c @@ -41,10 +41,11 @@ #include #include +#include #include #include -#include #include +#include #include #include #include @@ -254,6 +255,7 @@ enum DELETE_OPTION, EXCLUDE_CACHES_OPTION, EXCLUDE_OPTION, + EXCLUDE_TAG_OPTION, FORCE_LOCAL_OPTION, GROUP_OPTION, HANG_OPTION, @@ -320,13 +322,16 @@ enum const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION; const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; -static char doc[] = N_("GNU `tar' saves many files together into a single tape or disk archive, and can restore individual files from the archive.\n\ +static char const doc[] = N_("\ +GNU `tar' saves many files together into a single tape or disk archive, \ +and can restore individual files from the archive.\n\ \n\ Examples:\n\ tar -cf archive.tar foo bar # Create archive.tar from files foo and bar.\n\ tar -tvf archive.tar # List all files in archive.tar verbosely.\n\ - tar -xf archive.tar # Extract all files from archive.tar.\n\ -\vThe backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\ + tar -xf archive.tar # Extract all files from archive.tar.\n") +"\v" +N_("The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n\ none, off never make backups\n\ t, numbered make numbered backups\n\ @@ -403,7 +408,7 @@ static struct argp_option options[] = { #define GRID 30 {NULL, 0, NULL, 0, - N_("Overwrite control:"), GRID+1 }, + N_("Overwrite control:"), GRID }, {"verify", 'W', 0, 0, N_("attempt to verify the archive after writing it"), GRID+1 }, @@ -485,7 +490,7 @@ static struct argp_option options[] = { #define GRID 60 {NULL, 0, NULL, 0, - N_("Device selection and switching:\n"), GRID+1 }, + N_("Device selection and switching:"), GRID }, {"file", 'f', N_("ARCHIVE"), 0, N_("use archive file or device ARCHIVE"), GRID+1 }, @@ -524,7 +529,7 @@ static struct argp_option options[] = { #define GRID 70 {NULL, 0, NULL, 0, - N_("Device blocking:"), GRID+1 }, + N_("Device blocking:"), GRID }, {"blocking-factor", 'b', N_("BLOCKS"), 0, N_("BLOCKS x 512 bytes per record"), GRID+1 }, @@ -600,6 +605,8 @@ static struct argp_option options[] = { N_("exclude patterns listed in FILE"), GRID+1 }, {"exclude-caches", EXCLUDE_CACHES_OPTION, 0, 0, N_("exclude directories containing a cache tag"), GRID+1 }, + {"exclude-tag", EXCLUDE_TAG_OPTION, N_("FILE"), 0, + N_("exclude directories containing FILE"), GRID+1 }, {"no-recursion", NO_RECURSION_OPTION, 0, 0, N_("avoid descending automatically in directories"), GRID+1 }, {"one-file-system", ONE_FILE_SYSTEM_OPTION, 0, 0, @@ -633,7 +640,7 @@ static struct argp_option options[] = { N_("use sed replace EXPRESSION to transform file names"), GRID+1 }, #undef GRID -#define GRID 95 +#define GRID 95 {NULL, 0, NULL, 0, N_("File name matching options (affect both exclude and include patterns):"), GRID }, @@ -654,7 +661,7 @@ static struct argp_option options[] = { {"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0, N_("wildcards match `/' (default for exclusion)"), GRID+1 }, #undef GRID - + #define GRID 100 {NULL, 0, NULL, 0, N_("Informative output:"), GRID }, @@ -774,7 +781,7 @@ struct tar_args /* Variables used during option parsing */ | (args)->matching_flags \ | recursion_option) -#ifdef REMOTE_SHELL +#ifdef REMOTE_SHELL # define DECL_SHOW_DEFAULT_SETTINGS(stream, printer) \ { \ printer (stream, \ @@ -802,7 +809,7 @@ struct tar_args /* Variables used during option parsing */ static void show_default_settings (FILE *fp) DECL_SHOW_DEFAULT_SETTINGS(fp, fprintf) - + static void show_default_settings_fs (argp_fmtstream_t fs) DECL_SHOW_DEFAULT_SETTINGS(fs, argp_fmtstream_printf) @@ -872,7 +879,7 @@ set_stat_signal (const char *name) { "QUIT", SIGQUIT } }; struct sigtab *p; - + for (p = sigtab; p < sigtab + sizeof (sigtab) / sizeof (sigtab[0]); p++) if (strcmp (p->name, name) == 0) { @@ -950,7 +957,8 @@ enum read_file_list_state /* Result of reading file name from the list file */ { file_list_success, /* OK, name read successfully */ file_list_end, /* End of list file */ - file_list_zero /* Zero separator encountered where it should not */ + file_list_zero, /* Zero separator encountered where it should not */ + file_list_skip /* Empty (zero-length) entry encountered, skip it */ }; /* Read from FP a sequence of characters up to FILENAME_TERMINATOR and put them @@ -968,13 +976,15 @@ read_name_from_file (FILE *fp, struct obstack *stk) { /* We have read a zero separator. The file possibly is zero-separated */ - /* FATAL_ERROR((0, 0, N_("file name contains null character"))); */ return file_list_zero; } obstack_1grow (stk, c); counter++; } + if (counter == 0 && c != EOF) + return file_list_skip; + obstack_1grow (stk, 0); return (counter == 0 && c == EOF) ? file_list_end : file_list_success; @@ -1055,31 +1065,42 @@ update_argv (const char *filename, struct argp_state *state) open_fatal (filename); } - while ((read_state = read_name_from_file (fp, &argv_stk)) == file_list_success) - count++; - - if (read_state == file_list_zero) + while ((read_state = read_name_from_file (fp, &argv_stk)) != file_list_end) { - size_t size; + switch (read_state) + { + case file_list_success: + count++; + break; - WARN ((0, 0, N_("%s: file name read contains nul character"), - quotearg_colon (filename))); + case file_list_end: /* won't happen, just to pacify gcc */ + break; - /* Prepare new stack contents */ - size = obstack_object_size (&argv_stk); - p = obstack_finish (&argv_stk); - for (; size > 0; size--, p++) - if (*p) - obstack_1grow (&argv_stk, *p); - else - obstack_1grow (&argv_stk, '\n'); - obstack_1grow (&argv_stk, 0); - count = 1; - - /* Read rest of files using new filename terminator */ - filename_terminator = 0; - while (read_name_from_file (fp, &argv_stk) == file_list_success) - count++; + case file_list_zero: + { + size_t size; + + WARN ((0, 0, N_("%s: file name read contains nul character"), + quotearg_colon (filename))); + + /* Prepare new stack contents */ + size = obstack_object_size (&argv_stk); + p = obstack_finish (&argv_stk); + for (; size > 0; size--, p++) + if (*p) + obstack_1grow (&argv_stk, *p); + else + obstack_1grow (&argv_stk, '\n'); + obstack_1grow (&argv_stk, 0); + count = 1; + /* Read rest of files using new filename terminator */ + filename_terminator = 0; + break; + } + + case file_list_skip: + break; + } } if (!is_stdin) @@ -1122,11 +1143,11 @@ tar_help (struct argp_state *state) ARGP_HELP_STD_HELP & ~ARGP_HELP_BUG_ADDR); /* FIXME: use struct uparams.rmargin (from argp-help.c) instead of 79 */ fs = argp_make_fmtstream (state->out_stream, 0, 79, 0); - + argp_fmtstream_printf (fs, "\n%s\n\n", _("Valid arguments for --quoting-style options are:")); tar_list_quoting_styles (fs, " "); - + argp_fmtstream_puts (fs, _("\n*This* tar defaults to:\n")); show_default_settings_fs (fs); argp_fmtstream_putc (fs, '\n'); @@ -1286,7 +1307,7 @@ parse_opt (int key, char *arg, struct argp_state *state) get_date_or_file (args, "--mtime", arg, &mtime_option); set_mtime_option = true; break; - + case 'n': seekable_archive = true; break; @@ -1359,7 +1380,7 @@ parse_opt (int key, char *arg, struct argp_state *state) } } break; - + case 't': set_subcommand_option (LIST_SUBCOMMAND); verbose_option++; @@ -1489,6 +1510,10 @@ parse_opt (int key, char *arg, struct argp_state *state) exclude_caches_option = true; break; + case EXCLUDE_TAG_OPTION: + add_exclude_tag (arg); + break; + case FORCE_LOCAL_OPTION: force_local_option = true; break; @@ -1717,7 +1742,7 @@ parse_opt (int key, char *arg, struct argp_state *state) case TRANSFORM_OPTION: set_transform_expr (arg); break; - + case USE_COMPRESS_PROGRAM_OPTION: set_use_compress_program_option (arg); break; @@ -1904,7 +1929,7 @@ decode_options (int argc, char **argv) args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); args.version_control_string = 0; args.input_files = false; - + subcommand_option = UNKNOWN_SUBCOMMAND; archive_format = DEFAULT_FORMAT; blocking_factor = DEFAULT_BLOCKING; @@ -1916,7 +1941,7 @@ decode_options (int argc, char **argv) unquote_option = true; tar_sparse_major = 1; tar_sparse_minor = 0; - + owner_option = -1; group_option = -1; @@ -2019,7 +2044,7 @@ decode_options (int argc, char **argv) /* Warn about implicit use of the wildcards in command line arguments. See TODO */ warn_regex_usage = args.wildcards == default_wildcards; - + /* Derive option values and check option consistency. */ if (archive_format == DEFAULT_FORMAT) @@ -2038,13 +2063,6 @@ decode_options (int argc, char **argv) | FORMAT_MASK (GNU_FORMAT) | FORMAT_MASK (POSIX_FORMAT)); - if (multi_volume_option - && archive_format == POSIX_FORMAT - && subcommand_option == CREATE_SUBCOMMAND - && !tape_length_option) - USAGE_ERROR ((0, 0, - _("creating multi-volume archives in posix format requires using --tape-length (-L) option"))); - if (occurrence_option) { if (!args.input_files) @@ -2198,6 +2216,16 @@ decode_options (int argc, char **argv) break; } + /* Initialize stdlis */ + if (index_file_name) + { + stdlis = fopen (index_file_name, "w"); + if (! stdlis) + open_error (index_file_name); + } + else + stdlis = to_stdout_option ? stderr : stdout; + archive_name_cursor = archive_name_array; /* Prepare for generating backup names. */ @@ -2242,7 +2270,7 @@ main (int argc, char **argv) /* Close all inherited open descriptors, except for the first three */ closeopen (); - + /* Pre-allocate a few structures. */ allocated_archive_names = 10; @@ -2321,13 +2349,14 @@ main (int argc, char **argv) free (archive_name_array); name_term (); - if (stdlis == stdout) - close_stdout (); - if (exit_status == TAREXIT_FAILURE) error (0, 0, _("Error exit delayed from previous errors")); - if (ferror (stderr) || fclose (stderr) != 0) + + if (stdlis == stdout) + close_stdout (); + else if (ferror (stderr) || fclose (stderr) != 0) exit_status = TAREXIT_FAILURE; + return exit_status; }