diff options
-rw-r--r-- | bin/pax/options.c | 10 | ||||
-rw-r--r-- | kerberosIV/kadmin/kadmin.c | 4 | ||||
-rw-r--r-- | kerberosIV/kadmind/admin_server.c | 4 | ||||
-rw-r--r-- | kerberosIV/kauth/kauth.c | 4 | ||||
-rw-r--r-- | kerberosIV/kerberos/kerberos.c | 4 | ||||
-rw-r--r-- | kerberosIV/ksrvutil/ksrvutil.c | 4 | ||||
-rw-r--r-- | libexec/tcpd/tcpdchk/tcpdchk.c | 6 | ||||
-rw-r--r-- | libexec/tcpd/tcpdmatch/tcpdmatch.c | 6 | ||||
-rw-r--r-- | sbin/fsck_ext2fs/main.c | 6 | ||||
-rw-r--r-- | sys/arch/hppa/stand/mkboot/mkboot.c | 6 | ||||
-rw-r--r-- | sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y | 6 | ||||
-rw-r--r-- | sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y | 6 | ||||
-rw-r--r-- | sys/arch/i386/stand/installboot/installboot.c | 4 | ||||
-rw-r--r-- | usr.bin/passwd/krb_passwd.c | 4 | ||||
-rw-r--r-- | usr.bin/top/top.c | 4 | ||||
-rw-r--r-- | usr.bin/tset/tset.c | 2 | ||||
-rw-r--r-- | usr.sbin/cron/cron.c | 4 | ||||
-rw-r--r-- | usr.sbin/cron/crontab.c | 4 | ||||
-rw-r--r-- | usr.sbin/ssio/get_scanner.c | 4 | ||||
-rw-r--r-- | usr.sbin/ssio/reset_scanner.c | 4 | ||||
-rw-r--r-- | usr.sbin/ssio/set_scanner.c | 4 | ||||
-rw-r--r-- | usr.sbin/ssio/use_adf.c | 4 |
22 files changed, 52 insertions, 52 deletions
diff --git a/bin/pax/options.c b/bin/pax/options.c index d06eb3feab1..bc097b1b556 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.36 1999/04/29 12:59:03 aaron Exp $ */ +/* $OpenBSD: options.c,v 1.37 1999/05/23 17:19:22 aaron Exp $ */ /* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: options.c,v 1.36 1999/04/29 12:59:03 aaron Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.37 1999/05/23 17:19:22 aaron Exp $"; #endif #endif /* not lint */ @@ -205,7 +205,7 @@ pax_options(argc, argv) * process option flags */ while ((c=getopt(argc,argv,"ab:cdf:iklno:p:rs:tuvwx:zB:DE:G:HLPT:U:XYZ")) - != EOF) { + != -1) { switch (c) { case 'a': /* @@ -614,7 +614,7 @@ tar_options(argc, argv) */ while ((c = getoldopt(argc, argv, "b:cef:hmopruts:vwxzBC:HLOPXZ014578")) - != EOF) { + != -1) { switch(c) { case 'b': /* @@ -938,7 +938,7 @@ cpio_options(argc, argv) dflag = 1; act = -1; nodirs = 1; - while ((c=getopt(argc,argv,"abcdfiklmoprstuvzABC:E:F:H:I:LO:SZ6")) != EOF) + while ((c=getopt(argc,argv,"abcdfiklmoprstuvzABC:E:F:H:I:LO:SZ6")) != -1) switch (c) { case 'a': /* diff --git a/kerberosIV/kadmin/kadmin.c b/kerberosIV/kadmin/kadmin.c index 7a604deb79a..0ddc290f1dd 100644 --- a/kerberosIV/kadmin/kadmin.c +++ b/kerberosIV/kadmin/kadmin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kadmin.c,v 1.7 1998/02/18 11:53:45 art Exp $ */ +/* $OpenBSD: kadmin.c,v 1.8 1999/05/23 17:19:24 aaron Exp $ */ /* $KTH: kadmin.c,v 1.50 1997/11/03 19:51:46 assar Exp $ */ /* @@ -348,7 +348,7 @@ do_init(int argc, char **argv) memset(&pr, 0, sizeof(pr)); if (krb_get_default_principal(pr.name, pr.instance, default_realm) < 0) errx (1, "I could not even guess who you might be"); - while ((c = getopt(argc, argv, "p:u:r:mt")) != EOF) + while ((c = getopt(argc, argv, "p:u:r:mt")) != -1) switch (c) { case 'p': case 'u': diff --git a/kerberosIV/kadmind/admin_server.c b/kerberosIV/kadmind/admin_server.c index 5467b871eed..8c50c24c536 100644 --- a/kerberosIV/kadmind/admin_server.c +++ b/kerberosIV/kadmind/admin_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: admin_server.c,v 1.4 1998/08/16 02:42:09 art Exp $ */ +/* $OpenBSD: admin_server.c,v 1.5 1999/05/23 17:19:24 aaron Exp $ */ /* $KTH: admin_server.c,v 1.42 1997/12/04 19:31:39 assar Exp $ */ /* @@ -362,7 +362,7 @@ main(int argc, char **argv) /* admin_server main routine */ memset(krbrlm, 0, sizeof(krbrlm)); - while ((c = getopt(argc, argv, "f:hmnd:a:r:")) != EOF) + while ((c = getopt(argc, argv, "f:hmnd:a:r:")) != -1) switch(c) { case 'f': /* Syslog file name change */ prm.sysfile = optarg; diff --git a/kerberosIV/kauth/kauth.c b/kerberosIV/kauth/kauth.c index 2a3c6734747..4d89ff18c33 100644 --- a/kerberosIV/kauth/kauth.c +++ b/kerberosIV/kauth/kauth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kauth.c,v 1.4 1998/10/28 17:57:09 art Exp $ */ +/* $OpenBSD: kauth.c,v 1.5 1999/05/23 17:19:24 aaron Exp $ */ /* $KTH: kauth.c,v 1.81 1997/12/09 10:36:33 joda Exp $ */ /* @@ -180,7 +180,7 @@ main(int argc, char **argv) strupr(princ.realm); } - while ((c = getopt(argc, argv, "r:t:f:hdl:n:c:")) != EOF) + while ((c = getopt(argc, argv, "r:t:f:hdl:n:c:")) != -1) switch (c) { case 'd': krb_enable_debug(); diff --git a/kerberosIV/kerberos/kerberos.c b/kerberosIV/kerberos/kerberos.c index 0bd7a89a35a..567e7d2fef6 100644 --- a/kerberosIV/kerberos/kerberos.c +++ b/kerberosIV/kerberos/kerberos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kerberos.c,v 1.15 1998/11/28 23:41:01 art Exp $ */ +/* $OpenBSD: kerberos.c,v 1.16 1999/05/23 17:19:24 aaron Exp $ */ /* $KTH: kerberos.c,v 1.70 1997/09/26 18:06:38 joda Exp $ */ /* @@ -689,7 +689,7 @@ main(int argc, char **argv) umask(077); /* Create protected files */ - while ((c = getopt(argc, argv, "snmp:P:a:l:r:i:")) != EOF) { + while ((c = getopt(argc, argv, "snmp:P:a:l:r:i:")) != -1) { switch(c) { case 's': /* diff --git a/kerberosIV/ksrvutil/ksrvutil.c b/kerberosIV/ksrvutil/ksrvutil.c index 6530d6d057f..5fd37b25fb8 100644 --- a/kerberosIV/ksrvutil/ksrvutil.c +++ b/kerberosIV/ksrvutil/ksrvutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ksrvutil.c,v 1.5 1997/12/17 07:50:16 art Exp $ */ +/* $OpenBSD: ksrvutil.c,v 1.6 1999/05/23 17:19:24 aaron Exp $ */ /* $KTH: ksrvutil.c,v 1.39 1997/05/02 14:28:52 assar Exp $ */ /* @@ -323,7 +323,7 @@ main(int argc, char **argv) local_realm[REALM_SZ - 1] = '\0'; } - while((c = getopt(argc, argv, "ikc:f:p:r:")) != EOF) { + while((c = getopt(argc, argv, "ikc:f:p:r:")) != -1) { switch (c) { case 'i': interactive++; diff --git a/libexec/tcpd/tcpdchk/tcpdchk.c b/libexec/tcpd/tcpdchk/tcpdchk.c index c15a735c779..56ab3940d54 100644 --- a/libexec/tcpd/tcpdchk/tcpdchk.c +++ b/libexec/tcpd/tcpdchk/tcpdchk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpdchk.c,v 1.1 1997/02/26 06:17:09 downsj Exp $ */ +/* $OpenBSD: tcpdchk.c,v 1.2 1999/05/23 17:19:23 aaron Exp $ */ /* * tcpdchk - examine all tcpd access control rules and inetd.conf entries @@ -20,7 +20,7 @@ #if 0 static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25"; #else -static char rcsid[] = "$OpenBSD: tcpdchk.c,v 1.1 1997/02/26 06:17:09 downsj Exp $"; +static char rcsid[] = "$OpenBSD: tcpdchk.c,v 1.2 1999/05/23 17:19:23 aaron Exp $"; #endif #endif @@ -106,7 +106,7 @@ char **argv; /* * Parse the JCL. */ - while ((c = getopt(argc, argv, "adi:v")) != EOF) { + while ((c = getopt(argc, argv, "adi:v")) != -1) { switch (c) { case 'a': allow_check = 1; diff --git a/libexec/tcpd/tcpdmatch/tcpdmatch.c b/libexec/tcpd/tcpdmatch/tcpdmatch.c index fb4fd1c242f..6928bb63999 100644 --- a/libexec/tcpd/tcpdmatch/tcpdmatch.c +++ b/libexec/tcpd/tcpdmatch/tcpdmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpdmatch.c,v 1.1 1997/02/26 06:17:10 downsj Exp $ */ +/* $OpenBSD: tcpdmatch.c,v 1.2 1999/05/23 17:19:23 aaron Exp $ */ /* * tcpdmatch - explain what tcpd would do in a specific case @@ -19,7 +19,7 @@ #if 0 static char sccsid[] = "@(#) tcpdmatch.c 1.5 96/02/11 17:01:36"; #else -static char rcsid[] = "$OpenBSD: tcpdmatch.c,v 1.1 1997/02/26 06:17:10 downsj Exp $"; +static char rcsid[] = "$OpenBSD: tcpdmatch.c,v 1.2 1999/05/23 17:19:23 aaron Exp $"; #endif #endif @@ -85,7 +85,7 @@ char **argv; /* * Parse the JCL. */ - while ((ch = getopt(argc, argv, "di:")) != EOF) { + while ((ch = getopt(argc, argv, "di:")) != -1) { switch (ch) { case 'd': hosts_allow_table = "hosts.allow"; diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c index 9376f649e68..30a798b79d7 100644 --- a/sbin/fsck_ext2fs/main.c +++ b/sbin/fsck_ext2fs/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.4 1997/06/25 18:40:42 kstailey Exp $ */ +/* $OpenBSD: main.c,v 1.5 1999/05/23 17:19:22 aaron Exp $ */ /* $NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $ */ /* @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94"; #if 0 static char rcsid[] = "$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.4 1997/06/25 18:40:42 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.5 1999/05/23 17:19:22 aaron Exp $"; #endif #endif #endif /* not lint */ @@ -91,7 +91,7 @@ main(argc, argv) sync(); skipclean = 1; - while ((ch = getopt(argc, argv, "b:c:dfm:npy")) != EOF) { + while ((ch = getopt(argc, argv, "b:c:dfm:npy")) != -1) { switch (ch) { case 'b': skipclean = 0; diff --git a/sys/arch/hppa/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c index a68d4a6dd55..789162a3378 100644 --- a/sys/arch/hppa/stand/mkboot/mkboot.c +++ b/sys/arch/hppa/stand/mkboot/mkboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkboot.c,v 1.6 1999/05/03 22:47:05 mickey Exp $ */ +/* $OpenBSD: mkboot.c,v 1.7 1999/05/23 17:19:22 aaron Exp $ */ /* * Copyright (c) 1990, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: mkboot.c,v 1.6 1999/05/03 22:47:05 mickey Exp $"; +static char rcsid[] = "$OpenBSD: mkboot.c,v 1.7 1999/05/23 17:19:22 aaron Exp $"; #endif /* not lint */ #endif @@ -110,7 +110,7 @@ main(argc, argv) struct lifvol *lifv = (struct lifvol *)buf; struct lifdir *lifd = (struct lifdir *)(buf + LIF_DIRSTART); - while ((c = getopt(argc, argv, "vl:")) != EOF) { + while ((c = getopt(argc, argv, "vl:")) != -1) { switch (c) { case 'v': verbose++; diff --git a/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y b/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y index 97fed85741d..42007867550 100644 --- a/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y +++ b/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y @@ -1,4 +1,4 @@ -/* $OpenBSD: kbdio.y,v 1.2 1999/01/13 07:26:05 niklas Exp $ */ +/* $OpenBSD: kbdio.y,v 1.3 1999/05/23 17:19:21 aaron Exp $ */ /* Hello emacs, this should be edited in -*- Fundamental -*- mode */ %{ @@ -36,7 +36,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/kbdio/Attic/kbdio.y,v 1.2 1999/01/13 07:26:05 niklas Exp $" +#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/kbdio/Attic/kbdio.y,v 1.3 1999/05/23 17:19:21 aaron Exp $" #include <stdio.h> #include <stdlib.h> @@ -307,7 +307,7 @@ int main(int argc, char **argv) { int fd, c; const char *devname = "/dev/console"; - while((c = getopt(argc, argv, "df:")) != EOF) + while((c = getopt(argc, argv, "df:")) != -1) switch(c) { case 'd': yydebug = 1; diff --git a/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y b/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y index 6b46cf0efc4..93bfc7e199b 100644 --- a/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y +++ b/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y @@ -1,4 +1,4 @@ -/* $OpenBSD: vgaio.y,v 1.2 1999/01/13 07:26:07 niklas Exp $ */ +/* $OpenBSD: vgaio.y,v 1.3 1999/05/23 17:19:22 aaron Exp $ */ /* Hello emacs, this should be edited in -*- Fundamental -*- mode */ %{ @@ -36,7 +36,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/vgaio/Attic/vgaio.y,v 1.2 1999/01/13 07:26:07 niklas Exp $" +#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/vgaio/Attic/vgaio.y,v 1.3 1999/05/23 17:19:22 aaron Exp $" #include <stdio.h> #include <stdlib.h> @@ -229,7 +229,7 @@ int main(int argc, char **argv) { int fd, c; const char *devname = "/dev/console"; - while((c = getopt(argc, argv, "df:")) != EOF) + while((c = getopt(argc, argv, "df:")) != -1) switch(c) { case 'd': yydebug = 1; diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index f84790ef35a..103f5d000dc 100644 --- a/sys/arch/i386/stand/installboot/installboot.c +++ b/sys/arch/i386/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.33 1998/12/16 03:04:09 mickey Exp $ */ +/* $OpenBSD: installboot.c,v 1.34 1999/05/23 17:19:22 aaron Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -111,7 +111,7 @@ main(argc, argv) bios_diskinfo_t di; nsectors = nheads = -1; - while ((c = getopt(argc, argv, "vnh:s:")) != EOF) { + while ((c = getopt(argc, argv, "vnh:s:")) != -1) { switch (c) { case 'h': nheads = atoi(optarg); diff --git a/usr.bin/passwd/krb_passwd.c b/usr.bin/passwd/krb_passwd.c index 4ea9e9a18fd..c8829188c4f 100644 --- a/usr.bin/passwd/krb_passwd.c +++ b/usr.bin/passwd/krb_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: krb_passwd.c,v 1.10 1998/03/09 22:17:32 art Exp $ */ +/* $OpenBSD: krb_passwd.c,v 1.11 1999/05/23 17:19:21 aaron Exp $ */ /* $KTH: kpasswd.c,v 1.25 1997/05/02 14:28:51 assar Exp $ */ /* @@ -84,7 +84,7 @@ krb_passwd(int argc, char **argv) default_principal.instance, default_principal.realm); - while ((c = getopt(argc, argv, "u:n:i:r:h")) != EOF) { + while ((c = getopt(argc, argv, "u:n:i:r:h")) != -1) { switch (c) { case 'u': status = krb_parse_name (optarg, &principal); diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c index 0947e575a64..76c31480081 100644 --- a/usr.bin/top/top.c +++ b/usr.bin/top/top.c @@ -1,4 +1,4 @@ -/* $OpenBSD: top.c,v 1.2 1997/08/22 07:16:30 downsj Exp $ */ +/* $OpenBSD: top.c,v 1.3 1999/05/23 17:19:21 aaron Exp $ */ const char copyright[] = "Copyright (c) 1984 through 1996, William LeFebvre"; @@ -227,7 +227,7 @@ char *argv[]; optind = 1; } - while ((i = getopt(ac, av, "SIbinqus:d:U:o:")) != EOF) + while ((i = getopt(ac, av, "SIbinqus:d:U:o:")) != -1) { switch(i) { diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index 4647ca6ab06..622cbc1888e 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -1079,7 +1079,7 @@ main(int argc, char **argv) obsolete(argv); noinit = noset = quiet = Sflag = sflag = showterm = 0; - while ((ch = getopt(argc, argv, "a:d:e:Ii:k:m:np:qQSrs")) != EOF) { + while ((ch = getopt(argc, argv, "a:d:e:Ii:k:m:np:qQSrs")) != -1) { switch (ch) { case 'q': /* display term only */ noset = 1; diff --git a/usr.sbin/cron/cron.c b/usr.sbin/cron/cron.c index 65e4553c8e7..178815d386e 100644 --- a/usr.sbin/cron/cron.c +++ b/usr.sbin/cron/cron.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: cron.c,v 1.5 1998/03/30 06:59:42 deraadt Exp $"; +static char rcsid[] = "$Id: cron.c,v 1.6 1999/05/23 17:19:23 aaron Exp $"; #endif @@ -384,7 +384,7 @@ parse_args(argc, argv) { int argch; - while (EOF != (argch = getopt(argc, argv, "x:"))) { + while (-1 != (argch = getopt(argc, argv, "x:"))) { switch (argch) { default: usage(); diff --git a/usr.sbin/cron/crontab.c b/usr.sbin/cron/crontab.c index b354d362319..685e1bfb1e5 100644 --- a/usr.sbin/cron/crontab.c +++ b/usr.sbin/cron/crontab.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: crontab.c,v 1.12 1998/07/12 08:23:47 deraadt Exp $"; +static char rcsid[] = "$Id: crontab.c,v 1.13 1999/05/23 17:19:23 aaron Exp $"; #endif /* crontab - install and manage per-user crontab files @@ -154,7 +154,7 @@ parse_args(argc, argv) Filename[0] = '\0'; Option = opt_unknown; - while (EOF != (argch = getopt(argc, argv, getoptarg))) { + while (-1 != (argch = getopt(argc, argv, getoptarg))) { switch (argch) { #if DEBUGGING case 'x': diff --git a/usr.sbin/ssio/get_scanner.c b/usr.sbin/ssio/get_scanner.c index ac63a46155f..0927868f979 100644 --- a/usr.sbin/ssio/get_scanner.c +++ b/usr.sbin/ssio/get_scanner.c @@ -1,4 +1,4 @@ -static char *rcs_id = "$Id: get_scanner.c,v 1.2 1997/08/30 07:55:17 matthieu Exp $"; +static char *rcs_id = "$Id: get_scanner.c,v 1.3 1999/05/23 17:19:23 aaron Exp $"; /* * Copyright (c) 1995 Kenneth Stailey * All rights reserved. @@ -90,7 +90,7 @@ main(int argc, char *argv[]) extern int optind; extern char *optarg; - while ((c = getopt(argc, argv, "tpql:")) != EOF) { + while ((c = getopt(argc, argv, "tpql:")) != -1) { switch (c) { case 'q': quiet = TRUE; diff --git a/usr.sbin/ssio/reset_scanner.c b/usr.sbin/ssio/reset_scanner.c index 4f814126873..e70e02fc4a6 100644 --- a/usr.sbin/ssio/reset_scanner.c +++ b/usr.sbin/ssio/reset_scanner.c @@ -1,4 +1,4 @@ -static char *rcs_id = "$Id: reset_scanner.c,v 1.1 1997/03/11 03:23:15 kstailey Exp $"; +static char *rcs_id = "$Id: reset_scanner.c,v 1.2 1999/05/23 17:19:23 aaron Exp $"; #ifdef _IBMR2 /* * PINT Pint Is Not TWAIN - common scanner driver interface for UN*X @@ -48,7 +48,7 @@ main(int argc, char *argv[]) extern int optind; extern char *optarg; - while ((c = getopt(argc, argv, "fl:")) != EOF) { + while ((c = getopt(argc, argv, "fl:")) != -1) { switch (c) { case 'l': logical_name = optarg; diff --git a/usr.sbin/ssio/set_scanner.c b/usr.sbin/ssio/set_scanner.c index 2ab48fa6ee0..bef7c0bf934 100644 --- a/usr.sbin/ssio/set_scanner.c +++ b/usr.sbin/ssio/set_scanner.c @@ -1,4 +1,4 @@ -static char *rcs_id = "$Id: set_scanner.c,v 1.2 1997/08/30 07:55:17 matthieu Exp $"; +static char *rcs_id = "$Id: set_scanner.c,v 1.3 1999/05/23 17:19:23 aaron Exp $"; /* * Copyright (c) 1995 Kenneth Stailey * All rights reserved. @@ -82,7 +82,7 @@ main(int argc, char *argv[]) image_mode = UNINITIALIZED; - while ((c = getopt(argc, argv, "w:h:x:y:l:b:c:r:i:d")) != EOF) { + while ((c = getopt(argc, argv, "w:h:x:y:l:b:c:r:i:d")) != -1) { switch (c) { case 'w': width = inches_to_1200th(optarg); diff --git a/usr.sbin/ssio/use_adf.c b/usr.sbin/ssio/use_adf.c index d95f6d1c430..fa94b41c42d 100644 --- a/usr.sbin/ssio/use_adf.c +++ b/usr.sbin/ssio/use_adf.c @@ -1,4 +1,4 @@ -static char *rcs_id = "$Id: use_adf.c,v 1.2 1997/08/30 07:55:17 matthieu Exp $"; +static char *rcs_id = "$Id: use_adf.c,v 1.3 1999/05/23 17:19:23 aaron Exp $"; /* * Copyright (c) 1995 Kenneth Stailey * All rights reserved. @@ -66,7 +66,7 @@ main(int argc, char *argv[]) extern int errno; - while ((c = getopt(argc, argv, "l:")) != EOF) { + while ((c = getopt(argc, argv, "l:")) != -1) { switch (c) { case 'l': logical_name = optarg; |