--- pgp/src/getopt.c	2018/04/24 16:39:13	1.1.1.3
+++ pgp/src/getopt.c	2018/04/24 16:42:09	1.1.1.5
@@ -35,7 +35,7 @@ int	optopt = 0;
 char	*optarg = 0;
 
 int
-getopt(int argc, char **argv, char *opts)
+pgp_getopt(int argc, char **argv, char *opts)
 {
 	static int sp = 1;
 	register int c;
@@ -44,10 +44,10 @@ getopt(int argc, char **argv, char *opts
 	if(sp == 1) {
 		if(optind >= argc || (argv[optind][0] != '+' &&
 		   argv[optind][0] != '-') || argv[optind][1] == '\0')
-			return(EOF);
+			return EOF;
 		else if(strcmp(argv[optind], "--") == 0) {
 			optind++;
-			return(EOF);
+			return EOF;
 		}
 		/* '+' for config options, '+' should not be in the opts list */
 		if (argv[optind][0] == '+') {
@@ -62,7 +62,7 @@ getopt(int argc, char **argv, char *opts
 			optind++;
 			sp = 1;
 		}
-		return('\0');
+		return '\0';
 	}
 	if(*++cp == ':') {
 		if(argv[optind][sp+1] != '\0')
@@ -70,7 +70,7 @@ getopt(int argc, char **argv, char *opts
 		else if(++optind >= argc) {
 			ERR(": option requires an argument -- ", c);
 			sp = 1;
-			return('\0');
+			return '\0';
 		} else
 			optarg = argv[optind++];
 		sp = 1;
@@ -81,6 +81,6 @@ getopt(int argc, char **argv, char *opts
 		}
 		optarg = NULL;
 	}
-	return(c);
+	return c;
 }