From 01a5b51315430bc714a194cd0a864d4e33d6682f Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sat, 14 Dec 2024 23:51:29 -0500 Subject: rename getopt() so we can compile with g++ if needed. --- getopt.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'getopt.c') diff --git a/getopt.c b/getopt.c index c6bf394..0c0057e 100644 --- a/getopt.c +++ b/getopt.c @@ -36,17 +36,12 @@ extern char *self; #define ENDARGS "--" /* this is included because index is not on some UNIX systems */ -static -char * -index (s, c) -register char *s; -register int c; - { +static char *index (char *s, int c) { while (*s) if (c == *s) return (s); else s++; return (NULL); - } +} /* * get option letter from argument vector @@ -60,11 +55,9 @@ char *optarg; /* argument associated with option */ fputc(optopt,stderr);fputs(" (use -h for help)\n",stderr);return(BADCH); -int getopt(int nargc, char **nargv, char *ostr) -{ +int my_getopt(int nargc, char **nargv, char *ostr) { static char *place = EMSG; /* option letter processing */ - register char *oli; /* option letter list index */ - char *index(); + char *oli; /* option letter list index */ if(!*place) { /* update scanning pointer */ if(optind >= nargc || *(place = nargv[optind]) != '-' || !*++place) return(EOF); -- cgit v1.2.3