X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=ac32f97c02ea78bd1b396887d912109a84754914;hb=93906c238d9309f95afeddfa9ac8d7ce92351e70;hp=0dfa9c1d12aba316865733de80a203294b1bd914;hpb=2af87fa2776c8125a587a9b0c2c4fae3bf921ff7;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 0dfa9c1..ac32f97 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,6 +1,6 @@ /* 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. @@ -51,6 +51,7 @@ #include #include #include +#include /* Local declarations. */ @@ -83,7 +84,7 @@ void 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; @@ -166,6 +167,14 @@ set_archive_format (char const *name) 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) { @@ -275,10 +284,13 @@ enum 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, @@ -342,6 +354,7 @@ enum SHOW_SNAPSHOT_FIELD_RANGES_OPTION, SHOW_TRANSFORMED_NAMES_OPTION, SKIP_OLD_FILES_OPTION, + SORT_OPTION, SPARSE_VERSION_OPTION, STRIP_COMPONENTS_OPTION, SUFFIX_OPTION, @@ -490,7 +503,7 @@ static struct argp_option options[] = { {"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 @@ -551,6 +564,13 @@ static struct argp_option options[] = { " 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 @@ -715,12 +735,20 @@ static struct argp_option options[] = { {"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, @@ -1310,6 +1338,21 @@ parse_owner_group (char *arg, uintmax_t field_max, char const **name_option) /* 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) { @@ -1447,6 +1490,7 @@ 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': @@ -1743,6 +1787,14 @@ parse_opt (int key, char *arg, struct argp_state *state) 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; @@ -1759,6 +1811,10 @@ parse_opt (int key, char *arg, struct argp_state *state) 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; @@ -1996,6 +2052,11 @@ 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; @@ -2065,16 +2126,16 @@ parse_opt (int key, char *arg, struct argp_state *state) 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; @@ -2234,6 +2295,14 @@ static int subcommand_class[] = { 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) { @@ -2258,6 +2327,7 @@ 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; @@ -2265,6 +2335,8 @@ 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; @@ -2396,14 +2468,10 @@ 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 (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 @@ -2423,8 +2491,8 @@ decode_options (int argc, char **argv) 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"))); @@ -2461,8 +2529,8 @@ decode_options (int argc, char **argv) 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) @@ -2501,12 +2569,35 @@ decode_options (int argc, char **argv) && !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) @@ -2539,8 +2630,7 @@ decode_options (int argc, char **argv) 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. */ @@ -2783,6 +2873,7 @@ tar_stat_destroy (struct tar_stat_info *st) free (st->sparse_map); free (st->dumpdir); xheader_destroy (&st->xhdr); + info_free_exclist (st); memset (st, 0, sizeof (*st)); }