return reply == 'y' || reply == 'Y';
}
}
+
+void
+set_archive_format (char *name)
+{
+ static struct fmttab {
+ char *name;
+ enum archive_format fmt;
+ } fmttab[] = {
+ { "v7", V7_FORMAT },
+ { "oldgnu", OLDGNU_FORMAT },
+ { "posix", POSIX_FORMAT },
+#if 0 /* not fully supported yet */
+ { "star", STAR_FORMAT },
+#endif
+ { "gnu", GNU_FORMAT },
+ NULL
+ };
+ struct fmttab *p;
+ enum archive_format fmt;
+
+ for (p = fmttab; p->name; p++)
+ {
+ if (strcmp (p->name, name) == 0)
+ {
+ fmt = p->fmt;
+ break;
+ }
+ }
+
+ if (archive_format != DEFAULT_FORMAT && archive_format != fmt)
+ USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
+
+ archive_format = fmt;
+}
\f
/* Options. */
DELETE_OPTION,
EXCLUDE_OPTION,
FORCE_LOCAL_OPTION,
+ FORMAT_OPTION,
GROUP_OPTION,
IGNORE_CASE_OPTION,
IGNORE_FAILED_READ_OPTION,
VOLNO_FILE_OPTION,
WILDCARDS_OPTION,
WILDCARDS_MATCH_SLASH_OPTION,
-
- /* Some cleanup is being made in GNU tar long options. Using old names is
- allowed for a while, but will also send a warning to stderr. Take old
- names out in 1.14, or in summer 1997, whichever happens last. */
-
- OBSOLETE_ABSOLUTE_NAMES,
- OBSOLETE_BLOCK_COMPRESS,
- OBSOLETE_BLOCKING_FACTOR,
- OBSOLETE_BLOCK_NUMBER,
- OBSOLETE_READ_FULL_RECORDS,
- OBSOLETE_TOUCH,
- OBSOLETE_VERSION_CONTROL
};
/* If nonzero, display usage information and exit. */
static struct option long_options[] =
{
{"absolute-names", no_argument, 0, 'P'},
- {"absolute-paths", no_argument, 0, OBSOLETE_ABSOLUTE_NAMES},
{"after-date", required_argument, 0, 'N'},
{"anchored", no_argument, 0, ANCHORED_OPTION},
{"append", no_argument, 0, 'r'},
{"atime-preserve", no_argument, 0, ATIME_PRESERVE_OPTION},
{"backup", optional_argument, 0, BACKUP_OPTION},
- {"block-compress", no_argument, 0, OBSOLETE_BLOCK_COMPRESS},
{"block-number", no_argument, 0, 'R'},
- {"block-size", required_argument, 0, OBSOLETE_BLOCKING_FACTOR},
{"blocking-factor", required_argument, 0, 'b'},
{"bzip2", no_argument, 0, 'j'},
{"catenate", no_argument, 0, 'A'},
{"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'},
{"list", no_argument, 0, 't'},
{"listed-incremental", required_argument, 0, 'g'},
{"mode", required_argument, 0, MODE_OPTION},
- {"modification-time", no_argument, 0, OBSOLETE_TOUCH},
{"multi-volume", no_argument, 0, 'M'},
{"new-volume-script", required_argument, 0, 'F'},
{"newer", required_argument, 0, 'N'},
{"preserve-permissions", no_argument, 0, 'p'},
{"recursion", no_argument, &recursion_option, FNM_LEADING_DIR},
{"recursive-unlink", no_argument, 0, RECURSIVE_UNLINK_OPTION},
- {"read-full-blocks", no_argument, 0, OBSOLETE_READ_FULL_RECORDS},
{"read-full-records", no_argument, 0, 'B'},
/* FIXME: --partial-blocks might be a synonym for --read-full-records? */
- {"record-number", no_argument, 0, OBSOLETE_BLOCK_NUMBER},
{"record-size", required_argument, 0, RECORD_SIZE_OPTION},
{"remove-files", no_argument, 0, REMOVE_FILES_OPTION},
{"rsh-command", required_argument, 0, RSH_COMMAND_OPTION},
{"verbose", no_argument, 0, 'v'},
{"verify", no_argument, 0, 'W'},
{"version", no_argument, &show_version, 1},
- {"version-control", required_argument, 0, OBSOLETE_VERSION_CONTROL},
{"volno-file", required_argument, 0, VOLNO_FILE_OPTION},
{"wildcards", no_argument, 0, WILDCARDS_OPTION},
{"wildcards-match-slash", no_argument, 0, WILDCARDS_MATCH_SLASH_OPTION},
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\
set_subcommand_option (CAT_SUBCOMMAND);
break;
- case OBSOLETE_BLOCK_COMPRESS:
- WARN ((0, 0, _("Obsolete option, now implied by --blocking-factor")));
- break;
-
- case OBSOLETE_BLOCKING_FACTOR:
- WARN ((0, 0, _("Obsolete option name replaced by --blocking-factor")));
- /* Fall through. */
-
case 'b':
{
uintmax_t u;
}
break;
- case OBSOLETE_READ_FULL_RECORDS:
- WARN ((0, 0,
- _("Obsolete option name replaced by --read-full-records")));
- /* Fall through. */
-
case 'B':
/* Try to reblock input records. For reading 4.2BSD pipes. */
}
break;
- case OBSOLETE_TOUCH:
- WARN ((0, 0, _("Obsolete option name replaced by --touch")));
- /* Fall through. */
-
case 'm':
touch_option = 1;
break;
same_permissions_option = 1;
break;
- case OBSOLETE_ABSOLUTE_NAMES:
- WARN ((0, 0, _("Obsolete option name replaced by --absolute-names")));
- /* Fall through. */
-
case 'P':
absolute_names_option = 1;
break;
set_subcommand_option (APPEND_SUBCOMMAND);
break;
- case OBSOLETE_BLOCK_NUMBER:
- WARN ((0, 0, _("Obsolete option name replaced by --block-number")));
- /* Fall through. */
-
case 'R':
/* Print block numbers for debugging bad tar archives. */
set_use_compress_program_option ("compress");
break;
- case OBSOLETE_VERSION_CONTROL:
- WARN ((0, 0, _("Obsolete option name replaced by --backup")));
- /* Fall through. */
-
case ANCHORED_OPTION:
exclude_options |= EXCLUDE_ANCHORED;
break;
force_local_option = 1;
break;
+ case FORMAT_OPTION:
+ set_archive_format (optarg);
+ break;
+
case INDEX_FILE_OPTION:
index_file_name = optarg;
break;
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:
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 = GNU_FORMAT;
if (archive_format == GNU_FORMAT && getenv ("POSIXLY_CORRECT"))
archive_format = POSIX_FORMAT;
exit_status = TAREXIT_FAILURE;
exit (exit_status);
}
+
+void
+destroy_stat (struct tar_stat_info *st)
+{
+ free (st->orig_file_name);
+ free (st->file_name);
+ free (st->link_name);
+ free (st->uname);
+ free (st->gname);
+ memset (st, 0, sizeof (*st));
+}
+