Normalized use of remove_any_file().

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 78638d02c3aacd2616e484c76c23f9e7408c9416..6bd831ea17a2b015aebe9ac3e2c711309c1f6f6c 100644 (file)
--- 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 <system.h>
 
 #include <fnmatch.h>
 #include <argp.h>
@@ -38,6 +38,7 @@
 
 #include <getdate.h>
 #include <localedir.h>
+#include <rmt.h>
 #include <prepargs.h>
 #include <quotearg.h>
 #include <xstrtol.h>
@@ -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\
@@ -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,
@@ -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
@@ -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;
       
@@ -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);
 }
 
@@ -1365,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:
@@ -1510,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.  */
 
@@ -1580,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);