#define GLOBAL
#include "common.h"
+#include <argmatch.h>
#include <getdate.h>
#include <localedir.h>
#include <rmt.h>
#include <prepargs.h>
#include <quotearg.h>
#include <xstrtol.h>
+#include <stdopen.h>
/* Local declarations. */
stdin_used_by = option;
}
-/* Returns true if and only if the user typed 'y' or 'Y'. */
+extern int rpmatch (char const *response);
+
+/* Returns true if and only if the user typed an affirmative response. */
int
confirm (const char *message_action, const char *message_name)
{
static FILE *confirm_file;
static int confirm_file_EOF;
+ bool status = false;
if (!confirm_file)
{
fprintf (stdlis, "%s %s?", message_action, quote (message_name));
fflush (stdlis);
- {
- int reply = confirm_file_EOF ? EOF : getc (confirm_file);
- int character;
+ if (!confirm_file_EOF)
+ {
+ char *response = NULL;
+ size_t response_size = 0;
+ if (getline (&response, &response_size, confirm_file) < 0)
+ confirm_file_EOF = 1;
+ else
+ status = rpmatch (response) > 0;
+ free (response);
+ }
- for (character = reply;
- character != '\n';
- character = getc (confirm_file))
- if (character == EOF)
- {
- confirm_file_EOF = 1;
- fputc ('\n', stdlis);
- fflush (stdlis);
- break;
- }
- return reply == 'y' || reply == 'Y';
- }
+ if (confirm_file_EOF)
+ {
+ fputc ('\n', stdlis);
+ fflush (stdlis);
+ }
+
+ return status;
}
static struct fmttab {
#endif
{ "gnu", GNU_FORMAT },
{ "pax", POSIX_FORMAT }, /* An alias for posix */
- { NULL, 0 }
+ { NULL, 0 }
};
static void
\f
/* Options. */
-/* For long options that unconditionally set a single flag, we have getopt
- do it. For the others, we share the code for the equivalent short
- named option, the name of which is stored in the otherwise-unused `val'
- field of the `struct option'; for long options that have no equivalent
- short option, we use non-characters as pseudo short options,
- starting at CHAR_MAX + 1 and going upwards. */
-
enum
{
ANCHORED_OPTION = CHAR_MAX + 1,
Available option letters are DEIJQY and aeqy. Consider the following
assignments:
- [For Solaris tar compatibility]
+ [For Solaris tar compatibility =/= Is it important at all?]
e exit immediately with a nonzero exit status if unexpected errors occur
E use extended headers (--format=posix)
+
[q alias for --occurrence=1 =/= this would better be used for quiet?]
[I same as T =/= will harm star compatibility]
N_("force NAME as group for added files"), 51 },
{"mode", MODE_OPTION, N_("CHANGES"), 0,
N_("force (symbolic) mode CHANGES for added files"), 51 },
- {"atime-preserve", ATIME_PRESERVE_OPTION, 0, 0,
- N_("don't change access times on dumped files"), 51 },
+ {"atime-preserve", ATIME_PRESERVE_OPTION,
+ N_("METHOD"), OPTION_ARG_OPTIONAL,
+ N_("preserve access times on dumped files, either by restoring the times"
+ " after reading (METHOD='replace'; default) or by not setting the times"
+ " in the first place (METHOD='system')"), 51 },
{"touch", 'm', 0, 0,
N_("don't extract file modified time"), 51 },
{"same-owner", SAME_OWNER_OPTION, 0, 0,
{0, 0, 0, 0, 0, 0}
};
+static char const *const atime_preserve_args[] =
+{
+ "replace", "system", NULL
+};
+static enum atime_preserve const atime_preserve_types[] =
+{
+ replace_atime_preserve, system_atime_preserve
+};
+ARGMATCH_VERIFY (atime_preserve_args, atime_preserve_types);
+
+
struct tar_args {
char const *textual_date_option;
int exclude_options;
break;
case ATIME_PRESERVE_OPTION:
- atime_preserve_option = true;
+ atime_preserve_option =
+ (arg
+ ? XARGMATCH ("--atime-preserve", arg,
+ atime_preserve_args, atime_preserve_types)
+ : replace_atime_preserve);
+ if (! O_NOATIME && atime_preserve_option == system_atime_preserve)
+ FATAL_ERROR ((0, 0,
+ _("--atime-preserve='system' is not supported"
+ " on this platform\n")));
break;
case CHECKPOINT_OPTION:
archive_format = DEFAULT_ARCHIVE_FORMAT;
}
- /* FIXME: Merge the four conditionals below */
- if (volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
- assert_format (FORMAT_MASK (OLDGNU_FORMAT)
- | FORMAT_MASK (GNU_FORMAT)
- | FORMAT_MASK (POSIX_FORMAT));
-
-
- if (incremental_option)
- assert_format (FORMAT_MASK (OLDGNU_FORMAT)
- | FORMAT_MASK (GNU_FORMAT)
- | FORMAT_MASK (POSIX_FORMAT));
-
- if (multi_volume_option)
- assert_format (FORMAT_MASK (OLDGNU_FORMAT)
- | FORMAT_MASK (GNU_FORMAT)
- | FORMAT_MASK (POSIX_FORMAT));
-
- if (sparse_option)
+ if ((volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
+ || incremental_option
+ || multi_volume_option
+ || sparse_option)
assert_format (FORMAT_MASK (OLDGNU_FORMAT)
| FORMAT_MASK (GNU_FORMAT)
| FORMAT_MASK (POSIX_FORMAT));
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,
- 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 (archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT)
+ {
+ 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,
+ 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));
+ }
+ /* else FIXME
+ Label length in PAX format is limited by the volume size. */
}
if (verify_option)
filename_terminator = '\n';
set_quoting_style (0, escape_quoting_style);
+ /* Make sure we have first three descriptors available */
+ stdopen ();
+
/* Pre-allocate a few structures. */
allocated_archive_names = 10;
projects / chaz / tar / blobdiff