#include <getline.h>
#include <argp.h>
#include <argp-namefrob.h>
+#include <argp-fmtstream.h>
#include <signal.h>
#if ! defined SIGCHLD && defined SIGCLD
}
void
-tar_list_quoting_styles (FILE *fp, char *prefix)
+tar_list_quoting_styles (argp_fmtstream_t fs, char *prefix)
{
int i;
for (i = 0; quoting_style_args[i]; i++)
- fprintf (fp, "%s%s\n", prefix, quoting_style_args[i]);
+ argp_fmtstream_printf (fs, "%s%s\n", prefix, quoting_style_args[i]);
}
void
INDEX_FILE_OPTION,
KEEP_NEWER_FILES_OPTION,
MODE_OPTION,
+ MTIME_OPTION,
NEWER_MTIME_OPTION,
NO_ANCHORED_OPTION,
NO_DELAY_DIRECTORY_RESTORE_OPTION,
OCCURRENCE_OPTION,
OLD_ARCHIVE_OPTION,
ONE_FILE_SYSTEM_OPTION,
+ OVERWRITE_DIR_OPTION,
OVERWRITE_OPTION,
OWNER_OPTION,
PAX_OPTION,
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
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,
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,
{"verbose", 'v', 0, 0,
N_("verbosely list files processed"), GRID+1 },
- {"checkpoint", CHECKPOINT_OPTION, 0, 0,
- N_("display progress messages every 10th record"), GRID+1 },
+ {"checkpoint", CHECKPOINT_OPTION, N_("[.]NUMBER"), OPTION_ARG_OPTIONAL,
+ N_("display progress messages every NUMBERth record (default 10)"),
+ 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,
replace_atime_preserve, system_atime_preserve
};
+/* Make sure atime_preserve_types has as much entries as atime_preserve_args
+ (minus 1 for NULL guard) */
ARGMATCH_VERIFY (atime_preserve_args, atime_preserve_types);
/* Wildcard matching settings */
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 */
| (args)->matching_flags \
| recursion_option)
-static void
-show_default_settings (FILE *stream)
-{
- fprintf (stream,
- "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s",
- archive_format_string (DEFAULT_ARCHIVE_FORMAT),
- DEFAULT_ARCHIVE, DEFAULT_BLOCKING,
- quoting_style_args[DEFAULT_QUOTING_STYLE],
- DEFAULT_RMT_COMMAND);
-#ifdef REMOTE_SHELL
- fprintf (stream, " --rsh-command=%s", REMOTE_SHELL);
-#endif
- fprintf (stream, "\n");
+#ifdef REMOTE_SHELL
+# define DECL_SHOW_DEFAULT_SETTINGS(stream, printer) \
+{ \
+ printer (stream, \
+ "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s", \
+ archive_format_string (DEFAULT_ARCHIVE_FORMAT), \
+ DEFAULT_ARCHIVE, DEFAULT_BLOCKING, \
+ quoting_style_args[DEFAULT_QUOTING_STYLE], \
+ DEFAULT_RMT_COMMAND); \
+ printer (stream, " --rsh-command=%s", REMOTE_SHELL); \
+ printer (stream, "\n"); \
+}
+#else
+# define DECL_SHOW_DEFAULT_SETTINGS(stream, printer) \
+{ \
+ printer (stream, \
+ "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s", \
+ archive_format_string (DEFAULT_ARCHIVE_FORMAT), \
+ DEFAULT_ARCHIVE, DEFAULT_BLOCKING, \
+ quoting_style_args[DEFAULT_QUOTING_STYLE], \
+ DEFAULT_RMT_COMMAND); \
+ printer (stream, "\n"); \
}
+#endif
+
+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)
static void
set_subcommand_option (enum subcommand subcommand)
use_compress_program_option = string;
}
+\f
+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));
+}
+
+\f
+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;
+ }
+}
+
+\f
static volatile int _argp_hang;
enum read_file_list_state /* Result of reading file name from the list file */
}
}
+\f
+static void
+tar_help (struct argp_state *state)
+{
+ argp_fmtstream_t fs;
+ state->flags |= ARGP_NO_EXIT;
+ argp_state_help (state, state->out_stream,
+ 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');
+ argp_fmtstream_printf (fs, _("Report bugs to %s.\n"),
+ argp_program_bug_address);
+ argp_fmtstream_free (fs);
+}
\f
static error_t
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;
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':
break;
case CHECKPOINT_OPTION:
- checkpoint_option = true;
+ if (arg)
+ {
+ char *p;
+
+ if (*arg == '.')
+ {
+ checkpoint_style = checkpoint_dot;
+ arg++;
+ }
+ checkpoint_option = strtoul (arg, &p, 0);
+ if (*p)
+ FATAL_ERROR ((0, 0,
+ _("--checkpoint value is not an integer")));
+ }
+ else
+ checkpoint_option = 10;
break;
case BACKUP_OPTION:
}
break;
+ case OVERWRITE_DIR_OPTION:
+ old_files_option = DEFAULT_OLD_FILES;
+ break;
+
case OVERWRITE_OPTION:
old_files_option = OVERWRITE_OLD_FILES;
break;
break;
case TOTALS_OPTION:
- totals_option = true;
+ if (arg)
+ set_stat_signal (arg);
+ else
+ totals_option = true;
break;
case TRANSFORM_OPTION:
#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"),
- argp_program_bug_address);
+ tar_help (state);
close_stdout ();
exit (0);
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;
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);
}
\f
case CREATE_SUBCOMMAND:
create_archive ();
- if (totals_option)
- print_total_written ();
break;
case EXTRACT_SUBCOMMAND:
break;
}
+ if (totals_option)
+ print_total_stats ();
+
if (check_links_option)
check_links ();
projects / chaz / tar / blobdiff