getopt(3) returns -1, not EOF

8 files changed, 16 insertions, 16 deletions

diff --git a/usr.bin/tcfs/tcfsaddgroup.c b/usr.bin/tcfs/tcfsaddgroup.c
index bad57050656..38e36bd0a0b 100644
--- a/usr.bin/tcfs/tcfsaddgroup.c
+++ b/usr.bin/tcfs/tcfsaddgroup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsaddgroup.c,v 1.11 2000/06/20 08:59:52 fgsch Exp $	*/
+/*	$OpenBSD: tcfsaddgroup.c,v 1.12 2000/06/20 18:15:57 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -178,7 +178,7 @@ addgroup_main(int argn, char *argv[])
 	/*
 	 * Going to check the arguments
 	 */
-	while ((val = getopt(argn, argv, "vg:m:t:h")) != EOF)
+	while ((val = getopt(argn, argv, "vg:m:t:h")) != -1)
 		switch (val) {
 		case 'm':
 			members = atoi(optarg);
diff --git a/usr.bin/tcfs/tcfsadduser.c b/usr.bin/tcfs/tcfsadduser.c
index 5418b62c0b2..9bcaf9c696c 100644
--- a/usr.bin/tcfs/tcfsadduser.c
+++ b/usr.bin/tcfs/tcfsadduser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsadduser.c,v 1.7 2000/06/20 08:59:53 fgsch Exp $	*/
+/*	$OpenBSD: tcfsadduser.c,v 1.8 2000/06/20 18:15:57 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -41,7 +41,7 @@ adduser_main(int argn, char *argv[])
 	/*
 	 * Going to check the arguments
 	 */
-	while ((val = getopt(argn, argv, "g:l:hv")) != EOF)
+	while ((val = getopt(argn, argv, "g:l:hv")) != -1)
 		switch (val) {
 		case 'l':
 			strlcpy(user, optarg, sizeof(user));
diff --git a/usr.bin/tcfs/tcfsgenkey.c b/usr.bin/tcfs/tcfsgenkey.c
index 5ac39401ad2..7ad4454edfd 100644
--- a/usr.bin/tcfs/tcfsgenkey.c
+++ b/usr.bin/tcfs/tcfsgenkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsgenkey.c,v 1.9 2000/06/20 08:59:53 fgsch Exp $	*/
+/*	$OpenBSD: tcfsgenkey.c,v 1.10 2000/06/20 18:15:57 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -37,7 +37,7 @@ genkey_main(int argn, char *argv[])
 	/*
 	 * Going to check arguments
 	 */
-	while ((val = getopt(argn, argv, "h")) != EOF)
+	while ((val = getopt(argn, argv, "h")) != -1)
 		switch (val) {
 		case 'h':
 			printf(genkey_usage, argv[0]);
diff --git a/usr.bin/tcfs/tcfsputkey.c b/usr.bin/tcfs/tcfsputkey.c
index 2266c467a37..dec1b469271 100644
--- a/usr.bin/tcfs/tcfsputkey.c
+++ b/usr.bin/tcfs/tcfsputkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsputkey.c,v 1.10 2000/06/20 08:59:53 fgsch Exp $	*/
+/*	$OpenBSD: tcfsputkey.c,v 1.11 2000/06/20 18:15:57 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -47,7 +47,7 @@ putkey_main(int argc, char *argv[])
 	int isgroupkey = FALSE;
 	int havename = FALSE, havefspath = FALSE, havekey = FALSE;
 
-	while ((x = getopt(argc, argv, "kf:p:g:")) != EOF) {
+	while ((x = getopt(argc, argv, "kf:p:g:")) != -1) {
 		switch(x) {
 		case 'k':
 			def = FALSE;
diff --git a/usr.bin/tcfs/tcfsrmgroup.c b/usr.bin/tcfs/tcfsrmgroup.c
index d64bd06223d..2d8f701f990 100644
--- a/usr.bin/tcfs/tcfsrmgroup.c
+++ b/usr.bin/tcfs/tcfsrmgroup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsrmgroup.c,v 1.9 2000/06/20 08:59:53 fgsch Exp $	*/
+/*	$OpenBSD: tcfsrmgroup.c,v 1.10 2000/06/20 18:15:57 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -37,7 +37,7 @@ rmgroup_main(int argn, char *argv[])
 	/*
 	 * Going to check the arguments
 	 */
-	while ((val = getopt(argn, argv, "hg:v")) != EOF)
+	while ((val = getopt(argn, argv, "hg:v")) != -1)
 		switch (val) {
 		case 'g':
 			gid = (gid_t)atoi(optarg);
diff --git a/usr.bin/tcfs/tcfsrmkey.c b/usr.bin/tcfs/tcfsrmkey.c
index 3ab8b054c32..04f7092db44 100644
--- a/usr.bin/tcfs/tcfsrmkey.c
+++ b/usr.bin/tcfs/tcfsrmkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsrmkey.c,v 1.6 2000/06/20 08:59:53 fgsch Exp $	*/
+/*	$OpenBSD: tcfsrmkey.c,v 1.7 2000/06/20 18:15:57 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -43,7 +43,7 @@ rmkey_main(int argc, char *argv[])
 	int havempname = FALSE, havefsname = FALSE, isgroupkey = FALSE;
 	int havename = FALSE, havefspath = FALSE;
 
-	while ((x = getopt(argc, argv, "f:p:g:")) != EOF) {
+	while ((x = getopt(argc, argv, "f:p:g:")) != -1) {
 		switch(x) {
 		case 'p':
 			havempname = TRUE;
diff --git a/usr.bin/tcfs/tcfsrmuser.c b/usr.bin/tcfs/tcfsrmuser.c
index 563cd48be5e..96c3bfba4d4 100644
--- a/usr.bin/tcfs/tcfsrmuser.c
+++ b/usr.bin/tcfs/tcfsrmuser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsrmuser.c,v 1.8 2000/06/20 08:59:53 fgsch Exp $	*/
+/*	$OpenBSD: tcfsrmuser.c,v 1.9 2000/06/20 18:15:58 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -46,7 +46,7 @@ rmuser_main(int argn, char *argv[])
 	 if ((user = (char *)malloc(LOGIN_NAME_MAX + 1)) == NULL)
 		 err(1, NULL);
 
-	 while ((val = getopt(argn, argv, "l:hv")) != EOF)
+	 while ((val = getopt(argn, argv, "l:hv")) != -1)
 		switch (val) {
 		case 'l':
 			strlcpy(user, optarg, LOGIN_NAME_MAX + 1);
diff --git a/usr.bin/tcfs/tcfsrun.c b/usr.bin/tcfs/tcfsrun.c
index 1051f70f094..9970ba6bf3a 100644
--- a/usr.bin/tcfs/tcfsrun.c
+++ b/usr.bin/tcfs/tcfsrun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfsrun.c,v 1.8 2000/06/20 10:46:52 fgsch Exp $	*/
+/*	$OpenBSD: tcfsrun.c,v 1.9 2000/06/20 18:15:58 aaron Exp $	*/
 
 /*
  *	Transparent Cryptographic File System (TCFS) for NetBSD 
@@ -40,7 +40,7 @@ run_main(int argc, char *argv[], char *envp[])
 
 	uid = getuid();
 
-	while ((x = getopt(argc, argv, "p:f:")) != EOF) {
+	while ((x = getopt(argc, argv, "p:f:")) != -1) {
 		switch(x) {
 		case 'p':
 			strlcpy(fspath, optarg, sizeof(fspath));