/* Local declarations. */
+#ifndef DEFAULT_ARCHIVE_FORMAT
+# define DEFAULT_ARCHIVE_FORMAT GNU_FORMAT
+#endif
+
#ifndef DEFAULT_ARCHIVE
# define DEFAULT_ARCHIVE "tar.out"
#endif
return reply == 'y' || reply == 'Y';
}
}
+
+static struct fmttab {
+ char const *name;
+ enum archive_format fmt;
+} const fmttab[] = {
+ { "v7", V7_FORMAT },
+ { "oldgnu", OLDGNU_FORMAT },
+ { "posix", POSIX_FORMAT },
+#if 0 /* not fully supported yet */
+ { "star", STAR_FORMAT },
+#endif
+ { "gnu", GNU_FORMAT },
+ { NULL, 0 }
+};
+
+static void
+set_archive_format (char const *name)
+{
+ struct fmttab const *p;
+
+ for (p = fmttab; strcmp (p->name, name) != 0; )
+ if (! (++p)->name)
+ 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;
+}
+
+static const char *
+archive_format_string (enum archive_format fmt)
+{
+ struct fmttab const *p;
+
+ for (p = fmttab; p->name; p++)
+ if (p->fmt == fmt)
+ return p->name;
+ return "unknown?";
+}
+
\f
/* Options. */
DELETE_OPTION,
EXCLUDE_OPTION,
FORCE_LOCAL_OPTION,
+ FORMAT_OPTION,
GROUP_OPTION,
IGNORE_CASE_OPTION,
IGNORE_FAILED_READ_OPTION,
REMOVE_FILES_OPTION,
RSH_COMMAND_OPTION,
SHOW_OMITTED_DIRS_OPTION,
+ STRIP_PATH_OPTION,
SUFFIX_OPTION,
TOTALS_OPTION,
USE_COMPRESS_PROGRAM_OPTION,
{"file", required_argument, 0, 'f'},
{"files-from", required_argument, 0, 'T'},
{"force-local", no_argument, 0, FORCE_LOCAL_OPTION},
+ {"format", required_argument, 0, FORMAT_OPTION},
{"get", no_argument, 0, 'x'},
{"group", required_argument, 0, GROUP_OPTION},
{"gunzip", no_argument, 0, 'z'},
{"show-omitted-dirs", no_argument, 0, SHOW_OMITTED_DIRS_OPTION},
{"sparse", no_argument, 0, 'S'},
{"starting-file", required_argument, 0, 'K'},
+ {"strip-path", required_argument, 0, STRIP_PATH_OPTION },
{"suffix", required_argument, 0, SUFFIX_OPTION},
{"tape-length", required_argument, 0, 'L'},
{"to-stdout", no_argument, 0, 'O'},
fputs (_("\
\n\
Archive format selection:\n\
+ --format=FMTNAME create archive of the given format.\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\
+ --old-archive, --portability same as --format=v7\n\
+ --posix same as --format=posix\n\
-V, --label=NAME create archive with volume name NAME\n\
PATTERN at list/extract time, a globbing PATTERN\n\
- --old-archive, --portability write a V7 format archive\n\
- --posix write a POSIX format archive\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\
-h, --dereference dump instead the files symlinks point to\n\
--no-recursion avoid descending automatically in directories\n\
-l, --one-file-system stay in local file system when creating archive\n\
- -K, --starting-file=NAME begin at file NAME in the archive\n"),
+ -K, --starting-file=NAME begin at file NAME in the archive\n\
+ --strip-path=NUM strip NUM leading components from file names\n\
+ before extraction\n"),
stdout);
#if !MSDOS
fputs (_("\
stdout);
printf (_("\
\n\
-GNU tar cannot read nor produce `--posix' archives. If POSIXLY_CORRECT\n\
-is set in the environment, GNU extensions are disallowed with `--posix'.\n\
-Support for POSIX is only partially implemented, don't count on it yet.\n\
ARCHIVE may be FILE, HOST:FILE or USER@HOST:FILE; DATE may be a textual date\n\
or a file name starting with `/' or `.', in which case the file's date is used.\n\
-*This* `tar' defaults to `-f%s -b%d'.\n"),
+*This* `tar' defaults to `--format=%s -f%s -b%d'.\n"),
+ archive_format_string (DEFAULT_ARCHIVE_FORMAT),
DEFAULT_ARCHIVE, DEFAULT_BLOCKING);
printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
char const *backup_suffix_string;
char const *version_control_string = 0;
int exclude_options = EXCLUDE_WILDCARDS;
- int o_option = 0;
+ bool o_option = 0;
/* Set some default option values. */
BSD-derived systems. This is a consequence of the block/record
terminology confusion. */
- read_full_records_option = 1;
+ read_full_records_option = true;
break;
case 'c':
script at the end of each tape. */
info_script_option = optarg;
- multi_volume_option = 1;
+ multi_volume_option = true;
break;
case 'g':
listed_incremental_option = optarg;
- after_date_option = 1;
+ after_date_option = true;
/* Fall through. */
case 'G':
directories at the beginning of the archive, and include in each
directory its contents. */
- incremental_option = 1;
+ incremental_option = true;
break;
case 'h':
/* Follow symbolic links. */
-
- dereference_option = 1;
+ dereference_option = true;
break;
case 'i':
because Unix tar writes two blocks of zeros, then pads out
the record with garbage. */
- ignore_zeros_option = 1;
+ ignore_zeros_option = true;
break;
case 'I':
break;
case 'K':
- starting_file_option = 1;
+ starting_file_option = true;
addname (optarg, 0);
break;
/* When dumping directories, don't dump files/subdirectories
that are on other filesystems. */
- one_file_system_option = 1;
+ one_file_system_option = true;
break;
case 'L':
USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
_("Invalid tape length")));
tape_length_option = 1024 * (tarlong) u;
- multi_volume_option = 1;
+ multi_volume_option = true;
}
break;
case 'm':
- touch_option = 1;
+ touch_option = true;
break;
case 'M':
/* Make multivolume archive: when we can't write any more into
the archive, re-open it, and continue writing. */
- multi_volume_option = 1;
+ multi_volume_option = true;
break;
#if !MSDOS
case 'N':
- after_date_option = 1;
+ after_date_option = true;
/* Fall through. */
case NEWER_MTIME_OPTION:
#endif /* not MSDOS */
case 'o':
- o_option = 1;
+ o_option = true;
break;
case 'O':
- to_stdout_option = 1;
+ to_stdout_option = true;
break;
case 'p':
- same_permissions_option = 1;
+ same_permissions_option = true;
break;
case 'P':
- absolute_names_option = 1;
+ absolute_names_option = true;
break;
case 'r':
BSD-derived systems. This is a consequence of the block/record
terminology confusion. */
- block_number_option = 1;
+ block_number_option = true;
break;
case 's':
/* Names to extr are sorted. */
- same_order_option = 1;
+ same_order_option = true;
break;
case 'S':
- sparse_option = 1;
+ sparse_option = true;
break;
case 't':
break;
case 'w':
- interactive_option = 1;
+ interactive_option = true;
break;
case 'W':
- verify_option = 1;
+ verify_option = true;
break;
case 'x':
break;
case ATIME_PRESERVE_OPTION:
- atime_preserve_option = 1;
+ atime_preserve_option = true;
break;
case CHECKPOINT_OPTION:
- checkpoint_option = 1;
+ checkpoint_option = true;
break;
case BACKUP_OPTION:
- backup_option = 1;
+ backup_option = true;
if (optarg)
version_control_string = optarg;
break;
break;
case FORCE_LOCAL_OPTION:
- force_local_option = 1;
+ force_local_option = true;
break;
+ case FORMAT_OPTION:
+ set_archive_format (optarg);
+ break;
+
case INDEX_FILE_OPTION:
index_file_name = optarg;
break;
break;
case IGNORE_FAILED_READ_OPTION:
- ignore_failed_read_option = 1;
+ ignore_failed_read_option = true;
break;
case GROUP_OPTION:
break;
case NUMERIC_OWNER_OPTION:
- numeric_owner_option = 1;
+ numeric_owner_option = true;
break;
case OVERWRITE_OPTION:
break;
case POSIX_OPTION:
-#if OLDGNU_COMPATIBILITY
- if (archive_format == DEFAULT_FORMAT)
- archive_format = GNU_FORMAT;
- else if (archive_format != GNU_FORMAT)
- USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
-#else
- if (archive_format == DEFAULT_FORMAT)
- archive_format = POSIX_FORMAT;
- else if (archive_format != POSIX_FORMAT)
- USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
-#endif
+ set_archive_format ("posix");
break;
case PRESERVE_OPTION:
- same_permissions_option = 1;
- same_order_option = 1;
+ same_permissions_option = true;
+ same_order_option = true;
break;
case RECORD_SIZE_OPTION:
break;
case RECURSIVE_UNLINK_OPTION:
- recursive_unlink_option = 1;
+ recursive_unlink_option = true;
break;
case REMOVE_FILES_OPTION:
- remove_files_option = 1;
+ remove_files_option = true;
break;
case RSH_COMMAND_OPTION:
rsh_command_option = optarg;
break;
+ case STRIP_PATH_OPTION:
+ {
+ uintmax_t u;
+ if (! (xstrtoumax (optarg, 0, 10, &u, "") == LONGINT_OK
+ && u == (size_t) u))
+ USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+ _("Invalid number of elements")));
+ strip_path_elements = u;
+ }
+ break;
+
case SUFFIX_OPTION:
- backup_option = 1;
+ backup_option = true;
backup_suffix_string = optarg;
break;
+ case TOTALS_OPTION:
+ totals_option = true;
+ break;
+
case USE_COMPRESS_PROGRAM_OPTION:
set_use_compress_program_option (optarg);
break;
xrealloc (archive_name_array,
sizeof (const char *) * allocated_archive_names);
}
- archive_name_array[archive_names++] = buf;
-
- /* FIXME: How comes this works for many archives when buf is
- not xstrdup'ed? */
+ archive_name_array[archive_names++] = strdup (buf);
}
break;
if (subcommand_option == CREATE_SUBCOMMAND)
{
/* GNU Tar <= 1.13 compatibility */
- if (archive_format == DEFAULT_FORMAT)
- archive_format = V7_FORMAT;
- else if (archive_format != V7_FORMAT)
- USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
+ set_archive_format ("v7");
}
else
{
/* Derive option values and check option consistency. */
if (archive_format == DEFAULT_FORMAT)
- {
-#if OLDGNU_COMPATIBILITY
- archive_format = OLDGNU_FORMAT;
-#else
- archive_format = GNU_FORMAT;
-#endif
- }
+ archive_format = DEFAULT_ARCHIVE_FORMAT;
if (archive_format == GNU_FORMAT && getenv ("POSIXLY_CORRECT"))
archive_format = POSIX_FORMAT;
- if ((volume_label_option
+ 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,
free (st->gname);
memset (st, 0, sizeof (*st));
}
+
projects / chaz / tar / blobdiff