new copyright; att/bsd/shared

[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 cf2c994..a184fb1 100644 (file)
--- a/usr/src/lib/libc/stdlib/getopt.c
+++ b/usr/src/lib/libc/stdlib/getopt.c
@@ -2,24 +2,16 @@
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

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

-static char sccsid[] = "@(#)getopt.c   4.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)getopt.c   4.13 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>

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

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


@@ -32,29 +24,45 @@ char        *optarg;                /* argument associated with option */
 #define        BADCH   (int)'?'
 #define        EMSG    ""
 
 #define        BADCH   (int)'?'
 #define        EMSG    ""
 

+int

 getopt(nargc, nargv, ostr)
        int nargc;
 getopt(nargc, nargv, ostr)
        int nargc;

-       char **nargv, *ostr;
+       char * const *nargv;
+       const char *ostr;

 {
        static char *place = EMSG;              /* option letter processing */
        register char *oli;                     /* option letter list index */
 {
        static char *place = EMSG;              /* option letter processing */
        register char *oli;                     /* option letter list index */

-       char *index();
+       char *p;

 
        if (!*place) {                          /* update scanning pointer */
 
        if (!*place) {                          /* update scanning pointer */

-               if (optind >= nargc || *(place = nargv[optind]) != '-')
+               if (optind >= nargc || *(place = nargv[optind]) != '-') {
+                       place = EMSG;

                        return(EOF);
                        return(EOF);

+               }

                if (place[1] && *++place == '-') {      /* found "--" */
                        ++optind;
                if (place[1] && *++place == '-') {      /* found "--" */
                        ++optind;

+                       place = EMSG;

                        return(EOF);
                }
        }                                       /* option letter okay? */
        if ((optopt = (int)*place++) == (int)':' ||
            !(oli = index(ostr, optopt))) {
                        return(EOF);
                }
        }                                       /* 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 (!*place)
                        ++optind;

-               if (opterr)
+               if (opterr) {
+                       if (!(p = rindex(*nargv, '/')))
+                               p = *nargv;
+                       else
+                               ++p;

                        (void)fprintf(stderr, "%s: illegal option -- %c\n",
                        (void)fprintf(stderr, "%s: illegal option -- %c\n",

-                           *nargv, optopt);
+                           p, optopt);
+               }

                return(BADCH);
        }
        if (*++oli != ':') {                    /* don't need argument */
                return(BADCH);
        }
        if (*++oli != ':') {                    /* don't need argument */


@@ -67,10 +75,14 @@ getopt(nargc, nargv, ostr)
                        optarg = place;
                else if (nargc <= ++optind) {   /* no arg */
                        place = EMSG;
                        optarg = place;
                else if (nargc <= ++optind) {   /* no arg */
                        place = EMSG;

+                       if (!(p = rindex(*nargv, '/')))
+                               p = *nargv;
+                       else
+                               ++p;

                        if (opterr)
                                (void)fprintf(stderr,
                                    "%s: option requires an argument -- %c\n",
                        if (opterr)
                                (void)fprintf(stderr,
                                    "%s: option requires an argument -- %c\n",

-                                   *nargv, optopt);
+                                   p, optopt);

                        return(BADCH);
                }
                else                            /* white space */
                        return(BADCH);
                }
                else                            /* white space */