From: Jim Meyering <jim@meyering.net>
Date: Wed, 31 Mar 1999 05:52:46 +0000 (+0000)
Subject: No longer include long-options.h.
X-Git-Tag: v2.22-rc1~347^2~10^2~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d6cfd6169b099e76f77ecd2c578a3b4e5ee925b;p=thirdparty%2Futil-linux.git

No longer include long-options.h.
[long_options]: Add entries for --help and --version.
Remove parse_long_options call.
(main) [getopt switch]: Add a case for each of --help and --version.
---

diff --git a/login-utils/su.c b/login-utils/su.c
index ec18c0f15e..0f5efd22d8 100644
--- a/login-utils/su.c
+++ b/login-utils/su.c
@@ -82,7 +82,6 @@
 #define getusershell _getusershell_sys_proto_
 
 #include "system.h"
-#include "long-options.h"
 
 #undef getusershell
 
@@ -174,6 +173,8 @@ static struct option const longopts[] =
   {"login", no_argument, NULL, 'l'},
   {"preserve-environment", no_argument, &change_environment, 0},
   {"shell", required_argument, 0, 's'},
+  {GETOPT_HELP_OPTION_DECL},
+  {GETOPT_VERSION_OPTION_DECL},
   {0, 0, 0, 0}
 };
 
@@ -465,9 +466,6 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
-
   fast_startup = 0;
   simulate_login = 0;
   change_environment = 1;
@@ -500,6 +498,10 @@ main (int argc, char **argv)
 	  shell = optarg;
 	  break;
 
+	case_GETOPT_HELP_CHAR;
+
+	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+
 	default:
 	  usage (1);
 	}