X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Frmt.c;h=e4e8f44bc23e1eb8e99ecbe3420ebdd178220d6d;hb=257a4160e4490f7299f1f0f02b6c7c024d52c970;hp=8e9ad8433a8da83d333b17559a65110ae7ab4ded;hpb=db16e89362432f19368f0a7199b6c3395778b8cf;p=chaz%2Ftar

diff --git a/src/rmt.c b/src/rmt.c
index 8e9ad84..e4e8f44 100644
--- a/src/rmt.c
+++ b/src/rmt.c
@@ -32,6 +32,7 @@
 #include "system.h"
 #include "safe-read.h"
 
+#include <getopt.h>
 #include <sys/socket.h>
 
 #ifndef EXIT_FAILURE
@@ -203,7 +204,9 @@ decode_oflag (char const *oflag_string)
       struct name_value_pair { char const *name; int value; };
       static struct name_value_pair const table[] =
       {
+#ifdef O_APPEND
 	{"APPEND", O_APPEND},
+#endif
 	{"CREAT", O_CREAT},
 #ifdef O_DSYNC
 	{"DSYNC", O_DSYNC},
@@ -252,6 +255,34 @@ decode_oflag (char const *oflag_string)
   return symbolic_oflag;
 }
 
+static struct option const long_opts[] =
+{
+  {"help", no_argument, 0, 'h'},
+  {"version", no_argument, 0, 'v'},
+  {0, 0, 0, 0}
+};
+
+static void
+usage (int status)
+{
+  if (status != EXIT_SUCCESS)
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
+	     program_name);
+  else
+    {
+      printf (_("\
+Usage: %s [OPTION]\n\
+Manipulate a tape drive, accepting commands from a remote process.\n\
+\n\
+  --version  Output version info.\n\
+  --help  Output this help.\n"),
+	      program_name);
+      fputs (_("\nReport bugs to <bug-tar@gnu.org>.\n"), stdout);
+    }
+
+  exit (status);
+}
+
 /*---.
 | ?  |
 `---*/
@@ -271,12 +302,32 @@ main (int argc, char *const *argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  /* FIXME: Implement --help and --version as for any other GNU program.  */
+  switch (getopt_long (argc, argv, "", long_opts, NULL))
+    {
+    default:
+      usage (EXIT_FAILURE);
+      
+    case 'h':
+      usage (EXIT_SUCCESS);
+      
+    case 'v':
+      printf ("rmt (GNU %s) %s\n%s\n%s\n", PACKAGE, VERSION,
+	      "Copyright 1999 Free Software Foundation, Inc.",
+	      _("\
+This program comes with NO WARRANTY, to the extent permitted by law.\n\
+You may redistribute it under the terms of the GNU General Public License;\n\
+see the file named COPYING for details."));
+      return EXIT_SUCCESS;
+
+    case -1:
+      break;
+    }
 
-  argc--, argv++;
-  if (argc > 0)
+  if (optind < argc)
     {
-      debug_file = fopen (*argv, "w");
+      if (optind != argc - 1)
+	usage (EXIT_FAILURE);
+      debug_file = fopen (argv[optind], "w");
       if (debug_file == 0)
 	{
 	  report_numbered_error (errno);
@@ -286,10 +337,10 @@ main (int argc, char *const *argv)
     }
 
 top:
-  errno = 0;			/* FIXME: errno should be read-only */
+  errno = 0;
   status = 0;
   if (safe_read (STDIN_FILENO, &command, 1) != 1)
-    exit (EXIT_SUCCESS);
+    return EXIT_SUCCESS;
 
   switch (command)
     {