# define DEFAULT_BLOCKING 20
#endif
-static void usage (int) __attribute__ ((noreturn));
+void usage (int) __attribute__ ((noreturn));
\f
/* Miscellaneous. */
enum archive_format fmt;
} const fmttab[] = {
{ "v7", V7_FORMAT },
- { "oldgnu", OLDGNU_FORMAT },
+ { "oldgnu", OLDGNU_FORMAT },
+ { "ustar", USTAR_FORMAT },
{ "posix", POSIX_FORMAT },
#if 0 /* not fully supported yet */
{ "star", STAR_FORMAT },
USAGE_ERROR ((0, 0, _("%s: Invalid archive format"),
quotearg_colon (name)));
- if (archive_format != DEFAULT_FORMAT && archive_format != p->fmt)
- USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
-
archive_format = p->fmt;
}
return "unknown?";
}
+#define FORMAT_MASK(n) (1<<(n))
+
+static void
+assert_format(unsigned fmt_mask)
+{
+ if ((FORMAT_MASK(archive_format) & fmt_mask) == 0)
+ USAGE_ERROR ((0, 0,
+ _("GNU features wanted on incompatible archive format")));
+}
+
+
\f
/* Options. */
NO_WILDCARDS_MATCH_SLASH_OPTION,
NULL_OPTION,
NUMERIC_OWNER_OPTION,
+ OCCURRENCE_OPTION,
OVERWRITE_OPTION,
OWNER_OPTION,
+ PAX_OPTION,
POSIX_OPTION,
PRESERVE_OPTION,
RECORD_SIZE_OPTION,
RECURSIVE_UNLINK_OPTION,
REMOVE_FILES_OPTION,
RSH_COMMAND_OPTION,
+ SHOW_DEFAULTS_OPTION,
SHOW_OMITTED_DIRS_OPTION,
STRIP_PATH_OPTION,
SUFFIX_OPTION,
USE_COMPRESS_PROGRAM_OPTION,
VOLNO_FILE_OPTION,
WILDCARDS_OPTION,
- WILDCARDS_MATCH_SLASH_OPTION,
+ WILDCARDS_MATCH_SLASH_OPTION
};
/* If nonzero, display usage information and exit. */
{"no-same-owner", no_argument, &same_owner_option, -1},
{"no-same-permissions", no_argument, &same_permissions_option, -1},
{"numeric-owner", no_argument, 0, NUMERIC_OWNER_OPTION},
+ {"occurrence", optional_argument, 0, OCCURRENCE_OPTION},
{"old-archive", no_argument, 0, 'o'},
{"one-file-system", no_argument, 0, 'l'},
{"overwrite", no_argument, 0, OVERWRITE_OPTION},
{"owner", required_argument, 0, OWNER_OPTION},
+ {"pax-option", required_argument, 0, PAX_OPTION},
{"portability", no_argument, 0, 'o'},
{"posix", no_argument, 0, POSIX_OPTION},
{"preserve", no_argument, 0, PRESERVE_OPTION},
{"same-order", no_argument, 0, 's'},
{"same-owner", no_argument, &same_owner_option, 1},
{"same-permissions", no_argument, 0, 'p'},
+ {"show-defaults", no_argument, 0, SHOW_DEFAULTS_OPTION},
{"show-omitted-dirs", no_argument, 0, SHOW_OMITTED_DIRS_OPTION},
{"sparse", no_argument, 0, 'S'},
{"starting-file", required_argument, 0, 'K'},
};
/* Print a usage message and exit with STATUS. */
-static void
+void
usage (int status)
{
if (status != TAREXIT_SUCCESS)
-G, --incremental handle old GNU-format incremental backup\n\
-g, --listed-incremental=FILE\n\
handle new GNU-format incremental backup\n\
- --ignore-failed-read do not exit with nonzero on unreadable files\n"),
+ --ignore-failed-read do not exit with nonzero on unreadable files\n\
+ --occurrence[=NUM] process only the NUMth occurrence of each file in\n\
+ the archive. This option is valid only in\n\
+ conjunction with one of the subcommands --delete,\n\
+ --diff, --extract or --list and when a list of\n\
+ files is given either on the command line or\n\
+ via -T option.\n\
+ NUM defaults to 1.\n"),
stdout);
fputs (_("\
\n\
FMTNAME is one of the following:\n\
v7 old V7 tar format\n\
oldgnu GNU format as per tar <= 1.12\n\
- posix POSIX 1003.1-2001 tar format\n\
- gnu GNU format\n\
+ gnu GNU tar 1.13 format\n\
+ ustar POSIX 1003.1-1988 (ustar) format\n\
+ posix POSIX 1003.1-2001 (pax) format\n\
--old-archive, --portability same as --format=v7\n\
--posix same as --format=posix\n\
+ --pax-option keyword[[:]=value][,keyword[[:]=value], ...]\n\
+ control pax keywords\n\
-V, --label=NAME create archive with volume name NAME\n\
PATTERN at list/extract time, a globbing PATTERN\n\
-j, --bzip2 filter the archive through bzip2\n\
stdout);
#if !MSDOS
fputs (_("\
- -N, --newer=DATE only store files newer than DATE\n\
+ -N, --newer=DATE-OR-FILE only store files newer than DATE-OR-FILE\n\
--newer-mtime=DATE compare date and time when data changed only\n\
--after-date=DATE same as -N\n"),
stdout);
char const *version_control_string = 0;
int exclude_options = EXCLUDE_WILDCARDS;
bool o_option = 0;
-
+ int pax_option = 0;
+
/* Set some default option values. */
subcommand_option = UNKNOWN_SUBCOMMAND;
numeric_owner_option = true;
break;
+ case OCCURRENCE_OPTION:
+ if (!optarg)
+ occurrence_option = 1;
+ else
+ {
+ uintmax_t u;
+ if (xstrtoumax (optarg, 0, 10, &u, "") == LONGINT_OK)
+ occurrence_option = u;
+ else
+ FATAL_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+ _("Invalid number")));
+ }
+ break;
+
case OVERWRITE_OPTION:
old_files_option = OVERWRITE_OLD_FILES;
break;
}
break;
+ case PAX_OPTION:
+ pax_option++;
+ xheader_set_option (optarg);
+ break;
+
case POSIX_OPTION:
set_archive_format ("posix");
break;
rsh_command_option = optarg;
break;
+ case SHOW_DEFAULTS_OPTION:
+ printf ("--format=%s -f%s -b%d\n",
+ archive_format_string (DEFAULT_ARCHIVE_FORMAT),
+ DEFAULT_ARCHIVE, DEFAULT_BLOCKING);
+ exit(0);
+
case STRIP_PATH_OPTION:
{
uintmax_t u;
if (show_version)
{
- printf ("tar (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
- printf (_("Copyright (C) %d Free Software Foundation, Inc.\n"), 2003);
+ printf ("tar (%s) %s\n%s\n", PACKAGE_NAME, PACKAGE_VERSION,
+ "Copyright (C) 2003 Free Software Foundation, Inc.");
puts (_("\
This program comes with NO WARRANTY, to the extent permitted by law.\n\
You may redistribute it under the terms of the GNU General Public License;\n\
/* Derive option values and check option consistency. */
if (archive_format == DEFAULT_FORMAT)
- archive_format = DEFAULT_ARCHIVE_FORMAT;
-
- if (archive_format == GNU_FORMAT && getenv ("POSIXLY_CORRECT"))
- archive_format = POSIX_FORMAT;
-
- if (((volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
- || incremental_option || multi_volume_option || sparse_option)
- && archive_format != OLDGNU_FORMAT && archive_format != GNU_FORMAT)
- USAGE_ERROR ((0, 0,
- _("GNU features wanted on incompatible archive format")));
+ {
+ if (pax_option)
+ archive_format = POSIX_FORMAT;
+ else
+ archive_format = DEFAULT_ARCHIVE_FORMAT;
+ }
+
+ if (volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
+ assert_format (FORMAT_MASK (OLDGNU_FORMAT)
+ | FORMAT_MASK (GNU_FORMAT));
+
+ if (incremental_option || multi_volume_option)
+ assert_format (FORMAT_MASK (OLDGNU_FORMAT) | FORMAT_MASK (GNU_FORMAT));
+
+ if (sparse_option)
+ assert_format (FORMAT_MASK (OLDGNU_FORMAT)
+ | FORMAT_MASK (GNU_FORMAT)
+ | FORMAT_MASK (POSIX_FORMAT));
+
+ if (occurrence_option)
+ {
+ if (!input_files && !files_from_option)
+ USAGE_ERROR ((0, 0,
+ _("--occurrence is meaningless without a file list")));
+ if (subcommand_option != DELETE_SUBCOMMAND
+ && subcommand_option != DIFF_SUBCOMMAND
+ && subcommand_option != EXTRACT_SUBCOMMAND
+ && subcommand_option != LIST_SUBCOMMAND)
+ USAGE_ERROR ((0, 0,
+ _("--occurrence cannot be used in the requested operation mode")));
+ }
if (archive_names == 0)
{
if (archive_names > 1 && !multi_volume_option)
USAGE_ERROR ((0, 0,
- _("Multiple archive files requires `-M' option")));
+ _("Multiple archive files require `-M' option")));
if (listed_incremental_option
&& newer_mtime_option != TYPE_MINIMUM (time_t))
: 0));
if (volume_label_max_len < strlen (volume_label_option))
USAGE_ERROR ((0, 0,
- _("%s: Volume label is too long (limit is %lu bytes)"),
+ ngettext ("%s: Volume label is too long (limit is %lu byte)",
+ "%s: Volume label is too long (limit is %lu bytes)",
+ volume_label_max_len),
quotearg_colon (volume_label_option),
(unsigned long) volume_label_max_len));
}
+ if (verify_option)
+ {
+ if (multi_volume_option)
+ USAGE_ERROR ((0, 0, _("Cannot verify multi-volume archives")));
+ if (use_compress_program_option)
+ USAGE_ERROR ((0, 0, _("Cannot verify compressed archives")));
+ }
+
+ if (use_compress_program_option)
+ {
+ if (multi_volume_option)
+ USAGE_ERROR ((0, 0, _("Cannot use multi-volume compressed archives")));
+ if (subcommand_option == UPDATE_SUBCOMMAND)
+ USAGE_ERROR ((0, 0, _("Cannot update compressed archives")));
+ }
+
+ /* It is no harm to use --pax-option on non-pax archives in archive
+ reading mode. It may even be useful, since it allows to override
+ file attributes from tar headers. Therefore I allow such usage.
+ --gray */
+ if (pax_option
+ && archive_format != POSIX_FORMAT
+ && (subcommand_option != EXTRACT_SUBCOMMAND
+ || subcommand_option != DIFF_SUBCOMMAND
+ || subcommand_option != LIST_SUBCOMMAND))
+ USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives")));
+
/* If ready to unlink hierarchies, so we are for simpler files. */
if (recursive_unlink_option)
old_files_option = UNLINK_FIRST_OLD_FILES;
textual_date_option, treated_as));
}
}
+
\f
/* Tar proper. */
error (0, 0, _("Error exit delayed from previous errors"));
if (ferror (stderr) || fclose (stderr) != 0)
exit_status = TAREXIT_FAILURE;
- exit (exit_status);
+ return exit_status;
}
void
-destroy_stat (struct tar_stat_info *st)
+tar_stat_init (struct tar_stat_info *st)
+{
+ memset (st, 0, sizeof (*st));
+}
+
+void
+tar_stat_destroy (struct tar_stat_info *st)
{
free (st->orig_file_name);
free (st->file_name);
free (st->link_name);
free (st->uname);
free (st->gname);
+ free (st->sparse_map);
memset (st, 0, sizeof (*st));
}
projects / chaz / tar / blobdiff