GNU-like getopt_long() from NetBSD with changes by me to support

getopt_long_only().  At some point this should replace the BSD
getopt(3) but we are not there yet.

While I am here add protection from the multiple getopt() definitions
due to conflicting standards.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc
index 6b23e5cb2d..8f16135e99 100644
--- a/src/lib/libc/stdlib/Makefile.inc
+++ b/src/lib/libc/stdlib/Makefile.inc
@@ -4,10 +4,10 @@
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/stdlib ${LIBCSRCDIR}/stdlib
 
 SRCS+=  a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \
-        calloc.c cfree.c exit.c ecvt.c gcvt.c getenv.c getopt.c getsubopt.c \
-        heapsort.c l64a.c malloc.c merge.c multibyte.c putenv.c qsort.c \
-        radixsort.c rand.c random.c realpath.c setenv.c strtod.c strtol.c \
-        strtoll.c strtoul.c strtoull.c system.c tfind.c tsearch.c \
+        calloc.c cfree.c exit.c ecvt.c gcvt.c getenv.c getopt.c getopt_long.c \
+        getsubopt.c heapsort.c l64a.c malloc.c merge.c multibyte.c putenv.c =
+        qsort.c radixsort.c rand.c random.c realpath.c setenv.c strtod.c \
+        strtol.c strtoll.c strtoul.c strtoull.c system.c tfind.c tsearch.c \
         _rand48.c drand48.c erand48.c jrand48.c lcong48.c lrand48.c \
         mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c
 
@@ -33,13 +33,14 @@ SRCS+=	abs.c div.c labs.c ldiv.c
 .endif
 
 MAN+=   a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \
-        bsearch.3 div.3 ecvt.3 exit.3 getenv.3 getopt.3 getsubopt.3 labs.3 \
-        ldiv.3 malloc.3 memory.3 qabs.3 qdiv.3 qsort.3 radixsort.3 rand48.3 \
-        rand.3 random.3 realpath.3 strtod.3 strtol.3 strtoul.3 system.3 \
-        tsearch.3
+        bsearch.3 div.3 ecvt.3 exit.3 getenv.3 getopt.3 getopt_long.3 \
+        getsubopt.3 labs.3 ldiv.3 malloc.3 memory.3 qabs.3 qdiv.3 qsort.3 \
+        radixsort.3 rand48.3 rand.3 random.3 realpath.3 strtod.3 strtol.3 \
+        strtoul.3 system.3 tsearch.3
 
 MLINKS+=ecvt.3 fcvt.3 ecvt.3 gcvt.3
 MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
+MLINKS+=getopt_long.3 getopt_long_only.3
 MLINKS+=malloc.3 free.3 malloc.3 realloc.3 malloc.3 calloc.3
 MLINKS+=malloc.3 cfree.3 malloc.3 malloc.conf.5
 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3