Libc-391.4.1.tar.gz

[apple/libc.git] / stdlib / FreeBSD / getopt_long.c

diff --git a/stdlib/FreeBSD/getopt_long.c b/stdlib/FreeBSD/getopt_long.c
index 6ea873c554c30613834dba93f503c9e633890646..ef306bc2ab135a4187c44f6e24bda6c39c9e5ea9 100644 (file)
--- a/stdlib/FreeBSD/getopt_long.c
+++ b/stdlib/FreeBSD/getopt_long.c
@@ -1,6 +1,25 @@
+/*     $OpenBSD: getopt_long.c,v 1.17 2004/06/03 18:46:52 millert Exp $        */

 /*     $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $      */
 /*     $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $      */

-/*     $FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.2 2002/10/16 22:18:42 alfred Exp $ */

 
 

+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */

 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.


@@ -37,64 +56,58 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#include <sys/cdefs.h>
+#if 0

 #if defined(LIBC_SCCS) && !defined(lint)
 #if defined(LIBC_SCCS) && !defined(lint)

-__RCSID("$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $");
+static char *rcsid = "$OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert Exp $";

 #endif /* LIBC_SCCS and not lint */
 #endif /* LIBC_SCCS and not lint */

+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.12 2004/07/06 13:58:45 ache Exp $");

 
 

-#include "namespace.h"
-
-#include <assert.h>

 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 

-/* not part of the original file */
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(X)
-#endif
+#define GNU_COMPATIBLE         /* Be more compatible, configure's use us! */

 
 

-#if HAVE_CONFIG_H && !HAVE_GETOPT_LONG && !HAVE_DECL_OPTIND
-#define REPLACE_GETOPT
+#ifndef GNU_COMPATIBLE
+#define        REPLACE_GETOPT          /* use this getopt as the system getopt(3) */

 #endif
 
 #ifdef REPLACE_GETOPT
 #endif
 
 #ifdef REPLACE_GETOPT

-#ifdef __weak_alias
-__weak_alias(getopt,_getopt)
-#endif

 int    opterr = 1;             /* if error message should be printed */
 int    optind = 1;             /* index into parent argv vector */
 int    optopt = '?';           /* character checked for validity */
 int    optreset;               /* reset getopt */
 char    *optarg;               /* argument associated with option */
 int    opterr = 1;             /* if error message should be printed */
 int    optind = 1;             /* index into parent argv vector */
 int    optopt = '?';           /* character checked for validity */
 int    optreset;               /* reset getopt */
 char    *optarg;               /* argument associated with option */

-#elif HAVE_CONFIG_H && !HAVE_DECL_OPTRESET
-static int optreset;

 #endif
 
 #endif
 

-#ifdef __weak_alias
-__weak_alias(getopt_long,_getopt_long)
-#endif
+#define PRINT_ERROR    ((opterr) && (*options != ':'))

 
 

-#if !HAVE_GETOPT_LONG
-#define IGNORE_FIRST   (*options == '-' || *options == '+')
-#define PRINT_ERROR    ((opterr) && ((*options != ':') \
-                                     || (IGNORE_FIRST && options[1] != ':')))
-#define IS_POSIXLY_CORRECT (getenv("POSIXLY_CORRECT") != NULL)
-#define PERMUTE         (!IS_POSIXLY_CORRECT && !IGNORE_FIRST)
-/* XXX: GNU ignores PC if *options == '-' */
-#define IN_ORDER        (!IS_POSIXLY_CORRECT && *options == '-')
+#define FLAG_PERMUTE   0x01    /* permute non-options to the end of argv */
+#define FLAG_ALLARGS   0x02    /* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY  0x04    /* operate as getopt_long_only */

 
 /* return values */
 
 /* return values */

-#define        BADCH   (int)'?'
-#define        BADARG          ((IGNORE_FIRST && options[1] == ':') \
-                        || (*options == ':') ? (int)':' : (int)'?')
-#define INORDER (int)1
+#define        BADCH           (int)'?'
+#define        BADARG          ((*options == ':') ? (int)':' : (int)'?')
+#define        INORDER         (int)1
+
+#define        EMSG            ""

 
 

-#define        EMSG    ""
+#ifdef GNU_COMPATIBLE
+#define NO_PREFIX      (-1)
+#define D_PREFIX       0
+#define DD_PREFIX      1
+#define W_PREFIX       2
+#endif

 
 

-static int getopt_internal(int, char * const *, const char *);
+static int getopt_internal(int, char * const *, const char *,
+                          const struct option *, int *, int);
+static int parse_long_options(char * const *, const char *,
+                             const struct option *, int *, int, int);

 static int gcd(int, int);
 static void permute_args(int, int, int, char * const *);
 
 static int gcd(int, int);
 static void permute_args(int, int, int, char * const *);
 


@@ -106,20 +119,27 @@ static int nonopt_end = -1;   /* first option after non options (for permute) */
 
 /* Error messages */
 static const char recargchar[] = "option requires an argument -- %c";
 
 /* Error messages */
 static const char recargchar[] = "option requires an argument -- %c";

+static const char illoptchar[] = "illegal option -- %c"; /* From P1003.2 */
+#ifdef GNU_COMPATIBLE
+static int dash_prefix = NO_PREFIX;
+static const char gnuoptchar[] = "invalid option -- %c";
+
+static const char recargstring[] = "option `%s%s' requires an argument";
+static const char ambig[] = "option `%s%.*s' is ambiguous";
+static const char noarg[] = "option `%s%.*s' doesn't allow an argument";
+static const char illoptstring[] = "unrecognized option `%s%s'";
+#else

 static const char recargstring[] = "option requires an argument -- %s";
 static const char ambig[] = "ambiguous option -- %.*s";
 static const char noarg[] = "option doesn't take an argument -- %.*s";
 static const char recargstring[] = "option requires an argument -- %s";
 static const char ambig[] = "ambiguous option -- %.*s";
 static const char noarg[] = "option doesn't take an argument -- %.*s";

-static const char illoptchar[] = "unknown option -- %c";

 static const char illoptstring[] = "unknown option -- %s";
 static const char illoptstring[] = "unknown option -- %s";

-
+#endif

 
 /*
  * Compute the greatest common divisor of a and b.
  */
 static int
 
 /*
  * Compute the greatest common divisor of a and b.
  */
 static int

-gcd(a, b)
-       int a;
-       int b;
+gcd(int a, int b)

 {
        int c;
 
 {
        int c;
 


@@ -129,8 +149,8 @@ gcd(a, b)
                b = c;
                c = a % b;
        }
                b = c;
                c = a % b;
        }

-          
-       return b;
+
+       return (b);

 }
 
 /*
 }
 
 /*


@@ -139,17 +159,12 @@ gcd(a, b)
  * in each block).
  */
 static void
  * in each block).
  */
 static void

-permute_args(panonopt_start, panonopt_end, opt_end, nargv)
-       int panonopt_start;
-       int panonopt_end;
-       int opt_end;
-       char * const *nargv;
+permute_args(int panonopt_start, int panonopt_end, int opt_end,
+       char * const *nargv)

 {
        int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
        char *swap;
 
 {
        int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
        char *swap;
 

-       _DIAGASSERT(nargv != NULL);
-

        /*
         * compute lengths of blocks and number and size of cycles
         */
        /*
         * compute lengths of blocks and number and size of cycles
         */


@@ -175,33 +190,214 @@ permute_args(panonopt_start, panonopt_end, opt_end, nargv)
        }
 }
 
        }
 }
 

+/*
+ * parse_long_options --
+ *     Parse long options in argc/argv argument vector.
+ * Returns -1 if short_too is set and the option does not match long_options.
+ */
+static int
+parse_long_options(char * const *nargv, const char *options,
+       const struct option *long_options, int *idx, int short_too, int flags)
+{
+       char *current_argv, *has_equal;
+#ifdef GNU_COMPATIBLE
+       char *current_dash;
+#endif
+       size_t current_argv_len;
+       int i, match, exact_match, second_partial_match;
+
+       current_argv = place;
+#ifdef GNU_COMPATIBLE
+       switch (dash_prefix) {
+               case D_PREFIX:
+                       current_dash = "-";
+                       break;
+               case DD_PREFIX:
+                       current_dash = "--";
+                       break;
+               case W_PREFIX:
+                       current_dash = "-W ";
+                       break;
+               default:
+                       current_dash = "";
+                       break;
+       }
+#endif
+       match = -1;
+       exact_match = 0;
+       second_partial_match = 0;
+
+       optind++;
+
+       if ((has_equal = strchr(current_argv, '=')) != NULL) {
+               /* argument found (--option=arg) */
+               current_argv_len = has_equal - current_argv;
+               has_equal++;
+       } else
+               current_argv_len = strlen(current_argv);
+
+       for (i = 0; long_options[i].name; i++) {
+               /* find matching long option */
+               if (strncmp(current_argv, long_options[i].name,
+                   current_argv_len))
+                       continue;
+
+               if (strlen(long_options[i].name) == current_argv_len) {
+                       /* exact match */
+                       match = i;
+                       exact_match = 1;
+                       break;
+               }
+               /*
+                * If this is a known short option, don't allow
+                * a partial match of a single character.
+                */
+               if (short_too && current_argv_len == 1)
+                       continue;
+
+               if (match == -1)        /* first partial match */
+                       match = i;
+               else if ((flags & FLAG_LONGONLY) ||
+                        long_options[i].has_arg !=
+                            long_options[match].has_arg ||
+                        long_options[i].flag != long_options[match].flag ||
+                        long_options[i].val != long_options[match].val)
+                       second_partial_match = 1;
+       }
+       if (!exact_match && second_partial_match) {
+               /* ambiguous abbreviation */
+               if (PRINT_ERROR)
+                       warnx(ambig,
+#ifdef GNU_COMPATIBLE
+                            current_dash,
+#endif
+                            (int)current_argv_len,
+                            current_argv);
+               optopt = 0;
+               return (BADCH);
+       }
+       if (match != -1) {              /* option found */
+               if (long_options[match].has_arg == no_argument
+                   && has_equal) {
+                       if (PRINT_ERROR)
+                               warnx(noarg,
+#ifdef GNU_COMPATIBLE
+                                    current_dash,
+#endif
+                                    (int)current_argv_len,
+                                    current_argv);
+                       /*
+                        * XXX: GNU sets optopt to val regardless of flag
+                        */
+                       if (long_options[match].flag == NULL)
+                               optopt = long_options[match].val;
+                       else
+                               optopt = 0;
+#ifdef GNU_COMPATIBLE
+                       return (BADCH);
+#else
+                       return (BADARG);
+#endif
+               }
+               if (long_options[match].has_arg == required_argument ||
+                   long_options[match].has_arg == optional_argument) {
+                       if (has_equal)
+                               optarg = has_equal;
+                       else if (long_options[match].has_arg ==
+                           required_argument) {
+                               /*
+                                * optional argument doesn't use next nargv
+                                */
+                               optarg = nargv[optind++];
+                       }
+               }
+               if ((long_options[match].has_arg == required_argument)
+                   && (optarg == NULL)) {
+                       /*
+                        * Missing argument; leading ':' indicates no error
+                        * should be generated.
+                        */
+                       if (PRINT_ERROR)
+                               warnx(recargstring,
+#ifdef GNU_COMPATIBLE
+                                   current_dash,
+#endif
+                                   current_argv);
+                       /*
+                        * XXX: GNU sets optopt to val regardless of flag
+                        */
+                       if (long_options[match].flag == NULL)
+                               optopt = long_options[match].val;
+                       else
+                               optopt = 0;
+                       --optind;
+                       return (BADARG);
+               }
+       } else {                        /* unknown option */
+               if (short_too) {
+                       --optind;
+                       return (-1);
+               }
+               if (PRINT_ERROR)
+                       warnx(illoptstring,
+#ifdef GNU_COMPATIBLE
+                             current_dash,
+#endif
+                             current_argv);
+               optopt = 0;
+               return (BADCH);
+       }
+       if (idx)
+               *idx = match;
+       if (long_options[match].flag) {
+               *long_options[match].flag = long_options[match].val;
+               return (0);
+       } else
+               return (long_options[match].val);
+}
+

 /*
  * getopt_internal --
  *     Parse argc/argv argument vector.  Called by user level routines.
 /*
  * getopt_internal --
  *     Parse argc/argv argument vector.  Called by user level routines.

- *  Returns -2 if -- is found (can be long option or end of options marker).

  */
 static int
  */
 static int

-getopt_internal(nargc, nargv, options)
-       int nargc;
-       char * const *nargv;
-       const char *options;
+getopt_internal(int nargc, char * const *nargv, const char *options,
+       const struct option *long_options, int *idx, int flags)

 {
        char *oli;                              /* option letter list index */
 {
        char *oli;                              /* option letter list index */

-       int optchar;
+       int optchar, short_too;
+       int posixly_correct;

 
 

-       _DIAGASSERT(nargv != NULL);
-       _DIAGASSERT(options != NULL);
+       if (options == NULL)
+               return (-1);

 
 

-       optarg = NULL;
+       /*
+        * Disable GNU extensions if POSIXLY_CORRECT is set or options
+        * string begins with a '+'.
+        */
+       posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+#ifdef GNU_COMPATIBLE
+       if (*options == '-')
+               flags |= FLAG_ALLARGS;
+       else if (posixly_correct || *options == '+')
+               flags &= ~FLAG_PERMUTE;
+#else
+       if (posixly_correct || *options == '+')
+               flags &= ~FLAG_PERMUTE;
+       else if (*options == '-')
+               flags |= FLAG_ALLARGS;
+#endif
+       if (*options == '+' || *options == '-')
+               options++;

 
        /*
 
        /*

-        * XXX Some programs (like rsyncd) expect to be able to
-        * XXX re-initialize optind to 0 and have getopt_long(3)
-        * XXX properly function again.  Work around this braindamage.
+        * XXX Some GNU programs (like cvs) set optind to 0 instead of
+        * XXX using optreset.  Work around this braindamage.

         */
        if (optind == 0)
         */
        if (optind == 0)

-               optind = 1;
+               optind = optreset = 1;

 
 

+       optarg = NULL;

        if (optreset)
                nonopt_start = nonopt_end = -1;
 start:
        if (optreset)
                nonopt_start = nonopt_end = -1;
 start:


@@ -223,25 +419,29 @@ start:
                                optind = nonopt_start;
                        }
                        nonopt_start = nonopt_end = -1;
                                optind = nonopt_start;
                        }
                        nonopt_start = nonopt_end = -1;

-                       return -1;
+                       return (-1);

                }
                }

-               if ((*(place = nargv[optind]) != '-')
-                   || (place[1] == '\0')) {    /* found non-option */
-                       place = EMSG;
-                       if (IN_ORDER) {
+               if (*(place = nargv[optind]) != '-' ||
+#ifdef GNU_COMPATIBLE
+                   place[1] == '\0') {
+#else
+                   (place[1] == '\0' && strchr(options, '-') == NULL)) {
+#endif
+                       place = EMSG;           /* found non-option */
+                       if (flags & FLAG_ALLARGS) {

                                /*
                                /*

-                                * GNU extension: 
+                                * GNU extension:

                                 * return non-option as argument to option 1
                                 */
                                optarg = nargv[optind++];
                                 * return non-option as argument to option 1
                                 */
                                optarg = nargv[optind++];

-                               return INORDER;
+                               return (INORDER);

                        }
                        }

-                       if (!PERMUTE) {
+                       if (!(flags & FLAG_PERMUTE)) {

                                /*
                                /*

-                                * if no permutation wanted, stop parsing
-                                * at first non-option
+                                * If no permutation wanted, stop parsing
+                                * at first non-option.

                                 */
                                 */

-                               return -1;
+                               return (-1);

                        }
                        /* do permutation */
                        if (nonopt_start == -1)
                        }
                        /* do permutation */
                        if (nonopt_start == -1)


@@ -259,39 +459,97 @@ start:
                }
                if (nonopt_start != -1 && nonopt_end == -1)
                        nonopt_end = optind;
                }
                if (nonopt_start != -1 && nonopt_end == -1)
                        nonopt_end = optind;

-               if (place[1] && *++place == '-') {      /* found "--" */
-                       place++;
-                       return -2;
+
+               /*
+                * If we have "-" do nothing, if "--" we are done.
+                */
+               if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+                       optind++;
+                       place = EMSG;
+                       /*
+                        * We found an option (--), so if we skipped
+                        * non-options, we have to permute.
+                        */
+                       if (nonopt_end != -1) {
+                               permute_args(nonopt_start, nonopt_end,
+                                   optind, nargv);
+                               optind -= nonopt_end - nonopt_start;
+                       }
+                       nonopt_start = nonopt_end = -1;
+                       return (-1);

                }
        }
                }
        }

+
+       /*
+        * Check long options if:
+        *  1) we were passed some
+        *  2) the arg is not just "-"
+        *  3) either the arg starts with -- we are getopt_long_only()
+        */
+       if (long_options != NULL && place != nargv[optind] &&
+           (*place == '-' || (flags & FLAG_LONGONLY))) {
+               short_too = 0;
+#ifdef GNU_COMPATIBLE
+               dash_prefix = D_PREFIX;
+#endif
+               if (*place == '-') {
+                       place++;                /* --foo long option */
+#ifdef GNU_COMPATIBLE
+                       dash_prefix = DD_PREFIX;
+#endif
+               } else if (*place != ':' && strchr(options, *place) != NULL)
+                       short_too = 1;          /* could be short option too */
+
+               optchar = parse_long_options(nargv, options, long_options,
+                   idx, short_too, flags);
+               if (optchar != -1) {
+                       place = EMSG;
+                       return (optchar);
+               }
+       }
+

        if ((optchar = (int)*place++) == (int)':' ||
        if ((optchar = (int)*place++) == (int)':' ||

-           (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
-               /* option letter unknown or ':' */
+           (optchar == (int)'-' && *place != '\0') ||
+           (oli = strchr(options, optchar)) == NULL) {
+               /*
+                * If the user specified "-" and  '-' isn't listed in
+                * options, return -1 (non-option) as per POSIX.
+                * Otherwise, it is an unknown option character (or ':').
+                */
+               if (optchar == (int)'-' && *place == '\0')
+                       return (-1);

                if (!*place)
                        ++optind;
                if (!*place)
                        ++optind;

+#ifdef GNU_COMPATIBLE
+               if (PRINT_ERROR)
+                       warnx(posixly_correct ? illoptchar : gnuoptchar,
+                             optchar);
+#else

                if (PRINT_ERROR)
                        warnx(illoptchar, optchar);
                if (PRINT_ERROR)
                        warnx(illoptchar, optchar);

+#endif

                optopt = optchar;
                optopt = optchar;

-               return BADCH;
+               return (BADCH);

        }
        }

-       if (optchar == 'W' && oli[1] == ';') {          /* -W long-option */
-               /* XXX: what if no long options provided (called by getopt)? */
-               if (*place) 
-                       return -2;
-
-               if (++optind >= nargc) {        /* no arg */
+       if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+               /* -W long-option */
+               if (*place)                     /* no space */
+                       /* NOTHING */;
+               else if (++optind >= nargc) {   /* no arg */

                        place = EMSG;
                        if (PRINT_ERROR)
                                warnx(recargchar, optchar);
                        optopt = optchar;
                        place = EMSG;
                        if (PRINT_ERROR)
                                warnx(recargchar, optchar);
                        optopt = optchar;

-                       return BADARG;
+                       return (BADARG);

                } else                          /* white space */
                        place = nargv[optind];
                } else                          /* white space */
                        place = nargv[optind];

-               /*
-                * Handle -W arg the same as --arg (which causes getopt to
-                * stop parsing).
-                */
-               return -2;
+#ifdef GNU_COMPATIBLE
+               dash_prefix = W_PREFIX;
+#endif
+               optchar = parse_long_options(nargv, options, long_options,
+                   idx, 0, flags);
+               place = EMSG;
+               return (optchar);

        }
        if (*++oli != ':') {                    /* doesn't take argument */
                if (!*place)
        }
        if (*++oli != ':') {                    /* doesn't take argument */
                if (!*place)


@@ -307,15 +565,23 @@ start:
                                if (PRINT_ERROR)
                                        warnx(recargchar, optchar);
                                optopt = optchar;
                                if (PRINT_ERROR)
                                        warnx(recargchar, optchar);
                                optopt = optchar;

-                               return BADARG;
+                               return (BADARG);

                        } else
                                optarg = nargv[optind];
                        } else
                                optarg = nargv[optind];

+               } else if (!(flags & FLAG_PERMUTE)) {
+                       /*
+                        * If permutation is disabled, we can accept an
+                        * optional arg separated by whitespace so long
+                        * as it does not start with a dash (-).
+                        */
+                       if (optind + 1 < nargc && *nargv[optind + 1] != '-')
+                               optarg = nargv[++optind];

                }
                place = EMSG;
                ++optind;
        }
        /* dump back option letter */
                }
                place = EMSG;
                ++optind;
        }
        /* dump back option letter */

-       return optchar;
+       return (optchar);

 }
 
 #ifdef REPLACE_GETOPT
 }
 
 #ifdef REPLACE_GETOPT


@@ -323,36 +589,23 @@ start:
  * getopt --
  *     Parse argc/argv argument vector.
  *
  * getopt --
  *     Parse argc/argv argument vector.
  *

- * [eventually this will replace the real getopt]
+ * [eventually this will replace the BSD getopt]

  */
 int
  */
 int

-getopt(nargc, nargv, options)
-       int nargc;
-       char * const *nargv;
-       const char *options;
+getopt(int nargc, char * const *nargv, const char *options)

 {
 {

-       int retval;
-
-       _DIAGASSERT(nargv != NULL);
-       _DIAGASSERT(options != NULL);

 
 

-       if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
-               ++optind;
-               /*
-                * We found an option (--), so if we skipped non-options,
-                * we have to permute.
-                */
-               if (nonopt_end != -1) {
-                       permute_args(nonopt_start, nonopt_end, optind,
-                                      nargv);
-                       optind -= nonopt_end - nonopt_start;
-               }
-               nonopt_start = nonopt_end = -1;
-               retval = -1;
-       }
-       return retval;
+       /*
+        * We don't pass FLAG_PERMUTE to getopt_internal() since
+        * the BSD getopt(3) (unlike GNU) has never done this.
+        *
+        * Furthermore, since many privileged programs call getopt()
+        * before dropping privileges it makes sense to keep things
+        * as simple (and bug-free) as possible.
+        */
+       return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));

 }
 }

-#endif
+#endif /* REPLACE_GETOPT */

 
 /*
  * getopt_long --
 
 /*
  * getopt_long --


@@ -366,129 +619,24 @@ getopt_long(nargc, nargv, options, long_options, idx)
        const struct option *long_options;
        int *idx;
 {
        const struct option *long_options;
        int *idx;
 {

-       int retval;
-
-       _DIAGASSERT(nargv != NULL);
-       _DIAGASSERT(options != NULL);
-       _DIAGASSERT(long_options != NULL);
-       /* idx may be NULL */

 
 

-       if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
-               char *current_argv, *has_equal;
-               size_t current_argv_len;
-               int i, match;
-
-               current_argv = place;
-               match = -1;
+       return (getopt_internal(nargc, nargv, options, long_options, idx,
+           FLAG_PERMUTE));
+}

 
 

-               optind++;
-               place = EMSG;
+/*
+ * getopt_long_only --
+ *     Parse argc/argv argument vector.
+ */
+int
+getopt_long_only(nargc, nargv, options, long_options, idx)
+       int nargc;
+       char * const *nargv;
+       const char *options;
+       const struct option *long_options;
+       int *idx;
+{

 
 

-               if (*current_argv == '\0') {            /* found "--" */
-                       /*
-                        * We found an option (--), so if we skipped
-                        * non-options, we have to permute.
-                        */
-                       if (nonopt_end != -1) {
-                               permute_args(nonopt_start, nonopt_end,
-                                   optind, nargv);
-                               optind -= nonopt_end - nonopt_start;
-                       }
-                       nonopt_start = nonopt_end = -1;
-                       return -1;
-               }
-               if ((has_equal = strchr(current_argv, '=')) != NULL) {
-                       /* argument found (--option=arg) */
-                       current_argv_len = has_equal - current_argv;
-                       has_equal++;
-               } else
-                       current_argv_len = strlen(current_argv);
-           
-               for (i = 0; long_options[i].name; i++) {
-                       /* find matching long option */
-                       if (strncmp(current_argv, long_options[i].name,
-                           current_argv_len))
-                               continue;
-
-                       if (strlen(long_options[i].name) ==
-                           (unsigned)current_argv_len) {
-                               /* exact match */
-                               match = i;
-                               break;
-                       }
-                       if (match == -1)                /* partial match */
-                               match = i;
-                       else {
-                               /* ambiguous abbreviation */
-                               if (PRINT_ERROR)
-                                       warnx(ambig, (int)current_argv_len,
-                                            current_argv);
-                               optopt = 0;
-                               return BADCH;
-                       }
-               }
-               if (match != -1) {                      /* option found */
-                       if (long_options[match].has_arg == no_argument
-                           && has_equal) {
-                               if (PRINT_ERROR)
-                                       warnx(noarg, (int)current_argv_len,
-                                            current_argv);
-                               /*
-                                * XXX: GNU sets optopt to val regardless of
-                                * flag
-                                */
-                               if (long_options[match].flag == NULL)
-                                       optopt = long_options[match].val;
-                               else
-                                       optopt = 0;
-                               return BADARG;
-                       }
-                       if (long_options[match].has_arg == required_argument ||
-                           long_options[match].has_arg == optional_argument) {
-                               if (has_equal)
-                                       optarg = has_equal;
-                               else if (long_options[match].has_arg ==
-                                   required_argument) {
-                                       /*
-                                        * optional argument doesn't use
-                                        * next nargv
-                                        */
-                                       optarg = nargv[optind++];
-                               }
-                       }
-                       if ((long_options[match].has_arg == required_argument)
-                           && (optarg == NULL)) {
-                               /*
-                                * Missing argument; leading ':'
-                                * indicates no error should be generated
-                                */
-                               if (PRINT_ERROR)
-                                       warnx(recargstring, current_argv);
-                               /*
-                                * XXX: GNU sets optopt to val regardless
-                                * of flag
-                                */
-                               if (long_options[match].flag == NULL)
-                                       optopt = long_options[match].val;
-                               else
-                                       optopt = 0;
-                               --optind;
-                               return BADARG;
-                       }
-               } else {                        /* unknown option */
-                       if (PRINT_ERROR)
-                               warnx(illoptstring, current_argv);
-                       optopt = 0;
-                       return BADCH;
-               }
-               if (long_options[match].flag) {
-                       *long_options[match].flag = long_options[match].val;
-                       retval = 0;
-               } else 
-                       retval = long_options[match].val;
-               if (idx)
-                       *idx = match;
-       }
-       return retval;
+       return (getopt_internal(nargc, nargv, options, long_options, idx,
+           FLAG_PERMUTE|FLAG_LONGONLY));

 }
 }

-#endif /* !GETOPT_LONG */