/* 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.
#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;
SHOW_SNAPSHOT_FIELD_RANGES_OPTION,
SHOW_TRANSFORMED_NAMES_OPTION,
SKIP_OLD_FILES_OPTION,
+ SORT_OPTION,
SPARSE_VERSION_OPTION,
STRIP_COMPONENTS_OPTION,
SUFFIX_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, 0, 0,
+ {"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
" 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
/* Either NL or NUL, as decided by the --null option. */
static char filename_terminator;
+static char const *const sort_mode_arg[] = {
+ "none",
+ "name",
+ "inode",
+ NULL
+};
+
+static int sort_mode_flag[] = {
+ SAVEDIR_SORT_NONE,
+ SAVEDIR_SORT_NAME,
+ SAVEDIR_SORT_INODE
+};
+
+ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag);
+
static error_t
parse_opt (int key, char *arg, struct argp_state *state)
{
case ONE_TOP_LEVEL_OPTION:
one_top_level_option = true;
+ one_top_level_dir = arg;
break;
case 'l':
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;
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)
{
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 (one_top_level_option && absolute_names_option)
- USAGE_ERROR ((0, 0, _("--one-top-level cannot be used with --absolute-names")));
-
if (archive_names == 0)
{
/* If no archive file name given, try TAPE from the environment, or
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. */