From 84641942e5366b2e09367ba4f4376c99f15ecc8e Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Sun, 9 Nov 2008 17:21:26 +0000
Subject: apply post-1.12.1 patches, bump version to 1.12.2

---
 util-linux/getopt.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'util-linux')

diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 4026303..8b5e46c 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -142,7 +142,8 @@ static const char *normalize(const char *arg)
  * Other settings are found in global variables.
  */
 #if !ENABLE_GETOPT_LONG
-#define generate_output(argv,argc,optstr,longopts) generate_output(argv,argc,optstr)
+#define generate_output(argv,argc,optstr,longopts) \
+	generate_output(argv,argc,optstr)
 #endif
 static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts)
 {
@@ -156,14 +157,6 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
 	if (quiet_errors) /* No error reporting from getopt(3) */
 		opterr = 0;
 
-	/* Reset getopt(3) (see libbb/getopt32.c for long rant) */
-#ifdef __GLIBC__
-	optind = 0;
-#else /* BSD style */
-	optind = 1;
-	/* optreset = 1; */
-#endif
-
 	while (1) {
 		opt =
 #if ENABLE_GETOPT_LONG
-- 
cgit v1.1