flag fields are u_int's

[unix-history] / usr / src / lib / libc / stdlib / getopt.c

diff --git a/usr/src/lib/libc/stdlib/getopt.c b/usr/src/lib/libc/stdlib/getopt.c
index dba92f2..a184fb1 100644 (file)
--- a/usr/src/lib/libc/stdlib/getopt.c
+++ b/usr/src/lib/libc/stdlib/getopt.c
@@ -1,14 +1,17 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%

  */
 
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)getopt.c   4.2 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getopt.c   4.13 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

 
 #include <stdio.h>
 
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 
 /*
  * get option letter from argument vector
 
 /*
  * get option letter from argument vector


@@ -18,44 +21,74 @@ int opterr = 1,             /* if error message should be printed */
        optopt;                 /* character checked for validity */
 char   *optarg;                /* argument associated with option */
 
        optopt;                 /* character checked for validity */
 char   *optarg;                /* argument associated with option */
 

-#define BADCH  (int)'?'
-#define EMSG   ""
-#define tell(s)        if (opterr) {fputs(*nargv,stderr);fputs(s,stderr); \
-               fputc(optopt,stderr);fputc('\n',stderr);return(BADCH);}
+#define        BADCH   (int)'?'
+#define        EMSG    ""

 
 

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

 {
 {

-       static char     *place = EMSG;  /* option letter processing */
-       register char   *oli;           /* option letter list index */
-       char    *index();
+       static char *place = EMSG;              /* option letter processing */
+       register char *oli;                     /* option letter list index */
+       char *p;

 
 

-       if(!*place) {                   /* update scanning pointer */
-               if(optind >= nargc || *(place = nargv[optind]) != '-' || !*++place) return(EOF);
-               if (*place == '-') {    /* found "--" */
+       if (!*place) {                          /* update scanning pointer */
+               if (optind >= nargc || *(place = nargv[optind]) != '-') {
+                       place = EMSG;
+                       return(EOF);
+               }
+               if (place[1] && *++place == '-') {      /* found "--" */

                        ++optind;
                        ++optind;

+                       place = EMSG;

                        return(EOF);
                }
                        return(EOF);
                }

-       }                               /* option letter okay? */
-       if ((optopt = (int)*place++) == (int)':' || !(oli = index(ostr,optopt))) {
-               if(!*place) ++optind;
-               tell(": illegal option -- ");
+       }                                       /* option letter okay? */
+       if ((optopt = (int)*place++) == (int)':' ||
+           !(oli = index(ostr, optopt))) {
+               /*
+                * if the user didn't specify '-' as an option,
+                * assume it means EOF.
+                */
+               if (optopt == (int)'-')
+                       return(EOF);
+               if (!*place)
+                       ++optind;
+               if (opterr) {
+                       if (!(p = rindex(*nargv, '/')))
+                               p = *nargv;
+                       else
+                               ++p;
+                       (void)fprintf(stderr, "%s: illegal option -- %c\n",
+                           p, optopt);
+               }
+               return(BADCH);

        }
        }

-       if (*++oli != ':') {            /* don't need argument */
+       if (*++oli != ':') {                    /* don't need argument */

                optarg = NULL;
                optarg = NULL;

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

        }
        }

-       else {                          /* need an argument */
-               if (*place) optarg = place;     /* no white space */
+       else {                                  /* need an argument */
+               if (*place)                     /* no white space */
+                       optarg = place;

                else if (nargc <= ++optind) {   /* no arg */
                        place = EMSG;
                else if (nargc <= ++optind) {   /* no arg */
                        place = EMSG;

-                       tell(": option requires an argument -- ");
+                       if (!(p = rindex(*nargv, '/')))
+                               p = *nargv;
+                       else
+                               ++p;
+                       if (opterr)
+                               (void)fprintf(stderr,
+                                   "%s: option requires an argument -- %c\n",
+                                   p, optopt);
+                       return(BADCH);

                }
                }

-               else optarg = nargv[optind];    /* white space */
+               else                            /* white space */
+                       optarg = nargv[optind];

                place = EMSG;
                ++optind;
        }
                place = EMSG;
                ++optind;
        }

-       return(optopt);                 /* dump back option letter */
+       return(optopt);                         /* dump back option letter */

 }
 }