X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=1e0f95ddd8f42117dd1701f9d642e5538ff0ce33;hb=5addfdcb03a710d220d0d38262b106b99268b2ec;hp=0375c41bbe3946a4547200a2918aefd2cf2898e5;hpb=f9bd340c1bdcb47ce99e33bc995ef28de5f6d2eb;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 0375c41..1e0f95d 100644 --- a/src/tar.c +++ b/src/tar.c @@ -263,6 +263,7 @@ enum INDEX_FILE_OPTION, KEEP_NEWER_FILES_OPTION, MODE_OPTION, + MTIME_OPTION, NEWER_MTIME_OPTION, NO_ANCHORED_OPTION, NO_DELAY_DIRECTORY_RESTORE_OPTION, @@ -281,6 +282,7 @@ enum OCCURRENCE_OPTION, OLD_ARCHIVE_OPTION, ONE_FILE_SYSTEM_OPTION, + OVERWRITE_DIR_OPTION, OVERWRITE_OPTION, OWNER_OPTION, PAX_OPTION, @@ -299,6 +301,7 @@ enum SHOW_DEFAULTS_OPTION, SHOW_OMITTED_DIRS_OPTION, SHOW_TRANSFORMED_NAMES_OPTION, + SPARSE_VERSION_OPTION, STRIP_COMPONENTS_OPTION, SUFFIX_OPTION, TEST_LABEL_OPTION, @@ -380,6 +383,8 @@ static struct argp_option options[] = { {"sparse", 'S', 0, 0, N_("handle sparse files efficiently"), GRID+1 }, + {"sparse-version", SPARSE_VERSION_OPTION, N_("MAJOR[.MINOR]"), 0, + N_("set version of the sparse format to use (implies --sparse)"), GRID+1}, {"incremental", 'G', 0, 0, N_("handle old GNU-format incremental backup"), GRID+1 }, {"listed-incremental", 'g', N_("FILE"), 0, @@ -398,7 +403,7 @@ static struct argp_option options[] = { #define GRID 30 {NULL, 0, NULL, 0, - N_("Overwrite control:\n"), GRID+1 }, + N_("Overwrite control:"), GRID+1 }, {"verify", 'W', 0, 0, N_("attempt to verify the archive after writing it"), GRID+1 }, @@ -416,6 +421,9 @@ static struct argp_option options[] = { 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 }, + {"overwrite-dir", OVERWRITE_DIR_OPTION, 0, 0, + N_("overwrite metadata of existing directories when extracting (default)"), + GRID+1 }, #undef GRID #define GRID 40 @@ -440,6 +448,8 @@ static struct argp_option options[] = { N_("force NAME as owner for added files"), GRID+1 }, {"group", GROUP_OPTION, N_("NAME"), 0, N_("force NAME as group for added files"), GRID+1 }, + {"mtime", MTIME_OPTION, N_("DATE-OR-FILE"), 0, + N_("set mtime for added files from DATE-OR-FILE"), GRID+1 }, {"mode", MODE_OPTION, N_("CHANGES"), 0, N_("force (symbolic) mode CHANGES for added files"), GRID+1 }, {"atime-preserve", ATIME_PRESERVE_OPTION, @@ -604,10 +614,9 @@ static struct argp_option options[] = { N_("begin at member MEMBER-NAME in the archive"), GRID+1 }, {"newer", 'N', N_("DATE-OR-FILE"), 0, N_("only store files newer than DATE-OR-FILE"), GRID+1 }, + {"after-date", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, {"newer-mtime", NEWER_MTIME_OPTION, N_("DATE"), 0, N_("compare date and time when data changed only"), GRID+1 }, - {"after-date", 'N', N_("DATE"), 0, - N_("same as -N"), GRID+1 }, {"backup", BACKUP_OPTION, N_("CONTROL"), OPTION_ARG_OPTIONAL, N_("backup before removal, choose version CONTROL"), GRID+1 }, {"suffix", SUFFIX_OPTION, N_("STRING"), 0, @@ -621,7 +630,7 @@ static struct argp_option options[] = { N_("strip NUMBER leading components from file names on extraction"), GRID+1 }, {"transform", TRANSFORM_OPTION, N_("EXPRESSION"), 0, - N_("Use sed replace EXPRESSION to transform file names"), GRID+1 }, + N_("use sed replace EXPRESSION to transform file names"), GRID+1 }, #undef GRID #define GRID 95 @@ -657,8 +666,11 @@ static struct argp_option options[] = { GRID+1 }, {"check-links", 'l', 0, 0, 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"), GRID+1 }, + {"totals", TOTALS_OPTION, N_("SIGNAL"), OPTION_ARG_OPTIONAL, + N_("print total bytes after processing the archive; " + "with an argument - print total bytes when this SIGNAL is delivered; " + "Allowed signals are: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; " + "the names without SIG prefix are also accepted"), GRID+1 }, {"utc", UTC_OPTION, 0, 0, N_("print file modification dates in UTC"), GRID+1 }, {"index-file", INDEX_FILE_OPTION, N_("FILE"), 0, @@ -736,8 +748,9 @@ enum wildcards struct tar_args /* Variables used during option parsing */ { - char const *textual_date_option; /* Keeps the argument to --newer-mtime - option if it represents a textual date */ + struct textual_date *textual_date; /* Keeps the arguments to --newer-mtime + and/or --date option if they are + textual dates */ enum wildcards wildcards; /* Wildcard settings (--wildcards/ --no-wildcards) */ int matching_flags; /* exclude_fnmatch options */ @@ -814,7 +827,123 @@ set_use_compress_program_option (const char *string) use_compress_program_option = string; } + +static RETSIGTYPE +sigstat (int signo) +{ + compute_duration (); + print_total_stats (); +#ifndef HAVE_SIGACTION + signal (signo, sigstat); +#endif +} + +static void +stat_on_signal (int signo) +{ +#ifdef HAVE_SIGACTION + struct sigaction act; + act.sa_handler = sigstat; + sigemptyset (&act.sa_mask); + act.sa_flags = 0; + sigaction (signo, &act, NULL); +#else + signal (signo, sigstat); +#endif +} + +void +set_stat_signal (const char *name) +{ + static struct sigtab + { + char *name; + int signo; + } sigtab[] = { + { "SIGUSR1", SIGUSR1 }, + { "USR1", SIGUSR1 }, + { "SIGUSR2", SIGUSR2 }, + { "USR2", SIGUSR2 }, + { "SIGHUP", SIGHUP }, + { "HUP", SIGHUP }, + { "SIGINT", SIGINT }, + { "INT", SIGINT }, + { "SIGQUIT", SIGQUIT }, + { "QUIT", SIGQUIT } + }; + struct sigtab *p; + + for (p = sigtab; p < sigtab + sizeof (sigtab) / sizeof (sigtab[0]); p++) + if (strcmp (p->name, name) == 0) + { + stat_on_signal (p->signo); + return; + } + FATAL_ERROR ((0, 0, _("Unknown signal name: %s"), name)); +} + + +struct textual_date +{ + struct textual_date *next; + struct timespec *ts; + const char *option; + const char *date; +}; + +static void +get_date_or_file (struct tar_args *args, const char *option, + const char *str, struct timespec *ts) +{ + if (FILE_SYSTEM_PREFIX_LEN (str) != 0 + || ISSLASH (*str) + || *str == '.') + { + struct stat st; + if (deref_stat (dereference_option, str, &st) != 0) + { + stat_error (str); + USAGE_ERROR ((0, 0, _("Date sample file not found"))); + } + *ts = get_stat_mtime (&st); + } + else + { + if (! get_date (ts, str, NULL)) + { + WARN ((0, 0, _("Substituting %s for unknown date format %s"), + tartime (*ts, false), quote (str))); + ts->tv_nsec = 0; + } + else + { + struct textual_date *p = xmalloc (sizeof (*p)); + p->ts = ts; + p->option = option; + p->date = str; + p->next = args->textual_date; + args->textual_date = p; + } + } +} + +static void +report_textual_dates (struct tar_args *args) +{ + struct textual_date *p; + for (p = args->textual_date; p; ) + { + struct textual_date *next = p->next; + char const *treated_as = tartime (*p->ts, true); + if (strcmp (p->date, treated_as) != 0) + WARN ((0, 0, _("Option %s: Treating date `%s' as %s"), + p->option, p->date, treated_as)); + free (p); + p = next; + } +} + static volatile int _argp_hang; enum read_file_list_state /* Result of reading file name from the list file */ @@ -1153,6 +1282,11 @@ parse_opt (int key, char *arg, struct argp_state *state) multi_volume_option = true; break; + case MTIME_OPTION: + get_date_or_file (args, "--mtime", arg, &mtime_option); + set_mtime_option = true; + break; + case 'n': seekable_archive = true; break; @@ -1164,31 +1298,9 @@ 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 (FILE_SYSTEM_PREFIX_LEN (arg) != 0 - || ISSLASH (*arg) - || *arg == '.') - { - struct stat st; - if (deref_stat (dereference_option, arg, &st) != 0) - { - stat_error (arg); - USAGE_ERROR ((0, 0, _("Date sample file not found"))); - } - 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, false), quote (arg))); - newer_mtime_option.tv_nsec = 0; - } - else - args->textual_date_option = arg; - } - + get_date_or_file (args, + key == NEWER_MTIME_OPTION ? "--newer-mtime" + : "--after-date", arg, &newer_mtime_option); break; case 'o': @@ -1215,7 +1327,7 @@ parse_opt (int key, char *arg, struct argp_state *state) /* 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 + 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. */ @@ -1223,7 +1335,7 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case 's': - /* Names to extr are sorted. */ + /* Names to extract are sorted. */ same_order_option = true; break; @@ -1232,6 +1344,22 @@ parse_opt (int key, char *arg, struct argp_state *state) sparse_option = true; break; + case SPARSE_VERSION_OPTION: + sparse_option = true; + { + char *p; + tar_sparse_major = strtoul (arg, &p, 10); + if (*p) + { + if (*p != '.') + USAGE_ERROR ((0, 0, _("Invalid sparse version value"))); + tar_sparse_minor = strtoul (p + 1, &p, 10); + if (*p) + USAGE_ERROR ((0, 0, _("Invalid sparse version value"))); + } + } + break; + case 't': set_subcommand_option (LIST_SUBCOMMAND); verbose_option++; @@ -1463,6 +1591,10 @@ parse_opt (int key, char *arg, struct argp_state *state) } break; + case OVERWRITE_DIR_OPTION: + old_files_option = DEFAULT_OLD_FILES; + break; + case OVERWRITE_OPTION: old_files_option = OVERWRITE_OLD_FILES; break; @@ -1576,7 +1708,10 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case TOTALS_OPTION: - totals_option = true; + if (arg) + set_stat_signal (arg); + else + totals_option = true; break; case TRANSFORM_OPTION: @@ -1760,7 +1895,7 @@ decode_options (int argc, char **argv) struct tar_args args; /* Set some default option values. */ - args.textual_date_option = NULL; + args.textual_date = NULL; args.wildcards = default_wildcards; args.matching_flags = 0; args.include_anchored = EXCLUDE_ANCHORED; @@ -1769,7 +1904,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; @@ -1779,7 +1914,9 @@ decode_options (int argc, char **argv) newer_mtime_option.tv_nsec = -1; recursion_option = FNM_LEADING_DIR; unquote_option = true; - + tar_sparse_major = 1; + tar_sparse_minor = 0; + owner_option = -1; group_option = -1; @@ -2061,6 +2198,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. */ @@ -2077,13 +2224,8 @@ decode_options (int argc, char **argv) backup_option = false; } - if (verbose_option && args.textual_date_option) - { - char const *treated_as = tartime (newer_mtime_option, true); - if (strcmp (args.textual_date_option, treated_as) != 0) - WARN ((0, 0, _("Treating date `%s' as %s"), - args.textual_date_option, treated_as)); - } + if (verbose_option) + report_textual_dates (&args); } @@ -2108,6 +2250,9 @@ main (int argc, char **argv) /* Make sure we have first three descriptors available */ stdopen (); + /* Close all inherited open descriptors, except for the first three */ + closeopen (); + /* Pre-allocate a few structures. */ allocated_archive_names = 10; @@ -2150,8 +2295,6 @@ main (int argc, char **argv) case CREATE_SUBCOMMAND: create_archive (); - if (totals_option) - print_total_written (); break; case EXTRACT_SUBCOMMAND: @@ -2174,6 +2317,9 @@ main (int argc, char **argv) break; } + if (totals_option) + print_total_stats (); + if (check_links_option) check_links ();