X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=6bd831ea17a2b015aebe9ac3e2c711309c1f6f6c;hb=75bf036edc1425eb66dcc9623846c7204f943ce6;hp=a01b62a60a8bd9abe480c40893941cf7b3ecca78;hpb=ba08e339a6e05e2a0d1432efdadd67ff2c63f834;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index a01b62a..6bd831e 100644 --- a/src/tar.c +++ b/src/tar.c @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "system.h" +#include #include #include @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -207,6 +208,7 @@ enum NUMERIC_OWNER_OPTION, OCCURRENCE_OPTION, OLD_ARCHIVE_OPTION, + ONE_FILE_SYSTEM_OPTION, OVERWRITE_OPTION, OWNER_OPTION, PAX_OPTION, @@ -233,7 +235,7 @@ enum WILDCARDS_MATCH_SLASH_OPTION }; -const char *argp_program_version = "tar (" PACKAGE ") " VERSION; +const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION; const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; static char doc[] = N_("GNU `tar' saves many files together into a single tape or disk archive, and can restore individual files from the archive.\n\ \n\ @@ -270,7 +272,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, @@ -448,9 +450,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, @@ -459,8 +461,9 @@ static struct argp_option options[] = { N_("exclude pattern wildcards do not match '/'"), 71 }, {"no-recursion", NO_RECURSION_OPTION, 0, 0, N_("avoid descending automatically in directories"), 71 }, - {"one-file-system", 'l', 0, 0, /* FIXME: emit warning */ + {"one-file-system", ONE_FILE_SYSTEM_OPTION, 0, 0, N_("stay in local file system when creating archive"), 71 }, + {NULL, 'l', 0, OPTION_HIDDEN, "", 71}, {"recursion", RECURSION_OPTION, 0, 0, N_("recurse into directories (default)"), 71 }, {"absolute-names", 'P', 0, 0, @@ -492,7 +495,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, @@ -527,7 +530,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 { @@ -544,10 +547,14 @@ static void show_default_settings (FILE *stream) { fprintf (stream, - "--format=%s -f%s -b%d --rmt-command=%s --rsh-command=%s\n", + "--format=%s -f%s -b%d --rmt-command=%s", archive_format_string (DEFAULT_ARCHIVE_FORMAT), DEFAULT_ARCHIVE, DEFAULT_BLOCKING, - DEFAULT_RMT_COMMAND, REMOTE_SHELL); + DEFAULT_RMT_COMMAND); +#ifdef REMOTE_SHELL + fprintf (stream, " --rsh-command=%s", REMOTE_SHELL); +#endif + fprintf (stream, "\n"); } static void @@ -583,13 +590,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); } @@ -713,9 +720,19 @@ parse_opt(int key, char *arg, struct argp_state *state) break; case 'l': + /* Historically equivalent to --one-file-system. This usage is + incompatible with UNIX98 and POSIX specs and therefore is + deprecated. The semantics of -l option will be changed in + future versions. See TODO. + */ + WARN ((0, 0, + _("Semantics of -l option will change in the future releases."))); + WARN ((0, 0, + _("Please use --one-file-system option instead."))); + /* FALL THROUGH */ + case ONE_FILE_SYSTEM_OPTION: /* When dumping directories, don't dump files/subdirectories - that are on other filesystems. */ - + that are on other filesystems. */ one_file_system_option = true; break; @@ -754,7 +771,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 == '.') { @@ -1060,7 +1077,7 @@ parse_opt(int key, char *arg, struct argp_state *state) break; case RMT_COMMAND_OPTION: - rmt_command_option = arg; + rmt_command = arg; break; case RSH_COMMAND_OPTION: @@ -1255,7 +1272,7 @@ static struct argp argp = { void usage (int status) { - argp_help (&argp, stderr, ARGP_HELP_SEE, program_name); + argp_help (&argp, stderr, ARGP_HELP_SEE, (char*) program_name); exit (status); } @@ -1268,7 +1285,7 @@ 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; @@ -1278,7 +1295,6 @@ find_argp_option (struct argp_option *options, int letter) static void decode_options (int argc, char **argv) { - int optchar; /* option letter */ int index; struct tar_args args; @@ -1290,7 +1306,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; @@ -1367,7 +1382,7 @@ decode_options (int argc, char **argv) if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP, &index, &args)) - exit (1); /* FIXME */ + exit (1); /* Special handling for 'o' option: @@ -1512,9 +1527,6 @@ decode_options (int argc, char **argv) if (utc_option) verbose_option = 2; - if (!rmt_command_option) - rmt_command_option = DEFAULT_RMT_COMMAND; - /* Forbid using -c with no input files whatsoever. Check that `-f -', explicit or implied, is used correctly. */ @@ -1582,10 +1594,7 @@ decode_options (int argc, char **argv) int main (int argc, char **argv) { -#if HAVE_CLOCK_GETTIME - if (clock_gettime (CLOCK_REALTIME, &start_timespec) != 0) -#endif - start_time = time (0); + set_start_time (); program_name = argv[0]; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR);