/* 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-2015 Free
Software Foundation, Inc.
Written by John Gilmore, starting 1985-08-25.
#include <xstrtol.h>
#include <stdopen.h>
#include <priv-set.h>
+#include <savedir.h>
/* Local declarations. */
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;
archive_format = p->fmt;
}
+static void
+set_xattr_option (int value)
+{
+ if (value == 1)
+ set_archive_format ("posix");
+ xattrs_option = value;
+}
+
const char *
archive_format_string (enum archive_format fmt)
{
EXCLUDE_CACHES_UNDER_OPTION,
EXCLUDE_CACHES_ALL_OPTION,
EXCLUDE_OPTION,
+ EXCLUDE_IGNORE_OPTION,
+ EXCLUDE_IGNORE_RECURSIVE_OPTION,
EXCLUDE_TAG_OPTION,
EXCLUDE_TAG_UNDER_OPTION,
EXCLUDE_TAG_ALL_OPTION,
EXCLUDE_VCS_OPTION,
+ EXCLUDE_VCS_IGNORES_OPTION,
FORCE_LOCAL_OPTION,
FULL_TIME_OPTION,
GROUP_OPTION,
NO_SEEK_OPTION,
NO_SELINUX_CONTEXT_OPTION,
NO_UNQUOTE_OPTION,
+ NO_VERBATIM_FILES_FROM_OPTION,
NO_WILDCARDS_MATCH_SLASH_OPTION,
NO_WILDCARDS_OPTION,
NO_XATTR_OPTION,
OCCURRENCE_OPTION,
OLD_ARCHIVE_OPTION,
ONE_FILE_SYSTEM_OPTION,
+ ONE_TOP_LEVEL_OPTION,
OVERWRITE_DIR_OPTION,
OVERWRITE_OPTION,
OWNER_OPTION,
SHOW_SNAPSHOT_FIELD_RANGES_OPTION,
SHOW_TRANSFORMED_NAMES_OPTION,
SKIP_OLD_FILES_OPTION,
+ SORT_OPTION,
SPARSE_VERSION_OPTION,
STRIP_COMPONENTS_OPTION,
SUFFIX_OPTION,
TRANSFORM_OPTION,
UNQUOTE_OPTION,
UTC_OPTION,
+ VERBATIM_FILES_FROM_OPTION,
VOLNO_FILE_OPTION,
WARNING_OPTION,
WILDCARDS_MATCH_SLASH_OPTION,
{"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
" directories until the end of extraction"), GRID+1 },
{"no-delay-directory-restore", NO_DELAY_DIRECTORY_RESTORE_OPTION, 0, 0,
N_("cancel the effect of --delay-directory-restore option"), GRID+1 },
+ {"sort", SORT_OPTION, N_("ORDER"), 0,
+#if D_INO_IN_DIRENT
+ N_("directory sorting order: none (default), name or inode"
+#else
+ N_("directory sorting order: none (default) or name"
+#endif
+ ), GRID+1 },
#undef GRID
#define GRID 55
{"files-from", 'T', N_("FILE"), 0,
N_("get names to extract or create from FILE"), GRID+1 },
{"null", NULL_OPTION, 0, 0,
- N_("-T reads null-terminated names, disable -C"), GRID+1 },
+ N_("-T reads null-terminated names; implies --verbatim-files-from"),
+ GRID+1 },
{"no-null", NO_NULL_OPTION, 0, 0,
N_("disable the effect of the previous --null option"), GRID+1 },
{"unquote", UNQUOTE_OPTION, 0, 0,
- N_("unquote filenames read with -T (default)"), GRID+1 },
+ N_("unquote input file or member names (default)"), GRID+1 },
{"no-unquote", NO_UNQUOTE_OPTION, 0, 0,
- N_("do not unquote filenames read with -T"), GRID+1 },
+ N_("do not unquote input file or member names"), GRID+1 },
+ {"verbatim-files-from", VERBATIM_FILES_FROM_OPTION, 0, 0,
+ N_("-T reads file names verbatim (no option handling)"), GRID+1 },
+ {"no-verbatim-files-from", NO_VERBATIM_FILES_FROM_OPTION, 0, 0,
+ N_("-T treats file names starting with dash as options (default)"),
+ GRID+1 },
{"exclude", EXCLUDE_OPTION, N_("PATTERN"), 0,
N_("exclude files, given as a PATTERN"), GRID+1 },
{"exclude-from", 'X', N_("FILE"), 0,
{"exclude-tag", EXCLUDE_TAG_OPTION, N_("FILE"), 0,
N_("exclude contents of directories containing FILE, except"
" for FILE itself"), GRID+1 },
+ {"exclude-ignore", EXCLUDE_IGNORE_OPTION, N_("FILE"), 0,
+ N_("read exclude patterns for each directory from FILE, if it exists"),
+ GRID+1 },
+ {"exclude-ignore-recursive", EXCLUDE_IGNORE_RECURSIVE_OPTION, N_("FILE"), 0,
+ N_("read exclude patterns for each directory and its subdirectories "
+ "from FILE, if it exists"), GRID+1 },
{"exclude-tag-under", EXCLUDE_TAG_UNDER_OPTION, N_("FILE"), 0,
N_("exclude everything under directories containing FILE"), GRID+1 },
{"exclude-tag-all", EXCLUDE_TAG_ALL_OPTION, N_("FILE"), 0,
N_("exclude directories containing FILE"), GRID+1 },
{"exclude-vcs", EXCLUDE_VCS_OPTION, NULL, 0,
N_("exclude version control system directories"), GRID+1 },
+ {"exclude-vcs-ignores", EXCLUDE_VCS_IGNORES_OPTION, NULL, 0,
+ N_("read exclude patterns from the VCS ignore files"), GRID+1 },
{"exclude-backups", EXCLUDE_BACKUPS_OPTION, NULL, 0,
N_("exclude backup and lock files"), GRID+1 },
{"no-recursion", NO_RECURSION_OPTION, 0, 0,
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;
/* Either NL or NUL, as decided by the --null option. */
static char filename_terminator;
+static char const *const sort_mode_arg[] = {
+ "none",
+ "name",
+#if D_INO_IN_DIRENT
+ "inode",
+#endif
+ NULL
+};
+
+static int sort_mode_flag[] = {
+ SAVEDIR_SORT_NONE,
+ SAVEDIR_SORT_NAME,
+#if D_INO_IN_DIRENT
+ SAVEDIR_SORT_INODE
+#endif
+};
+
+ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag);
+
static error_t
parse_opt (int key, char *arg, struct argp_state *state)
{
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;
break;
case 'T':
- name_add_file (arg, filename_terminator);
+ name_add_file (arg, filename_terminator, verbatim_files_from_option,
+ MAKE_INCL_OPTIONS (args));
/* Indicate we've been given -T option. This is for backward
compatibility only, so that `tar cfT archive /dev/null will
succeed */
cachedir_file_p);
break;
+ case EXCLUDE_IGNORE_OPTION:
+ excfile_add (arg, EXCL_NON_RECURSIVE);
+ break;
+
+ case EXCLUDE_IGNORE_RECURSIVE_OPTION:
+ excfile_add (arg, EXCL_RECURSIVE);
+ break;
+
case EXCLUDE_TAG_OPTION:
add_exclusion_tag (arg, exclusion_tag_contents, NULL);
break;
add_exclude_array (vcs_file_table, 0);
break;
+ case EXCLUDE_VCS_IGNORES_OPTION:
+ exclude_vcs_ignores ();
+ break;
+
case FORCE_LOCAL_OPTION:
force_local_option = true;
break;
case NULL_OPTION:
filename_terminator = '\0';
+ verbatim_files_from_option = true;
break;
case NO_NULL_OPTION:
filename_terminator = '\n';
+ verbatim_files_from_option = false;
break;
case NUMERIC_OWNER_OPTION:
show_transformed_names_option = true;
break;
+ case SORT_OPTION:
+ savedir_sort_order = XARGMATCH ("--sort", arg,
+ sort_mode_arg, sort_mode_flag);
+ break;
+
case SUFFIX_OPTION:
backup_option = true;
args->backup_suffix_string = arg;
break;
case XATTR_OPTION:
- set_archive_format ("posix");
- xattrs_option = 1;
+ set_xattr_option (1);
break;
case NO_XATTR_OPTION:
- xattrs_option = -1;
+ set_xattr_option (-1);
break;
case XATTR_INCLUDE:
case XATTR_EXCLUDE:
+ set_xattr_option (1);
xattrs_mask_add (arg, (key == XATTR_INCLUDE));
break;
unquote_option = false;
break;
+ case VERBATIM_FILES_FROM_OPTION:
+ verbatim_files_from_option = true;
+ break;
+
+ case NO_VERBATIM_FILES_FROM_OPTION:
+ verbatim_files_from_option = false;
+ break;
+
case WARNING_OPTION:
set_warning_option (arg);
break;
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)
{
blocking_factor = DEFAULT_BLOCKING;
record_size = DEFAULT_BLOCKING * BLOCKSIZE;
excluded = new_exclude ();
+
newer_mtime_option.tv_sec = TYPE_MINIMUM (time_t);
newer_mtime_option.tv_nsec = -1;
recursion_option = FNM_LEADING_DIR;
tar_sparse_major = 1;
tar_sparse_minor = 0;
+ savedir_sort_order = SAVEDIR_SORT_NONE;
+
owner_option = -1; owner_name_option = NULL;
group_option = -1; group_name_option = NULL;
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 || same_order_option)
- && !IS_SUBCOMMAND_CLASS (SUBCL_READ))
- USAGE_ERROR ((0, 0,
- _("--%s option cannot be used with %s"),
- starting_file_option ? "starting-file" : "same-order",
- subcommand_string (subcommand_option)));
+ 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 (absolute_names_option)
+ option_conflict_error ("--one-top-level", "--absolute-names");
+
+ if (!one_top_level_dir)
+ {
+ /* 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)
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. */
free (st->sparse_map);
free (st->dumpdir);
xheader_destroy (&st->xhdr);
+ info_free_exclist (st);
memset (st, 0, sizeof (*st));
}
projects / chaz / tar / blobdiff