#define GLOBAL
#include "common.h"
-#include "quotearg.h"
-#include "xstrtol.h"
+#include <localedir.h>
+#include <prepargs.h>
+#include <quotearg.h>
+#include <xstrtol.h>
time_t get_date ();
\f
/* Miscellaneous. */
-/*----------------------------------------------.
-| Doesn't return if stdin already requested. |
-`----------------------------------------------*/
-
/* Name of option using stdin. */
static const char *stdin_used_by;
+/* Doesn't return if stdin already requested. */
void
request_stdin (const char *option)
{
stdin_used_by = option;
}
-/*--------------------------------------------------------.
-| Returns true if and only if the user typed 'y' or 'Y'. |
-`--------------------------------------------------------*/
-
+/* Returns true if and only if the user typed 'y' or 'Y'. */
int
confirm (const char *message_action, const char *message_name)
{
GROUP_OPTION,
MODE_OPTION,
NEWER_MTIME_OPTION,
- NO_RECURSE_OPTION,
NULL_OPTION,
OVERWRITE_OPTION,
OWNER_OPTION,
/* If nonzero, print the version on standard output and exit. */
static int show_version;
-struct option long_options[] =
+static struct option long_options[] =
{
{"absolute-names", no_argument, 0, 'P'},
{"absolute-paths", no_argument, 0, OBSOLETE_ABSOLUTE_NAMES},
{"block-number", no_argument, 0, 'R'},
{"block-size", required_argument, 0, OBSOLETE_BLOCKING_FACTOR},
{"blocking-factor", required_argument, 0, 'b'},
- {"bzip2", no_argument, 0, 'I'},
+ {"bzip2", no_argument, 0, 'j'},
{"catenate", no_argument, 0, 'A'},
{"checkpoint", no_argument, &checkpoint_option, 1},
{"compare", no_argument, 0, 'd'},
{"newer", required_argument, 0, 'N'},
{"newer-mtime", required_argument, 0, NEWER_MTIME_OPTION},
{"null", no_argument, 0, NULL_OPTION},
- {"no-recursion", no_argument, 0, NO_RECURSE_OPTION},
+ {"no-recursion", no_argument, &recursion_option, 0},
{"no-same-owner", no_argument, &same_owner_option, -1},
{"no-same-permissions", no_argument, &same_permissions_option, -1},
{"numeric-owner", no_argument, &numeric_owner_option, 1},
{0, 0, 0, 0}
};
-/*---------------------------------------------.
-| Print a usage message and exit with STATUS. |
-`---------------------------------------------*/
-
+/* Print a usage message and exit with STATUS. */
static void
usage (int status)
{
PATTERN at list/extract time, a globbing PATTERN\n\
-o, --old-archive, --portability write a V7 format archive\n\
--posix write a POSIX format archive\n\
- -I, --bzip2 filter the archive through bzip2\n\
+ -j, --bzip2 filter the archive through bzip2\n\
-z, --gzip, --ungzip filter the archive through gzip\n\
-Z, --compress, --uncompress filter the archive through compress\n\
--use-compress-program=PROG filter through PROG (must accept -d)\n"),
\n\
Local file selection:\n\
-C, --directory=DIR change to directory DIR\n\
- -T, --files-from=NAME get names to extract or create from file NAME\n\
+ -T, -I, --files-from=NAME get names to extract or create from file NAME\n\
--null -T reads null-terminated names, disable -C\n\
--exclude=PATTERN exclude files, given as a globbing PATTERN\n\
-X, --exclude-from=FILE exclude globbing patterns listed in FILE\n\
exit (status);
}
-/*----------------------------.
-| Parse the options for tar. |
-`----------------------------*/
+/* Parse the options for tar. */
-/* Available option letters are DEHJQY and aejnqy. Some are reserved:
+/* Available option letters are DEHJQY and aenqy. Some are reserved:
+ e exit immediately with a nonzero exit status if unexpected errors occur
+ E use extended headers (draft POSIX headers, that is)
+ n the archive is quickly seekable, so don't worry about random seeks
+ q stop after extracting the first occurrence of the named file
y per-file gzip compression
Y per-block gzip compression */
#define OPTION_STRING \
- "-01234567ABC:F:GIK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
+ "-01234567ABC:F:GIK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxz"
static void
set_subcommand_option (enum subcommand subcommand)
}
static void
-decode_options (int argc, char *const *argv)
+decode_options (int argc, char **argv)
{
int optchar; /* option letter */
int input_files; /* number of input files */
excluded_with_slash = new_exclude ();
excluded_without_slash = new_exclude ();
newer_mtime_option = TYPE_MINIMUM (time_t);
+ recursion_option = FNM_LEADING_DIR;
owner_option = -1;
group_option = -1;
input_files = 0;
+ prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv);
+
while (optchar = getopt_long (argc, argv, OPTION_STRING, long_options, 0),
optchar != -1)
switch (optchar)
&& u == (blocking_factor = u)
&& 0 < blocking_factor
&& u == (record_size = u * BLOCKSIZE) / BLOCKSIZE))
- USAGE_ERROR ((0, 0, _("Invalid blocking factor")));
+ USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+ _("Invalid blocking factor")));
}
break;
ignore_zeros_option = 1;
break;
- case 'I':
+ case 'j':
set_use_compress_program_option ("bzip2");
break;
{
uintmax_t u;
if (xstrtoumax (optarg, 0, 10, &u, "") != LONGINT_OK)
- USAGE_ERROR ((0, 0, _("Invalid tape length")));
+ USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+ _("Invalid tape length")));
tape_length_option = 1024 * (tarlong) u;
multi_volume_option = 1;
}
/* Fall through. */
case NEWER_MTIME_OPTION:
- if (newer_mtime_option != TYPE_MINIMUM (time_t))
+ if (newer_mtime_option != TYPE_MINIMUM (time_t))
USAGE_ERROR ((0, 0, _("More than one threshold date")));
newer_mtime_option = get_date (optarg, 0);
break;
case 'T':
+ case 'I': /* for compatibility with Solaris tar */
files_from_option = optarg;
break;
&& g == (gid_t) g)
group_option = g;
else
- FATAL_ERROR ((0, 0, _("Invalid group given on option")));
+ FATAL_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+ _("%s: Invalid group")));
}
break;
xalloc_die ();
break;
- case NO_RECURSE_OPTION:
- no_recurse_option = 1;
- break;
-
case NULL_OPTION:
filename_terminator = '\0';
break;
&& u == (uid_t) u)
owner_option = u;
else
- FATAL_ERROR ((0, 0, _("Invalid owner given on option")));
+ FATAL_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+ _("Invalid owner")));
}
break;
uintmax_t u;
if (! (xstrtoumax (optarg, 0, 10, &u, "") == LONGINT_OK
&& u == (size_t) u))
- USAGE_ERROR ((0, 0, _("Invalid record size")));
+ USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+ _("Invalid record size")));
record_size = u;
if (record_size % BLOCKSIZE != 0)
USAGE_ERROR ((0, 0, _("Record size must be a multiple of %d."),
USAGE_ERROR ((0, 0,
_("Cannot combine --listed-incremental with --newer")));
+ if (volume_label_option)
+ {
+ size_t volume_label_max_len =
+ (sizeof current_header->header.name
+ - 1 /* for trailing '\0' */
+ - (multi_volume_option
+ ? (sizeof " Volume "
+ - 1 /* for null at end of " Volume " */
+ + INT_STRLEN_BOUND (int) /* for volume number */
+ - 1 /* for sign, as 0 <= volno */)
+ : 0));
+ if (volume_label_max_len < strlen (volume_label_option))
+ USAGE_ERROR ((0, 0,
+ _("%s: Volume label is too long (limit is %lu bytes)"),
+ quotearg_colon (volume_label_option),
+ (unsigned long) volume_label_max_len));
+ }
+
/* If ready to unlink hierarchies, so we are for simpler files. */
if (recursive_unlink_option)
old_files_option = UNLINK_FIRST_OLD_FILES;
case CAT_SUBCOMMAND:
case UPDATE_SUBCOMMAND:
case APPEND_SUBCOMMAND:
- case DELETE_SUBCOMMAND:
for (archive_name_cursor = archive_name_array;
archive_name_cursor < archive_name_array + archive_names;
archive_name_cursor++)
if (!strcmp (*archive_name_cursor, "-"))
USAGE_ERROR ((0, 0,
- _("Options `-Aru' and `--delete' are incompatible with `-f -'")));
+ _("Options `-Aru' are incompatible with `-f -'")));
default:
break;
\f
/* Tar proper. */
-/*-----------------------.
-| Main routine for tar. |
-`-----------------------*/
-
+/* Main routine for tar. */
int
-main (int argc, char *const *argv)
+main (int argc, char **argv)
{
#if HAVE_CLOCK_GETTIME
if (clock_gettime (CLOCK_REALTIME, &start_timespec) != 0)
case EXTRACT_SUBCOMMAND:
extr_init ();
read_and (extract_archive);
+ extract_finish ();
break;
case LIST_SUBCOMMAND:
projects / chaz / tar / blobdiff