summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormillert <>1997-01-15 23:43:43 +0000
committermillert <>1997-01-15 23:43:43 +0000
commit3dcd8c4aebf5203dff6e9d4c88414c207e0ab74c (patch)
tree2f4eb6cb395038759776aa9f3a547726e402ce80
parentf8953640b655af43a4ee7a6448038e8c3fe37076 (diff)
downloadopenbsd-3dcd8c4aebf5203dff6e9d4c88414c207e0ab74c.tar.gz
openbsd-3dcd8c4aebf5203dff6e9d4c88414c207e0ab74c.tar.bz2
openbsd-3dcd8c4aebf5203dff6e9d4c88414c207e0ab74c.zip
getopt(3) returns -1 when out of args, not EOF, whee!
-rw-r--r--src/regress/lib/libc/db/dbtest.c2
-rw-r--r--src/regress/lib/libc/regex/main.c4
-rw-r--r--src/usr.bin/nc/netcat.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/regress/lib/libc/db/dbtest.c b/src/regress/lib/libc/db/dbtest.c
index 65587a6fcb..ac9eaa48fd 100644
--- a/src/regress/lib/libc/db/dbtest.c
+++ b/src/regress/lib/libc/db/dbtest.c
@@ -107,7 +107,7 @@ main(argc, argv)
107 fname = NULL; 107 fname = NULL;
108 oflags = O_CREAT | O_RDWR; 108 oflags = O_CREAT | O_RDWR;
109 sflag = 0; 109 sflag = 0;
110 while ((ch = getopt(argc, argv, "f:i:lo:s")) != EOF) 110 while ((ch = getopt(argc, argv, "f:i:lo:s")) != -1)
111 switch (ch) { 111 switch (ch) {
112 case 'f': 112 case 'f':
113 fname = optarg; 113 fname = optarg;
diff --git a/src/regress/lib/libc/regex/main.c b/src/regress/lib/libc/regex/main.c
index add5e8be10..6e63ffc235 100644
--- a/src/regress/lib/libc/regex/main.c
+++ b/src/regress/lib/libc/regex/main.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: main.c,v 1.2 1996/12/21 22:23:42 millert Exp $ */ 1/* $OpenBSD: main.c,v 1.3 1997/01/15 23:41:07 millert Exp $ */
2/* $NetBSD: main.c,v 1.2 1995/04/20 22:39:51 cgd Exp $ */ 2/* $NetBSD: main.c,v 1.2 1995/04/20 22:39:51 cgd Exp $ */
3 3
4#include <stdio.h> 4#include <stdio.h>
@@ -47,7 +47,7 @@ char *argv[];
47 47
48 progname = argv[0]; 48 progname = argv[0];
49 49
50 while ((c = getopt(argc, argv, "c:e:S:E:x")) != EOF) 50 while ((c = getopt(argc, argv, "c:e:S:E:x")) != -1)
51 switch (c) { 51 switch (c) {
52 case 'c': /* compile options */ 52 case 'c': /* compile options */
53 copts = options('c', optarg); 53 copts = options('c', optarg);
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index 5ceb4f1d2f..f6c10424a7 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1389,7 +1389,7 @@ main (argc, argv)
1389 1389
1390/* If your shitbox doesn't have getopt, step into the nineties already. */ 1390/* If your shitbox doesn't have getopt, step into the nineties already. */
1391/* optarg, optind = next-argv-component [i.e. flag arg]; optopt = last-char */ 1391/* optarg, optind = next-argv-component [i.e. flag arg]; optopt = last-char */
1392 while ((x = getopt (argc, argv, "ae:g:G:hi:lno:p:rs:tuvw:z")) != EOF) { 1392 while ((x = getopt (argc, argv, "ae:g:G:hi:lno:p:rs:tuvw:z")) != -1) {
1393/* Debug (("in go: x now %c, optarg %x optind %d", x, optarg, optind)) */ 1393/* Debug (("in go: x now %c, optarg %x optind %d", x, optarg, optind)) */
1394 switch (x) { 1394 switch (x) {
1395 case 'a': 1395 case 'a':