#include <xstrtol.h>
#include <stdopen.h>
#include <priv-set.h>
+#include <savedir.h>
/* Local declarations. */
SHOW_SNAPSHOT_FIELD_RANGES_OPTION,
SHOW_TRANSFORMED_NAMES_OPTION,
SKIP_OLD_FILES_OPTION,
+ SORT_OPTION,
SPARSE_VERSION_OPTION,
STRIP_COMPONENTS_OPTION,
SUFFIX_OPTION,
" 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)
{
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;
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;
{
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 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. */