X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=78638d02c3aacd2616e484c76c23f9e7408c9416;hb=68bd7ac50a26c795ba9cbaa9d18e26c35f10c09c;hp=2f393f622fd9d4d8dc9ff0c51c301f93e5a2a0f9;hpb=a447fd3714cbcb37950f399390809f797b0633ec;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 2f393f6..78638d0 100644 --- a/src/tar.c +++ b/src/tar.c @@ -128,6 +128,7 @@ static struct fmttab { { "star", STAR_FORMAT }, #endif { "gnu", GNU_FORMAT }, + { "pax", POSIX_FORMAT }, /* An alias for posix */ { NULL, 0 } }; @@ -186,7 +187,6 @@ enum DELETE_OPTION, EXCLUDE_OPTION, FORCE_LOCAL_OPTION, - FORMAT_OPTION, GROUP_OPTION, IGNORE_CASE_OPTION, IGNORE_FAILED_READ_OPTION, @@ -248,6 +248,20 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n never, simple always make simple backups\n"); +/* NOTE: + + Available option letters are DEIJQY and aeqy. Consider the following + assignments: + + [For Solaris tar compatibility] + 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] + + y per-file gzip compression + Y per-block gzip compression */ + static struct argp_option options[] = { {NULL, 0, NULL, 0, N_("Main operation mode:"), 0}, @@ -256,7 +270,7 @@ static struct argp_option options[] = { N_("list the contents of an archive"), 10 }, {"extract", 'x', 0, 0, N_("extract files from an archive"), 10 }, - {"get", 0, 0, OPTION_ALIAS, NULL}, + {"get", 0, 0, OPTION_ALIAS, NULL, 0 }, {"create", 'c', 0, 0, N_("create a new archive"), 10 }, {"diff", 'd', 0, 0, @@ -303,7 +317,9 @@ static struct argp_option options[] = { N_("do not exit with nonzero on unreadable files"), 21 }, {"occurrence", OCCURRENCE_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL, N_("process only the NUMth occurrence of each file in the archive. This option is valid only in conjunction with one of the subcommands --delete, --diff, --extract or --list and when a list of files is given either on the command line or via -T option. NUMBER defaults to 1."), 21 }, - + {"seek", 'n', NULL, 0, + N_("Archive is seekable"), 21 }, + {NULL, 0, NULL, 0, N_("Handling of file attributes:"), 30 }, @@ -385,7 +401,7 @@ static struct argp_option options[] = { {NULL, 0, NULL, 0, N_("Archive format selection:"), 60 }, - {"format", FORMAT_OPTION, N_("FORMAT"), 0, + {"format", 'H', N_("FORMAT"), 0, N_("create archive of the given format."), 61 }, {"", 0, NULL, OPTION_DOC, N_("FORMAT is one of the following:"), 62}, @@ -432,9 +448,9 @@ static struct argp_option options[] = { {"ignore-case", IGNORE_CASE_OPTION, 0, 0, N_("exclusion ignores case"), 71 }, {"anchored", ANCHORED_OPTION, 0, 0, - N_("exclude patterns match file name start (default)"), 71 }, + N_("exclude patterns match file name start"), 71 }, {"no-anchored", NO_ANCHORED_OPTION, 0, 0, - N_("exclude patterns match after any /"), 71 }, + N_("exclude patterns match after any / (default)"), 71 }, {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0, N_("exclusion is case sensitive (default)"), 71 }, {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0, @@ -476,7 +492,7 @@ static struct argp_option options[] = { {"verbose", 'v', 0, 0, N_("verbosely list files processed"), 81 }, {"checkpoint", CHECKPOINT_OPTION, 0, 0, - N_("print directory names while reading the archive"), 81 }, + N_("display progress messages every 10th record"), 81 }, {"check-links", CHECK_LINKS_OPTION, 0, 0, N_("print a message if not all links are dumped"), 82 }, {"totals", TOTALS_OPTION, 0, 0, @@ -511,7 +527,7 @@ static struct argp_option options[] = { /* FIXME -V (--label) conflicts with the default short option for --version */ - {0, 0, 0, 0} + {0, 0, 0, 0, 0, 0} }; struct tar_args { @@ -548,7 +564,8 @@ set_subcommand_option (enum subcommand subcommand) static void set_use_compress_program_option (const char *string) { - if (use_compress_program_option && strcmp (use_compress_program_option, string) != 0) + if (use_compress_program_option + && strcmp (use_compress_program_option, string) != 0) USAGE_ERROR ((0, 0, _("Conflicting compression options"))); use_compress_program_option = string; @@ -566,13 +583,13 @@ for complete list of authors.\n")); " the Free Software Foundation; either version 2 of the License, or\n" " (at your option) any later version.\n" "\n" - " GNU Mailutils is distributed in the hope that it will be useful,\n" + " GNU tar is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" " GNU General Public License for more details.\n" "\n" " You should have received a copy of the GNU General Public License\n" - " along with GNU Mailutils; if not, write to the Free Software\n" + " along with GNU tar; if not, write to the Free Software\n" " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n")); exit (0); } @@ -723,6 +740,10 @@ parse_opt(int key, char *arg, struct argp_state *state) multi_volume_option = true; break; + + case 'n': + seekable_archive = true; + break; #if !MSDOS case 'N': @@ -733,7 +754,7 @@ parse_opt(int key, char *arg, struct argp_state *state) if (NEWER_OPTION_INITIALIZED (newer_mtime_option)) USAGE_ERROR ((0, 0, _("More than one threshold date"))); - if (FILESYSTEM_PREFIX_LEN (arg) != 0 + if (FILE_SYSTEM_PREFIX_LEN (arg) != 0 || ISSLASH (*arg) || *arg == '.') { @@ -897,7 +918,7 @@ parse_opt(int key, char *arg, struct argp_state *state) force_local_option = true; break; - case FORMAT_OPTION: + case 'H': set_archive_format (arg); break; @@ -1247,29 +1268,16 @@ find_argp_option (struct argp_option *options, int letter) !(options->name == NULL && options->key == 0 && options->arg == 0 - && options->flags + && options->flags == 0 && options->doc == NULL); options++) if (options->key == letter) return options; return NULL; } -/* FIXME: - - Available option letters are DEHIJQY 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) - I same as T (for compatibility with Solaris tar) - 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 */ - static void decode_options (int argc, char **argv) { - int optchar; /* option letter */ int index; struct tar_args args; @@ -1281,7 +1289,6 @@ decode_options (int argc, char **argv) args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); args.version_control_string = 0; args.input_files = 0; - subcommand_option = UNKNOWN_SUBCOMMAND; archive_format = DEFAULT_FORMAT;