/* A tar (tape archiver) program.
- Copyright 1988, 1992-1997, 1999-2001, 2003-2007, 2012-2013 Free
+ Copyright 1988, 1992-1997, 1999-2001, 2003-2007, 2012-2014 Free
Software Foundation, Inc.
Written by John Gilmore, starting 1985-08-25.
request_stdin (const char *option)
{
if (stdin_used_by)
- USAGE_ERROR ((0, 0, _("Options '-%s' and '-%s' both want standard input"),
+ USAGE_ERROR ((0, 0, _("Options '%s' and '%s' both want standard input"),
stdin_used_by, option));
stdin_used_by = option;
IGNORE_COMMAND_ERROR_OPTION,
IGNORE_FAILED_READ_OPTION,
INDEX_FILE_OPTION,
+ KEEP_DIRECTORY_SYMLINK_OPTION,
KEEP_NEWER_FILES_OPTION,
LEVEL_OPTION,
LZIP_OPTION,
OCCURRENCE_OPTION,
OLD_ARCHIVE_OPTION,
ONE_FILE_SYSTEM_OPTION,
+ ONE_TOP_LEVEL_OPTION,
OVERWRITE_DIR_OPTION,
OVERWRITE_OPTION,
OWNER_OPTION,
{"overwrite-dir", OVERWRITE_DIR_OPTION, 0, 0,
N_("overwrite metadata of existing directories when extracting (default)"),
GRID+1 },
+ {"keep-directory-symlink", KEEP_DIRECTORY_SYMLINK_OPTION, 0, 0,
+ N_("preserve existing symlinks to directories when extracting"),
+ GRID+1 },
+ {"one-top-level", ONE_TOP_LEVEL_OPTION, N_("DIR"), OPTION_ARG_OPTIONAL,
+ N_("create a subdirectory to avoid having loose files extracted"),
+ GRID+1 },
#undef GRID
#define GRID 40
{"no-same-permissions", NO_SAME_PERMISSIONS_OPTION, 0, 0,
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"), GRID+1 },
+ N_("member arguments are listed in the same order as the "
+ "files in the archive"), GRID+1 },
{"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"preserve", PRESERVE_OPTION, 0, 0,
N_("same as both -p and -s"), GRID+1 },
{"hard-dereference", HARD_DEREFERENCE_OPTION, 0, 0,
N_("follow hard links; archive and dump the files they refer to"), GRID+1 },
{"starting-file", 'K', N_("MEMBER-NAME"), 0,
- N_("begin at member MEMBER-NAME in the archive"), GRID+1 },
+ N_("begin at member MEMBER-NAME when reading 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 },
use_compress_program_option = string;
}
\f
-static RETSIGTYPE
+static void
sigstat (int signo)
{
compute_duration ();
s = xasprintf (_("filter the archive through %s"), LZMA_PROGRAM);
break;
+ case LZOP_OPTION:
+ s = xasprintf (_("filter the archive through %s"), LZOP_PROGRAM);
+
case 'J':
s = xasprintf (_("filter the archive through %s"), XZ_PROGRAM);
break;
one_file_system_option = true;
break;
+ case ONE_TOP_LEVEL_OPTION:
+ one_top_level_option = true;
+ one_top_level_dir = arg;
+ break;
+
case 'l':
check_links_option = 1;
break;
ignore_failed_read_option = true;
break;
+ case KEEP_DIRECTORY_SYMLINK_OPTION:
+ keep_directory_symlink_option = true;
+ break;
+
case KEEP_NEWER_FILES_OPTION:
old_files_option = KEEP_NEWER_FILES;
break;
/* Return t if the subcommand_option is in class(es) f */
#define IS_SUBCOMMAND_CLASS(f) (subcommand_class[subcommand_option] & (f))
-
+
static struct tar_args args;
+static void
+option_conflict_error (const char *a, const char *b)
+{
+ /* TRANSLATORS: Both %s in this statement are replaced with
+ option names. */
+ USAGE_ERROR ((0, 0, _("'%s' cannot be used with '%s'"), a, b));
+}
+
static void
decode_options (int argc, char **argv)
{
USAGE_ERROR ((0, 0,
_("--occurrence is meaningless without a file list")));
if (!IS_SUBCOMMAND_CLASS (SUBCL_OCCUR))
- USAGE_ERROR ((0, 0,
- _("--occurrence cannot be used with %s"),
- subcommand_string (subcommand_option)));
+ option_conflict_error ("--occurrence",
+ subcommand_string (subcommand_option));
}
if (archive_names == 0)
if (listed_incremental_option
&& NEWER_OPTION_INITIALIZED (newer_mtime_option))
- USAGE_ERROR ((0, 0,
- _("Cannot combine --listed-incremental with --newer")));
+ option_conflict_error ("--listed-incremental", "--newer");
+
if (incremental_level != -1 && !listed_incremental_option)
WARN ((0, 0,
_("--level is meaningless without --listed-incremental")));
if (use_compress_program_option)
USAGE_ERROR ((0, 0, _("Cannot verify compressed archives")));
if (!IS_SUBCOMMAND_CLASS (SUBCL_WRITE))
- USAGE_ERROR ((0, 0, _("--verify cannot be used with %s"),
- subcommand_string (subcommand_option)));
+ option_conflict_error ("--verify",
+ subcommand_string (subcommand_option));
}
if (use_compress_program_option)
&& !IS_SUBCOMMAND_CLASS (SUBCL_READ))
USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives")));
+ if (starting_file_option && !IS_SUBCOMMAND_CLASS (SUBCL_READ))
+ option_conflict_error ("--starting-file",
+ subcommand_string (subcommand_option));
+
+ if (same_order_option && !IS_SUBCOMMAND_CLASS (SUBCL_READ))
+ option_conflict_error ("--same-order",
+ subcommand_string (subcommand_option));
+
+ if (one_top_level_option)
+ {
+ char *base;
+
+ if (!IS_SUBCOMMAND_CLASS (SUBCL_READ))
+ option_conflict_error ("--one-top-level",
+ subcommand_string (subcommand_option));
+ if (absolute_names_option)
+ option_conflict_error ("--one-top-level", "--absolute-names");
+
+ /* If the user wants to guarantee that everything is under one directory,
+ determine its name now and let it be created later. */
+ base = base_name (archive_name_array[0]);
+ one_top_level_dir = strip_compression_suffix (base);
+ free (base);
+
+ if (!one_top_level_dir)
+ USAGE_ERROR ((0, 0,
+ _("Cannot deduce top-level directory name; "
+ "please set it explicitly with --one-top-level=DIR")));
+ }
+
/* If ready to unlink hierarchies, so we are for simpler files. */
if (recursive_unlink_option)
old_files_option = UNLINK_FIRST_OLD_FILES;
USAGE_ERROR ((0, 0, _("Volume length cannot be less than record size")));
if (same_order_option && listed_incremental_option)
- USAGE_ERROR ((0, 0, _("--preserve-order is not compatible with "
- "--listed-incremental")));
+ option_conflict_error ("--preserve-order", "--listed-incremental");
/* Forbid using -c with no input files whatsoever. Check that '-f -',
explicit or implied, is used correctly. */
exit_failure = TAREXIT_FAILURE;
exit_status = TAREXIT_SUCCESS;
+ error_hook = checkpoint_flush_actions;
+
filename_terminator = '\n';
set_quoting_style (0, DEFAULT_QUOTING_STYLE);
test_archive_label ();
}
+ checkpoint_finish ();
+
if (totals_option)
print_total_stats ();
projects / chaz / tar / blobdiff