From 82ff19e279cc8fae158947314e8c07034dd5b1e5 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Fri, 3 Mar 2006 21:21:33 +0000
Subject: Rename getopt_long-susv3 to -simple

---
 libc/unistd/Makefile.in          |  4 +--
 libc/unistd/getopt_long-simple.c | 58 ++++++++++++++++++++++++++++++++++++++++
 libc/unistd/getopt_long-susv3.c  | 58 ----------------------------------------
 3 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 libc/unistd/getopt_long-simple.c
 delete mode 100644 libc/unistd/getopt_long-susv3.c

(limited to 'libc')

diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in
index 6e85e10c9..8095aa641 100644
--- a/libc/unistd/Makefile.in
+++ b/libc/unistd/Makefile.in
@@ -19,11 +19,11 @@ CSRC := $(filter-out daemon.c,$(CSRC))
 endif
 
 ifeq ($(UCLIBC_HAS_GNU_GETOPT),y)
-CSRC := $(filter-out getopt-susv3.c getopt_long-susv3.c,$(CSRC))
+CSRC := $(filter-out getopt-susv3.c getopt_long-simple.c,$(CSRC))
 else
 CSRC := $(filter-out getopt.c,$(CSRC))
 ifneq ($(UCLIBC_HAS_GETOPT_LONG),y)
-CSRC := $(filter-out getopt_long-susv3.c,$(CSRC))
+CSRC := $(filter-out getopt_long-simple.c,$(CSRC))
 endif
 endif
 
diff --git a/libc/unistd/getopt_long-simple.c b/libc/unistd/getopt_long-simple.c
new file mode 100644
index 000000000..2dae341a3
--- /dev/null
+++ b/libc/unistd/getopt_long-simple.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2006 Rich Felker <dalias@aerifal.cx>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#include <stddef.h>
+#include <getopt.h>
+#include <stdio.h>
+
+libc_hidden_proto(getopt)
+
+static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
+{
+	if (optind >= argc || !argv[optind] || argv[optind][0] != '-') return -1;
+	if ((longonly && argv[optind][1]) ||
+		(argv[optind][1] == '-' && argv[optind][2]))
+	{
+		int i;
+		for (i=0; longopts[i].name; i++) {
+			const char *name = longopts[i].name;
+			char *opt = argv[optind]+2;
+			while (*name && *name++ == *opt++);
+			if (*name || (*opt && *opt != '=')) continue;
+			if (*opt == '=') {
+				if (!longopts[i].has_arg) continue;
+				optarg = opt+1;
+			} else {
+				if (longopts[i].has_arg == required_argument) {
+					if (!(optarg = argv[++optind]))
+						return ':';
+				} else optarg = NULL;
+			}
+			optind++;
+			if (idx) *idx = i;
+			if (longopts[i].flag) {
+				*longopts[i].flag = longopts[i].val;
+				return 0;
+			}
+			return longopts[i].val;
+		}
+		if (argv[optind][1] == '-') {
+			optind++;
+			return '?';
+		}
+	}
+	return getopt(argc, argv, optstring);
+}
+
+int getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
+{
+	return __getopt_long(argc, argv, optstring, longopts, idx, 0);
+}
+
+int getopt_long_only(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
+{
+	return __getopt_long(argc, argv, optstring, longopts, idx, 1);
+}
diff --git a/libc/unistd/getopt_long-susv3.c b/libc/unistd/getopt_long-susv3.c
deleted file mode 100644
index 2dae341a3..000000000
--- a/libc/unistd/getopt_long-susv3.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2006 Rich Felker <dalias@aerifal.cx>
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-
-#include <stddef.h>
-#include <getopt.h>
-#include <stdio.h>
-
-libc_hidden_proto(getopt)
-
-static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
-{
-	if (optind >= argc || !argv[optind] || argv[optind][0] != '-') return -1;
-	if ((longonly && argv[optind][1]) ||
-		(argv[optind][1] == '-' && argv[optind][2]))
-	{
-		int i;
-		for (i=0; longopts[i].name; i++) {
-			const char *name = longopts[i].name;
-			char *opt = argv[optind]+2;
-			while (*name && *name++ == *opt++);
-			if (*name || (*opt && *opt != '=')) continue;
-			if (*opt == '=') {
-				if (!longopts[i].has_arg) continue;
-				optarg = opt+1;
-			} else {
-				if (longopts[i].has_arg == required_argument) {
-					if (!(optarg = argv[++optind]))
-						return ':';
-				} else optarg = NULL;
-			}
-			optind++;
-			if (idx) *idx = i;
-			if (longopts[i].flag) {
-				*longopts[i].flag = longopts[i].val;
-				return 0;
-			}
-			return longopts[i].val;
-		}
-		if (argv[optind][1] == '-') {
-			optind++;
-			return '?';
-		}
-	}
-	return getopt(argc, argv, optstring);
-}
-
-int getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
-{
-	return __getopt_long(argc, argv, optstring, longopts, idx, 0);
-}
-
-int getopt_long_only(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
-{
-	return __getopt_long(argc, argv, optstring, longopts, idx, 1);
-}
-- 
cgit v1.2.3