Started merging with cpio into paxutils.

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 36956e36ea902cc1200372d916607bf3b3d97ab7..87029a8e73b2dcd7cef16c67b87aa64f1b2b6486 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>
@@ -583,13 +584,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);
 }
@@ -1060,7 +1061,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 +1256,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 +1269,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;
@@ -1510,9 +1511,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 +1578,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);