.

2 files changed, 10 insertions, 78 deletions

diff --git a/src/basename.c b/src/basename.c
index c89b13c27..6fc11302e 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -38,10 +38,9 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <getopt.h>
 
-#include "version.h"
 #include "system.h"
+#include "long-options.h"
 
 char *basename ();
 void strip_trailing_slashes ();
@@ -51,19 +50,6 @@ static void remove_suffix ();
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
-static int show_help;
-
-/* If non-zero, print the version on standard output and exit.  */
-static int show_version;
-
-static struct option const long_options[] =
-{
-  {"help", no_argument, &show_help, 1},
-  {"version", no_argument, &show_version, 1},
-  {0, 0, 0, 0}
-};
-
 static void
 usage (status)
      int status;
@@ -89,40 +75,20 @@ main (argc, argv)
      char **argv;
 {
   char *name;
-  int c;
 
   program_name = argv[0];
 
-  while ((c = getopt_long (argc, argv, "", long_options, (int *) 0)) != EOF)
-    {
-      switch (c)
-	{
-	case 0:
-	  break;
-
-	default:
-	  usage (1);
-	}
-    }
-
-  if (show_version)
-    {
-      printf ("%s\n", version_string);
-      exit (0);
-    }
-
-  if (show_help)
-    usage (0);
+  parse_long_options (argc, argv, usage);
 
-  if (argc - optind == 0 || argc - optind > 2)
+  if (argc == 1 || argc > 3)
     usage (1);
 
-  strip_trailing_slashes (argv[optind]);
+  strip_trailing_slashes (argv[1]);
 
-  name = basename (argv[optind]);
+  name = basename (argv[1]);
 
   if (argc == 3)
-    remove_suffix (name, argv[optind + 1]);
+    remove_suffix (name, argv[2]);
 
   puts (name);
 
diff --git a/src/dirname.c b/src/dirname.c
index b615ba13d..a0345be7a 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -30,29 +30,15 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <getopt.h>
 
-#include "version.h"
 #include "system.h"
+#include "long-options.h"
 
 void strip_trailing_slashes ();
 
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
-static int show_help;
-
-/* If non-zero, print the version on standard output and exit.  */
-static int show_version;
-
-static struct option const long_options[] =
-{
-  {"help", no_argument, &show_help, 1},
-  {"version", no_argument, &show_version, 1},
-  {0, 0, 0, 0}
-};
-
 static void
 usage (status)
      int status;
@@ -79,35 +65,15 @@ main (argc, argv)
 {
   register char *path;
   register char *slash;
-  int c;
 
   program_name = argv[0];
 
-  while ((c = getopt_long (argc, argv, "", long_options, (int *) 0)) != EOF)
-    {
-      switch (c)
-	{
-	case 0:
-	  break;
-
-	default:
-	  usage (1);
-	}
-    }
-
-  if (show_version)
-    {
-      printf ("%s\n", version_string);
-      exit (0);
-    }
-
-  if (show_help)
-    usage (0);
+  parse_long_options (argc, argv, usage);
 
-  if (argc - optind != 1)
+  if (argc != 2)
     usage (1);
 
-  path = argv[optind];
+  path = argv[1];
   strip_trailing_slashes (path);
 
   slash = rindex (path, '/');