Clean up the ether_hostton() stuff.

[libpcap] / missing / getopt.c

diff --git a/missing/getopt.c b/missing/getopt.c
index f5e62daa4cccf380ae1b1e06f3d96cb5b0b653c1..cc798e1de84d352f15dd5a14037f890955e4b72b 100644 (file)
--- a/missing/getopt.c
+++ b/missing/getopt.c
@@ -39,6 +39,8 @@ static char sccsid[] = "@(#)getopt.c  8.3 (Berkeley) 4/27/95";
 #include <stdlib.h>
 #include <string.h>
 
+#include "getopt.h"
+
 int    opterr = 1,             /* if error message should be printed */
        optind = 1,             /* index into parent argv vector */
        optopt,                 /* character checked for validity */
@@ -59,14 +61,17 @@ getopt(nargc, nargv, ostr)
        char * const *nargv;
        const char *ostr;
 {
-#ifdef _WIN32
-       char *__progname="windump";
-#else
-       extern char *__progname;
-#endif
+       char *cp;
+       static char *__progname;
        static char *place = EMSG;              /* option letter processing */
        char *oli;                              /* option letter list index */
 
+       if (__progname == NULL) {
+               if ((cp = strrchr(nargv[0], '/')) != NULL)
+                       __progname = cp + 1;
+               else
+                       __progname = nargv[0];
+       }
        if (optreset || !*place) {              /* update scanning pointer */
                optreset = 0;
                if (optind >= nargc || *(place = nargv[optind]) != '-') {