diff options
252 files changed, 603 insertions, 603 deletions
diff --git a/bin/cp/cp.c b/bin/cp/cp.c index fc3e45047e8..a3d98a481e4 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cp.c,v 1.5 1996/12/14 12:17:38 mickey Exp $ */ +/* $OpenBSD: cp.c,v 1.6 1997/01/15 23:40:20 millert Exp $ */ /* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95"; #else -static char rcsid[] = "$OpenBSD: cp.c,v 1.5 1996/12/14 12:17:38 mickey Exp $"; +static char rcsid[] = "$OpenBSD: cp.c,v 1.6 1997/01/15 23:40:20 millert Exp $"; #endif #endif /* not lint */ @@ -110,7 +110,7 @@ main(argc, argv) char *target; Hflag = Lflag = Pflag = Rflag = 0; - while ((ch = getopt(argc, argv, "HLPRfipr")) != EOF) + while ((ch = getopt(argc, argv, "HLPRfipr")) != -1) switch (ch) { case 'H': Hflag = 1; diff --git a/bin/csh/printf.c b/bin/csh/printf.c index b39ff0a7c44..08caba6fa0e 100644 --- a/bin/csh/printf.c +++ b/bin/csh/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.5 1996/12/14 12:17:41 mickey Exp $ */ +/* $OpenBSD: printf.c,v 1.6 1997/01/15 23:40:22 millert Exp $ */ /* $NetBSD: printf.c,v 1.6 1995/03/21 09:03:15 cgd Exp $ */ /* @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 7/20/93"; #else -static char rcsid[] = "$OpenBSD: printf.c,v 1.5 1996/12/14 12:17:41 mickey Exp $"; +static char rcsid[] = "$OpenBSD: printf.c,v 1.6 1997/01/15 23:40:22 millert Exp $"; #endif #endif /* not lint */ @@ -97,7 +97,7 @@ main(argc, argv) int ch, end, fieldwidth, precision; char convch, nextch, *format, *fmt, *start; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { default: usage(); diff --git a/bin/ed/main.c b/bin/ed/main.c index 0400323cdf0..34d69311131 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.5 1996/12/14 12:17:56 mickey Exp $ */ +/* $OpenBSD: main.c,v 1.6 1997/01/15 23:40:23 millert Exp $ */ /* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */ /* main.c: This file contains the main control and user-interface routines @@ -39,7 +39,7 @@ char *copyright = #if 0 static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.5 1996/12/14 12:17:56 mickey Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.6 1997/01/15 23:40:23 millert Exp $"; #endif #endif /* not lint */ @@ -118,7 +118,7 @@ main(argc, argv) red = (n = strlen(argv[0])) > 2 && argv[0][n - 3] == 'r'; top: - while ((c = getopt(argc, argv, "p:sx")) != EOF) + while ((c = getopt(argc, argv, "p:sx")) != -1) switch(c) { case 'p': /* set prompt */ prompt = optarg; diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 25caf23be98..3de15a81e2f 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd.c,v 1.4 1996/12/14 12:18:12 mickey Exp $ */ +/* $OpenBSD: pwd.c,v 1.5 1997/01/15 23:40:24 millert Exp $ */ /* $NetBSD: pwd.c,v 1.7 1995/03/21 09:08:18 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; #else -static char rcsid[] = "$OpenBSD: pwd.c,v 1.4 1996/12/14 12:18:12 mickey Exp $"; +static char rcsid[] = "$OpenBSD: pwd.c,v 1.5 1997/01/15 23:40:24 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ main(argc, argv) * there's no way to display a logical path after forking. We don't * document either flag, only adding -P for future portability. */ - while ((ch = getopt(argc, argv, "P")) != EOF) + while ((ch = getopt(argc, argv, "P")) != -1) switch (ch) { case 'P': break; diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 39112c5d95f..2052c22c0a9 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -1,5 +1,5 @@ /* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */ -/* $OpenBSD: rcp.c,v 1.8 1996/12/22 02:57:51 tholo Exp $ */ +/* $OpenBSD: rcp.c,v 1.9 1997/01/15 23:40:25 millert Exp $ */ /* * Copyright (c) 1983, 1990, 1992, 1993 @@ -124,7 +124,7 @@ main(argc, argv) char *targ, *shell; fflag = tflag = 0; - while ((ch = getopt(argc, argv, OPTIONS)) != EOF) + while ((ch = getopt(argc, argv, OPTIONS)) != -1) switch(ch) { /* User-visible flags. */ case 'K': #ifdef KERBEROS diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c index 570d61e8e0a..1b8d4e41a15 100644 --- a/bin/rmail/rmail.c +++ b/bin/rmail/rmail.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmail.c,v 1.4 1996/12/14 12:18:17 mickey Exp $ */ +/* $OpenBSD: rmail.c,v 1.5 1997/01/15 23:40:26 millert Exp $ */ /* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rmail.c 8.3 (Berkeley) 5/15/95"; #else -static char rcsid[] = "$OpenBSD: rmail.c,v 1.4 1996/12/14 12:18:17 mickey Exp $"; +static char rcsid[] = "$OpenBSD: rmail.c,v 1.5 1997/01/15 23:40:26 millert Exp $"; #endif #endif /* not lint */ @@ -115,7 +115,7 @@ main(argc, argv) debug = 0; domain = "UUCP"; /* Default "domain". */ - while ((ch = getopt(argc, argv, "D:T")) != EOF) + while ((ch = getopt(argc, argv, "D:T")) != -1) switch (ch) { case 'T': debug = 1; diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 319bd86e33f..1e1da1fd79b 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: histedit.c,v 1.6 1996/10/20 00:54:50 millert Exp $ */ +/* $OpenBSD: histedit.c,v 1.7 1997/01/15 23:40:28 millert Exp $ */ /* $NetBSD: histedit.c,v 1.8 1995/05/11 21:29:12 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: histedit.c,v 1.6 1996/10/20 00:54:50 millert Exp $"; +static char rcsid[] = "$OpenBSD: histedit.c,v 1.7 1997/01/15 23:40:28 millert Exp $"; #endif #endif /* not lint */ @@ -211,7 +211,7 @@ histcmd(argc, argv) optreset = 1; optind = 1; /* initialize getopt */ while (not_fcnumber(argv[optind]) && - (ch = getopt(argc, argv, ":e:lnrs")) != EOF) + (ch = getopt(argc, argv, ":e:lnrs")) != -1) switch ((char)ch) { case 'e': editor = optarg; diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index b9774dd713e..7f1a9eeab99 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sleep.c,v 1.3 1996/08/02 12:41:09 deraadt Exp $ */ +/* $OpenBSD: sleep.c,v 1.4 1997/01/15 23:40:28 millert Exp $ */ /* $NetBSD: sleep.c,v 1.8 1995/03/21 09:11:11 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: sleep.c,v 1.3 1996/08/02 12:41:09 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: sleep.c,v 1.4 1997/01/15 23:40:28 millert Exp $"; #endif #endif /* not lint */ @@ -64,7 +64,7 @@ main(argc, argv) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { default: usage(); diff --git a/distrib/crunch/crunchide/crunchide.c b/distrib/crunch/crunchide/crunchide.c index 2b34454440a..6f3fc817faa 100644 --- a/distrib/crunch/crunchide/crunchide.c +++ b/distrib/crunch/crunchide/crunchide.c @@ -84,7 +84,7 @@ char **argv; if(argc > 0) pname = argv[0]; - while ((ch = getopt(argc, argv, "k:f:")) != EOF) + while ((ch = getopt(argc, argv, "k:f:")) != -1) switch(ch) { case 'k': add_to_keep_list(optarg); diff --git a/games/arithmetic/arithmetic.c b/games/arithmetic/arithmetic.c index 6cda404fb85..0f2f85db86d 100644 --- a/games/arithmetic/arithmetic.c +++ b/games/arithmetic/arithmetic.c @@ -111,7 +111,7 @@ main(argc, argv) int ch, cnt; void intr(); - while ((ch = getopt(argc, argv, "r:o:")) != EOF) + while ((ch = getopt(argc, argv, "r:o:")) != -1) switch(ch) { case 'o': { register char *p; diff --git a/games/banner/banner.c b/games/banner/banner.c index 910a51cac77..275aa9479bb 100644 --- a/games/banner/banner.c +++ b/games/banner/banner.c @@ -1040,7 +1040,7 @@ main(argc, argv) setegid(getgid()); setgid(getgid()); - while ((ch = getopt(argc, argv, "w:td")) != EOF) + while ((ch = getopt(argc, argv, "w:td")) != -1) switch(ch) { case 'w': width = atoi(optarg); diff --git a/games/boggle/boggle/bog.c b/games/boggle/boggle/bog.c index 5ceb547f3c2..a523aba910a 100644 --- a/games/boggle/boggle/bog.c +++ b/games/boggle/boggle/bog.c @@ -137,7 +137,7 @@ main(argc, argv) minlength = 3; tlimit = 180; /* 3 minutes is standard */ - while ((ch = getopt(argc, argv, "bds:t:w:")) != EOF) + while ((ch = getopt(argc, argv, "bds:t:w:")) != -1) switch(ch) { case 'b': batch = 1; diff --git a/games/cribbage/crib.c b/games/cribbage/crib.c index 1ff23da72c1..f6e86e78275 100644 --- a/games/cribbage/crib.c +++ b/games/cribbage/crib.c @@ -71,7 +71,7 @@ main(argc, argv) egid = getegid(); setegid(getgid()); - while ((ch = getopt(argc, argv, "eqr")) != EOF) + while ((ch = getopt(argc, argv, "eqr")) != -1) switch (ch) { case 'e': explain = TRUE; diff --git a/games/factor/factor.c b/games/factor/factor.c index ba31462a294..3407b3587a0 100644 --- a/games/factor/factor.c +++ b/games/factor/factor.c @@ -103,7 +103,7 @@ main(argc, argv) setegid(getgid()); setgid(getgid()); - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/games/fish/fish.c b/games/fish/fish.c index 14af9c0571d..f76ac54dec2 100644 --- a/games/fish/fish.c +++ b/games/fish/fish.c @@ -82,7 +82,7 @@ main(argc, argv) { int ch, move; - while ((ch = getopt(argc, argv, "p")) != EOF) + while ((ch = getopt(argc, argv, "p")) != -1) switch(ch) { case 'p': promode = 1; diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c index 64b699f0531..636f246b280 100644 --- a/games/fortune/fortune/fortune.c +++ b/games/fortune/fortune/fortune.c @@ -304,9 +304,9 @@ register char **argv; ignore_case = FALSE; # ifdef DEBUG - while ((ch = getopt(argc, argv, "aDefilm:osw")) != EOF) + while ((ch = getopt(argc, argv, "aDefilm:osw")) != -1) #else - while ((ch = getopt(argc, argv, "aefilm:osw")) != EOF) + while ((ch = getopt(argc, argv, "aefilm:osw")) != -1) #endif /* DEBUG */ switch(ch) { case 'a': /* any fortune */ diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c index 6c4b74bb411..48ee4bfe375 100644 --- a/games/fortune/strfile/strfile.c +++ b/games/fortune/strfile/strfile.c @@ -272,7 +272,7 @@ char **argv; extern int optind; int ch; - while ((ch = getopt(argc, argv, "c:iorsx")) != EOF) + while ((ch = getopt(argc, argv, "c:iorsx")) != -1) switch(ch) { case 'c': /* new delimiting char */ Delimch = *optarg; diff --git a/games/gomoku/main.c b/games/gomoku/main.c index 44405939b30..d01bd99d819 100644 --- a/games/gomoku/main.c +++ b/games/gomoku/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.5 1996/12/22 20:01:16 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.6 1997/01/15 23:40:49 millert Exp $ */ /* * Copyright (c) 1994 * The Regents of the University of California. All rights reserved. @@ -99,7 +99,7 @@ main(argc, argv) else prog = argv[0]; - while ((ch = getopt(argc, argv, "bcdD:u")) != EOF) { + while ((ch = getopt(argc, argv, "bcdD:u")) != -1) { switch (ch) { case 'b': /* background */ interactive = 0; diff --git a/games/morse/morse.c b/games/morse/morse.c index 8e36af890cd..26eb4c7a996 100644 --- a/games/morse/morse.c +++ b/games/morse/morse.c @@ -107,7 +107,7 @@ main(argc, argv) setegid(getgid()); setgid(getgid()); - while ((ch = getopt(argc, argv, "s")) != EOF) + while ((ch = getopt(argc, argv, "s")) != -1) switch((char)ch) { case 's': sflag = 1; diff --git a/games/number/number.c b/games/number/number.c index 860e23a165b..d49a00dbbbe 100644 --- a/games/number/number.c +++ b/games/number/number.c @@ -101,7 +101,7 @@ main(argc, argv) setgid(getgid()); lflag = 0; - while ((ch = getopt(argc, argv, "l")) != EOF) + while ((ch = getopt(argc, argv, "l")) != -1) switch (ch) { case 'l': lflag = 1; diff --git a/games/phantasia/setup.c b/games/phantasia/setup.c index 85cfe4c1a5e..c315de7fa03 100644 --- a/games/phantasia/setup.c +++ b/games/phantasia/setup.c @@ -65,7 +65,7 @@ main(argc, argv) int ch; char path[MAXPATHLEN], *prefix; - while ((ch = getopt(argc, argv, "m:")) != EOF) + while ((ch = getopt(argc, argv, "m:")) != -1) switch(ch) { case 'm': monsterfile = optarg; diff --git a/games/pig/pig.c b/games/pig/pig.c index 27215f008b4..9ff54390c0d 100644 --- a/games/pig/pig.c +++ b/games/pig/pig.c @@ -70,7 +70,7 @@ main(argc, argv) setegid(getgid()); setgid(getgid()); - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { case '?': default: diff --git a/games/primes/primes.c b/games/primes/primes.c index 18d673cecb0..7ab7acbc957 100644 --- a/games/primes/primes.c +++ b/games/primes/primes.c @@ -124,7 +124,7 @@ main(argc, argv) setegid(getgid()); setgid(getgid()); - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c index dba39fd27f8..bbd14de48a6 100644 --- a/games/quiz/quiz.c +++ b/games/quiz/quiz.c @@ -89,7 +89,7 @@ main(argc, argv) setgid(getgid()); indexfile = _PATH_QUIZIDX; - while ((ch = getopt(argc, argv, "i:t")) != EOF) + while ((ch = getopt(argc, argv, "i:t")) != -1) switch(ch) { case 'i': indexfile = optarg; diff --git a/games/random/random.c b/games/random/random.c index 4f8b258ba0a..9e9edb0ee09 100644 --- a/games/random/random.c +++ b/games/random/random.c @@ -78,7 +78,7 @@ main(argc, argv) setgid(getgid()); random_exit = unbuffer_output = 0; - while ((ch = getopt(argc, argv, "er")) != EOF) + while ((ch = getopt(argc, argv, "er")) != -1) switch (ch) { case 'e': random_exit = 1; diff --git a/games/snake/snake/snake.c b/games/snake/snake/snake.c index bb0a1fa2831..c75589ed422 100644 --- a/games/snake/snake/snake.c +++ b/games/snake/snake/snake.c @@ -122,7 +122,7 @@ char **argv; (void)time(&tv); srandom((int)tv); - while ((ch = getopt(argc, argv, "l:w:")) != EOF) + while ((ch = getopt(argc, argv, "l:w:")) != -1) switch((char)ch) { #ifdef notdef case 'd': diff --git a/games/tetris/tetris.c b/games/tetris/tetris.c index 8eeb60d511e..4756bb1ef0a 100644 --- a/games/tetris/tetris.c +++ b/games/tetris/tetris.c @@ -130,7 +130,7 @@ main(argc, argv) egid = getegid(); setegid(gid); - while ((ch = getopt(argc, argv, "k:l:s")) != EOF) + while ((ch = getopt(argc, argv, "k:l:s")) != -1) switch(ch) { case 'k': if (strlen(keys = optarg) != 6) diff --git a/games/worms/worms.c b/games/worms/worms.c index 4e42f1c50c8..ad42e1a0b70 100644 --- a/games/worms/worms.c +++ b/games/worms/worms.c @@ -219,7 +219,7 @@ main(argc, argv) number = 3; trail = ' '; field = NULL; - while ((ch = getopt(argc, argv, "fl:n:t")) != EOF) + while ((ch = getopt(argc, argv, "fl:n:t")) != -1) switch(ch) { case 'f': field = "WORM"; diff --git a/games/wump/wump.c b/games/wump/wump.c index 73eb8f75d57..fb9a9bc02d7 100644 --- a/games/wump/wump.c +++ b/games/wump/wump.c @@ -123,9 +123,9 @@ main(argc, argv) setgid(getgid()); #ifdef DEBUG - while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != EOF) + while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != -1) #else - while ((c = getopt(argc, argv, "a:b:hp:r:t:")) != EOF) + while ((c = getopt(argc, argv, "a:b:hp:r:t:")) != -1) #endif switch (c) { case 'a': diff --git a/kerberosIV/kadmin/kadmin.c b/kerberosIV/kadmin/kadmin.c index 9de5accf798..12f62f24b80 100644 --- a/kerberosIV/kadmin/kadmin.c +++ b/kerberosIV/kadmin/kadmin.c @@ -1,4 +1,4 @@ -/* $Id: kadmin.c,v 1.3 1996/09/15 23:30:52 millert Exp $ */ +/* $Id: kadmin.c,v 1.4 1997/01/15 23:40:50 millert Exp $ */ /* * Copyright (C) 1989 by the Massachusetts Institute of Technology @@ -318,7 +318,7 @@ do_init(int argc, char **argv) else strcpy(krbrlm, default_realm); - while ((c = getopt(argc, argv, OPTION_STRING)) != EOF) + while ((c = getopt(argc, argv, OPTION_STRING)) != -1) switch (c) { case 'u': strncpy(myname, optarg, sizeof(myname) - 1); diff --git a/kerberosIV/kadmind/admin_server.c b/kerberosIV/kadmind/admin_server.c index cc62531798e..0990eaa57fb 100644 --- a/kerberosIV/kadmind/admin_server.c +++ b/kerberosIV/kadmind/admin_server.c @@ -1,4 +1,4 @@ -/* $Id: admin_server.c,v 1.1 1995/12/14 06:52:49 tholo Exp $ */ +/* $Id: admin_server.c,v 1.2 1997/01/15 23:40:51 millert Exp $ */ /*- * Copyright (C) 1989 by the Massachusetts Institute of Technology @@ -380,7 +380,7 @@ main(int argc, char **argv) /* admin_server main routine */ bzero(krbrlm, sizeof(krbrlm)); - while ((c = getopt(argc, argv, "f:hnd:a:r:")) != EOF) + while ((c = getopt(argc, argv, "f:hnd:a:r:")) != -1) switch(c) { case 'f': /* Syslog file name change */ prm.sysfile = optarg; diff --git a/kerberosIV/kerberos/kerberos.c b/kerberosIV/kerberos/kerberos.c index 5cbc693c55f..c3ad1b27030 100644 --- a/kerberosIV/kerberos/kerberos.c +++ b/kerberosIV/kerberos/kerberos.c @@ -1,4 +1,4 @@ -/* $Id: kerberos.c,v 1.3 1996/09/17 23:29:37 deraadt Exp $ */ +/* $Id: kerberos.c,v 1.4 1997/01/15 23:40:52 millert Exp $ */ /*- * Copyright 1987, 1988 by the Student Information Processing Board @@ -627,7 +627,7 @@ main(int argc, char **argv) progname = argv[0]; - while ((c = getopt(argc, argv, "snmp:a:l:r:")) != EOF) { + while ((c = getopt(argc, argv, "snmp:a:l:r:")) != -1) { switch(c) { case 's': /* diff --git a/kerberosIV/kpropd/kpropd.c b/kerberosIV/kpropd/kpropd.c index b2a97227a0c..1c283d6eed5 100644 --- a/kerberosIV/kpropd/kpropd.c +++ b/kerberosIV/kpropd/kpropd.c @@ -1,4 +1,4 @@ -/* $Id: kpropd.c,v 1.3 1996/09/16 18:48:56 millert Exp $ */ +/* $Id: kpropd.c,v 1.4 1997/01/15 23:40:53 millert Exp $ */ /*- * Copyright 1987 by the Massachusetts Institute of Technology. @@ -162,7 +162,7 @@ main(int argc, char **argv) if (argv[argc - 1][0] == 'k' && isdigit(argv[argc - 1][1])) { argc--; /* ttys file hack */ } - while ((c = getopt(argc, argv, "r:s:d:l:p:P:")) != EOF) { + while ((c = getopt(argc, argv, "r:s:d:l:p:P:")) != -1) { switch(c) { case 'r': rflag++; diff --git a/lib/libc/time/zic.c b/lib/libc/time/zic.c index 98e063e479f..d50d1144b08 100644 --- a/lib/libc/time/zic.c +++ b/lib/libc/time/zic.c @@ -2,7 +2,7 @@ #if 0 static char elsieid[] = "@(#)zic.c 7.80"; #else -static char rcsid[] = "$OpenBSD: zic.c,v 1.5 1997/01/14 03:16:58 millert Exp $"; +static char rcsid[] = "$OpenBSD: zic.c,v 1.6 1997/01/15 23:40:55 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -478,7 +478,7 @@ char * argv[]; (void) textdomain(TZ_DOMAIN); #endif /* HAVE_GETTEXT - 0 */ progname = argv[0]; - while ((c = getopt(argc, argv, "d:l:p:L:vsy:")) != EOF) + while ((c = getopt(argc, argv, "d:l:p:L:vsy:")) != -1) switch (c) { default: usage(); diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index d7a2600f758..dff77ec233c 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$Id: fingerd.c,v 1.5 1996/12/08 13:29:54 downsj Exp $"; +static char rcsid[] = "$Id: fingerd.c,v 1.6 1997/01/15 23:40:56 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -76,7 +76,7 @@ main(argc, argv) logging = secure = user_required = short_list = 0; openlog("fingerd", LOG_PID | LOG_CONS, LOG_DAEMON); opterr = 0; - while ((ch = getopt(argc, argv, "sluSmMpP:")) != EOF) + while ((ch = getopt(argc, argv, "sluSmMpP:")) != -1) switch (ch) { case 'l': logging = 1; diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 48f2b951bbb..c8a7422ca9a 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.30 1997/01/05 21:28:07 bitblt Exp $ */ +/* $OpenBSD: ftpd.c,v 1.31 1997/01/15 23:40:58 millert Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -241,7 +241,7 @@ main(argc, argv, envp) /* set this here so klogin can use it... */ (void)snprintf(ttyline, sizeof(ttyline), "ftp%d", getpid()); - while ((ch = getopt(argc, argv, argstr)) != EOF) { + while ((ch = getopt(argc, argv, argstr)) != -1) { switch (ch) { case 'A': anon_only = 1; diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c index 531b356d8b5..5148e6ad1c6 100644 --- a/libexec/getNAME/getNAME.c +++ b/libexec/getNAME/getNAME.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)getNAME.c 5.4 (Berkeley) 1/20/91";*/ -static char rcsid[] = "$Id: getNAME.c,v 1.1 1995/10/18 08:43:16 deraadt Exp $"; +static char rcsid[] = "$Id: getNAME.c,v 1.2 1997/01/15 23:40:59 millert Exp $"; #endif /* not lint */ /* @@ -61,7 +61,7 @@ main(argc, argv) extern int optind; int ch; - while ((ch = getopt(argc, argv, "it")) != EOF) + while ((ch = getopt(argc, argv, "it")) != -1) switch(ch) { case 'i': intro = 1; diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c index 66fdb3a5c52..d94ed8d899c 100644 --- a/libexec/lfs_cleanerd/cleanerd.c +++ b/libexec/lfs_cleanerd/cleanerd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cleanerd.c,v 1.2 1996/07/01 11:04:56 downsj Exp $ */ +/* $OpenBSD: cleanerd.c,v 1.3 1997/01/15 23:41:00 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)cleanerd.c 8.5 (Berkeley) 6/10/95";*/ -static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.2 1996/07/01 11:04:56 downsj Exp $"; +static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.3 1997/01/15 23:41:00 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -169,7 +169,7 @@ main(argc, argv) cmd_err = nodaemon = 0; clean_opts = 0; segs_per_clean = 1; - while ((opt = getopt(argc, argv, "bdmn:r:s")) != EOF) { + while ((opt = getopt(argc, argv, "bdmn:r:s")) != -1) { switch (opt) { case 'b': /* * Use live bytes to determine diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c index 6fde3c16986..a24cab92a71 100644 --- a/libexec/mail.local/mail.local.c +++ b/libexec/mail.local/mail.local.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)mail.local.c 5.6 (Berkeley) 6/19/91";*/ -static char rcsid[] = "$Id: mail.local.c,v 1.9 1996/12/24 19:42:03 deraadt Exp $"; +static char rcsid[] = "$Id: mail.local.c,v 1.10 1997/01/15 23:41:01 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -86,7 +86,7 @@ main(argc, argv) openlog("mail.local", LOG_PERROR, LOG_MAIL); from = NULL; - while ((ch = getopt(argc, argv, "lLdf:r:")) != EOF) + while ((ch = getopt(argc, argv, "lLdf:r:")) != -1) switch(ch) { case 'd': /* backward compatible */ break; diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c index 5f534be51be..a2b49d11e3d 100644 --- a/libexec/rlogind/rlogind.c +++ b/libexec/rlogind/rlogind.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rlogind.c 8.1 (Berkeley) 6/4/93"; */ -static char *rcsid = "$Id: rlogind.c,v 1.11 1996/12/04 04:11:44 millert Exp $"; +static char *rcsid = "$Id: rlogind.c,v 1.12 1997/01/15 23:41:02 millert Exp $"; #endif /* not lint */ /* @@ -130,7 +130,7 @@ main(argc, argv) openlog("rlogind", LOG_PID | LOG_CONS, LOG_AUTH); opterr = 0; - while ((ch = getopt(argc, argv, ARGSTR)) != EOF) + while ((ch = getopt(argc, argv, ARGSTR)) != -1) switch (ch) { case 'a': /* check_all = 1; */ diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 07ada915b2a..5fb2d4e4af2 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */ -static char *rcsid = "$Id: rshd.c,v 1.9 1996/12/22 03:41:20 tholo Exp $"; +static char *rcsid = "$Id: rshd.c,v 1.10 1997/01/15 23:41:03 millert Exp $"; #endif /* not lint */ /* @@ -109,7 +109,7 @@ main(argc, argv) openlog("rshd", LOG_PID | LOG_ODELAY, LOG_DAEMON); opterr = 0; - while ((ch = getopt(argc, argv, OPTIONS)) != EOF) + while ((ch = getopt(argc, argv, OPTIONS)) != -1) switch (ch) { case 'a': check_all = 1; diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c index 8971d6736f5..d61084308a5 100644 --- a/libexec/telnetd/telnetd.c +++ b/libexec/telnetd/telnetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: telnetd.c,v 1.5 1996/12/23 13:31:40 robin Exp $ */ +/* $OpenBSD: telnetd.c,v 1.6 1997/01/15 23:41:05 millert Exp $ */ /* $NetBSD: telnetd.c,v 1.6 1996/03/20 04:25:57 tls Exp $ */ /* @@ -45,7 +45,7 @@ static char copyright[] = static char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; static char rcsid[] = "$NetBSD: telnetd.c,v 1.5 1996/02/28 20:38:23 thorpej Exp $"; #else -static char rcsid[] = "$OpenBSD: telnetd.c,v 1.5 1996/12/23 13:31:40 robin Exp $"; +static char rcsid[] = "$OpenBSD: telnetd.c,v 1.6 1997/01/15 23:41:05 millert Exp $"; #endif #endif /* not lint */ @@ -196,7 +196,7 @@ main(argc, argv) highpty = getnpty(); #endif /* CRAY */ - while ((ch = getopt(argc, argv, valid_opts)) != EOF) { + while ((ch = getopt(argc, argv, valid_opts)) != -1) { switch(ch) { #ifdef AUTHENTICATION diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c index 65587a6fcb2..ac9eaa48fdc 100644 --- a/regress/lib/libc/db/dbtest.c +++ b/regress/lib/libc/db/dbtest.c @@ -107,7 +107,7 @@ main(argc, argv) fname = NULL; oflags = O_CREAT | O_RDWR; sflag = 0; - while ((ch = getopt(argc, argv, "f:i:lo:s")) != EOF) + while ((ch = getopt(argc, argv, "f:i:lo:s")) != -1) switch (ch) { case 'f': fname = optarg; diff --git a/regress/lib/libc/regex/main.c b/regress/lib/libc/regex/main.c index add5e8be103..6e63ffc2351 100644 --- a/regress/lib/libc/regex/main.c +++ b/regress/lib/libc/regex/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.2 1996/12/21 22:23:42 millert Exp $ */ +/* $OpenBSD: main.c,v 1.3 1997/01/15 23:41:07 millert Exp $ */ /* $NetBSD: main.c,v 1.2 1995/04/20 22:39:51 cgd Exp $ */ #include <stdio.h> @@ -47,7 +47,7 @@ char *argv[]; progname = argv[0]; - while ((c = getopt(argc, argv, "c:e:S:E:x")) != EOF) + while ((c = getopt(argc, argv, "c:e:S:E:x")) != -1) switch (c) { case 'c': /* compile options */ copts = options('c', optarg); diff --git a/regress/sys/arch/i386/ldt/testldt.c b/regress/sys/arch/i386/ldt/testldt.c index fae021d0e12..a88c1b826d1 100644 --- a/regress/sys/arch/i386/ldt/testldt.c +++ b/regress/sys/arch/i386/ldt/testldt.c @@ -161,7 +161,7 @@ main(int argc, char *argv[]) exit(1); } - while ((ch = getopt(argc, argv, "v")) != EOF) { + while ((ch = getopt(argc, argv, "v")) != -1) { switch (ch) { case 'v': verbose++; diff --git a/sbin/bim/bim.c b/sbin/bim/bim.c index 5c8daecbc75..bbb52f522ed 100644 --- a/sbin/bim/bim.c +++ b/sbin/bim/bim.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bim.c,v 1.2 1996/06/23 14:29:56 deraadt Exp $ */ +/* $OpenBSD: bim.c,v 1.3 1997/01/15 23:41:09 millert Exp $ */ /* $NetBSD: bim.c,v 1.4 1995/09/28 07:08:49 phil Exp $ */ /* @@ -618,7 +618,7 @@ char *argv[]; cmdscnt = 0; opterr = TRUE; fname = DEFAULT_DEVICE; - while ((optchar = getopt (argc, argv, "c:")) != EOF) + while ((optchar = getopt (argc, argv, "c:")) != -1) switch (optchar) { case 'c': if (cmdscnt == MAXARGCMDS) usage(); argcmds[cmdscnt++] = optarg; diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 1782a131b08..9e63bd76a53 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dmesg.c,v 1.3 1996/12/22 03:00:49 deraadt Exp $ */ +/* $OpenBSD: dmesg.c,v 1.4 1997/01/15 23:41:10 millert Exp $ */ /* $NetBSD: dmesg.c,v 1.8 1995/03/18 14:54:49 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: dmesg.c,v 1.3 1996/12/22 03:00:49 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dmesg.c,v 1.4 1997/01/15 23:41:10 millert Exp $"; #endif #endif /* not lint */ @@ -86,7 +86,7 @@ main(argc, argv) char buf[5]; memf = nlistf = NULL; - while ((ch = getopt(argc, argv, "M:N:")) != EOF) + while ((ch = getopt(argc, argv, "M:N:")) != -1) switch(ch) { case 'M': memf = optarg; diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 27908279056..09c26a2eca8 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.6 1996/10/20 08:36:35 tholo Exp $ */ +/* $OpenBSD: main.c,v 1.7 1997/01/15 23:41:46 millert Exp $ */ /* $NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.6 1996/10/20 08:36:35 tholo Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.7 1997/01/15 23:41:46 millert Exp $"; #endif #endif /* not lint */ @@ -82,7 +82,7 @@ main(argc, argv) sync(); skipclean = 1; - while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != EOF) { + while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != -1) { switch (ch) { case 'p': preen++; diff --git a/sbin/fsck_msdos/main.c b/sbin/fsck_msdos/main.c index 4ee85d06814..dd6c38901c0 100644 --- a/sbin/fsck_msdos/main.c +++ b/sbin/fsck_msdos/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.3 1996/06/23 14:30:45 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.4 1997/01/15 23:41:47 millert Exp $ */ /* $NetBSD: main.c,v 1.1.4.1 1996/05/31 18:41:54 jtc Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: main.c,v 1.3 1996/06/23 14:30:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.4 1997/01/15 23:41:47 millert Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -74,7 +74,7 @@ main(argc, argv) int ret = 0, erg; int ch; - while ((ch = getopt(argc, argv, "vpyn")) != EOF) { + while ((ch = getopt(argc, argv, "vpyn")) != -1) { switch (ch) { case 'n': alwaysno = 1; diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c index 4aec3c69911..3551f9219a1 100644 --- a/sbin/modload/modload.c +++ b/sbin/modload/modload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modload.c,v 1.9 1996/09/16 01:37:00 deraadt Exp $ */ +/* $OpenBSD: modload.c,v 1.10 1997/01/15 23:41:14 millert Exp $ */ /* $NetBSD: modload.c,v 1.13 1995/05/28 05:21:58 jtc Exp $ */ /* @@ -172,7 +172,7 @@ main(argc, argv) char buf[MODIOBUF]; char *symbuf; - while ((c = getopt(argc, argv, "dvsuqA:e:p:o:")) != EOF) { + while ((c = getopt(argc, argv, "dvsuqA:e:p:o:")) != -1) { switch (c) { case 'd': debug = 1; diff --git a/sbin/modunload/modunload.c b/sbin/modunload/modunload.c index 4e5f7645ee6..b27c00b13b4 100644 --- a/sbin/modunload/modunload.c +++ b/sbin/modunload/modunload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modunload.c,v 1.4 1996/08/05 11:05:21 mickey Exp $ */ +/* $OpenBSD: modunload.c,v 1.5 1997/01/15 23:41:14 millert Exp $ */ /* $NetBSD: modunload.c,v 1.9 1995/05/28 05:23:05 jtc Exp $ */ /* @@ -76,7 +76,7 @@ main(argc, argv) char *modname = NULL; struct lmc_unload ulbuf; - while ((c = getopt(argc, argv, "i:n:")) != EOF) { + while ((c = getopt(argc, argv, "i:n:")) != -1) { switch (c) { case 'i': modnum = atoi(optarg); diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 1efd465ef66..5f1465322fa 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.12 1996/12/23 08:38:49 downsj Exp $ */ +/* $OpenBSD: mount.c,v 1.13 1997/01/15 23:41:15 millert Exp $ */ /* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount.c 8.19 (Berkeley) 4/19/94"; #else -static char rcsid[] = "$OpenBSD: mount.c,v 1.12 1996/12/23 08:38:49 downsj Exp $"; +static char rcsid[] = "$OpenBSD: mount.c,v 1.13 1997/01/15 23:41:15 millert Exp $"; #endif #endif /* not lint */ @@ -120,7 +120,7 @@ main(argc, argv) all = forceall = init_flags = 0; options = NULL; vfstype = "ffs"; - while ((ch = getopt(argc, argv, "Aadfo:rwt:uv")) != EOF) + while ((ch = getopt(argc, argv, "Aadfo:rwt:uv")) != -1) switch (ch) { case 'A': all = forceall = 1; diff --git a/sbin/mount_ados/mount_ados.c b/sbin/mount_ados/mount_ados.c index 52105cb3135..07e3ad7ca5c 100644 --- a/sbin/mount_ados/mount_ados.c +++ b/sbin/mount_ados/mount_ados.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ados.c,v 1.4 1996/12/16 17:11:36 deraadt Exp $ */ +/* $OpenBSD: mount_ados.c,v 1.5 1997/01/15 23:41:16 millert Exp $ */ /* $NetBSD: mount_ados.c,v 1.5 1996/04/13 01:30:59 jtc Exp $ */ /* @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.4 1996/12/16 17:11:36 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.5 1997/01/15 23:41:16 millert Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -73,7 +73,7 @@ main(argc, argv) mntflags = set_gid = set_uid = set_mask = 0; (void)memset(&args, '\0', sizeof(args)); - while ((c = getopt(argc, argv, "u:g:m:o:")) != EOF) { + while ((c = getopt(argc, argv, "u:g:m:o:")) != -1) { switch (c) { case 'u': args.uid = a_uid(optarg); diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index b1ec2d8d550..63ec59857f8 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_cd9660.c,v 1.3 1996/06/23 14:31:16 deraadt Exp $ */ +/* $OpenBSD: mount_cd9660.c,v 1.4 1997/01/15 23:41:17 millert Exp $ */ /* $NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $ */ /* @@ -49,7 +49,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_cd9660.c 8.4 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.3 1996/06/23 14:31:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.4 1997/01/15 23:41:17 millert Exp $"; #endif #endif /* not lint */ @@ -83,7 +83,7 @@ main(argc, argv) char *dev, *dir; mntflags = opts = 0; - while ((ch = getopt(argc, argv, "ego:r")) != EOF) + while ((ch = getopt(argc, argv, "ego:r")) != -1) switch (ch) { case 'e': opts |= ISOFSMNT_EXTATT; diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c index 7f6eee62847..441010ec7f6 100644 --- a/sbin/mount_ext2fs/mount_ext2fs.c +++ b/sbin/mount_ext2fs/mount_ext2fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ext2fs.c,v 1.1 1996/06/27 07:20:28 downsj Exp $ */ +/* $OpenBSD: mount_ext2fs.c,v 1.2 1997/01/15 23:41:18 millert Exp $ */ /* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.1 1996/06/27 07:20:28 downsj Exp $"; +static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.2 1997/01/15 23:41:18 millert Exp $"; #endif #endif /* not lint */ @@ -80,7 +80,7 @@ main(argc, argv) mntflags = 0; optind = optreset = 1; /* Reset for parse of new argv. */ - while ((ch = getopt(argc, argv, "o:")) != EOF) + while ((ch = getopt(argc, argv, "o:")) != -1) switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags); diff --git a/sbin/mount_fdesc/mount_fdesc.c b/sbin/mount_fdesc/mount_fdesc.c index 221ff6e1e2a..94133ec7b64 100644 --- a/sbin/mount_fdesc/mount_fdesc.c +++ b/sbin/mount_fdesc/mount_fdesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_fdesc.c,v 1.3 1996/06/23 14:31:19 deraadt Exp $ */ +/* $OpenBSD: mount_fdesc.c,v 1.4 1997/01/15 23:41:19 millert Exp $ */ /* $NetBSD: mount_fdesc.c,v 1.7 1996/04/13 01:31:15 jtc Exp $ */ /* @@ -48,7 +48,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_fdesc.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.3 1996/06/23 14:31:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.4 1997/01/15 23:41:19 millert Exp $"; #endif #endif /* not lint */ @@ -78,7 +78,7 @@ main(argc, argv) int ch, mntflags; mntflags = 0; - while ((ch = getopt(argc, argv, "o:")) != EOF) + while ((ch = getopt(argc, argv, "o:")) != -1) switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags); diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c index f88975e0226..e3c05c6e0e5 100644 --- a/sbin/mount_ffs/mount_ffs.c +++ b/sbin/mount_ffs/mount_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ffs.c,v 1.4 1996/06/23 14:31:20 deraadt Exp $ */ +/* $OpenBSD: mount_ffs.c,v 1.5 1997/01/15 23:41:20 millert Exp $ */ /* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.4 1996/06/23 14:31:20 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.5 1997/01/15 23:41:20 millert Exp $"; #endif #endif /* not lint */ @@ -83,7 +83,7 @@ main(argc, argv) mntflags = 0; optind = optreset = 1; /* Reset for parse of new argv. */ - while ((ch = getopt(argc, argv, "o:")) != EOF) + while ((ch = getopt(argc, argv, "o:")) != -1) switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags); diff --git a/sbin/mount_kernfs/mount_kernfs.c b/sbin/mount_kernfs/mount_kernfs.c index 04af851fffc..b7d10b38fcf 100644 --- a/sbin/mount_kernfs/mount_kernfs.c +++ b/sbin/mount_kernfs/mount_kernfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_kernfs.c,v 1.3 1996/06/23 14:31:22 deraadt Exp $ */ +/* $OpenBSD: mount_kernfs.c,v 1.4 1997/01/15 23:41:21 millert Exp $ */ /* $NetBSD: mount_kernfs.c,v 1.8 1996/04/13 05:35:39 cgd Exp $ */ /* @@ -48,7 +48,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_kernfs.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_kernfs.c,v 1.3 1996/06/23 14:31:22 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_kernfs.c,v 1.4 1997/01/15 23:41:21 millert Exp $"; #endif #endif /* not lint */ @@ -78,7 +78,7 @@ main(argc, argv) int ch, mntflags; mntflags = 0; - while ((ch = getopt(argc, argv, "o:")) != EOF) + while ((ch = getopt(argc, argv, "o:")) != -1) switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags); diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c index fcec7fa7902..3e4c35ef43b 100644 --- a/sbin/mount_lfs/mount_lfs.c +++ b/sbin/mount_lfs/mount_lfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_lfs.c,v 1.4 1996/12/09 13:38:47 deraadt Exp $ */ +/* $OpenBSD: mount_lfs.c,v 1.5 1997/01/15 23:41:22 millert Exp $ */ /* $NetBSD: mount_lfs.c,v 1.4 1996/04/13 05:35:44 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_lfs.c 8.3 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.4 1996/12/09 13:38:47 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.5 1997/01/15 23:41:22 millert Exp $"; #endif #endif /* not lint */ @@ -85,7 +85,7 @@ main(argc, argv) options = NULL; mntflags = noclean = 0; - while ((ch = getopt(argc, argv, "dno:s")) != EOF) + while ((ch = getopt(argc, argv, "dno:s")) != -1) switch (ch) { case 'd': cleaner_debug = 1; diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index a223f2271f3..dd06fe3f167 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_msdos.c,v 1.8 1996/12/16 17:11:38 deraadt Exp $ */ +/* $OpenBSD: mount_msdos.c,v 1.9 1997/01/15 23:41:22 millert Exp $ */ /* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */ /* @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.8 1996/12/16 17:11:38 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.9 1997/01/15 23:41:22 millert Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -76,7 +76,7 @@ main(argc, argv) mntflags = set_gid = set_uid = set_mask = 0; (void)memset(&args, '\0', sizeof(args)); - while ((c = getopt(argc, argv, "Gsl9u:g:m:o:")) != EOF) { + while ((c = getopt(argc, argv, "Gsl9u:g:m:o:")) != -1) { switch (c) { case 'G': args.flags |= MSDOSFSMNT_GEMDOSFS; diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c index 08b40c0351e..fd49f42e586 100644 --- a/sbin/mount_null/mount_null.c +++ b/sbin/mount_null/mount_null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_null.c,v 1.3 1996/06/23 14:31:29 deraadt Exp $ */ +/* $OpenBSD: mount_null.c,v 1.4 1997/01/15 23:41:23 millert Exp $ */ /* $NetBSD: mount_null.c,v 1.3 1996/04/13 01:31:49 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_null.c 8.5 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_null.c,v 1.3 1996/06/23 14:31:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_null.c,v 1.4 1997/01/15 23:41:23 millert Exp $"; #endif #endif /* not lint */ @@ -81,7 +81,7 @@ main(argc, argv) char target[MAXPATHLEN]; mntflags = 0; - while ((ch = getopt(argc, argv, "o:")) != EOF) + while ((ch = getopt(argc, argv, "o:")) != -1) switch(ch) { case 'o': getmntopts(optarg, mopts, &mntflags); diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c index fca5ee1c503..a29fb29f6a2 100644 --- a/sbin/mount_portal/mount_portal.c +++ b/sbin/mount_portal/mount_portal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_portal.c,v 1.4 1996/06/25 21:31:26 deraadt Exp $ */ +/* $OpenBSD: mount_portal.c,v 1.5 1997/01/15 23:41:24 millert Exp $ */ /* $NetBSD: mount_portal.c,v 1.8 1996/04/13 01:31:54 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_portal.c 8.4 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.4 1996/06/25 21:31:26 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.5 1997/01/15 23:41:24 millert Exp $"; #endif #endif /* not lint */ @@ -132,7 +132,7 @@ main(argc, argv) */ int ch; - while ((ch = getopt(argc, argv, "o:")) != EOF) { + while ((ch = getopt(argc, argv, "o:")) != -1) { switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags); diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c index 55fa0bdf3ab..f03ec7d76d6 100644 --- a/sbin/mount_procfs/mount_procfs.c +++ b/sbin/mount_procfs/mount_procfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_procfs.c,v 1.3 1996/06/23 14:31:38 deraadt Exp $ */ +/* $OpenBSD: mount_procfs.c,v 1.4 1997/01/15 23:41:25 millert Exp $ */ /* $NetBSD: mount_procfs.c,v 1.7 1996/04/13 01:31:59 jtc Exp $ */ /* @@ -48,7 +48,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_procfs.c 8.3 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.3 1996/06/23 14:31:38 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.4 1997/01/15 23:41:25 millert Exp $"; #endif #endif /* not lint */ @@ -78,7 +78,7 @@ main(argc, argv) int ch, mntflags; mntflags = 0; - while ((ch = getopt(argc, argv, "o:")) != EOF) + while ((ch = getopt(argc, argv, "o:")) != -1) switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags); diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c index c1414b5c0fe..1c8cf67453a 100644 --- a/sbin/mount_umap/mount_umap.c +++ b/sbin/mount_umap/mount_umap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_umap.c,v 1.4 1996/06/23 14:31:40 deraadt Exp $ */ +/* $OpenBSD: mount_umap.c,v 1.5 1997/01/15 23:41:26 millert Exp $ */ /* $NetBSD: mount_umap.c,v 1.5 1996/04/13 01:32:05 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_umap.c 8.3 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.4 1996/06/23 14:31:40 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.5 1997/01/15 23:41:26 millert Exp $"; #endif #endif /* not lint */ @@ -107,7 +107,7 @@ main(argc, argv) mntflags = 0; umapfile = gmapfile = NULL; - while ((ch = getopt(argc, argv, "g:o:u:")) != EOF) + while ((ch = getopt(argc, argv, "g:o:u:")) != -1) switch (ch) { case 'g': gmapfile = optarg; diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c index 3a019a90ab6..6650fe9c69b 100644 --- a/sbin/mount_union/mount_union.c +++ b/sbin/mount_union/mount_union.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_union.c,v 1.3 1996/06/23 14:31:43 deraadt Exp $ */ +/* $OpenBSD: mount_union.c,v 1.4 1997/01/15 23:41:27 millert Exp $ */ /* $NetBSD: mount_union.c,v 1.3 1996/04/13 01:32:11 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_union.c,v 1.3 1996/06/23 14:31:43 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_union.c,v 1.4 1997/01/15 23:41:27 millert Exp $"; #endif #endif /* not lint */ @@ -83,7 +83,7 @@ main(argc, argv) mntflags = 0; args.mntflags = UNMNT_ABOVE; - while ((ch = getopt(argc, argv, "bo:r")) != EOF) + while ((ch = getopt(argc, argv, "bo:r")) != -1) switch (ch) { case 'b': args.mntflags &= ~UNMNT_OPMASK; diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index 542263b9c5b..64babcb94e0 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mountd.c,v 1.13 1996/12/10 07:26:45 deraadt Exp $ */ +/* $OpenBSD: mountd.c,v 1.14 1997/01/15 23:41:28 millert Exp $ */ /* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */ /* @@ -249,7 +249,7 @@ main(argc, argv) SVCXPRT *udptransp, *tcptransp; int c; - while ((c = getopt(argc, argv, "dnr")) != EOF) + while ((c = getopt(argc, argv, "dnr")) != -1) switch (c) { case 'd': debug = 1; diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c index 216323410ed..7a3596e395c 100644 --- a/sbin/ncheck_ffs/ncheck_ffs.c +++ b/sbin/ncheck_ffs/ncheck_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncheck_ffs.c,v 1.4 1996/08/14 06:41:37 tholo Exp $ */ +/* $OpenBSD: ncheck_ffs.c,v 1.5 1997/01/15 23:41:30 millert Exp $ */ /*- * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.4 1996/08/14 06:41:37 tholo Exp $"; +static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.5 1997/01/15 23:41:30 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -438,7 +438,7 @@ main(argc, argv) int c; ino_t ino; - while ((c = getopt(argc, argv, "ai:ms")) != EOF) + while ((c = getopt(argc, argv, "ai:ms")) != -1) switch (c) { case 'a': aflag++; diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 5558ce7241c..81b2332ce0e 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.9 1996/12/23 07:48:28 downsj Exp $ */ +/* $OpenBSD: newfs.c,v 1.10 1997/01/15 23:41:31 millert Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.9 1996/12/23 07:48:28 downsj Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.10 1997/01/15 23:41:31 millert Exp $"; #endif #endif /* not lint */ @@ -227,7 +227,7 @@ main(argc, argv) opstring = mfs ? "NT:a:b:c:d:e:f:i:m:o:s:" : "NOS:T:a:b:c:d:e:f:i:k:l:m:n:o:p:r:s:t:u:x:z:"; - while ((ch = getopt(argc, argv, opstring)) != EOF) { + while ((ch = getopt(argc, argv, opstring)) != -1) { switch (ch) { case 'N': Nflag = 1; diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c index 11fc9e46874..5004b8650b5 100644 --- a/sbin/newfs_msdos/newfs_msdos.c +++ b/sbin/newfs_msdos/newfs_msdos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs_msdos.c,v 1.3 1997/01/10 19:04:10 kstailey Exp $ */ +/* $OpenBSD: newfs_msdos.c,v 1.4 1997/01/15 23:41:32 millert Exp $ */ /* * Copyright (c) 1995, 1996 Joerg Wunsch @@ -205,7 +205,7 @@ main(argc, argv) int c, i, fd, format = 0, rootdirsize; char *rdev; - while ((c = getopt(argc, argv, "s:L:t:")) != EOF) + while ((c = getopt(argc, argv, "s:L:t:")) != -1) switch (c) { case 's': format = atoi(optarg); diff --git a/sbin/newlfs/newfs.c b/sbin/newlfs/newfs.c index 6d283ab3446..5adb25e1a47 100644 --- a/sbin/newlfs/newfs.c +++ b/sbin/newlfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.5 1996/12/04 08:39:31 deraadt Exp $ */ +/* $OpenBSD: newfs.c,v 1.6 1997/01/15 23:41:33 millert Exp $ */ /* $NetBSD: newfs.c,v 1.5 1996/05/16 07:17:50 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.5 (Berkeley) 5/24/95"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.5 1996/12/04 08:39:31 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.6 1997/01/15 23:41:33 millert Exp $"; #endif #endif /* not lint */ @@ -156,7 +156,7 @@ main(argc, argv) opstring += 2; debug = lfs = segsize = 0; - while ((ch = getopt(argc, argv, opstring)) != EOF) + while ((ch = getopt(argc, argv, opstring)) != -1) switch(ch) { case 'B': /* LFS segment size */ if ((segsize = atoi(optarg)) < LFS_MINSEGSIZE) diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c index 2bc527b51b4..93b3cefacea 100644 --- a/sbin/nfsd/nfsd.c +++ b/sbin/nfsd/nfsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsd.c,v 1.3 1996/09/16 20:41:28 deraadt Exp $ */ +/* $OpenBSD: nfsd.c,v 1.4 1997/01/15 23:41:34 millert Exp $ */ /* $NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft Exp $ */ /* @@ -167,7 +167,7 @@ main(argc, argv, envp) #define GETOPT "n:rtu" #define USAGE "[-rtu] [-n num_servers]" #endif - while ((ch = getopt(argc, argv, GETOPT)) != EOF) + while ((ch = getopt(argc, argv, GETOPT)) != -1) switch (ch) { case 'n': nfsdcnt = atoi(optarg); diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c index d647d6b363a..ee596a50641 100644 --- a/sbin/nfsiod/nfsiod.c +++ b/sbin/nfsiod/nfsiod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsiod.c,v 1.3 1996/08/02 11:05:09 deraadt Exp $ */ +/* $OpenBSD: nfsiod.c,v 1.4 1997/01/15 23:41:35 millert Exp $ */ /* $NetBSD: nfsiod.c,v 1.12 1996/02/20 16:06:55 fvdl Exp $ */ /* @@ -97,7 +97,7 @@ main(argc, argv) #define MAXNFSDCNT 20 #define DEFNFSDCNT 1 num_servers = DEFNFSDCNT; - while ((ch = getopt(argc, argv, "n:")) != EOF) + while ((ch = getopt(argc, argv, "n:")) != -1) switch (ch) { case 'n': num_servers = atoi(optarg); diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index c60f7b9c4f2..330326d126a 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.12 1996/12/22 03:00:52 deraadt Exp $ */ +/* $OpenBSD: ping.c,v 1.13 1997/01/15 23:41:36 millert Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: ping.c,v 1.12 1996/12/22 03:00:52 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ping.c,v 1.13 1997/01/15 23:41:36 millert Exp $"; #endif #endif /* not lint */ @@ -204,7 +204,7 @@ main(argc, argv) preload = 0; datap = &outpack[8 + sizeof(struct timeval)]; - while ((ch = getopt(argc, argv, "DI:LRS:c:dfh:i:l:np:qrs:T:t:vw:")) != EOF) + while ((ch = getopt(argc, argv, "DI:LRS:c:dfh:i:l:np:qrs:T:t:vw:")) != -1) switch(ch) { case 'c': npackets = strtol(optarg, 0, NULL); diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index caf185528f1..1b2fe05b1b3 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reboot.c,v 1.4 1996/07/22 09:20:59 deraadt Exp $ */ +/* $OpenBSD: reboot.c,v 1.5 1997/01/15 23:41:38 millert Exp $ */ /* $NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: reboot.c,v 1.4 1996/07/22 09:20:59 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: reboot.c,v 1.5 1997/01/15 23:41:38 millert Exp $"; #endif #endif /* not lint */ @@ -87,7 +87,7 @@ main(argc, argv) } else howto = 0; lflag = nflag = qflag = 0; - while ((ch = getopt(argc, argv, "lnqd")) != EOF) + while ((ch = getopt(argc, argv, "lnqd")) != -1) switch(ch) { case 'l': /* Undocumented; used by shutdown. */ lflag = 1; diff --git a/sbin/restore/main.c b/sbin/restore/main.c index 153411f9092..33ccc60af92 100644 --- a/sbin/restore/main.c +++ b/sbin/restore/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.5 1996/09/16 02:32:34 millert Exp $ */ +/* $OpenBSD: main.c,v 1.6 1997/01/15 23:41:38 millert Exp $ */ /* $NetBSD: main.c,v 1.11 1996/03/15 22:39:39 scottr Exp $ */ /* @@ -102,7 +102,7 @@ main(argc, argv) if ((inputdev = getenv("TAPE")) == NULL) inputdev = _PATH_DEFTAPE; obsolete(&argc, &argv); - while ((ch = getopt(argc, argv, "b:cdf:himNRrs:tvxy")) != EOF) + while ((ch = getopt(argc, argv, "b:cdf:himNRrs:tvxy")) != -1) switch(ch) { case 'b': /* Change default tape blocksize. */ diff --git a/sbin/route/route.c b/sbin/route/route.c index bf64254c18a..52d2755bfb5 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.16 1996/12/22 03:00:53 deraadt Exp $ */ +/* $OpenBSD: route.c,v 1.17 1997/01/15 23:41:40 millert Exp $ */ /* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: route.c,v 1.16 1996/12/22 03:00:53 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: route.c,v 1.17 1997/01/15 23:41:40 millert Exp $"; #endif #endif /* not lint */ @@ -145,7 +145,7 @@ main(argc, argv) if (argc < 2) usage((char *)NULL); - while ((ch = getopt(argc, argv, "nqdtv")) != EOF) + while ((ch = getopt(argc, argv, "nqdtv")) != -1) switch(ch) { case 'n': nflag = 1; diff --git a/sbin/routed/main.c b/sbin/routed/main.c index e1f06adf418..301b60e3d1a 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.4 1996/10/02 06:51:45 mickey Exp $ */ +/* $OpenBSD: main.c,v 1.5 1997/01/15 23:41:12 millert Exp $ */ /* * Copyright (c) 1983, 1988, 1993 @@ -39,7 +39,7 @@ char copyright[] = #if !defined(lint) static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.4 1996/10/02 06:51:45 mickey Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.5 1997/01/15 23:41:12 millert Exp $"; #endif #include "defs.h" @@ -120,7 +120,7 @@ main(int argc, (void)gethostname(myname, sizeof(myname)-1); (void)gethost(myname, &myaddr); - while ((n = getopt(argc, argv, "sqdghmpAtT:F:P:")) != EOF) { + while ((n = getopt(argc, argv, "sqdghmpAtT:F:P:")) != -1) { switch (n) { case 's': supplier = 1; diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index 64fddb212b7..289947ff122 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtquery.c,v 1.3 1996/10/02 06:51:49 mickey Exp $ */ +/* $OpenBSD: rtquery.c,v 1.4 1997/01/15 23:41:11 millert Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -114,7 +114,7 @@ main(int argc, OMSG.rip_nets[0].n_metric = htonl(HOPCNT_INFINITY); pgmname = argv[0]; - while ((ch = getopt(argc, argv, "np1w:r:t:")) != EOF) + while ((ch = getopt(argc, argv, "np1w:r:t:")) != -1) switch (ch) { case 'n': not_trace = 1; diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c index 8915446f6ab..716a442127e 100644 --- a/sbin/scsi/scsi.c +++ b/sbin/scsi/scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi.c,v 1.1 1996/06/12 11:21:43 deraadt Exp $ */ +/* $OpenBSD: scsi.c,v 1.2 1997/01/15 23:41:41 millert Exp $ */ /* $FreeBSD: scsi.c,v 1.11 1996/04/06 11:00:28 joerg Exp $ */ /* @@ -115,7 +115,7 @@ void procargs(int *argc_p, char ***argv_p) fflag = 0; commandflag = 0; debugflag = 0; - while ((ch = getopt(argc, argv, "ceprvf:d:b:t:l:z:m:P:s:")) != EOF) { + while ((ch = getopt(argc, argv, "ceprvf:d:b:t:l:z:m:P:s:")) != -1) { switch (ch) { #ifdef SCIOCADDR case 'p': diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 4c78e0c62a6..252282f831c 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shutdown.c,v 1.6 1996/12/22 02:59:53 deraadt Exp $ */ +/* $OpenBSD: shutdown.c,v 1.7 1997/01/15 23:41:42 millert Exp $ */ /* $NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94"; #else -static char rcsid[] = "$OpenBSD: shutdown.c,v 1.6 1996/12/22 02:59:53 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: shutdown.c,v 1.7 1997/01/15 23:41:42 millert Exp $"; #endif #endif /* not lint */ @@ -122,7 +122,7 @@ main(argc, argv) #endif nosync = NULL; readstdin = 0; - while ((ch = getopt(argc, argv, "-fhknr")) != EOF) + while ((ch = getopt(argc, argv, "-fhknr")) != -1) switch (ch) { case '-': readstdin = 1; diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 1513c8e2352..d8e6a936cd7 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapon.c,v 1.2 1996/06/23 14:32:46 deraadt Exp $ */ +/* $OpenBSD: swapon.c,v 1.3 1997/01/15 23:41:43 millert Exp $ */ /* $NetBSD: swapon.c,v 1.7 1995/03/18 15:01:18 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: swapon.c,v 1.2 1996/06/23 14:32:46 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: swapon.c,v 1.3 1997/01/15 23:41:43 millert Exp $"; #endif #endif /* not lint */ @@ -67,7 +67,7 @@ main(argc, argv) int ch, doall; doall = 0; - while ((ch = getopt(argc, argv, "a")) != EOF) + while ((ch = getopt(argc, argv, "a")) != -1) switch((char)ch) { case 'a': doall = 1; diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c index ad51f0dfa75..e597f4d255d 100644 --- a/sbin/sysctl/pathconf.c +++ b/sbin/sysctl/pathconf.c @@ -91,7 +91,7 @@ main(argc, argv) char *path; int ch; - while ((ch = getopt(argc, argv, "Aan")) != EOF) { + while ((ch = getopt(argc, argv, "Aan")) != -1) { switch (ch) { case 'A': diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index d4957d72837..799c15dd686 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.4 1996/11/25 08:22:43 mickey Exp $ */ +/* $OpenBSD: sysctl.c,v 1.5 1997/01/15 23:44:22 millert Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: sysctl.c,v 1.4 1996/11/25 08:22:43 mickey Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.5 1997/01/15 23:44:22 millert Exp $"; #endif #endif /* not lint */ @@ -143,7 +143,7 @@ main(argc, argv) extern int optind; int ch, lvl1; - while ((ch = getopt(argc, argv, "Aanw")) != EOF) { + while ((ch = getopt(argc, argv, "Aanw")) != -1) { switch (ch) { case 'A': diff --git a/sbin/ttyflags/ttyflags.c b/sbin/ttyflags/ttyflags.c index a4ae8b5ad81..9ea77dcf18b 100644 --- a/sbin/ttyflags/ttyflags.c +++ b/sbin/ttyflags/ttyflags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ttyflags.c,v 1.5 1996/10/30 08:17:05 tholo Exp $ */ +/* $OpenBSD: ttyflags.c,v 1.6 1997/01/15 23:41:44 millert Exp $ */ /* $NetBSD: ttyflags.c,v 1.8 1996/04/09 05:20:30 cgd Exp $ */ /* @@ -39,7 +39,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.5 1996/10/30 08:17:05 tholo Exp $"; +static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.6 1997/01/15 23:41:44 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -77,7 +77,7 @@ main(argc, argv) int aflag, ch, rval, pflag = 0; aflag = nflag = vflag = 0; - while ((ch = getopt(argc, argv, "panv")) != EOF) + while ((ch = getopt(argc, argv, "panv")) != -1) switch (ch) { case 'a': aflag = 1; diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 86450277255..f3cfeb569ab 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umount.c,v 1.4 1996/06/23 14:32:53 deraadt Exp $ */ +/* $OpenBSD: umount.c,v 1.5 1997/01/15 23:41:45 millert Exp $ */ /* $NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)umount.c 8.3 (Berkeley) 2/20/94"; #else -static char rcsid[] = "$OpenBSD: umount.c,v 1.4 1996/06/23 14:32:53 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: umount.c,v 1.5 1997/01/15 23:41:45 millert Exp $"; #endif #endif /* not lint */ @@ -94,7 +94,7 @@ main(argc, argv) sync(); all = 0; - while ((ch = getopt(argc, argv, "aFfh:t:v")) != EOF) + while ((ch = getopt(argc, argv, "aFfh:t:v")) != -1) switch (ch) { case 'a': all = 1; diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c index f5f664b0075..d829203e434 100644 --- a/sys/arch/alpha/stand/installboot.c +++ b/sys/arch/alpha/stand/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.4 1996/10/30 22:40:31 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.5 1997/01/15 23:41:48 millert Exp $ */ /* $NetBSD: installboot.c,v 1.2 1995/12/20 00:17:49 cgd Exp $ */ /* @@ -83,7 +83,7 @@ main(argc, argv) int mib[2]; size_t size; - while ((c = getopt(argc, argv, "vn")) != EOF) { + while ((c = getopt(argc, argv, "vn")) != -1) { switch (c) { case 'n': /* Do not actually write the bootblock to disk */ diff --git a/sys/arch/amiga/stand/binpatch/binpatch.c b/sys/arch/amiga/stand/binpatch/binpatch.c index 358c60caf01..60d04a0dc94 100644 --- a/sys/arch/amiga/stand/binpatch/binpatch.c +++ b/sys/arch/amiga/stand/binpatch/binpatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: binpatch.c,v 1.2 1996/10/04 23:09:54 niklas Exp $ */ +/* $OpenBSD: binpatch.c,v 1.3 1997/01/15 23:41:49 millert Exp $ */ /* $NetBSD: binpatch.c,v 1.6 1995/08/18 15:28:28 chopps Exp $ */ /* Author: Markus Wild mw@eunet.ch ??? */ @@ -110,7 +110,7 @@ main(int argc, char *argv[]) u_char cval; - while ((c = getopt (argc, argv, "H:a:bwlr:s:o:")) != EOF) + while ((c = getopt (argc, argv, "H:a:bwlr:s:o:")) != -1) switch (c) { case 'H': diff --git a/sys/arch/amiga/stand/loadbsd/loadbsd.c b/sys/arch/amiga/stand/loadbsd/loadbsd.c index 82287c45321..bd30916977a 100644 --- a/sys/arch/amiga/stand/loadbsd/loadbsd.c +++ b/sys/arch/amiga/stand/loadbsd/loadbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loadbsd.c,v 1.8 1996/10/10 07:08:16 niklas Exp $ */ +/* $OpenBSD: loadbsd.c,v 1.9 1997/01/15 23:41:50 millert Exp $ */ /* $NetBSD: loadbsd.c,v 1.19.4.2 1996/08/03 00:51:46 jtc Exp $ */ /* @@ -208,7 +208,7 @@ main(argc, argv) if ((ExpansionBase=(void *)OpenLibrary(EXPANSIONNAME, 0)) == NULL) err(20, "can't open expansion library"); - while ((ch = getopt(argc, argv, "aAbcC:DhI:km:n:ptsSVZ")) != EOF) { + while ((ch = getopt(argc, argv, "aAbcC:DhI:km:n:ptsSVZ")) != -1) { switch (ch) { case 'k': k_flag = 1; diff --git a/sys/arch/atari/stand/binpatch/binpatch.c b/sys/arch/atari/stand/binpatch/binpatch.c index 79f25f72c0a..3a0b46efe5c 100644 --- a/sys/arch/atari/stand/binpatch/binpatch.c +++ b/sys/arch/atari/stand/binpatch/binpatch.c @@ -63,7 +63,7 @@ main(argc, argv) u_char cval; - while ((c = getopt (argc, argv, "a:bwlr:s:o:")) != EOF) + while ((c = getopt (argc, argv, "a:bwlr:s:o:")) != -1) switch (c) { case 'a': diff --git a/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c b/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c index 1a226c93957..553f75ff398 100644 --- a/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c +++ b/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c @@ -95,7 +95,7 @@ int read_block PROTO((void *, int, int)); int write_block PROTO((void *, int, int)); void set_csum PROTO((char *)); -const char version[] = "$Revision: 1.2 $"; +const char version[] = "$Revision: 1.3 $"; char *Progname = NULL; /* What are we called */ int t_flag = 0; /* Test -- don't actually do it */ @@ -121,7 +121,7 @@ char *argv[]; init_toslib(argv[0]); Progname = argv[0]; - while ((c = getopt(argc, argv, "htVwo:")) != EOF) { + while ((c = getopt(argc, argv, "htVwo:")) != -1) { switch (c) { case 'h': h_flag = 1; diff --git a/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c b/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c index 784d0b25d05..649b4ff664b 100644 --- a/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c +++ b/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c @@ -52,7 +52,7 @@ int s_flag = 0; /* St-ram only */ int t_flag = 0; /* Just test, do not execute */ int v_flag = 0; /* show version */ -const char version[] = "$Revision: 1.2 $"; +const char version[] = "$Revision: 1.3 $"; /* * Default name of kernel to boot, large enough to patch @@ -86,7 +86,7 @@ char **argv; kparam.boothowto = RB_SINGLE; - while ((ch = getopt(argc, argv, "abdhstVwDo:S:T:")) != EOF) { + while ((ch = getopt(argc, argv, "abdhstVwDo:S:T:")) != -1) { switch (ch) { case 'a': kparam.boothowto &= ~(RB_SINGLE); diff --git a/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c b/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c index ad4f092496f..d9eed90059a 100644 --- a/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c +++ b/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c @@ -53,7 +53,7 @@ int v_flag = 0; /* Verbose (a dot for each track copied) */ int V_flag = 0; /* Show version */ char *progname; -const char version[] = "$Revision: 1.2 $"; +const char version[] = "$Revision: 1.3 $"; int main(argc, argv) @@ -71,7 +71,7 @@ char *argv[]; progname = argv[0]; init_toslib(argv[0]); - while ((ch = getopt(argc, argv, "hvVwo:")) != EOF) { + while ((ch = getopt(argc, argv, "hvVwo:")) != -1) { switch (ch) { case 'h': h_flag = 1; diff --git a/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c b/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c index 82231e4f0ea..2b38cf9b05a 100644 --- a/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c +++ b/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c @@ -74,7 +74,7 @@ char *argv[]; int dflag = -1; char *device = NULL; - while( (c = getopt(argc, argv, "d:n:s:e:")) != EOF) + while( (c = getopt(argc, argv, "d:n:s:e:")) != -1) { switch(c) { diff --git a/sys/arch/i386/isa/pcvt/Util/demo/playvt.c b/sys/arch/i386/isa/pcvt/Util/demo/playvt.c index d0a391ff6b4..75e1e399260 100644 --- a/sys/arch/i386/isa/pcvt/Util/demo/playvt.c +++ b/sys/arch/i386/isa/pcvt/Util/demo/playvt.c @@ -59,7 +59,7 @@ char *argv[]; int fflag = -1; char *filename; - while( (c = getopt(argc, argv, "d:f:")) != EOF) + while( (c = getopt(argc, argv, "d:f:")) != -1) { switch(c) { diff --git a/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c b/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c index 8520c321d9e..64672ffc9eb 100644 --- a/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c +++ b/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c @@ -85,7 +85,7 @@ char *argv[]; int fd; char *device = NULL; - while( (c = getopt(argc, argv, "vcd:")) != EOF) + while( (c = getopt(argc, argv, "vcd:")) != -1) { switch(c) { diff --git a/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c b/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c index ba2b21334ef..4db3d93a4b4 100644 --- a/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c +++ b/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c @@ -109,7 +109,7 @@ char *argv[]; char *map = NULL; int kbfd; - while((c = getopt(argc, argv, "Rd:lm:opr:st:x")) != EOF) + while((c = getopt(argc, argv, "Rd:lm:opr:st:x")) != -1) { switch(c) { diff --git a/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c b/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c index 3c10e5c8003..3639e790178 100644 --- a/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c +++ b/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c @@ -95,7 +95,7 @@ main(int argc, char **argv) int dflag = 0; char *device = NULL; - while( (c = getopt(argc, argv, "c:d:f:is:")) != EOF) + while( (c = getopt(argc, argv, "c:d:f:is:")) != -1) { switch(c) { diff --git a/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c b/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c index a4d65060117..f47da8d2eaa 100644 --- a/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c +++ b/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c @@ -88,7 +88,7 @@ int main(int argc, char **argv) { int left = 0, mid = 0, right = 0, accel = 0, sticky = -1; struct mousedefs mdef; - while((c = getopt(argc, argv, "l:m:r:a:s:")) != EOF) + while((c = getopt(argc, argv, "l:m:r:a:s:")) != -1) switch(c) { case 'l': left = nametoscan(optarg); diff --git a/sys/arch/i386/isa/pcvt/Util/scon/scon.c b/sys/arch/i386/isa/pcvt/Util/scon/scon.c index 53776168b54..edf9ea2fb08 100644 --- a/sys/arch/i386/isa/pcvt/Util/scon/scon.c +++ b/sys/arch/i386/isa/pcvt/Util/scon/scon.c @@ -204,7 +204,7 @@ char *argv[]; int c; int fd; - while( (c = getopt(argc, argv, "ac:d:f:HVlms:t:vp:18")) != EOF) + while( (c = getopt(argc, argv, "ac:d:f:HVlms:t:vp:18")) != -1) { switch(c) { diff --git a/sys/arch/i386/isa/pcvt/Util/set2061/main.c b/sys/arch/i386/isa/pcvt/Util/set2061/main.c index 03a482d3e3f..a7a020d6e28 100644 --- a/sys/arch/i386/isa/pcvt/Util/set2061/main.c +++ b/sys/arch/i386/isa/pcvt/Util/set2061/main.c @@ -63,7 +63,7 @@ char *argv[]; long freq = -1; int no = -1; - while( (c = getopt(argc, argv, "f:n:")) != EOF) + while( (c = getopt(argc, argv, "f:n:")) != -1) { switch(c) { diff --git a/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c b/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c index bca5a787ae8..839f83bba4c 100644 --- a/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c +++ b/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c @@ -96,7 +96,7 @@ int main(argc,argv) if(argc == 1) usage(); /* program requires options */ /* get options */ - while ((option = getopt(argc, argv, "cli")) != EOF) + while ((option = getopt(argc, argv, "cli")) != -1) switch(option) { case 'c' : diff --git a/sys/arch/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c index 19ed48b0d2a..88244cb41ba 100644 --- a/sys/arch/mvme68k/stand/installboot/installboot.c +++ b/sys/arch/mvme68k/stand/installboot/installboot.c @@ -89,7 +89,7 @@ main(argc, argv) char *protostore; long protosize; - while ((c = getopt(argc, argv, "vnh")) != EOF) { + while ((c = getopt(argc, argv, "vnh")) != -1) { switch (c) { case 'h': /* Don't strip a.out header */ diff --git a/sys/arch/pmax/stand/mkboottape.c b/sys/arch/pmax/stand/mkboottape.c index a4707c57800..4d4b20580c8 100644 --- a/sys/arch/pmax/stand/mkboottape.c +++ b/sys/arch/pmax/stand/mkboottape.c @@ -86,7 +86,7 @@ main(argc, argv) char block[DEV_BSIZE]; makebootfile = 0; - while ((i = getopt(argc, argv, "b")) != EOF) + while ((i = getopt(argc, argv, "b")) != -1) switch(i) { case 'b': makebootfile = 1; diff --git a/sys/arch/sparc/stand/installboot.c b/sys/arch/sparc/stand/installboot.c index 643bc96eb4e..959de4a341d 100644 --- a/sys/arch/sparc/stand/installboot.c +++ b/sys/arch/sparc/stand/installboot.c @@ -95,7 +95,7 @@ main(argc, argv) int mib[2]; size_t size; - while ((c = getopt(argc, argv, "a:vnh")) != EOF) { + while ((c = getopt(argc, argv, "a:vnh")) != -1) { switch (c) { case 'a': karch = optarg; diff --git a/sys/arch/sun3/stand/installboot/installboot.c b/sys/arch/sun3/stand/installboot/installboot.c index 19ed48b0d2a..88244cb41ba 100644 --- a/sys/arch/sun3/stand/installboot/installboot.c +++ b/sys/arch/sun3/stand/installboot/installboot.c @@ -89,7 +89,7 @@ main(argc, argv) char *protostore; long protosize; - while ((c = getopt(argc, argv, "vnh")) != EOF) { + while ((c = getopt(argc, argv, "vnh")) != -1) { switch (c) { case 'h': /* Don't strip a.out header */ diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_asm.c b/sys/dev/microcode/aic7xxx/aic7xxx_asm.c index 03dc38f8f10..39df041368a 100644 --- a/sys/dev/microcode/aic7xxx/aic7xxx_asm.c +++ b/sys/dev/microcode/aic7xxx/aic7xxx_asm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_asm.c,v 1.6 1996/11/28 23:28:00 niklas Exp $ */ +/* $OpenBSD: aic7xxx_asm.c,v 1.7 1997/01/15 23:42:08 millert Exp $ */ /*+M************************************************************************* * Adaptec AIC7770/AIC7870 sequencer code assembler. @@ -45,7 +45,7 @@ * are token separators. * *-M*************************************************************************/ -static char id[] = "$Id: aic7xxx_asm.c,v 1.6 1996/11/28 23:28:00 niklas Exp $"; +static char id[] = "$Id: aic7xxx_asm.c,v 1.7 1997/01/15 23:42:08 millert Exp $"; #include <ctype.h> #include <stdio.h> #include <string.h> @@ -587,7 +587,7 @@ main(int argc, char **argv) int fd[2]; ofile = NULL; - while ((c = getopt(argc, argv, "dho:vD:")) != EOF) { + while ((c = getopt(argc, argv, "dho:vD:")) != -1) { switch (c) { case 'd': debug = !0; diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 329aa32797c..1226bfd5777 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apply.c,v 1.2 1996/06/26 05:31:13 deraadt Exp $ */ +/* $OpenBSD: apply.c,v 1.3 1997/01/15 23:42:09 millert Exp $ */ /* $NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; #else -static char rcsid[] = "$OpenBSD: apply.c,v 1.2 1996/06/26 05:31:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: apply.c,v 1.3 1997/01/15 23:42:09 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ main(argc, argv) debug = 0; magic = '%'; /* Default magic char is `%'. */ nargs = -1; - while ((ch = getopt(argc, argv, "a:d0123456789")) != EOF) + while ((ch = getopt(argc, argv, "a:d0123456789")) != -1) switch (ch) { case 'a': if (optarg[1] != '\0') diff --git a/usr.bin/apropos/apropos.c b/usr.bin/apropos/apropos.c index 2d233702c8c..0992e011c69 100644 --- a/usr.bin/apropos/apropos.c +++ b/usr.bin/apropos/apropos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apropos.c,v 1.3 1996/10/25 06:27:42 downsj Exp $ */ +/* $OpenBSD: apropos.c,v 1.4 1997/01/15 23:42:10 millert Exp $ */ /* $NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: apropos.c,v 1.3 1996/10/25 06:27:42 downsj Exp $"; +static char rcsid[] = "$OpenBSD: apropos.c,v 1.4 1997/01/15 23:42:10 millert Exp $"; #endif #endif /* not lint */ @@ -81,7 +81,7 @@ main(argc, argv) conffile = NULL; p_augment = p_path = NULL; - while ((ch = getopt(argc, argv, "C:M:m:P:")) != EOF) + while ((ch = getopt(argc, argv, "C:M:m:P:")) != -1) switch (ch) { case 'C': conffile = optarg; diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index 4de5e562911..a6da84ff8de 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar.c,v 1.2 1996/06/26 05:31:18 deraadt Exp $ */ +/* $OpenBSD: ar.c,v 1.3 1997/01/15 23:42:11 millert Exp $ */ /* $NetBSD: ar.c,v 1.5 1995/03/26 03:27:44 glass Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: ar.c,v 1.2 1996/06/26 05:31:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ar.c,v 1.3 1997/01/15 23:42:11 millert Exp $"; #endif #endif /* not lint */ @@ -101,7 +101,7 @@ main(argc, argv) argv[1] = p; } - while ((c = getopt(argc, argv, "abcdilmopqrTtuvx")) != EOF) { + while ((c = getopt(argc, argv, "abcdilmopqrTtuvx")) != -1) { switch(c) { case 'a': options |= AR_A; diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c index 79d12402730..75ad2116238 100644 --- a/usr.bin/at/at.c +++ b/usr.bin/at/at.c @@ -1,4 +1,4 @@ -/* $OpenBSD: at.c,v 1.5 1996/10/26 20:06:50 millert Exp $ */ +/* $OpenBSD: at.c,v 1.6 1997/01/15 23:42:12 millert Exp $ */ /* $NetBSD: at.c,v 1.4 1995/03/25 18:13:31 glass Exp $ */ /* @@ -65,7 +65,7 @@ /* File scope variables */ #ifndef lint -static char rcsid[] = "$OpenBSD: at.c,v 1.5 1996/10/26 20:06:50 millert Exp $"; +static char rcsid[] = "$OpenBSD: at.c,v 1.6 1997/01/15 23:42:12 millert Exp $"; #endif char *no_export[] = @@ -495,7 +495,7 @@ main(argc, argv) /* process whatever options we can process */ opterr = 1; - while ((c = getopt(argc, argv, options)) != EOF) + while ((c = getopt(argc, argv, options)) != -1) switch (c) { case 'v': /* verify time settings */ atverify = 1; diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c index db7dccea77d..b2d3a5df3e7 100644 --- a/usr.bin/bdes/bdes.c +++ b/usr.bin/bdes/bdes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bdes.c,v 1.2 1996/06/26 05:31:39 deraadt Exp $ */ +/* $OpenBSD: bdes.c,v 1.3 1997/01/15 23:42:13 millert Exp $ */ /* $NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $ */ /*- @@ -51,7 +51,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)bdes.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: bdes.c,v 1.2 1996/06/26 05:31:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: bdes.c,v 1.3 1997/01/15 23:42:13 millert Exp $"; #endif #endif /* not lint */ @@ -195,7 +195,7 @@ main(ac, av) /* process the argument list */ kflag = 0; - while ((i = getopt(argc, argv, "abdF:f:k:m:o:pv:")) != EOF) + while ((i = getopt(argc, argv, "abdF:f:k:m:o:pv:")) != -1) switch(i) { case 'a': /* key is ASCII */ keybase = KEY_ASCII; diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 52ebc42187f..7c927f52367 100644 --- a/usr.bin/biff/biff.c +++ b/usr.bin/biff/biff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biff.c,v 1.2 1996/06/26 05:31:41 deraadt Exp $ */ +/* $OpenBSD: biff.c,v 1.3 1997/01/15 23:42:14 millert Exp $ */ /* $NetBSD: biff.c,v 1.3 1995/03/26 02:34:22 glass Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: biff.c,v 1.2 1996/06/26 05:31:41 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: biff.c,v 1.3 1997/01/15 23:42:14 millert Exp $"; #endif #endif /* not lint */ @@ -69,7 +69,7 @@ main(argc, argv) char *name; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { case '?': default: diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c index e385b332e7d..27234bc8a7b 100644 --- a/usr.bin/cal/cal.c +++ b/usr.bin/cal/cal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cal.c,v 1.3 1996/08/11 00:46:44 deraadt Exp $ */ +/* $OpenBSD: cal.c,v 1.4 1997/01/15 23:42:15 millert Exp $ */ /* $NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: cal.c,v 1.3 1996/08/11 00:46:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cal.c,v 1.4 1997/01/15 23:42:15 millert Exp $"; #endif #endif /* not lint */ @@ -146,7 +146,7 @@ main(argc, argv) int ch, month, year, yflag; yflag = 0; - while ((ch = getopt(argc, argv, "jy")) != EOF) + while ((ch = getopt(argc, argv, "jy")) != -1) switch(ch) { case 'j': julian = 1; diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index 3259a568edc..b08638f4990 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.c,v 1.5 1996/12/05 06:04:38 millert Exp $ */ +/* $OpenBSD: calendar.c,v 1.6 1997/01/15 23:42:16 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$OpenBSD: calendar.c,v 1.5 1996/12/05 06:04:38 millert Exp $"; +static char rcsid[] = "$OpenBSD: calendar.c,v 1.6 1997/01/15 23:42:16 millert Exp $"; #endif #endif /* not lint */ @@ -77,7 +77,7 @@ main(argc, argv) (void) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "?-af:t:A:B:")) != EOF) + while ((ch = getopt(argc, argv, "?-af:t:A:B:")) != -1) switch (ch) { case '-': /* backward contemptible */ case 'a': diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index a1789a5a822..ed340c9b3e2 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cap_mkdb.c,v 1.2 1996/06/26 05:31:48 deraadt Exp $ */ +/* $OpenBSD: cap_mkdb.c,v 1.3 1997/01/15 23:42:17 millert Exp $ */ /* $NetBSD: cap_mkdb.c,v 1.5 1995/09/02 05:47:12 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95"; #endif -static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.2 1996/06/26 05:31:48 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.3 1997/01/15 23:42:17 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -92,7 +92,7 @@ main(argc, argv) int c; capname = NULL; - while ((c = getopt(argc, argv, "f:v")) != EOF) { + while ((c = getopt(argc, argv, "f:v")) != -1) { switch(c) { case 'f': capname = optarg; diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index abab951236f..d2701075dee 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chpass.c,v 1.6 1996/10/20 23:45:50 millert Exp $ */ +/* $OpenBSD: chpass.c,v 1.7 1997/01/15 23:42:18 millert Exp $ */ /* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: chpass.c,v 1.6 1996/10/20 23:45:50 millert Exp $"; +static char rcsid[] = "$OpenBSD: chpass.c,v 1.7 1997/01/15 23:42:18 millert Exp $"; #endif #endif /* not lint */ @@ -95,7 +95,7 @@ main(argc, argv) #endif op = EDITENTRY; - while ((ch = getopt(argc, argv, "a:s:ly")) != EOF) + while ((ch = getopt(argc, argv, "a:s:ly")) != -1) switch(ch) { case 'a': op = LOADENTRY; diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index 9df77c0736c..80b7b8ed7c6 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmp.c,v 1.4 1996/08/01 00:29:10 michaels Exp $ */ +/* $OpenBSD: cmp.c,v 1.5 1997/01/15 23:42:19 millert Exp $ */ /* $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: cmp.c,v 1.4 1996/08/01 00:29:10 michaels Exp $"; +static char rcsid[] = "$OpenBSD: cmp.c,v 1.5 1997/01/15 23:42:19 millert Exp $"; #endif #endif /* not lint */ @@ -77,7 +77,7 @@ main(argc, argv) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "ls")) != EOF) + while ((ch = getopt(argc, argv, "ls")) != -1) switch (ch) { case 'l': /* print all differences */ lflag = 1; diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c index fe4067d7687..835b6d8b512 100644 --- a/usr.bin/col/col.c +++ b/usr.bin/col/col.c @@ -1,4 +1,4 @@ -/* $OpenBSD: col.c,v 1.2 1996/06/26 05:32:10 deraadt Exp $ */ +/* $OpenBSD: col.c,v 1.3 1997/01/15 23:42:20 millert Exp $ */ /* $NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: col.c,v 1.2 1996/06/26 05:32:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: col.c,v 1.3 1997/01/15 23:42:20 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -135,7 +135,7 @@ main(argc, argv) max_bufd_lines = 128; compress_spaces = 1; /* compress spaces into tabs */ - while ((opt = getopt(argc, argv, "bfhl:x")) != EOF) + while ((opt = getopt(argc, argv, "bfhl:x")) != -1) switch (opt) { case 'b': /* do not output backspaces */ no_backspaces = 1; diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 540eda01408..0c164a7d57c 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: colrm.c,v 1.2 1996/06/26 05:32:14 deraadt Exp $ */ +/* $OpenBSD: colrm.c,v 1.3 1997/01/15 23:42:21 millert Exp $ */ /* $NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: colrm.c,v 1.2 1996/06/26 05:32:14 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: colrm.c,v 1.3 1997/01/15 23:42:21 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -71,7 +71,7 @@ main(argc, argv) register int ch; char *p; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { case '?': default: diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index 6faa84b0c0c..15ea133659d 100644 --- a/usr.bin/column/column.c +++ b/usr.bin/column/column.c @@ -1,4 +1,4 @@ -/* $OpenBSD: column.c,v 1.2 1996/06/26 05:32:16 deraadt Exp $ */ +/* $OpenBSD: column.c,v 1.3 1997/01/15 23:42:21 millert Exp $ */ /* $NetBSD: column.c,v 1.4 1995/09/02 05:53:03 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: column.c,v 1.2 1996/06/26 05:32:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: column.c,v 1.3 1997/01/15 23:42:21 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -91,7 +91,7 @@ main(argc, argv) termwidth = win.ws_col; tflag = xflag = 0; - while ((ch = getopt(argc, argv, "c:s:tx")) != EOF) + while ((ch = getopt(argc, argv, "c:s:tx")) != -1) switch(ch) { case 'c': termwidth = atoi(optarg); diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c index cb1fb339ea9..565532d286c 100644 --- a/usr.bin/compress/compress.c +++ b/usr.bin/compress/compress.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compress.c,v 1.2 1996/06/26 05:32:20 deraadt Exp $ */ +/* $OpenBSD: compress.c,v 1.3 1997/01/15 23:42:22 millert Exp $ */ /* $NetBSD: compress.c,v 1.9 1995/03/26 09:44:38 glass Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94"; #else -static char rcsid[] = "$OpenBSD: compress.c,v 1.2 1996/06/26 05:32:20 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: compress.c,v 1.3 1997/01/15 23:42:22 millert Exp $"; #endif #endif /* not lint */ @@ -99,7 +99,7 @@ main(argc, argv) errx(1, "unknown program name"); bits = cat = 0; - while ((ch = getopt(argc, argv, "b:cdfv")) != EOF) + while ((ch = getopt(argc, argv, "b:cdfv")) != -1) switch(ch) { case 'b': bits = strtol(optarg, &p, 10); diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index c352bdb8aaf..aa4aa1c6268 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctags.c,v 1.2 1996/06/26 05:32:28 deraadt Exp $ */ +/* $OpenBSD: ctags.c,v 1.3 1997/01/15 23:42:23 millert Exp $ */ /* $NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95"; #endif -static char rcsid[] = "$OpenBSD: ctags.c,v 1.2 1996/06/26 05:32:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ctags.c,v 1.3 1997/01/15 23:42:23 millert Exp $"; #endif /* not lint */ #include <err.h> @@ -98,7 +98,7 @@ main(argc, argv) char cmd[100]; /* too ugly to explain */ aflag = uflag = NO; - while ((ch = getopt(argc, argv, "BFadf:tuwvx")) != EOF) + while ((ch = getopt(argc, argv, "BFadf:tuwvx")) != -1) switch(ch) { case 'B': searchar = '?'; diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 052e2efc477..86592253161 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cut.c,v 1.2 1996/06/26 05:32:34 deraadt Exp $ */ +/* $OpenBSD: cut.c,v 1.3 1997/01/15 23:42:24 millert Exp $ */ /* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: cut.c,v 1.2 1996/06/26 05:32:34 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cut.c,v 1.3 1997/01/15 23:42:24 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -86,7 +86,7 @@ main(argc, argv) /* Since we don't support multi-byte characters, the -c and -b options are equivalent, and the -n option is meaningless. */ - while ((ch = getopt(argc, argv, "b:c:d:f:sn")) != EOF) + while ((ch = getopt(argc, argv, "b:c:d:f:sn")) != -1) switch(ch) { case 'b': case 'c': diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index 31771abb7a9..1cdc80fcbcb 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -1,4 +1,4 @@ -/* $OpenBSD: du.c,v 1.3 1996/10/18 18:16:07 millert Exp $ */ +/* $OpenBSD: du.c,v 1.4 1997/01/15 23:42:25 millert Exp $ */ /* $NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: du.c,v 1.3 1996/10/18 18:16:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: du.c,v 1.4 1997/01/15 23:42:25 millert Exp $"; #endif #endif /* not lint */ @@ -82,7 +82,7 @@ main(argc, argv) Hflag = Lflag = Pflag = aflag = cflag = kflag = sflag = 0; totalblocks = 0; ftsoptions = FTS_PHYSICAL; - while ((ch = getopt(argc, argv, "HLPacksx")) != EOF) + while ((ch = getopt(argc, argv, "HLPacksx")) != -1) switch (ch) { case 'H': Hflag = 1; diff --git a/usr.bin/elf2olf/elf2olf.c b/usr.bin/elf2olf/elf2olf.c index 37297cfc8f1..af8c1931c64 100644 --- a/usr.bin/elf2olf/elf2olf.c +++ b/usr.bin/elf2olf/elf2olf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elf2olf.c,v 1.3 1996/12/09 07:10:14 deraadt Exp $ */ +/* $OpenBSD: elf2olf.c,v 1.4 1997/01/15 23:42:46 millert Exp $ */ /* * Copyright (c) 1996 Erik Theisen. All rights reserved. * @@ -30,7 +30,7 @@ static char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.3 1996/12/09 07:10:14 deraadt Exp $"; +static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.4 1997/01/15 23:42:46 millert Exp $"; #endif #include <stdlib.h> @@ -85,7 +85,7 @@ main(int argc, char*argv[]) * Process cmdline */ opstring = olf2elf ? "v" : "vo:"; - while((ch = getopt(argc, argv, opstring)) != EOF) + while((ch = getopt(argc, argv, opstring)) != -1) switch(ch) { case 'v': verbose = 1; diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c index a0497c409a6..fc114394317 100644 --- a/usr.bin/file/file.c +++ b/usr.bin/file/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.3 1996/06/26 05:32:56 deraadt Exp $ */ +/* $OpenBSD: file.c,v 1.4 1997/01/15 23:42:26 millert Exp $ */ /* * file - find type of a file or files - main program. * @@ -26,7 +26,7 @@ * 4. This notice may not be removed or altered. */ #ifndef lint -static char *moduleid = "$OpenBSD: file.c,v 1.3 1996/06/26 05:32:56 deraadt Exp $"; +static char *moduleid = "$OpenBSD: file.c,v 1.4 1997/01/15 23:42:26 millert Exp $"; #endif /* lint */ #include <stdio.h> @@ -97,7 +97,7 @@ char *argv[]; if (!(magicfile = getenv("MAGIC"))) magicfile = MAGIC; - while ((c = getopt(argc, argv, "vcdf:Lm:z")) != EOF) + while ((c = getopt(argc, argv, "vcdf:Lm:z")) != -1) switch (c) { case 'v': (void) fprintf(stdout, "%s-%d.%d\n", progname, diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c index c193f1ee9e2..cc045166b7a 100644 --- a/usr.bin/find/main.c +++ b/usr.bin/find/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.3 1996/10/24 03:46:04 tholo Exp $ */ +/* $OpenBSD: main.c,v 1.4 1997/01/15 23:42:27 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: main.c,v 1.3 1996/10/24 03:46:04 tholo Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.4 1997/01/15 23:42:27 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -77,7 +77,7 @@ main(argc, argv) p = start = argv; ftsoptions = FTS_NOSTAT|FTS_PHYSICAL; - while ((ch = getopt(argc, argv, "Hdf:hXx")) != EOF) + while ((ch = getopt(argc, argv, "Hdf:hXx")) != -1) switch(ch) { case 'H': ftsoptions |= FTS_COMFOLLOW; diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index 3bc15431568..6a4350536f7 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: finger.c,v 1.4 1996/12/08 13:29:19 downsj Exp $ */ +/* $OpenBSD: finger.c,v 1.5 1997/01/15 23:42:28 millert Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -48,7 +48,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)finger.c 5.22 (Berkeley) 6/29/90";*/ -static char rcsid[] = "$OpenBSD: finger.c,v 1.4 1996/12/08 13:29:19 downsj Exp $"; +static char rcsid[] = "$OpenBSD: finger.c,v 1.5 1997/01/15 23:42:28 millert Exp $"; #endif /* not lint */ /* @@ -87,7 +87,7 @@ main(argc, argv) char domain[256]; time_t time(); - while ((ch = getopt(argc, argv, "lmMps")) != EOF) + while ((ch = getopt(argc, argv, "lmMps")) != -1) switch(ch) { case 'l': lflag = 1; /* long format */ diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c index ba42ae9773f..e42d3623858 100644 --- a/usr.bin/from/from.c +++ b/usr.bin/from/from.c @@ -1,4 +1,4 @@ -/* $OpenBSD: from.c,v 1.2 1996/06/26 05:33:27 deraadt Exp $ */ +/* $OpenBSD: from.c,v 1.3 1997/01/15 23:42:29 millert Exp $ */ /* $NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: from.c,v 1.2 1996/06/26 05:33:27 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: from.c,v 1.3 1997/01/15 23:42:29 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -71,7 +71,7 @@ main(argc, argv) #endif file = sender = NULL; - while ((ch = getopt(argc, argv, "f:s:")) != EOF) + while ((ch = getopt(argc, argv, "f:s:")) != -1) switch((char)ch) { case 'f': file = optarg; diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index 9f93fcb7bfd..b674c8e2efa 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fstat.c,v 1.7 1996/12/22 03:25:52 tholo Exp $ */ +/* $OpenBSD: fstat.c,v 1.8 1997/01/15 23:42:30 millert Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)fstat.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$OpenBSD: fstat.c,v 1.7 1996/12/22 03:25:52 tholo Exp $"; +static char *rcsid = "$OpenBSD: fstat.c,v 1.8 1997/01/15 23:42:30 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -166,7 +166,7 @@ main(argc, argv) arg = 0; what = KERN_PROC_ALL; nlistf = memf = NULL; - while ((ch = getopt(argc, argv, "fnp:u:vN:M:")) != EOF) + while ((ch = getopt(argc, argv, "fnp:u:vN:M:")) != -1) switch((char)ch) { case 'f': fsflg = 1; diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index 75764acf1d7..ef205df31f4 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.13 1997/01/09 11:22:16 niklas Exp $ */ +/* $OpenBSD: main.c,v 1.14 1997/01/15 23:42:31 millert Exp $ */ /* * Copyright (c) 1985, 1989, 1993, 1994 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.13 1997/01/09 11:22:16 niklas Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.14 1997/01/15 23:42:31 millert Exp $"; #endif #endif /* not lint */ @@ -90,7 +90,7 @@ main(argc, argv) autologin = 1; mark = HASHBYTES; - while ((ch = getopt(argc, argv, "p:r:dgintv")) != EOF) { + while ((ch = getopt(argc, argv, "p:r:dgintv")) != -1) { switch (ch) { case 'd': options |= SO_DEBUG; diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c index 8576ff96122..30740547687 100644 --- a/usr.bin/getopt/getopt.c +++ b/usr.bin/getopt/getopt.c @@ -1,7 +1,7 @@ -/* $OpenBSD: getopt.c,v 1.2 1996/06/26 05:33:45 deraadt Exp $ */ +/* $OpenBSD: getopt.c,v 1.3 1997/01/15 23:42:32 millert Exp $ */ #ifndef lint -static char rcsid[] = "$OpenBSD: getopt.c,v 1.2 1996/06/26 05:33:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: getopt.c,v 1.3 1997/01/15 23:42:32 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -16,7 +16,7 @@ char *argv[]; int status = 0; optind = 2; /* Past the program name and the option letters. */ - while ((c = getopt(argc, argv, argv[1])) != EOF) + while ((c = getopt(argc, argv, argv[1])) != -1) switch (c) { case '?': status = 1; /* getopt routine gave message */ diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c index 551d4e332f1..b94064511d5 100644 --- a/usr.bin/head/head.c +++ b/usr.bin/head/head.c @@ -1,4 +1,4 @@ -/* $OpenBSD: head.c,v 1.2 1996/06/26 05:34:15 deraadt Exp $ */ +/* $OpenBSD: head.c,v 1.3 1997/01/15 23:42:33 millert Exp $ */ /* * Copyright (c) 1980, 1987 Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)head.c 5.5 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$OpenBSD: head.c,v 1.2 1996/06/26 05:34:15 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: head.c,v 1.3 1997/01/15 23:42:33 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -73,7 +73,7 @@ main(argc, argv) argc--; argv++; } - while ((ch = getopt (argc, argv, "n:")) != EOF) + while ((ch = getopt (argc, argv, "n:")) != -1) switch (ch) { case 'n': if ((linecnt = atoi(optarg)) < 0) diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c index bb13d56d463..a0d6feb224a 100644 --- a/usr.bin/hexdump/hexsyntax.c +++ b/usr.bin/hexdump/hexsyntax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hexsyntax.c,v 1.2 1996/06/26 05:34:20 deraadt Exp $ */ +/* $OpenBSD: hexsyntax.c,v 1.3 1997/01/15 23:42:34 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)hexsyntax.c 5.2 (Berkeley) 5/8/90";*/ -static char rcsid[] = "$OpenBSD: hexsyntax.c,v 1.2 1996/06/26 05:34:20 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: hexsyntax.c,v 1.3 1997/01/15 23:42:34 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -56,7 +56,7 @@ newsyntax(argc, argvp) char *p, **argv; argv = *argvp; - while ((ch = getopt(argc, argv, "bcde:f:n:os:vx")) != EOF) + while ((ch = getopt(argc, argv, "bcde:f:n:os:vx")) != -1) switch (ch) { case 'b': add("\"%07.7_Ax\n\""); diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c index 7946ded0f56..9a918c34da0 100644 --- a/usr.bin/hexdump/odsyntax.c +++ b/usr.bin/hexdump/odsyntax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: odsyntax.c,v 1.2 1996/06/26 05:34:21 deraadt Exp $ */ +/* $OpenBSD: odsyntax.c,v 1.3 1997/01/15 23:42:34 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)odsyntax.c 5.4 (Berkeley) 3/8/91";*/ -static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.2 1996/06/26 05:34:21 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.3 1997/01/15 23:42:34 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -59,7 +59,7 @@ oldsyntax(argc, argvp) deprecated = 1; argv = *argvp; - while ((ch = getopt(argc, argv, "aBbcDdeFfHhIiLlOoPpswvXx")) != EOF) + while ((ch = getopt(argc, argv, "aBbcDdeFfHhIiLlOoPpswvXx")) != -1) switch (ch) { case 'a': odprecede(); diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 4696ef799c7..1586254719e 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: id.c,v 1.2 1996/06/26 05:34:24 deraadt Exp $ */ +/* $OpenBSD: id.c,v 1.3 1997/01/15 23:42:35 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";*/ -static char rcsid[] = "$OpenBSD: id.c,v 1.2 1996/06/26 05:34:24 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: id.c,v 1.3 1997/01/15 23:42:35 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -73,7 +73,7 @@ main(argc, argv) int Gflag, ch, gflag, id, nflag, pflag, rflag, uflag; Gflag = gflag = nflag = pflag = rflag = uflag = 0; - while ((ch = getopt(argc, argv, "Ggnpru")) != EOF) + while ((ch = getopt(argc, argv, "Ggnpru")) != -1) switch(ch) { case 'G': Gflag = 1; diff --git a/usr.bin/info_mkdb/info_mkdb.c b/usr.bin/info_mkdb/info_mkdb.c index cad011e300e..023dad80415 100644 --- a/usr.bin/info_mkdb/info_mkdb.c +++ b/usr.bin/info_mkdb/info_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: info_mkdb.c,v 1.1 1996/07/22 03:16:31 tholo Exp $ */ +/* $OpenBSD: info_mkdb.c,v 1.2 1997/01/15 23:42:36 millert Exp $ */ /*- * Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: info_mkdb.c,v 1.1 1996/07/22 03:16:31 tholo Exp $"; +static char rcsid[] = "$OpenBSD: info_mkdb.c,v 1.2 1997/01/15 23:42:36 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -82,7 +82,7 @@ main(argc, argv) int c; infoname = NULL; - while ((c = getopt(argc, argv, "f:v")) != EOF) { + while ((c = getopt(argc, argv, "f:v")) != -1) { switch(c) { case 'f': infoname = optarg; diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c index b2344daefec..8882cece4bd 100644 --- a/usr.bin/ipcs/ipcs.c +++ b/usr.bin/ipcs/ipcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipcs.c,v 1.6 1996/12/22 03:25:54 tholo Exp $ */ +/* $OpenBSD: ipcs.c,v 1.7 1997/01/15 23:42:37 millert Exp $ */ /* $NetBSD: ipcs.c,v 1.10.6.1 1996/06/07 01:53:47 thorpej Exp $ */ /* @@ -138,7 +138,7 @@ main(argc, argv) char errbuf[_POSIX2_LINE_MAX]; int i; - while ((i = getopt(argc, argv, "MmQqSsabC:cN:optT")) != EOF) + while ((i = getopt(argc, argv, "MmQqSsabC:cN:optT")) != -1) switch (i) { case 'M': display = SHMTOTAL; diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index c4d9e38d1b2..e1ed653eecc 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -1,4 +1,4 @@ -/* $Id: join.c,v 1.5 1996/08/12 16:37:00 michaels Exp $ +/* $Id: join.c,v 1.6 1997/01/15 23:42:38 millert Exp $ /*- * Copyright (c) 1991, 1993, 1994 @@ -45,7 +45,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */ -static char rcsid[] = "$Id: join.c,v 1.5 1996/08/12 16:37:00 michaels Exp $"; +static char rcsid[] = "$Id: join.c,v 1.6 1997/01/15 23:42:38 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -129,7 +129,7 @@ main(argc, argv) aflag = vflag = 0; obsolete(argv); - while ((ch = getopt(argc, argv, "\01a:e:j:1:2:o:t:v:")) != EOF) { + while ((ch = getopt(argc, argv, "\01a:e:j:1:2:o:t:v:")) != -1) { switch (ch) { case '\01': /* See comment in obsolete(). */ aflag = 1; diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c index 6a4436341a3..e174f1a6d71 100644 --- a/usr.bin/ktrace/ktrace.c +++ b/usr.bin/ktrace/ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ktrace.c,v 1.3 1996/09/21 08:11:03 deraadt Exp $ */ +/* $OpenBSD: ktrace.c,v 1.4 1997/01/15 23:42:40 millert Exp $ */ /* $NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95"; #endif -static char *rcsid = "$OpenBSD: ktrace.c,v 1.3 1996/09/21 08:11:03 deraadt Exp $"; +static char *rcsid = "$OpenBSD: ktrace.c,v 1.4 1997/01/15 23:42:40 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -77,7 +77,7 @@ main(argc, argv) append = ops = pidset = inherit = 0; trpoints = DEF_POINTS; tracefile = DEF_TRACEFILE; - while ((ch = getopt(argc,argv,"aCcdf:g:ip:t:")) != EOF) + while ((ch = getopt(argc,argv,"aCcdf:g:ip:t:")) != -1) switch((char)ch) { case 'a': append = 1; diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index db527951a49..5c425dd4d80 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -1,4 +1,4 @@ -/* $OpenBSD: last.c,v 1.2 1996/06/26 05:34:51 deraadt Exp $ */ +/* $OpenBSD: last.c,v 1.3 1997/01/15 23:42:41 millert Exp $ */ /* $NetBSD: last.c,v 1.6 1994/12/24 16:49:02 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94"; #endif -static char rcsid[] = "$OpenBSD: last.c,v 1.2 1996/06/26 05:34:51 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: last.c,v 1.3 1997/01/15 23:42:41 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -107,7 +107,7 @@ main(argc, argv) char *p; maxrec = -1; - while ((ch = getopt(argc, argv, "0123456789f:h:t:")) != EOF) + while ((ch = getopt(argc, argv, "0123456789f:h:t:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index f002369fdc9..f47688fab0a 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lastcomm.c,v 1.3 1996/06/26 05:34:54 deraadt Exp $ */ +/* $OpenBSD: lastcomm.c,v 1.4 1997/01/15 23:42:41 millert Exp $ */ /* $NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)lastcomm.c 8.2 (Berkeley) 4/29/95"; #endif -static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.3 1996/06/26 05:34:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.4 1997/01/15 23:42:41 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -87,7 +87,7 @@ main(argc, argv) char *acctfile; acctfile = _PATH_ACCT; - while ((ch = getopt(argc, argv, "f:")) != EOF) + while ((ch = getopt(argc, argv, "f:")) != -1) switch((char)ch) { case 'f': acctfile = optarg; diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c index b95718ed4be..2df97a0ed20 100644 --- a/usr.bin/locate/code/locate.code.c +++ b/usr.bin/locate/code/locate.code.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: locate.code.c,v 1.6 1996/10/20 00:52:53 michaels Exp $ + * $OpenBSD: locate.code.c,v 1.7 1997/01/15 23:42:42 millert Exp $ * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: locate.code.c,v 1.6 1996/10/20 00:52:53 michaels Exp $ + * $Id: locate.code.c,v 1.7 1997/01/15 23:42:42 millert Exp $ */ #ifndef lint @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)locate.code.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: locate.code.c,v 1.6 1996/10/20 00:52:53 michaels Exp $"; +static char rcsid[] = "$OpenBSD: locate.code.c,v 1.7 1997/01/15 23:42:42 millert Exp $"; #endif #endif /* not lint */ @@ -137,7 +137,7 @@ main(argc, argv) FILE *fp; register int i, j; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { default: usage(); diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index 7c1810ff455..890448008b6 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: locate.c,v 1.6 1996/10/20 00:52:56 michaels Exp $ + * $OpenBSD: locate.c,v 1.7 1997/01/15 23:42:44 millert Exp $ * * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. * Copyright (c) 1989, 1993 @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: locate.c,v 1.6 1996/10/20 00:52:56 michaels Exp $ + * $Id: locate.c,v 1.7 1997/01/15 23:42:44 millert Exp $ */ #ifndef lint @@ -50,7 +50,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: locate.c,v 1.6 1996/10/20 00:52:56 michaels Exp $"; +static char rcsid[] = "$OpenBSD: locate.c,v 1.7 1997/01/15 23:42:44 millert Exp $"; #endif #endif /* not lint */ @@ -160,7 +160,7 @@ main(argc, argv) #endif (void) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "Scd:il:ms")) != EOF) + while ((ch = getopt(argc, argv, "Scd:il:ms")) != -1) switch(ch) { case 'S': /* statistic lines */ f_statistic = 1; diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index 1e365e08f00..b13a1f44f74 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.c,v 1.7 1996/10/16 00:09:20 millert Exp $ */ +/* $OpenBSD: lock.c,v 1.8 1997/01/15 23:42:45 millert Exp $ */ /* $NetBSD: lock.c,v 1.8 1996/05/07 18:32:31 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: lock.c,v 1.7 1996/10/16 00:09:20 millert Exp $"; +static char rcsid[] = "$OpenBSD: lock.c,v 1.8 1997/01/15 23:42:45 millert Exp $"; #endif /* not lint */ /* @@ -108,7 +108,7 @@ main(argc, argv) if (!(pw = getpwuid(getuid()))) errx(1, "unknown uid %d.", getuid()); - while ((ch = getopt(argc, argv, "npt:")) != EOF) + while ((ch = getopt(argc, argv, "npt:")) != -1) switch((char)ch) { case 't': if ((sectimeout = atoi(optarg)) <= 0) diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c index 53c9860af4d..6b2b30662f5 100644 --- a/usr.bin/logger/logger.c +++ b/usr.bin/logger/logger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logger.c,v 1.2 1996/06/26 05:35:58 deraadt Exp $ */ +/* $OpenBSD: logger.c,v 1.3 1997/01/15 23:42:45 millert Exp $ */ /* $NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: logger.c,v 1.2 1996/06/26 05:35:58 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: logger.c,v 1.3 1997/01/15 23:42:45 millert Exp $"; #endif /* not lint */ #include <errno.h> @@ -78,7 +78,7 @@ main(argc, argv) tag = NULL; pri = LOG_NOTICE; logflags = 0; - while ((ch = getopt(argc, argv, "f:ip:st:")) != EOF) + while ((ch = getopt(argc, argv, "f:ip:st:")) != -1) switch((char)ch) { case 'f': /* file to log */ if (freopen(optarg, "r", stdin) == NULL) { diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 392abb79f77..e64d6003472 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login.c,v 1.15 1996/12/22 03:25:55 tholo Exp $ */ +/* $OpenBSD: login.c,v 1.16 1997/01/15 23:43:03 millert Exp $ */ /* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94"; #endif -static char rcsid[] = "$OpenBSD: login.c,v 1.15 1996/12/22 03:25:55 tholo Exp $"; +static char rcsid[] = "$OpenBSD: login.c,v 1.16 1997/01/15 23:43:03 millert Exp $"; #endif /* not lint */ /* @@ -159,7 +159,7 @@ main(argc, argv) fflag = hflag = pflag = 0; uid = getuid(); - while ((ch = getopt(argc, argv, "fh:u:p")) != EOF) + while ((ch = getopt(argc, argv, "fh:u:p")) != -1) switch (ch) { case 'f': fflag = 1; diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c index d023fca063d..3978fa9d225 100644 --- a/usr.bin/logname/logname.c +++ b/usr.bin/logname/logname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logname.c,v 1.2 1996/06/26 05:36:04 deraadt Exp $ */ +/* $OpenBSD: logname.c,v 1.3 1997/01/15 23:42:47 millert Exp $ */ /* $NetBSD: logname.c,v 1.6 1994/12/22 06:39:32 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94"; #endif -static char rcsid[] = "$OpenBSD: logname.c,v 1.2 1996/06/26 05:36:04 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: logname.c,v 1.3 1997/01/15 23:42:47 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -65,7 +65,7 @@ main(argc, argv) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c index 2f7fccff11e..7be948301df 100644 --- a/usr.bin/look/look.c +++ b/usr.bin/look/look.c @@ -1,4 +1,4 @@ -/* $OpenBSD: look.c,v 1.2 1996/06/26 05:36:06 deraadt Exp $ */ +/* $OpenBSD: look.c,v 1.3 1997/01/15 23:42:48 millert Exp $ */ /* $NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: look.c,v 1.2 1996/06/26 05:36:06 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: look.c,v 1.3 1997/01/15 23:42:48 millert Exp $"; #endif /* not lint */ /* @@ -109,7 +109,7 @@ main(argc, argv) file = _PATH_WORDS; termchar = '\0'; - while ((ch = getopt(argc, argv, "dft:")) != EOF) + while ((ch = getopt(argc, argv, "dft:")) != -1) switch(ch) { case 'd': dflag = 1; diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index 234d83f4093..187dc3a9ae0 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.4 1996/08/22 00:35:01 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.5 1997/01/15 23:42:49 millert Exp $ */ /* $NetBSD: main.c,v 1.11 1996/01/13 23:25:26 pk Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.4 1996/08/22 00:35:01 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.5 1997/01/15 23:42:49 millert Exp $"; #endif #endif /* not lint */ @@ -167,7 +167,7 @@ main(argc,argv) initkwds(); - while ((c = getopt(argc, argv, "tD:U:o:")) != EOF) + while ((c = getopt(argc, argv, "tD:U:o:")) != -1) switch(c) { case 'D': /* define something..*/ diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c index 4ea11afbc50..063ecfa3873 100644 --- a/usr.bin/mail/main.c +++ b/usr.bin/mail/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.3 1996/09/16 02:26:09 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.4 1997/01/15 23:42:50 millert Exp $ */ /* $NetBSD: main.c,v 1.5 1996/06/08 19:48:31 christos Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.3 1996/09/16 02:26:09 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.4 1997/01/15 23:42:50 millert Exp $"; #endif #endif /* not lint */ @@ -95,7 +95,7 @@ main(argc, argv) bcc = NIL; smopts = NIL; subject = NOSTR; - while ((i = getopt(argc, argv, "INT:b:c:dfins:u:v")) != EOF) { + while ((i = getopt(argc, argv, "INT:b:c:dfins:u:v")) != -1) { switch (i) { case 'T': /* diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index f588e7a82f5..c8447760ac2 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.9 1996/11/30 21:08:59 millert Exp $ */ +/* $OpenBSD: main.c,v 1.10 1997/01/15 23:42:51 millert Exp $ */ /* $NetBSD: main.c,v 1.31 1996/11/06 17:59:12 christos Exp $ */ /* @@ -49,7 +49,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.9 1996/11/30 21:08:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.10 1997/01/15 23:42:51 millert Exp $"; #endif #endif /* not lint */ @@ -172,7 +172,7 @@ MainParseArgs(argc, argv) #else # define OPTFLAGS "BD:I:PSV:d:ef:ij:km:nqrst" #endif -rearg: while((c = getopt(argc, argv, OPTFLAGS)) != EOF) { +rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) { switch(c) { case 'D': Var_Set(optarg, "1", VAR_GLOBAL); diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c index 35a2c9328cb..70e5d873080 100644 --- a/usr.bin/man/man.c +++ b/usr.bin/man/man.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man.c,v 1.4 1996/09/16 02:26:10 deraadt Exp $ */ +/* $OpenBSD: man.c,v 1.5 1997/01/15 23:42:52 millert Exp $ */ /* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95"; #else -static char rcsid[] = "$OpenBSD: man.c,v 1.4 1996/09/16 02:26:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: man.c,v 1.5 1997/01/15 23:42:52 millert Exp $"; #endif #endif /* not lint */ @@ -95,7 +95,7 @@ main(argc, argv) f_cat = f_how = 0; conffile = p_add = p_path = NULL; - while ((ch = getopt(argc, argv, "-aC:cfhkM:m:P:w")) != EOF) + while ((ch = getopt(argc, argv, "-aC:cfhkM:m:P:w")) != -1) switch (ch) { case 'a': f_all = 1; diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c index 8f7ac36553c..35f43c3e677 100644 --- a/usr.bin/mesg/mesg.c +++ b/usr.bin/mesg/mesg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mesg.c,v 1.2 1996/06/26 05:37:05 deraadt Exp $ */ +/* $OpenBSD: mesg.c,v 1.3 1997/01/15 23:42:53 millert Exp $ */ /* $NetBSD: mesg.c,v 1.4 1994/12/23 07:16:32 jtc Exp $ */ /* @@ -49,7 +49,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94"; #endif -static char rcsid[] = "$OpenBSD: mesg.c,v 1.2 1996/06/26 05:37:05 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mesg.c,v 1.3 1997/01/15 23:42:53 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -71,7 +71,7 @@ main(argc, argv) char *tty; int ch; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c index e9d65542433..360dc0a83ef 100644 --- a/usr.bin/modstat/modstat.c +++ b/usr.bin/modstat/modstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modstat.c,v 1.6 1996/08/06 18:17:22 deraadt Exp $ */ +/* $OpenBSD: modstat.c,v 1.7 1997/01/15 23:42:54 millert Exp $ */ /* * Copyright (c) 1993 Terrence R. Lambert. @@ -133,7 +133,7 @@ main(argc, argv) int modnum = -1; char *modname = NULL; - while ((c = getopt(argc, argv, "i:n:")) != EOF) { + while ((c = getopt(argc, argv, "i:n:")) != -1) { switch (c) { case 'i': modnum = atoi(optarg); diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c index 5ceb4f1d2fd..f6c10424a76 100644 --- a/usr.bin/nc/netcat.c +++ b/usr.bin/nc/netcat.c @@ -1389,7 +1389,7 @@ main (argc, argv) /* If your shitbox doesn't have getopt, step into the nineties already. */ /* optarg, optind = next-argv-component [i.e. flag arg]; optopt = last-char */ - while ((x = getopt (argc, argv, "ae:g:G:hi:lno:p:rs:tuvw:z")) != EOF) { + while ((x = getopt (argc, argv, "ae:g:G:hi:lno:p:rs:tuvw:z")) != -1) { /* Debug (("in go: x now %c, optarg %x optind %d", x, optarg, optind)) */ switch (x) { case 'a': diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 10a31faaa2f..349be1474b2 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.5 1996/12/22 03:25:58 tholo Exp $ */ +/* $OpenBSD: main.c,v 1.6 1997/01/15 23:42:55 millert Exp $ */ /* $NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ char copyright[] = #if 0 static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94"; #else -static char *rcsid = "$OpenBSD: main.c,v 1.5 1996/12/22 03:25:58 tholo Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.6 1997/01/15 23:42:55 millert Exp $"; #endif #endif /* not lint */ @@ -226,7 +226,7 @@ main(argc, argv) af = AF_UNSPEC; - while ((ch = getopt(argc, argv, "Aadf:ghI:iM:mN:np:rstuw:")) != EOF) + while ((ch = getopt(argc, argv, "Aadf:ghI:iM:mN:np:rstuw:")) != -1) switch(ch) { case 'A': Aflag = 1; diff --git a/usr.bin/newsyslog/newsyslog.c b/usr.bin/newsyslog/newsyslog.c index 0894fded093..f6904029260 100644 --- a/usr.bin/newsyslog/newsyslog.c +++ b/usr.bin/newsyslog/newsyslog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newsyslog.c,v 1.7 1996/12/07 08:00:45 deraadt Exp $ */ +/* $OpenBSD: newsyslog.c,v 1.8 1997/01/15 23:42:56 millert Exp $ */ /* * This file contains changes from the Open Software Foundation. @@ -29,7 +29,7 @@ provided "as is" without express or implied warranty. */ #ifndef lint -static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.7 1996/12/07 08:00:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.8 1997/01/15 23:42:56 millert Exp $"; #endif /* not lint */ #ifndef CONF @@ -199,7 +199,7 @@ PRS(argc,argv) } optind = 1; /* Start options parsing */ - while ((c=getopt(argc,argv,"nrvf:t:")) != EOF) + while ((c = getopt(argc,argv,"nrvf:t:")) != -1) switch (c) { case 'n': noaction++; /* This implies needroot as off */ diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index d84b73da9bc..50e7829e428 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsstat.c,v 1.5 1996/12/22 03:25:59 tholo Exp $ */ +/* $OpenBSD: nfsstat.c,v 1.6 1997/01/15 23:42:57 millert Exp $ */ /* $NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $ */ /* @@ -48,7 +48,7 @@ static char copyright[] = static char sccsid[] = "from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93"; static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $"; #else -static char *rcsid = "$OpenBSD: nfsstat.c,v 1.5 1996/12/22 03:25:59 tholo Exp $"; +static char *rcsid = "$OpenBSD: nfsstat.c,v 1.6 1997/01/15 23:42:57 millert Exp $"; #endif #endif /* not lint */ @@ -99,7 +99,7 @@ main(argc, argv) interval = 0; memf = nlistf = NULL; - while ((ch = getopt(argc, argv, "M:N:w:sc")) != EOF) + while ((ch = getopt(argc, argv, "M:N:w:sc")) != -1) switch(ch) { case 'M': memf = optarg; diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c index d97f1765e36..26b14601265 100644 --- a/usr.bin/nm/nm.c +++ b/usr.bin/nm/nm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nm.c,v 1.3 1996/06/26 05:37:33 deraadt Exp $ */ +/* $OpenBSD: nm.c,v 1.4 1997/01/15 23:42:59 millert Exp $ */ /* $NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)nm.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: nm.c,v 1.3 1996/06/26 05:37:33 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: nm.c,v 1.4 1997/01/15 23:42:59 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -92,7 +92,7 @@ main(argc, argv) extern int optind; int ch, errors; - while ((ch = getopt(argc, argv, "agnopruw")) != EOF) { + while ((ch = getopt(argc, argv, "agnopruw")) != -1) { switch (ch) { case 'a': print_all_symbols = 1; diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c index dfd0e4ae025..a0b984ce6c2 100644 --- a/usr.bin/passwd/passwd.c +++ b/usr.bin/passwd/passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: passwd.c,v 1.4 1996/06/26 05:37:47 deraadt Exp $ */ +/* $OpenBSD: passwd.c,v 1.5 1997/01/15 23:43:01 millert Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)passwd.c 5.5 (Berkeley) 7/6/91";*/ -static char rcsid[] = "$OpenBSD: passwd.c,v 1.4 1996/06/26 05:37:47 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: passwd.c,v 1.5 1997/01/15 23:43:01 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -88,7 +88,7 @@ main(argc, argv) if (basename == NULL) basename = argv[0]; - while ((ch = getopt(argc, argv, "lky")) != EOF) + while ((ch = getopt(argc, argv, "lky")) != -1) switch (ch) { case 'l': /* change local password file */ use_kerberos = 0; diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index cc5fce44c0f..514227f4d4a 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: paste.c,v 1.2 1996/06/26 05:37:50 deraadt Exp $ */ +/* $OpenBSD: paste.c,v 1.3 1997/01/15 23:43:02 millert Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -44,7 +44,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/ -static char rcsid[] = "$OpenBSD: paste.c,v 1.2 1996/06/26 05:37:50 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: paste.c,v 1.3 1997/01/15 23:43:02 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -65,7 +65,7 @@ main(argc, argv) int ch, seq; seq = 0; - while ((ch = getopt(argc, argv, "d:s")) != EOF) + while ((ch = getopt(argc, argv, "d:s")) != -1) switch(ch) { case 'd': delimcnt = tr(delim = optarg); diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c index e50f46efabf..a9cfc75ce5a 100644 --- a/usr.bin/pr/pr.c +++ b/usr.bin/pr/pr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pr.c,v 1.3 1996/08/10 04:41:00 imp Exp $ */ +/* $OpenBSD: pr.c,v 1.4 1997/01/15 23:43:00 millert Exp $ */ /*- * Copyright (c) 1991 Keith Muller. @@ -45,7 +45,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)pr.c 8.1 (Berkeley) 6/6/93"; */ -static char *rcsid = "$OpenBSD: pr.c,v 1.3 1996/08/10 04:41:00 imp Exp $"; +static char *rcsid = "$OpenBSD: pr.c,v 1.4 1997/01/15 23:43:00 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -1593,7 +1593,7 @@ setup(argc, argv) } } else err = stderr; - while ((c = egetopt(argc, argv, "#adFmrte?h:i?l:n?o:s?w:")) != EOF) { + while ((c = egetopt(argc, argv, "#adFmrte?h:i?l:n?o:s?w:")) != -1) { switch (c) { case '+': if ((pgnm = atoi(eoptarg)) < 1) { diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c index 138cf6ad02d..17e9817a557 100644 --- a/usr.bin/ranlib/ranlib.c +++ b/usr.bin/ranlib/ranlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ranlib.c,v 1.2 1996/06/26 05:38:06 deraadt Exp $ */ +/* $OpenBSD: ranlib.c,v 1.3 1997/01/15 23:43:04 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -44,7 +44,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)ranlib.c 5.6 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: ranlib.c,v 1.2 1996/06/26 05:38:06 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ranlib.c,v 1.3 1997/01/15 23:43:04 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -64,7 +64,7 @@ main(argc, argv) int ch, eval, tflag; tflag = 0; - while ((ch = getopt(argc, argv, "t")) != EOF) + while ((ch = getopt(argc, argv, "t")) != -1) switch(ch) { case 't': tflag = 1; diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c index abf696301dc..9362944f9dc 100644 --- a/usr.bin/rev/rev.c +++ b/usr.bin/rev/rev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rev.c,v 1.2 1996/06/26 05:38:29 deraadt Exp $ */ +/* $OpenBSD: rev.c,v 1.3 1997/01/15 23:43:05 millert Exp $ */ /* $NetBSD: rev.c,v 1.5 1995/09/28 08:49:40 tls Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: rev.c,v 1.2 1996/06/26 05:38:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rev.c,v 1.3 1997/01/15 23:43:05 millert Exp $"; #endif #endif /* not lint */ @@ -69,7 +69,7 @@ main(argc, argv) size_t len; int ch, rval; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { case '?': default: diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index fa9bcac429d..51e72d9d2fb 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlogin.c,v 1.10 1996/12/22 03:26:01 tholo Exp $ */ +/* $OpenBSD: rlogin.c,v 1.11 1997/01/15 23:43:06 millert Exp $ */ /* $NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rlogin.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: rlogin.c,v 1.10 1996/12/22 03:26:01 tholo Exp $"; +static char rcsid[] = "$OpenBSD: rlogin.c,v 1.11 1997/01/15 23:43:06 millert Exp $"; #endif #endif /* not lint */ @@ -183,7 +183,7 @@ main(argc, argv) #else #define OPTIONS "8EKLde:l:" #endif - while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != EOF) + while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != -1) switch(ch) { case '8': eight = 1; diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c index 7ec8abf9da0..a7d97f3b8b6 100644 --- a/usr.bin/rpcinfo/rpcinfo.c +++ b/usr.bin/rpcinfo/rpcinfo.c @@ -1,9 +1,9 @@ -/* $OpenBSD: rpcinfo.c,v 1.3 1996/06/29 01:07:33 deraadt Exp $ */ +/* $OpenBSD: rpcinfo.c,v 1.4 1997/01/15 23:43:08 millert Exp $ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/ /*static char sccsid[] = "from: @(#)rpcinfo.c 2.2 88/08/11 4.0 RPCSRC";*/ -static char rcsid[] = "$OpenBSD: rpcinfo.c,v 1.3 1996/06/29 01:07:33 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rpcinfo.c,v 1.4 1997/01/15 23:43:08 millert Exp $"; #endif /* @@ -96,7 +96,7 @@ main(argc, argv) function = NONE; portnum = 0; errflg = 0; - while ((c = getopt(argc, argv, "ptubdn:")) != EOF) { + while ((c = getopt(argc, argv, "ptubdn:")) != -1) { switch (c) { case 'p': diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index 517a400afa5..b708793dbe6 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsh.c,v 1.10 1996/12/22 03:26:02 tholo Exp $ */ +/* $OpenBSD: rsh.c,v 1.11 1997/01/15 23:43:09 millert Exp $ */ /*- * Copyright (c) 1983, 1990 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rsh.c 5.24 (Berkeley) 7/1/91";*/ -static char rcsid[] = "$OpenBSD: rsh.c,v 1.10 1996/12/22 03:26:02 tholo Exp $"; +static char rcsid[] = "$OpenBSD: rsh.c,v 1.11 1997/01/15 23:43:09 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -121,7 +121,7 @@ main(argc, argv) #else #define OPTIONS "8KLdel:nw" #endif - while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != EOF) + while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != -1) switch(ch) { case 'K': #ifdef KERBEROS diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c index 992d8fb060f..9df8234404e 100644 --- a/usr.bin/ruptime/ruptime.c +++ b/usr.bin/ruptime/ruptime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ruptime.c,v 1.2 1996/06/26 05:38:54 deraadt Exp $ */ +/* $OpenBSD: ruptime.c,v 1.3 1997/01/15 23:43:10 millert Exp $ */ /* * Copyright (c) 1983 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)ruptime.c 5.8 (Berkeley) 7/21/90";*/ -static char rcsid[] = "$OpenBSD: ruptime.c,v 1.2 1996/06/26 05:38:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ruptime.c,v 1.3 1997/01/15 23:43:10 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -85,7 +85,7 @@ main(argc, argv) char *interval(); aflg = 0; - while ((ch = getopt(argc, argv, "alrut")) != EOF) + while ((ch = getopt(argc, argv, "alrut")) != -1) switch((char)ch) { case 'a': aflg = 1; diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c index fe6c6122bd3..961d3380eb2 100644 --- a/usr.bin/rwho/rwho.c +++ b/usr.bin/rwho/rwho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rwho.c,v 1.4 1996/08/30 15:15:26 deraadt Exp $ */ +/* $OpenBSD: rwho.c,v 1.5 1997/01/15 23:43:10 millert Exp $ */ /* * Copyright (c) 1983 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rwho.c 5.5 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$OpenBSD: rwho.c,v 1.4 1996/08/30 15:15:26 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rwho.c,v 1.5 1997/01/15 23:43:10 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -92,7 +92,7 @@ main(argc, argv) int f, n, i; time_t time(); - while ((ch = getopt(argc, argv, "a")) != EOF) + while ((ch = getopt(argc, argv, "a")) != -1) switch((char)ch) { case 'a': aflg = 1; diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 1496907fe23..058bc326c44 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: script.c,v 1.2 1996/06/26 05:39:02 deraadt Exp $ */ +/* $OpenBSD: script.c,v 1.3 1997/01/15 23:43:11 millert Exp $ */ /* $NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: script.c,v 1.2 1996/06/26 05:39:02 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: script.c,v 1.3 1997/01/15 23:43:11 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -92,7 +92,7 @@ main(argc, argv) char ibuf[BUFSIZ]; aflg = 0; - while ((ch = getopt(argc, argv, "a")) != EOF) + while ((ch = getopt(argc, argv, "a")) != -1) switch(ch) { case 'a': aflg = 1; diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 3bb83daf76a..f365409959f 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.3 1996/06/26 05:39:07 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.4 1997/01/15 23:43:12 millert Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -45,7 +45,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; */ -static char *rcsid = "$OpenBSD: main.c,v 1.3 1996/06/26 05:39:07 deraadt Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.4 1997/01/15 23:43:12 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -113,7 +113,7 @@ main(argc, argv) int c, fflag; fflag = 0; - while ((c = getopt(argc, argv, "ae:f:n")) != EOF) + while ((c = getopt(argc, argv, "ae:f:n")) != -1) switch (c) { case 'a': aflag = 1; diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c index 8c12930c6d9..0704f6bcb8b 100644 --- a/usr.bin/size/size.c +++ b/usr.bin/size/size.c @@ -1,4 +1,4 @@ -/* $OpenBSD: size.c,v 1.4 1996/09/03 11:16:47 deraadt Exp $ */ +/* $OpenBSD: size.c,v 1.5 1997/01/15 23:43:13 millert Exp $ */ /* $NetBSD: size.c,v 1.7 1996/01/14 23:07:12 pk Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)size.c 8.2 (Berkeley) 12/9/93"; #endif -static char rcsid[] = "$OpenBSD: size.c,v 1.4 1996/09/03 11:16:47 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: size.c,v 1.5 1997/01/15 23:43:13 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -73,7 +73,7 @@ main(argc, argv) { int ch, eval; - while ((ch = getopt(argc, argv, "w")) != EOF) + while ((ch = getopt(argc, argv, "w")) != -1) switch(ch) { case 'w': ignore_bad_archive_entries = 0; diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 50c42025282..46ccad9999b 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -1,4 +1,4 @@ -/* $OpenBSD: split.c,v 1.2 1996/06/26 05:39:28 deraadt Exp $ */ +/* $OpenBSD: split.c,v 1.3 1997/01/15 23:43:14 millert Exp $ */ /* $NetBSD: split.c,v 1.5 1995/08/31 22:22:05 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94"; #endif -static char rcsid[] = "$OpenBSD: split.c,v 1.2 1996/06/26 05:39:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: split.c,v 1.3 1997/01/15 23:43:14 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -79,7 +79,7 @@ main(argc, argv) int ch; char *ep, *p; - while ((ch = getopt(argc, argv, "-0123456789b:l:")) != EOF) + while ((ch = getopt(argc, argv, "-0123456789b:l:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c index 770fe4b8ab9..fcc78488f98 100644 --- a/usr.bin/strip/strip.c +++ b/usr.bin/strip/strip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strip.c,v 1.5 1997/01/14 10:33:00 downsj Exp $ */ +/* $OpenBSD: strip.c,v 1.6 1997/01/15 23:43:15 millert Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)strip.c 5.8 (Berkeley) 11/6/91";*/ -static char rcsid[] = "$OpenBSD: strip.c,v 1.5 1997/01/14 10:33:00 downsj Exp $"; +static char rcsid[] = "$OpenBSD: strip.c,v 1.6 1997/01/15 23:43:15 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -80,7 +80,7 @@ main(argc, argv) char *fn; sfcn = s_sym; - while ((ch = getopt(argc, argv, "dx")) != EOF) + while ((ch = getopt(argc, argv, "dx")) != -1) switch(ch) { case 'x': xflag = 1; diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c index 11396e3d8bc..602d6bab39f 100644 --- a/usr.bin/su/su.c +++ b/usr.bin/su/su.c @@ -1,4 +1,4 @@ -/* $OpenBSD: su.c,v 1.17 1996/12/22 03:26:03 tholo Exp $ */ +/* $OpenBSD: su.c,v 1.18 1997/01/15 23:43:16 millert Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91";*/ -static char rcsid[] = "$OpenBSD: su.c,v 1.17 1996/12/22 03:26:03 tholo Exp $"; +static char rcsid[] = "$OpenBSD: su.c,v 1.18 1997/01/15 23:43:16 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -94,7 +94,7 @@ main(argc, argv) char shellbuf[MAXPATHLEN], avshellbuf[MAXPATHLEN]; asme = asthem = fastlogin = 0; - while ((ch = getopt(argc, argv, ARGSTR)) != EOF) + while ((ch = getopt(argc, argv, ARGSTR)) != -1) switch((char)ch) { #ifdef KERBEROS case 'K': diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index d35d48690b0..409a9a2900d 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.8 1996/12/22 03:26:07 tholo Exp $ */ +/* $OpenBSD: main.c,v 1.9 1997/01/15 23:43:17 millert Exp $ */ /* $NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: main.c,v 1.8 1996/12/22 03:26:07 tholo Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.9 1997/01/15 23:43:17 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -97,7 +97,7 @@ main(argc, argv) int ch; char errbuf[_POSIX2_LINE_MAX]; - while ((ch = getopt(argc, argv, "M:N:w:")) != EOF) + while ((ch = getopt(argc, argv, "M:N:w:")) != -1) switch(ch) { case 'M': memf = optarg; diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index aca36d6baab..70aa03547b7 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tail.c,v 1.3 1997/01/12 23:43:07 millert Exp $ */ +/* $OpenBSD: tail.c,v 1.4 1997/01/15 23:43:18 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: tail.c,v 1.3 1997/01/12 23:43:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: tail.c,v 1.4 1997/01/15 23:43:18 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -114,7 +114,7 @@ main(argc, argv) obsolete(argv); style = NOTSET; - while ((ch = getopt(argc, argv, "b:c:fn:r")) != EOF) + while ((ch = getopt(argc, argv, "b:c:fn:r")) != -1) switch(ch) { case 'b': ARG(512, FBYTES, RBYTES); diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index 23c8a367f53..631da628f23 100644 --- a/usr.bin/tcopy/tcopy.c +++ b/usr.bin/tcopy/tcopy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcopy.c,v 1.2 1996/06/26 05:40:29 deraadt Exp $ */ +/* $OpenBSD: tcopy.c,v 1.3 1997/01/15 23:43:19 millert Exp $ */ /* $NetBSD: tcopy.c,v 1.4 1995/08/31 22:17:24 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95"; #endif -static char rcsid[] = "$OpenBSD: tcopy.c,v 1.2 1996/06/26 05:40:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tcopy.c,v 1.3 1997/01/15 23:43:19 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -89,7 +89,7 @@ main(argc, argv) char *buff, *inf; guesslen = 1; - while ((ch = getopt(argc, argv, "cs:vx")) != EOF) + while ((ch = getopt(argc, argv, "cs:vx")) != -1) switch((char)ch) { case 'c': op = COPYVERIFY; diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index ae80438b019..5b148382922 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.3 1996/07/03 14:01:56 niklas Exp $ */ +/* $OpenBSD: main.c,v 1.4 1997/01/15 23:43:20 millert Exp $ */ /* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */ /* @@ -45,7 +45,7 @@ static char copyright[] = static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; static char rcsid[] = "$NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.3 1996/07/03 14:01:56 niklas Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.4 1997/01/15 23:43:20 millert Exp $"; #endif #endif /* not lint */ @@ -143,7 +143,7 @@ main(argc, argv) rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE; autologin = -1; - while ((ch = getopt(argc, argv, "8EKLS:X:ab:cde:fFk:l:n:rt:x")) != EOF) { + while ((ch = getopt(argc, argv, "8EKLS:X:ab:cde:fFk:l:n:rt:x")) != -1) { switch(ch) { case '8': eight = 3; /* binary output and input */ diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index 5600cde64d6..a0dbc606182 100644 --- a/usr.bin/time/time.c +++ b/usr.bin/time/time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: time.c,v 1.3 1996/10/12 20:36:06 deraadt Exp $ */ +/* $OpenBSD: time.c,v 1.4 1997/01/15 23:43:21 millert Exp $ */ /* $NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: time.c,v 1.3 1996/10/12 20:36:06 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: time.c,v 1.4 1997/01/15 23:43:21 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -72,7 +72,7 @@ main(argc, argv) struct rusage ru; lflag = 0; - while ((ch = getopt(argc, argv, "lp")) != EOF) + while ((ch = getopt(argc, argv, "lp")) != -1) switch((char)ch) { case 'p': portableflag = 1; diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 87a7c14fd9f..925f36ed3c3 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: touch.c,v 1.2 1996/06/26 05:41:45 deraadt Exp $ */ +/* $OpenBSD: touch.c,v 1.3 1997/01/15 23:43:22 millert Exp $ */ /* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: touch.c,v 1.2 1996/06/26 05:41:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: touch.c,v 1.3 1997/01/15 23:43:22 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -83,7 +83,7 @@ main(argc, argv) if (gettimeofday(&tv[0], NULL)) err(1, "gettimeofday"); - while ((ch = getopt(argc, argv, "acfmr:t:")) != EOF) + while ((ch = getopt(argc, argv, "acfmr:t:")) != -1) switch(ch) { case 'a': aflag = 1; diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c index 63f13549337..2f168654f5d 100644 --- a/usr.bin/tput/tput.c +++ b/usr.bin/tput/tput.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tput.c,v 1.2 1996/06/26 05:41:47 deraadt Exp $ */ +/* $OpenBSD: tput.c,v 1.3 1997/01/15 23:43:23 millert Exp $ */ /* $NetBSD: tput.c,v 1.8 1995/08/31 22:11:37 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: tput.c,v 1.2 1996/06/26 05:41:47 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tput.c,v 1.3 1997/01/15 23:43:23 millert Exp $"; #endif /* not lint */ #include <termios.h> @@ -72,7 +72,7 @@ main(argc, argv) char *cptr, *p, *term, buf[1024], tbuf[1024]; term = NULL; - while ((ch = getopt(argc, argv, "T:")) != EOF) + while ((ch = getopt(argc, argv, "T:")) != -1) switch(ch) { case 'T': term = optarg; diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 74af9024d05..4c089fe7c32 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tr.c,v 1.2 1996/06/26 05:41:51 deraadt Exp $ */ +/* $OpenBSD: tr.c,v 1.3 1997/01/15 23:43:24 millert Exp $ */ /* $NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: tr.c,v 1.2 1996/06/26 05:41:51 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tr.c,v 1.3 1997/01/15 23:43:24 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -106,7 +106,7 @@ main(argc, argv) int cflag, dflag, sflag, isstring2; cflag = dflag = sflag = 0; - while ((ch = getopt(argc, argv, "cds")) != EOF) + while ((ch = getopt(argc, argv, "cds")) != -1) switch((char)ch) { case 'c': cflag = 1; diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index ebfa48a5319..5e51908b1a9 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tset.c,v 1.2 1996/06/26 05:41:58 deraadt Exp $ */ +/* $OpenBSD: tset.c,v 1.3 1997/01/15 23:43:25 millert Exp $ */ /* $NetBSD: tset.c,v 1.4 1994/12/07 05:08:15 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tset.c 8.1 (Berkeley) 6/9/93"; #endif -static char rcsid[] = "$OpenBSD: tset.c,v 1.2 1996/06/26 05:41:58 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tset.c,v 1.3 1997/01/15 23:43:25 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -99,7 +99,7 @@ main(argc, argv) obsolete(argv); noinit = noset = quiet = Sflag = sflag = showterm = 0; - while ((ch = getopt(argc, argv, "-a:d:e:Ii:k:m:np:QSrs")) != EOF) { + while ((ch = getopt(argc, argv, "-a:d:e:Ii:k:m:np:QSrs")) != -1) { switch (ch) { case '-': /* display term only */ noset = 1; diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c index 4312d34278b..8fc1acf0379 100644 --- a/usr.bin/tsort/tsort.c +++ b/usr.bin/tsort/tsort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tsort.c,v 1.3 1996/06/26 05:42:00 deraadt Exp $ */ +/* $OpenBSD: tsort.c,v 1.4 1997/01/15 23:43:26 millert Exp $ */ /* $NetBSD: tsort.c,v 1.11 1996/01/17 20:37:53 mycroft Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tsort.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: tsort.c,v 1.3 1996/06/26 05:42:00 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tsort.c,v 1.4 1997/01/15 23:43:26 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -125,7 +125,7 @@ main(argc, argv) int bsize, ch, nused; BUF bufs[2]; - while ((ch = getopt(argc, argv, "dlq")) != EOF) + while ((ch = getopt(argc, argv, "dlq")) != -1) switch (ch) { case 'd': debug = 1; diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c index 7c2dd8f7983..d3bced594d2 100644 --- a/usr.bin/ul/ul.c +++ b/usr.bin/ul/ul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ul.c,v 1.3 1996/06/26 05:42:05 deraadt Exp $ */ +/* $OpenBSD: ul.c,v 1.4 1997/01/15 23:43:27 millert Exp $ */ /* $NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: ul.c,v 1.3 1996/06/26 05:42:05 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ul.c,v 1.4 1997/01/15 23:43:27 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -100,7 +100,7 @@ main(argc, argv) termtype = getenv("TERM"); if (termtype == NULL || (argv[0][0] == 'c' && !isatty(1))) termtype = "lpr"; - while ((c=getopt(argc, argv, "it:T:")) != EOF) + while ((c=getopt(argc, argv, "it:T:")) != -1) switch(c) { case 't': diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index d4f9b1296bf..895b0f06a7e 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uniq.c,v 1.2 1996/06/26 05:42:13 deraadt Exp $ */ +/* $OpenBSD: uniq.c,v 1.3 1997/01/15 23:43:28 millert Exp $ */ /* $NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: uniq.c,v 1.2 1996/06/26 05:42:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: uniq.c,v 1.3 1997/01/15 23:43:28 millert Exp $"; #endif /* not lint */ #include <errno.h> @@ -80,7 +80,7 @@ main (argc, argv) char *prevline, *thisline, *p; obsolete(argv); - while ((ch = getopt(argc, argv, "-cdf:s:u")) != EOF) + while ((ch = getopt(argc, argv, "-cdf:s:u")) != -1) switch (ch) { case '-': --optind; diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c index d1962fe4603..222ebeea811 100644 --- a/usr.bin/unvis/unvis.c +++ b/usr.bin/unvis/unvis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unvis.c,v 1.2 1996/06/26 05:42:18 deraadt Exp $ */ +/* $OpenBSD: unvis.c,v 1.3 1997/01/15 23:43:29 millert Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: unvis.c,v 1.2 1996/06/26 05:42:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: unvis.c,v 1.3 1997/01/15 23:43:29 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -61,7 +61,7 @@ main(argc, argv) FILE *fp; int ch; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch((char)ch) { case '?': default: diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c index 748173355ff..6285c3face4 100644 --- a/usr.bin/users/users.c +++ b/usr.bin/users/users.c @@ -1,4 +1,4 @@ -/* $OpenBSD: users.c,v 1.2 1996/06/26 05:42:20 deraadt Exp $ */ +/* $OpenBSD: users.c,v 1.3 1997/01/15 23:43:30 millert Exp $ */ /* $NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)users.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: users.c,v 1.2 1996/06/26 05:42:20 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: users.c,v 1.3 1997/01/15 23:43:30 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -70,7 +70,7 @@ main(argc, argv) struct utmp utmp; int ch; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { case '?': default: diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c index 80c68ed35d0..b04d24a4fe4 100644 --- a/usr.bin/vacation/vacation.c +++ b/usr.bin/vacation/vacation.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vacation.c,v 1.3 1996/12/06 02:09:22 deraadt Exp $ */ +/* $OpenBSD: vacation.c,v 1.4 1997/01/15 23:43:31 millert Exp $ */ /* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94"; #endif -static char rcsid[] = "$OpenBSD: vacation.c,v 1.3 1996/12/06 02:09:22 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: vacation.c,v 1.4 1997/01/15 23:43:31 millert Exp $"; #endif /* not lint */ /* @@ -114,7 +114,7 @@ main(argc, argv) opterr = iflag = 0; interval = -1; - while ((ch = getopt(argc, argv, "a:Iir:")) != EOF) + while ((ch = getopt(argc, argv, "a:Iir:")) != -1) switch((char)ch) { case 'a': /* alias */ if (!(cur = (ALIAS *)malloc((u_int)sizeof(ALIAS)))) diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c index 033fb8c96f3..7d2269e34b3 100644 --- a/usr.bin/vi/common/main.c +++ b/usr.bin/vi/common/main.c @@ -114,9 +114,9 @@ editor(gp, argc, argv) F_SET(gp, G_SNAPSHOT); #ifdef DEBUG - while ((ch = getopt(argc, argv, "c:D:eFlRrSsT:t:vw:")) != EOF) + while ((ch = getopt(argc, argv, "c:D:eFlRrSsT:t:vw:")) != -1) #else - while ((ch = getopt(argc, argv, "c:eFlRrSst:vw:")) != EOF) + while ((ch = getopt(argc, argv, "c:eFlRrSst:vw:")) != -1) #endif switch (ch) { case 'c': /* Run the command. */ diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c index 345e821b2d0..b09ebaa07c5 100644 --- a/usr.bin/vis/vis.c +++ b/usr.bin/vis/vis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vis.c,v 1.2 1996/06/26 05:42:39 deraadt Exp $ */ +/* $OpenBSD: vis.c,v 1.3 1997/01/15 23:43:33 millert Exp $ */ /* $NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: vis.c,v 1.2 1996/06/26 05:42:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: vis.c,v 1.3 1997/01/15 23:43:33 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -67,7 +67,7 @@ main(argc, argv) FILE *fp; int ch; - while ((ch = getopt(argc, argv, "nwctsobfF:ld")) != EOF) + while ((ch = getopt(argc, argv, "nwctsobfF:ld")) != -1) switch((char)ch) { case 'n': none++; diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index fa310cd57e2..a8538bb2550 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1,5 +1,5 @@ /* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */ -/* $OpenBSD: vmstat.c,v 1.15 1996/12/22 03:26:09 tholo Exp $ */ +/* $OpenBSD: vmstat.c,v 1.16 1997/01/15 23:43:34 millert Exp $ */ /* * Copyright (c) 1980, 1986, 1991, 1993 @@ -191,7 +191,7 @@ main(argc, argv) memf = nlistf = NULL; interval = reps = todo = 0; - while ((c = getopt(argc, argv, "c:fiM:mN:stw:")) != EOF) { + while ((c = getopt(argc, argv, "c:fiM:mN:stw:")) != -1) { switch (c) { case 'c': reps = atoi(optarg); diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 57cc2d69390..7592955a8df 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -1,4 +1,4 @@ -/* $OpenBSD: w.c,v 1.11 1996/12/22 03:26:10 tholo Exp $ */ +/* $OpenBSD: w.c,v 1.12 1997/01/15 23:43:35 millert Exp $ */ /*- * Copyright (c) 1980, 1991, 1993, 1994 @@ -141,7 +141,7 @@ main(argc, argv) } memf = nlistf = NULL; - while ((ch = getopt(argc, argv, p)) != EOF) + while ((ch = getopt(argc, argv, p)) != -1) switch (ch) { case 'h': header = 0; diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index 1878b2ac7b6..cda3c1f8f38 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wall.c,v 1.7 1996/09/16 02:26:18 deraadt Exp $ */ +/* $OpenBSD: wall.c,v 1.8 1997/01/15 23:43:36 millert Exp $ */ /* $NetBSD: wall.c,v 1.6 1994/11/17 07:17:58 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93"; #endif -static char rcsid[] = "$OpenBSD: wall.c,v 1.7 1996/09/16 02:26:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: wall.c,v 1.8 1997/01/15 23:43:36 millert Exp $"; #endif /* not lint */ /* @@ -97,7 +97,7 @@ main(argc, argv) char line[sizeof(utmp.ut_line) + 1]; struct wallgroup *g; - while ((ch = getopt(argc, argv, "ng:")) != EOF) + while ((ch = getopt(argc, argv, "ng:")) != -1) switch (ch) { case 'n': /* undoc option for shutdown: suppress banner */ diff --git a/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c index 0daf5b617d8..dc062206525 100644 --- a/usr.bin/whatis/whatis.c +++ b/usr.bin/whatis/whatis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: whatis.c,v 1.2 1996/06/26 05:42:54 deraadt Exp $ */ +/* $OpenBSD: whatis.c,v 1.3 1997/01/15 23:43:37 millert Exp $ */ /* * Copyright (c) 1987, 1993 @@ -76,7 +76,7 @@ main(argc, argv) conffile = NULL; p_augment = p_path = NULL; - while ((ch = getopt(argc, argv, "C:M:m:P:")) != EOF) + while ((ch = getopt(argc, argv, "C:M:m:P:")) != -1) switch (ch) { case 'C': conffile = optarg; diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c index cc1d0f64e57..32f63a3dc34 100644 --- a/usr.bin/whereis/whereis.c +++ b/usr.bin/whereis/whereis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: whereis.c,v 1.2 1996/06/26 05:42:56 deraadt Exp $ */ +/* $OpenBSD: whereis.c,v 1.3 1997/01/15 23:43:38 millert Exp $ */ /* $NetBSD: whereis.c,v 1.6 1995/08/31 21:54:52 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)whereis.c 8.3 (Berkeley) 5/4/95"; #endif -static char *rcsid = "$OpenBSD: whereis.c,v 1.2 1996/06/26 05:42:56 deraadt Exp $"; +static char *rcsid = "$OpenBSD: whereis.c,v 1.3 1997/01/15 23:43:38 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -70,7 +70,7 @@ main(argc, argv) int ch, sverrno, mib[2]; char *p, *t, *std, path[MAXPATHLEN]; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index 9ed130763e9..329351660fa 100644 --- a/usr.bin/whois/whois.c +++ b/usr.bin/whois/whois.c @@ -1,4 +1,4 @@ -/* $OpenBSD: whois.c,v 1.2 1996/06/26 05:43:02 deraadt Exp $ */ +/* $OpenBSD: whois.c,v 1.3 1997/01/15 23:43:39 millert Exp $ */ /* $NetBSD: whois.c,v 1.5 1994/11/14 05:13:25 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: whois.c,v 1.2 1996/06/26 05:43:02 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: whois.c,v 1.3 1997/01/15 23:43:39 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -76,7 +76,7 @@ main(argc, argv) char *host; host = NICHOST; - while ((ch = getopt(argc, argv, "h:")) != EOF) + while ((ch = getopt(argc, argv, "h:")) != -1) switch((char)ch) { case 'h': host = optarg; diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 2180c9ea106..8bc611cb09d 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xargs.c,v 1.3 1996/06/26 05:44:03 deraadt Exp $ */ +/* $OpenBSD: xargs.c,v 1.4 1997/01/15 23:43:40 millert Exp $ */ /* $NetBSD: xargs.c,v 1.7 1994/11/14 06:51:41 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: xargs.c,v 1.3 1996/06/26 05:44:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: xargs.c,v 1.4 1997/01/15 23:43:40 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -96,7 +96,7 @@ main(argc, argv) nargs = 5000; nline = ARG_MAX - 4 * 1024; nflag = xflag = 0; - while ((ch = getopt(argc, argv, "0n:s:tx")) != EOF) + while ((ch = getopt(argc, argv, "0n:s:tx")) != -1) switch(ch) { case 'n': nflag = 1; diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 2fe0119b22c..05fb9f3ba61 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xinstall.c,v 1.9 1996/12/06 02:14:56 deraadt Exp $ */ +/* $OpenBSD: xinstall.c,v 1.10 1997/01/15 23:43:41 millert Exp $ */ /* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif -static char rcsid[] = "$OpenBSD: xinstall.c,v 1.9 1996/12/06 02:14:56 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: xinstall.c,v 1.10 1997/01/15 23:43:41 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -103,7 +103,7 @@ main(argc, argv) char *flags, *to_name, *group = NULL, *owner = NULL; iflags = 0; - while ((ch = getopt(argc, argv, "Ccdf:g:m:o:pSs")) != EOF) + while ((ch = getopt(argc, argv, "Ccdf:g:m:o:pSs")) != -1) switch((char)ch) { case 'C': docompare = 1; diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index 96a14372d40..8bc2c1ac7b9 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ac.c,v 1.2 1996/08/29 03:32:19 deraadt Exp $"; +static char rcsid[] = "$Id: ac.c,v 1.3 1997/01/15 23:43:44 millert Exp $"; #endif #include <sys/types.h> @@ -226,7 +226,7 @@ main(argc, argv) int c; fp = NULL; - while ((c = getopt(argc, argv, "Dc:dpt:w:")) != EOF) { + while ((c = getopt(argc, argv, "Dc:dpt:w:")) != -1) { switch (c) { #ifdef DEBUG case 'D': diff --git a/usr.sbin/amd/amd/get_args.c b/usr.sbin/amd/amd/get_args.c index 4de3e410b85..30d6c846c8d 100644 --- a/usr.sbin/amd/amd/get_args.c +++ b/usr.sbin/amd/amd/get_args.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)get_args.c 8.1 (Berkeley) 6/6/93 - * $Id: get_args.c,v 1.1 1995/10/18 08:47:10 deraadt Exp $ + * $Id: get_args.c,v 1.2 1997/01/15 23:43:45 millert Exp $ */ /* @@ -111,7 +111,7 @@ char *v[]; char *logfile = 0; char *sub_domain = 0; - while ((opt_ch = getopt(c, v, "mnprva:c:d:h:k:l:t:w:x:y:C:D:")) != EOF) + while ((opt_ch = getopt(c, v, "mnprva:c:d:h:k:l:t:w:x:y:C:D:")) != -1) switch (opt_ch) { case 'a': if (*optarg != '/') { diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c index 7419b596e30..c4f4989c98a 100644 --- a/usr.sbin/amd/amq/amq.c +++ b/usr.sbin/amd/amq/amq.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)amq.c 8.1 (Berkeley) 6/7/93 - * $Id: amq.c,v 1.4 1996/08/13 06:06:53 deraadt Exp $ + * $Id: amq.c,v 1.5 1997/01/15 23:43:46 millert Exp $ */ /* @@ -52,7 +52,7 @@ char copyright[] = "\ #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: amq.c,v 1.4 1996/08/13 06:06:53 deraadt Exp $"; +static char rcsid[] = "$Id: amq.c,v 1.5 1997/01/15 23:43:46 millert Exp $"; static char sccsid[] = "@(#)amq.c 8.1 (Berkeley) 6/7/93"; #endif /* not lint */ @@ -308,7 +308,7 @@ char *argv[]; /* * Parse arguments */ - while ((opt_ch = getopt(argc, argv, "fh:l:msuvx:D:M:")) != EOF) + while ((opt_ch = getopt(argc, argv, "fh:l:msuvx:D:M:")) != -1) switch (opt_ch) { case 'f': flush_flag = 1; diff --git a/usr.sbin/amd/fsinfo/fsinfo.c b/usr.sbin/amd/fsinfo/fsinfo.c index 480cef4d456..6ffaa3b5a4f 100644 --- a/usr.sbin/amd/fsinfo/fsinfo.c +++ b/usr.sbin/amd/fsinfo/fsinfo.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)fsinfo.c 8.1 (Berkeley) 6/6/93 - * $Id: fsinfo.c,v 1.2 1996/10/26 20:10:20 millert Exp $ + * $Id: fsinfo.c,v 1.3 1997/01/15 23:43:47 millert Exp $ */ #ifndef lint @@ -104,7 +104,7 @@ char *v[]; if (!progname) progname = "fsinfo"; - while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != EOF) + while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != -1) switch (ch) { case 'a': autodir = optarg; diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c index 47806893699..df10c4fd1ac 100644 --- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c +++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93 - * $Id: mk-amd-map.c,v 1.1 1995/10/18 08:47:22 deraadt Exp $ + * $Id: mk-amd-map.c,v 1.2 1997/01/15 23:43:48 millert Exp $ */ /* @@ -52,7 +52,7 @@ char copyright[] = "\ #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: mk-amd-map.c,v 1.1 1995/10/18 08:47:22 deraadt Exp $"; +static char rcsid[] = "$Id: mk-amd-map.c,v 1.2 1997/01/15 23:43:48 millert Exp $"; static char sccsid[] = "@(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93"; #endif /* not lint */ @@ -248,7 +248,7 @@ char *argv[]; int ch; extern int optind; - while ((ch = getopt(argc, argv, "p")) != EOF) + while ((ch = getopt(argc, argv, "p")) != -1) switch (ch) { case 'p': printit = 1; diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index d2c329021ec..9af01e5b57f 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -97,7 +97,7 @@ main(argc, argv) int ch; pid = getpid(); - while ((ch = getopt(argc, argv, "andsf")) != EOF) + while ((ch = getopt(argc, argv, "andsf")) != -1) switch((char)ch) { case 'a': dump(0); diff --git a/usr.sbin/catman/catman.c b/usr.sbin/catman/catman.c index d6e36008266..cddaba6e16f 100644 --- a/usr.sbin/catman/catman.c +++ b/usr.sbin/catman/catman.c @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: catman.c,v 1.1 1995/10/18 08:47:29 deraadt Exp $"; +static char rcsid[] = "$Id: catman.c,v 1.2 1997/01/15 23:43:49 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -70,7 +70,7 @@ main(argc, argv) { int c; - while ((c = getopt(argc, argv, "knpswM:")) != EOF) { + while ((c = getopt(argc, argv, "knpswM:")) != -1) { switch (c) { case 'k': f_ignerr = 1; diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c index cc3a69eaad8..3c437c24f37 100644 --- a/usr.sbin/chown/chown.c +++ b/usr.sbin/chown/chown.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)chown.c 8.8 (Berkeley) 4/4/94"; */ -static char *rcsid = "$Id: chown.c,v 1.1 1995/10/18 08:47:29 deraadt Exp $"; +static char *rcsid = "$Id: chown.c,v 1.2 1997/01/15 23:43:52 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -82,7 +82,7 @@ main(argc, argv) ischown = myname[2] == 'o'; Hflag = Lflag = Pflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRfh")) != EOF) + while ((ch = getopt(argc, argv, "HLPRfh")) != -1) switch (ch) { case 'H': Hflag = 1; diff --git a/usr.sbin/config.old/main.c b/usr.sbin/config.old/main.c index 7e434a7d987..b1e94dbfd2d 100644 --- a/usr.sbin/config.old/main.c +++ b/usr.sbin/config.old/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.2 1997/01/12 07:43:33 downsj Exp $ */ +/* $OpenBSD: main.c,v 1.3 1997/01/15 23:43:54 millert Exp $ */ /* $NetBSD: main.c,v 1.14 1996/06/10 02:32:24 thorpej Exp $ */ /* @@ -71,7 +71,7 @@ main(argc, argv) char *p; fatal_errors =1; - while ((ch = getopt(argc, argv, "gpk")) != EOF) + while ((ch = getopt(argc, argv, "gpk")) != -1) switch (ch) { case 'g': debugging++; diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c index 9b1aade9a45..5d7aa13a19d 100644 --- a/usr.sbin/config/main.c +++ b/usr.sbin/config/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.8 1996/10/23 22:37:53 niklas Exp $ */ +/* $OpenBSD: main.c,v 1.9 1997/01/15 23:43:53 millert Exp $ */ /* $NetBSD: main.c,v 1.18 1996/08/31 20:58:20 mycroft Exp $ */ /* @@ -92,7 +92,7 @@ main(argc, argv) int pflag, ch; pflag = 0; - while ((ch = getopt(argc, argv, "gpb:s:")) != EOF) { + while ((ch = getopt(argc, argv, "gpb:s:")) != -1) { switch (ch) { case 'g': diff --git a/usr.sbin/ctm/mkCTM/mkctm.c b/usr.sbin/ctm/mkCTM/mkctm.c index f9dfcb7e88f..e08c82b59e8 100644 --- a/usr.sbin/ctm/mkCTM/mkctm.c +++ b/usr.sbin/ctm/mkCTM/mkctm.c @@ -502,7 +502,7 @@ main(int argc, char **argv) err(1,"Default regular expression argument to -I is botched"); flag_ignore = 1; - while ((i = getopt(argc,argv,"D:I:B:qv")) != EOF) + while ((i = getopt(argc,argv,"D:I:B:qv")) != -1) switch (i) { case 'D': damage_limit = strtol(optarg,0,0); diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c index 4a0e17c7171..c23f3d0c750 100644 --- a/usr.sbin/dev_mkdb/dev_mkdb.c +++ b/usr.sbin/dev_mkdb/dev_mkdb.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)dev_mkdb.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$Id: dev_mkdb.c,v 1.2 1996/08/29 03:33:19 deraadt Exp $"; +static char rcsid[] = "$Id: dev_mkdb.c,v 1.3 1997/01/15 23:43:55 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -78,7 +78,7 @@ main(argc, argv) u_char buf[MAXNAMLEN + 1]; char dbtmp[MAXPATHLEN + 1], dbname[MAXPATHLEN + 1]; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch((char)ch) { case '?': default: diff --git a/usr.sbin/grfinfo/grfinfo.c b/usr.sbin/grfinfo/grfinfo.c index e051d4c43be..9ab8bbc9c80 100644 --- a/usr.sbin/grfinfo/grfinfo.c +++ b/usr.sbin/grfinfo/grfinfo.c @@ -19,7 +19,7 @@ * improvements that they make and grant CSS redistribution rights. * * from: Utah $Hdr: grfinfo.c 1.3 94/04/04$ - * $Id: grfinfo.c,v 1.1 1995/10/18 08:47:34 deraadt Exp $ + * $Id: grfinfo.c,v 1.2 1997/01/15 23:43:56 millert Exp $ */ #include <stdio.h> @@ -52,7 +52,7 @@ main(argc, argv) register int c; pname = argv[0]; - while ((c = getopt(argc, argv, "at")) != EOF) + while ((c = getopt(argc, argv, "at")) != -1) switch (c) { /* everything */ case 'a': diff --git a/usr.sbin/gspa/gspa/gspa.c b/usr.sbin/gspa/gspa/gspa.c index 49c891175b0..94cbc82c38b 100644 --- a/usr.sbin/gspa/gspa/gspa.c +++ b/usr.sbin/gspa/gspa/gspa.c @@ -83,7 +83,7 @@ main(int argc, char **argv) hex_name = list_name = 0; /* parse options */ - while ((c = getopt(argc, argv, "o:l:")) != EOF) { + while ((c = getopt(argc, argv, "o:l:")) != -1) { switch (c) { case 'o': if (hex_name) diff --git a/usr.sbin/hilinfo/hilinfo.c b/usr.sbin/hilinfo/hilinfo.c index 5cf867bc45a..0d322b034be 100644 --- a/usr.sbin/hilinfo/hilinfo.c +++ b/usr.sbin/hilinfo/hilinfo.c @@ -19,7 +19,7 @@ * improvements that they make and grant CSS redistribution rights. * * from: Utah $Hdr: hilinfo.c 1.3 94/04/04$ - * $Id: hilinfo.c,v 1.1 1995/10/18 08:47:35 deraadt Exp $ + * $Id: hilinfo.c,v 1.2 1997/01/15 23:43:58 millert Exp $ */ #include <stdio.h> @@ -57,7 +57,7 @@ main(argc, argv) int multi; pname = argv[0]; - while ((c = getopt(argc, argv, "at")) != EOF) + while ((c = getopt(argc, argv, "at")) != -1) switch (c) { /* everything */ case 'a': diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 9f8f105aa59..549f14e7739 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inetd.c,v 1.23 1996/12/14 19:19:09 deraadt Exp $ */ +/* $OpenBSD: inetd.c,v 1.24 1997/01/15 23:43:59 millert Exp $ */ /* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */ /* * Copyright (c) 1983,1991 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/ -static char rcsid[] = "$OpenBSD: inetd.c,v 1.23 1996/12/14 19:19:09 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: inetd.c,v 1.24 1997/01/15 23:43:59 millert Exp $"; #endif /* not lint */ /* @@ -289,7 +289,7 @@ main(argc, argv, envp) progname = strrchr(argv[0], '/'); progname = progname ? progname + 1 : argv[0]; - while ((ch = getopt(argc, argv, "d")) != EOF) + while ((ch = getopt(argc, argv, "d")) != -1) switch(ch) { case 'd': debug = 1; diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index f038f6e113a..8b3ff50cb46 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iostat.c,v 1.6 1996/12/22 03:28:56 deraadt Exp $ */ +/* $OpenBSD: iostat.c,v 1.7 1997/01/15 23:44:01 millert Exp $ */ /* $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $ */ /* @@ -131,7 +131,7 @@ main(argc, argv) int ch, hdrcnt; struct timeval tv; - while ((ch = getopt(argc, argv, "Cc:dDIM:N:Tw:")) != EOF) + while ((ch = getopt(argc, argv, "Cc:dDIM:N:Tw:")) != -1) switch(ch) { case 'c': if ((reps = atoi(optarg)) <= 0) diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c index bcedb0bcb61..f1e11503d74 100644 --- a/usr.sbin/kgmon/kgmon.c +++ b/usr.sbin/kgmon/kgmon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgmon.c,v 1.2 1996/05/01 22:15:24 niklas Exp $ */ +/* $OpenBSD: kgmon.c,v 1.3 1997/01/15 23:44:02 millert Exp $ */ /* * Copyright (c) 1983, 1992, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)kgmon.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$OpenBSD: kgmon.c,v 1.2 1996/05/01 22:15:24 niklas Exp $"; +static char *rcsid = "$OpenBSD: kgmon.c,v 1.3 1997/01/15 23:44:02 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -89,7 +89,7 @@ main(int argc, char **argv) seteuid(getuid()); kmemf = NULL; system = NULL; - while ((ch = getopt(argc, argv, "M:N:bhpr")) != EOF) { + while ((ch = getopt(argc, argv, "M:N:bhpr")) != -1) { switch((char)ch) { case 'M': diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c index 42820267bb6..a9121118658 100644 --- a/usr.sbin/mopd/mopchk/mopchk.c +++ b/usr.sbin/mopd/mopchk/mopchk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopchk.c,v 1.2 1996/09/21 19:12:18 maja Exp $ +/* $OpenBSD: mopchk.c,v 1.3 1997/01/15 23:44:27 millert Exp $ /* * Copyright (c) 1995-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mopchk.c,v 1.2 1996/09/21 19:12:18 maja Exp $"; +static char rcsid[] = "$OpenBSD: mopchk.c,v 1.3 1997/01/15 23:44:27 millert Exp $"; #endif /* @@ -89,7 +89,7 @@ main(argc, argv) openlog(Program, LOG_PID | LOG_CONS, LOG_DAEMON); opterr = 0; - while ((op = getopt(argc, argv, "av")) != EOF) { + while ((op = getopt(argc, argv, "av")) != -1) { switch (op) { case 'a': AllFlag++; diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c index 5e4be97afd8..3c4773db312 100644 --- a/usr.sbin/mopd/mopd/mopd.c +++ b/usr.sbin/mopd/mopd/mopd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopd.c,v 1.2 1996/09/21 19:12:24 maja Exp $ */ +/* $OpenBSD: mopd.c,v 1.3 1997/01/15 23:44:28 millert Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mopd.c,v 1.2 1996/09/21 19:12:24 maja Exp $"; +static char rcsid[] = "$OpenBSD: mopd.c,v 1.3 1997/01/15 23:44:28 millert Exp $"; #endif /* @@ -96,7 +96,7 @@ main(argc, argv) if (*Program == '-') Program++; - while ((c = getopt(argc, argv, "34adfv")) != EOF) + while ((c = getopt(argc, argv, "34adfv")) != -1) switch (c) { case '3': Not3Flag++; diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c index 90dd880b512..a5bae7d915c 100644 --- a/usr.sbin/mopd/mopprobe/mopprobe.c +++ b/usr.sbin/mopd/mopprobe/mopprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopprobe.c,v 1.2 1996/09/21 19:12:35 maja Exp $ */ +/* $OpenBSD: mopprobe.c,v 1.3 1997/01/15 23:44:29 millert Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.2 1996/09/21 19:12:35 maja Exp $"; +static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.3 1997/01/15 23:44:29 millert Exp $"; #endif /* @@ -95,7 +95,7 @@ main(argc, argv) openlog(Program, LOG_PID | LOG_CONS, LOG_DAEMON); opterr = 0; - while ((op = getopt(argc, argv, "ado")) != EOF) { + while ((op = getopt(argc, argv, "ado")) != -1) { switch (op) { case '3': Not3Flag++; diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c index 08bd79c8c98..d529e939ae7 100644 --- a/usr.sbin/mopd/moptrace/moptrace.c +++ b/usr.sbin/mopd/moptrace/moptrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moptrace.c,v 1.2 1996/09/21 19:12:39 maja Exp $ */ +/* $OpenBSD: moptrace.c,v 1.3 1997/01/15 23:44:30 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: moptrace.c,v 1.2 1996/09/21 19:12:39 maja Exp $"; +static char rcsid[] = "$OpenBSD: moptrace.c,v 1.3 1997/01/15 23:44:30 millert Exp $"; #endif /* @@ -95,7 +95,7 @@ main(argc, argv) openlog(Program, LOG_PID | LOG_CONS, LOG_DAEMON); opterr = 0; - while ((op = getopt(argc, argv, "34ad")) != EOF) { + while ((op = getopt(argc, argv, "34ad")) != -1) { switch (op) { case '3': Not3Flag++; diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c index fb2423c5f12..162e8ddbd4e 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/mtree/mtree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtree.c,v 1.4 1997/01/03 21:40:50 millert Exp $ */ +/* $OpenBSD: mtree.c,v 1.5 1997/01/15 23:44:03 millert Exp $ */ /* $NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: mtree.c,v 1.4 1997/01/03 21:40:50 millert Exp $"; +static char rcsid[] = "$OpenBSD: mtree.c,v 1.5 1997/01/15 23:44:03 millert Exp $"; #endif #endif /* not lint */ @@ -79,7 +79,7 @@ main(argc, argv) dir = NULL; keys = KEYDEFAULT; - while ((ch = getopt(argc, argv, "cdef:iK:k:np:rs:tUux")) != EOF) + while ((ch = getopt(argc, argv, "cdef:iK:k:np:rs:tUux")) != -1) switch((char)ch) { case 'c': cflag = 1; diff --git a/usr.sbin/named/dnsquery/dnsquery.c b/usr.sbin/named/dnsquery/dnsquery.c index c6401467781..93478663990 100644 --- a/usr.sbin/named/dnsquery/dnsquery.c +++ b/usr.sbin/named/dnsquery/dnsquery.c @@ -44,7 +44,7 @@ char *argv[]; } /* handle args */ - while ((c = getopt(argc, argv, "c:dh:n:p:r:st:u:v")) != EOF) { + while ((c = getopt(argc, argv, "c:dh:n:p:r:st:u:v")) != -1) { switch (c) { case 'r' : _res.retry = atoi(optarg); diff --git a/usr.sbin/named/named-xfer/named-xfer.c b/usr.sbin/named/named-xfer/named-xfer.c index 98363bc2c8a..d8e981df9c3 100644 --- a/usr.sbin/named/named-xfer/named-xfer.c +++ b/usr.sbin/named/named-xfer/named-xfer.c @@ -181,9 +181,9 @@ main(argc, argv) openlog(ProgName, LOG_PID); #endif #ifdef STUBS - while ((c = getopt(argc, argv, "C:d:l:s:t:z:f:p:P:qS")) != EOF) + while ((c = getopt(argc, argv, "C:d:l:s:t:z:f:p:P:qS")) != -1) #else - while ((c = getopt(argc, argv, "C:d:l:s:t:z:f:p:P:q")) != EOF) + while ((c = getopt(argc, argv, "C:d:l:s:t:z:f:p:P:q")) != -1) #endif switch (c) { #ifdef GEN_AXFR diff --git a/usr.sbin/named/xfer/named-xfer.c b/usr.sbin/named/xfer/named-xfer.c index db41f0ccbf5..1b72e36d379 100644 --- a/usr.sbin/named/xfer/named-xfer.c +++ b/usr.sbin/named/xfer/named-xfer.c @@ -44,7 +44,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)named-xfer.c 4.18 (Berkeley) 3/7/91";*/ -static char rcsid[] = "$Id: named-xfer.c,v 1.1 1995/10/18 08:47:56 deraadt Exp $"; +static char rcsid[] = "$Id: named-xfer.c,v 1.2 1997/01/15 23:44:07 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -111,7 +111,7 @@ main(argc, argv) #else openlog("named-xfer", LOG_PID); #endif - while ((c = getopt(argc, argv, "d:l:s:t:z:f:p:P:q")) != EOF) + while ((c = getopt(argc, argv, "d:l:s:t:z:f:p:P:q")) != -1) switch (c) { case 'd': debug = atoi(optarg); diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c index c48c92c47cc..25142f6d031 100644 --- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c +++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #ifndef lint -static char *rcsid = "$Id: netgroup_mkdb.c,v 1.2 1996/05/01 13:32:21 deraadt Exp $"; +static char *rcsid = "$Id: netgroup_mkdb.c,v 1.3 1997/01/15 23:44:08 millert Exp $"; #endif #include <sys/types.h> @@ -104,7 +104,7 @@ main(argc, argv) char *fname = _PATH_NETGROUP; - while ((ch = getopt(argc, argv, "do:")) != EOF) + while ((ch = getopt(argc, argv, "do:")) != -1) switch (ch) { #ifdef DEBUG_NG case 'd': diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index 77f61d54bfe..3127dd5bce4 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -1,7 +1,7 @@ -/* $OpenBSD: main.c,v 1.2 1996/06/04 08:43:34 niklas Exp $ */ +/* $OpenBSD: main.c,v 1.3 1997/01/15 23:44:09 millert Exp $ */ #ifndef lint -static char *rcsid = "$OpenBSD: main.c,v 1.2 1996/06/04 08:43:34 niklas Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.3 1997/01/15 23:44:09 millert Exp $"; #endif /* @@ -56,7 +56,7 @@ main(int argc, char **argv) char *prog_name = argv[0], *cp; start = argv; - while ((ch = getopt(argc, argv, Options)) != EOF) { + while ((ch = getopt(argc, argv, Options)) != -1) { switch(ch) { case 'v': Verbose = TRUE; diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index 5d318d0edd8..0596b181f21 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -1,7 +1,7 @@ -/* $OpenBSD: main.c,v 1.3 1996/12/29 12:18:27 graichen Exp $ */ +/* $OpenBSD: main.c,v 1.4 1997/01/15 23:44:10 millert Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: main.c,v 1.3 1996/12/29 12:18:27 graichen Exp $"; +static const char *rcsid = "$OpenBSD: main.c,v 1.4 1997/01/15 23:44:10 millert Exp $"; #endif /* @@ -43,7 +43,7 @@ main(int argc, char **argv) char *prog_name = argv[0]; pkgs = start = argv; - while ((ch = getopt(argc, argv, Options)) != EOF) + while ((ch = getopt(argc, argv, Options)) != -1) switch(ch) { case 'v': Verbose = TRUE; diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c index 871f2e8d480..98434f0852b 100644 --- a/usr.sbin/pkg_install/delete/main.c +++ b/usr.sbin/pkg_install/delete/main.c @@ -1,7 +1,7 @@ -/* $OpenBSD: main.c,v 1.2 1996/06/04 08:43:37 niklas Exp $ */ +/* $OpenBSD: main.c,v 1.3 1997/01/15 23:44:10 millert Exp $ */ #ifndef lint -static char *rcsid = "$OpenBSD: main.c,v 1.2 1996/06/04 08:43:37 niklas Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.3 1997/01/15 23:44:10 millert Exp $"; #endif /* @@ -43,7 +43,7 @@ main(int argc, char **argv) char *prog_name = argv[0]; pkgs = start = argv; - while ((ch = getopt(argc, argv, Options)) != EOF) + while ((ch = getopt(argc, argv, Options)) != -1) switch(ch) { case 'v': Verbose = TRUE; diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c index f2b0edeb483..1c2cb187869 100644 --- a/usr.sbin/pkg_install/info/main.c +++ b/usr.sbin/pkg_install/info/main.c @@ -1,7 +1,7 @@ -/* $OpenBSD: main.c,v 1.2 1996/06/04 08:43:39 niklas Exp $ */ +/* $OpenBSD: main.c,v 1.3 1997/01/15 23:44:11 millert Exp $ */ #ifndef lint -static char *rcsid = "$OpenBSD: main.c,v 1.2 1996/06/04 08:43:39 niklas Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.3 1997/01/15 23:44:11 millert Exp $"; #endif /* @@ -45,7 +45,7 @@ main(int argc, char **argv) char *prog_name = argv[0]; pkgs = start = argv; - while ((ch = getopt(argc, argv, Options)) != EOF) + while ((ch = getopt(argc, argv, Options)) != -1) switch(ch) { case 'a': AllInstalled = TRUE; diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c index a61a06b2def..f5621c236a9 100644 --- a/usr.sbin/portmap/portmap.c +++ b/usr.sbin/portmap/portmap.c @@ -40,7 +40,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)portmap.c 5.4 (Berkeley) 4/19/91";*/ -static char rcsid[] = "$Id: portmap.c,v 1.11 1996/10/06 04:13:12 deraadt Exp $"; +static char rcsid[] = "$Id: portmap.c,v 1.12 1997/01/15 23:44:12 millert Exp $"; #endif /* not lint */ /* @@ -121,7 +121,7 @@ main(argc, argv) int len = sizeof(struct sockaddr_in); register struct pmaplist *pml; - while ((c = getopt(argc, argv, "d")) != EOF) { + while ((c = getopt(argc, argv, "d")) != -1) { switch (c) { case 'd': diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c index ec58dd73f1e..0d22bd53db1 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.c +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd_mkdb.c,v 1.8 1996/10/16 09:16:14 downsj Exp $ */ +/* $OpenBSD: pwd_mkdb.c,v 1.9 1997/01/15 23:44:14 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94";*/ -static char *rcsid = "$Id: pwd_mkdb.c,v 1.8 1996/10/16 09:16:14 downsj Exp $"; +static char *rcsid = "$Id: pwd_mkdb.c,v 1.9 1997/01/15 23:44:14 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -103,7 +103,7 @@ main(argc, argv) DBT ypdata, ypkey; makeold = 0; - while ((ch = getopt(argc, argv, "cpvd:")) != EOF) + while ((ch = getopt(argc, argv, "cpvd:")) != -1) switch(ch) { case 'c': /* verify only */ cflag = 1; diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 7cba3473198..9847ffde373 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rarpd.c,v 1.5 1996/08/12 23:42:12 deraadt Exp $ */ +/* $OpenBSD: rarpd.c,v 1.6 1997/01/15 23:44:15 millert Exp $ */ /* $NetBSD: rarpd.c,v 1.12 1996/03/21 18:28:23 jtc Exp $ */ /* @@ -28,7 +28,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: rarpd.c,v 1.5 1996/08/12 23:42:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rarpd.c,v 1.6 1997/01/15 23:44:15 millert Exp $"; #endif @@ -125,7 +125,7 @@ main(argc, argv) openlog(name, LOG_PID | LOG_CONS, LOG_DAEMON); opterr = 0; - while ((op = getopt(argc, argv, "adf")) != EOF) { + while ((op = getopt(argc, argv, "adf")) != -1) { switch (op) { case 'a': ++aflag; diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c index 11d5445911a..45d693aa48f 100644 --- a/usr.sbin/rbootd/rbootd.c +++ b/usr.sbin/rbootd/rbootd.c @@ -98,7 +98,7 @@ main(argc, argv) /* * Parse any arguments. */ - while ((c = getopt(argc, argv, "adi:")) != EOF) + while ((c = getopt(argc, argv, "adi:")) != -1) switch(c) { case 'a': BootAny++; diff --git a/usr.sbin/sendmail/contrib/bitdomain.c b/usr.sbin/sendmail/contrib/bitdomain.c index 52d6d2187c3..ec79b9506e4 100644 --- a/usr.sbin/sendmail/contrib/bitdomain.c +++ b/usr.sbin/sendmail/contrib/bitdomain.c @@ -51,7 +51,7 @@ char **argv; { int opt; - while ((opt = getopt(argc, argv, "o:")) != EOF) { + while ((opt = getopt(argc, argv, "o:")) != -1) { switch (opt) { case 'o': if (!freopen(optarg, "w", stdout)) { diff --git a/usr.sbin/sendmail/mailstats/mailstats.c b/usr.sbin/sendmail/mailstats/mailstats.c index 83082bacb75..a003ea00b52 100644 --- a/usr.sbin/sendmail/mailstats/mailstats.c +++ b/usr.sbin/sendmail/mailstats/mailstats.c @@ -73,7 +73,7 @@ main(argc, argv) cfile = _PATH_SENDMAILCF; sfile = NULL; mnames = TRUE; - while ((ch = getopt(argc, argv, "C:f:o")) != EOF) + while ((ch = getopt(argc, argv, "C:f:o")) != -1) { switch (ch) { diff --git a/usr.sbin/sendmail/makemap/makemap.c b/usr.sbin/sendmail/makemap/makemap.c index 2e289a81641..90f5d515a36 100644 --- a/usr.sbin/sendmail/makemap/makemap.c +++ b/usr.sbin/sendmail/makemap/makemap.c @@ -129,7 +129,7 @@ main(argc, argv) #else #define OPTIONS "Ndforv" #endif - while ((opt = getopt(argc, argv, OPTIONS)) != EOF) + while ((opt = getopt(argc, argv, OPTIONS)) != -1) { switch (opt) { diff --git a/usr.sbin/sendmail/praliases/praliases.c b/usr.sbin/sendmail/praliases/praliases.c index 2c1cc0a07de..10b022a4737 100644 --- a/usr.sbin/sendmail/praliases/praliases.c +++ b/usr.sbin/sendmail/praliases/praliases.c @@ -67,7 +67,7 @@ main(argc, argv) #endif filename = "/etc/aliases"; - while ((ch = getopt(argc, argv, "f:")) != EOF) + while ((ch = getopt(argc, argv, "f:")) != -1) switch((char)ch) { case 'f': filename = optarg; diff --git a/usr.sbin/sendmail/src/main.c b/usr.sbin/sendmail/src/main.c index a4805f91f8b..df276d46f1b 100644 --- a/usr.sbin/sendmail/src/main.c +++ b/usr.sbin/sendmail/src/main.c @@ -249,7 +249,7 @@ main(argc, argv, envp) # define OPTIONS "B:b:C:cd:e:F:f:h:IiM:mN:nO:o:p:q:R:r:sTtUV:vX:" #endif opterr = 0; - while ((j = getopt(argc, argv, OPTIONS)) != EOF) + while ((j = getopt(argc, argv, OPTIONS)) != -1) { switch (j) { diff --git a/usr.sbin/sysctl/pathconf.c b/usr.sbin/sysctl/pathconf.c index ad51f0dfa75..e597f4d255d 100644 --- a/usr.sbin/sysctl/pathconf.c +++ b/usr.sbin/sysctl/pathconf.c @@ -91,7 +91,7 @@ main(argc, argv) char *path; int ch; - while ((ch = getopt(argc, argv, "Aan")) != EOF) { + while ((ch = getopt(argc, argv, "Aan")) != -1) { switch (ch) { case 'A': diff --git a/usr.sbin/sysctl/sysctl.c b/usr.sbin/sysctl/sysctl.c index d4957d72837..799c15dd686 100644 --- a/usr.sbin/sysctl/sysctl.c +++ b/usr.sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.4 1996/11/25 08:22:43 mickey Exp $ */ +/* $OpenBSD: sysctl.c,v 1.5 1997/01/15 23:44:22 millert Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: sysctl.c,v 1.4 1996/11/25 08:22:43 mickey Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.5 1997/01/15 23:44:22 millert Exp $"; #endif #endif /* not lint */ @@ -143,7 +143,7 @@ main(argc, argv) extern int optind; int ch, lvl1; - while ((ch = getopt(argc, argv, "Aanw")) != EOF) { + while ((ch = getopt(argc, argv, "Aanw")) != -1) { switch (ch) { case 'A': diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 9d5e7ff1aca..84fec5d551c 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -216,7 +216,7 @@ main(argc, argv) FILE *fp; char *p, line[MSG_BSIZE + 1]; - while ((ch = getopt(argc, argv, "duf:m:p:")) != EOF) + while ((ch = getopt(argc, argv, "duf:m:p:")) != -1) switch(ch) { case 'd': /* debug */ Debug++; diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c index f0737adde0c..06622b6a5fb 100644 --- a/usr.sbin/tcpdump/tcpdump.c +++ b/usr.sbin/tcpdump/tcpdump.c @@ -24,7 +24,7 @@ static const char copyright[] = "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996\n\ The Regents of the University of California. All rights reserved.\n"; static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/tcpdump.c,v 1.6 1996/12/12 16:22:21 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/tcpdump.c,v 1.7 1997/01/15 23:44:25 millert Exp $ (LBL)"; #endif /* @@ -145,7 +145,7 @@ main(int argc, char **argv) error("%s", ebuf); opterr = 0; - while ((op = getopt(argc, argv, "c:defF:i:lnNOpqr:s:StT:vw:xY")) != EOF) + while ((op = getopt(argc, argv, "c:defF:i:lnNOpqr:s:StT:vw:xY")) != -1) switch (op) { case 'c': cnt = atoi(optarg); diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index 3bab7298bd0..82fa3a92052 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)trpt.c 5.14 (Berkeley) 7/1/91";*/ -static char rcsid[] = "$Id: trpt.c,v 1.4 1996/12/22 03:29:10 deraadt Exp $"; +static char rcsid[] = "$Id: trpt.c,v 1.5 1997/01/15 23:44:26 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -115,7 +115,7 @@ main(argc, argv) off_t lseek(); jflag = npcbs = 0; - while ((ch = getopt(argc, argv, "afjp:st")) != EOF) + while ((ch = getopt(argc, argv, "afjp:st")) != -1) switch (ch) { case 'a': ++aflag; diff --git a/usr.sbin/videomode/videomode.c b/usr.sbin/videomode/videomode.c index ca4e4c2ed31..91f49caa25a 100644 --- a/usr.sbin/videomode/videomode.c +++ b/usr.sbin/videomode/videomode.c @@ -61,7 +61,7 @@ main(argc, argv) dump_mode(0); return (0); } - while ((c = getopt(argc, argv, "as:")) != EOF) { + while ((c = getopt(argc, argv, "as:")) != -1) { switch (c) { case 'a': if (optind < argc) diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c index 4b603e8d294..6308bc92299 100644 --- a/usr.sbin/vipw/vipw.c +++ b/usr.sbin/vipw/vipw.c @@ -67,7 +67,7 @@ main(argc, argv) struct stat begin, end; int ch; - while ((ch = getopt(argc, argv, "")) != EOF) { + while ((ch = getopt(argc, argv, "")) != -1) { switch (ch) { case '?': default: diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c index ca8acc57a82..a3f025be54e 100644 --- a/usr.sbin/ypserv/makedbm/makedbm.c +++ b/usr.sbin/ypserv/makedbm/makedbm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: makedbm.c,v 1.4 1996/06/26 21:26:35 maja Exp $ */ +/* $OpenBSD: makedbm.c,v 1.5 1997/01/15 23:44:32 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: makedbm.c,v 1.4 1996/06/26 21:26:35 maja Exp $"; +static char rcsid[] = "$OpenBSD: makedbm.c,v 1.5 1997/01/15 23:44:32 millert Exp $"; #endif #include <stdio.h> @@ -327,7 +327,7 @@ main (argc,argv) aflag = uflag = bflag = lflag = sflag = 0; infile = outfile = NULL; - while ((ch = getopt(argc, argv, "blsui:o:m:d:")) != EOF) + while ((ch = getopt(argc, argv, "blsui:o:m:d:")) != -1) switch (ch) { case 'b': bflag++; diff --git a/usr.sbin/ypserv/mknetid/mknetid.c b/usr.sbin/ypserv/mknetid/mknetid.c index e905ca6b972..46b859db8bc 100644 --- a/usr.sbin/ypserv/mknetid/mknetid.c +++ b/usr.sbin/ypserv/mknetid/mknetid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mknetid.c,v 1.2 1996/05/30 09:53:09 deraadt Exp $ */ +/* $OpenBSD: mknetid.c,v 1.3 1997/01/15 23:44:33 millert Exp $ */ /* * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mknetid.c,v 1.2 1996/05/30 09:53:09 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mknetid.c,v 1.3 1997/01/15 23:44:33 millert Exp $"; #endif #include <sys/param.h> @@ -537,7 +537,7 @@ char *argv[]; qflag = usage = 0; domain = NULL; - while ((ch = getopt(argc, argv, "d:g:h:m:p:q")) != EOF) + while ((ch = getopt(argc, argv, "d:g:h:m:p:q")) != -1) switch (ch) { case 'd': domain = optarg; diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c index b9434dacf85..a6d7fc5ba45 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.c +++ b/usr.sbin/ypserv/ypserv/ypserv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv.c,v 1.6 1996/10/02 23:44:56 deraadt Exp $ */ +/* $OpenBSD: ypserv.c,v 1.7 1997/01/15 23:44:34 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypserv.c,v 1.6 1996/10/02 23:44:56 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypserv.c,v 1.7 1997/01/15 23:44:34 millert Exp $"; #endif #include "yp.h" @@ -246,7 +246,7 @@ char *argv[]; int ch; extern char *optarg; - while ((ch = getopt(argc, argv, "a:dx")) != EOF) + while ((ch = getopt(argc, argv, "a:dx")) != -1) switch (ch) { case 'a': aclfile = optarg; diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.c b/usr.sbin/ypserv/ypxfr/ypxfr.c index 7bf5665adef..72fb12b07d3 100644 --- a/usr.sbin/ypserv/ypxfr/ypxfr.c +++ b/usr.sbin/ypserv/ypxfr/ypxfr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypxfr.c,v 1.10 1996/12/24 19:28:03 deraadt Exp $ */ +/* $OpenBSD: ypxfr.c,v 1.11 1997/01/15 23:44:35 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypxfr.c,v 1.10 1996/12/24 19:28:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypxfr.c,v 1.11 1997/01/15 23:44:35 millert Exp $"; #endif #include <stdio.h> @@ -464,7 +464,7 @@ char *argv[]; yp_get_default_domain(&domain); - while ((ch = getopt(argc, argv, "cd:fh:s:C:")) != EOF) + while ((ch = getopt(argc, argv, "cd:fh:s:C:")) != -1) switch (ch) { case 'c': cflag++; |