diff options
Diffstat (limited to 'usr.sbin')
28 files changed, 138 insertions, 139 deletions
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index 7bbecbfa923..d1628e62b6f 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -205,7 +205,7 @@ main(int argc, char *argv[]) switch (c) { #ifdef DEBUG case 'D': - Debug++; + Debug = 1; break; #endif case 'd': diff --git a/usr.sbin/cron/atrun.c b/usr.sbin/cron/atrun.c index a00d715885d..a6dbb9a784a 100644 --- a/usr.sbin/cron/atrun.c +++ b/usr.sbin/cron/atrun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atrun.c,v 1.27 2015/01/23 02:37:25 tedu Exp $ */ +/* $OpenBSD: atrun.c,v 1.28 2015/02/09 23:00:14 deraadt Exp $ */ /* * Copyright (c) 2002-2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -160,7 +160,7 @@ atrun(at_db *db, double batch_maxload, time_t now) /* * Pending jobs have the user execute bit set. */ - if (statbuf.st_mode & S_IXUSR) { + if (statbuf.st_mode & S_IXUSR) { /* new job to run */ if (isupper(job->queue)) { /* we run one batch job per atrun() call */ diff --git a/usr.sbin/cron/config.h b/usr.sbin/cron/config.h index bbc6f069019..e66ad2a02cc 100644 --- a/usr.sbin/cron/config.h +++ b/usr.sbin/cron/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.20 2015/02/09 22:35:08 deraadt Exp $ */ +/* $OpenBSD: config.h,v 1.21 2015/02/09 23:00:14 deraadt Exp $ */ /* Copyright 1988,1990,1993,1994 by Paul Vixie * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") @@ -70,12 +70,12 @@ * are both defined, then logging will go to both * places. */ -#define SYSLOG /*-*/ +#define SYSLOG /*-*/ /* if you have a tm_gmtoff member in struct tm. * If not, we will have to compute the value ourselves. */ -#define HAVE_TM_GMTOFF /*-*/ +#define HAVE_TM_GMTOFF /*-*/ /* if your OS has the paths.h header */ #define HAVE_PATHS_H /*-*/ diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 904569ecca1..fd14f3b9bd0 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -113,7 +113,7 @@ main(int argc, char *argv[]) switch(ch) { case 'p': protoname = optarg; - pflag++; + pflag = 1; break; case 'g': quotatype = GRPQUOTA; @@ -122,7 +122,7 @@ main(int argc, char *argv[]) quotatype = USRQUOTA; break; case 't': - tflag++; + tflag = 1; break; default: usage(); diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c index 31f60b9f295..8c5ec688e52 100644 --- a/usr.sbin/lpr/filters/lpf.c +++ b/usr.sbin/lpr/filters/lpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpf.c,v 1.12 2009/10/27 23:59:52 deraadt Exp $ */ +/* $OpenBSD: lpf.c,v 1.13 2015/02/09 23:00:14 deraadt Exp $ */ /* $NetBSD: lpf.c,v 1.8 2000/04/29 00:12:32 abs Exp $ */ /* @@ -89,7 +89,7 @@ main(int argc, char **argv) indent = atoi(optarg); break; case 'r': /* map nl->cr-nl */ - onlcr++; + onlcr = 1; break; case 'c': /* Print control chars */ literal++; diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index 38b37e96c3f..dad94bf0a23 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpd.c,v 1.57 2015/01/16 06:40:18 deraadt Exp $ */ +/* $OpenBSD: lpd.c,v 1.58 2015/02/09 23:00:14 deraadt Exp $ */ /* $NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $ */ /* @@ -176,7 +176,7 @@ main(int argc, char **argv) options |= SO_DEBUG; break; case 'l': - lflag++; + lflag = 1; break; case 'n': child_max = strtol(optarg, &cp, 10); @@ -185,10 +185,10 @@ main(int argc, char **argv) optarg); break; case 'r': - rflag++; + rflag = 1; break; case 's': - sflag++; + sflag = 1; break; case 'w': l = strtol(optarg, &cp, 10); diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c index 6947dfb7fe2..115da6b3324 100644 --- a/usr.sbin/lpr/lpq/lpq.c +++ b/usr.sbin/lpr/lpq/lpq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpq.c,v 1.21 2015/01/16 06:40:18 deraadt Exp $ */ +/* $OpenBSD: lpq.c,v 1.22 2015/02/09 23:00:14 deraadt Exp $ */ /* $NetBSD: lpq.c,v 1.9 1999/12/07 14:54:47 mrg Exp $ */ /* @@ -88,10 +88,10 @@ main(int argc, char **argv) while ((ch = getopt(argc, argv, "alP:w:")) != -1) { switch(ch) { case 'a': - ++aflag; + aflag = 1; break; case 'l': /* long output */ - ++lflag; + lflag = 1; break; case 'P': /* printer name */ printer = optarg; diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c index 5027435df47..1bb9eb2f95a 100644 --- a/usr.sbin/lpr/lpr/lpr.c +++ b/usr.sbin/lpr/lpr/lpr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpr.c,v 1.47 2015/01/16 06:40:18 deraadt Exp $ */ +/* $OpenBSD: lpr.c,v 1.48 2015/02/09 23:00:14 deraadt Exp $ */ /* $NetBSD: lpr.c,v 1.19 2000/10/11 20:23:52 is Exp $ */ /* @@ -209,19 +209,19 @@ main(int argc, char **argv) break; case 'm': /* send mail when done */ - mailflg++; + mailflg = 1; break; case 'q': /* just q job */ - qflag++; + qflag = 1; break; case 'r': /* remove file when done */ - rflag++; + rflag = 1; break; case 's': /* try to link files */ - sflag++; + sflag = 1; break; case 'w': /* versatec page width */ diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index bf48b9dae11..1309a997c75 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pac.c,v 1.23 2015/01/16 14:36:44 deraadt Exp $ */ +/* $OpenBSD: pac.c,v 1.24 2015/02/09 23:00:14 deraadt Exp $ */ /* $NetBSD: pac.c,v 1.14 2000/04/27 13:40:18 msaitoh Exp $ */ /* @@ -127,14 +127,14 @@ main(int argc, char **argv) /* * Summarize and compress accounting file. */ - summarize++; + summarize = 1; continue; case 'c': /* * Sort by cost. */ - sort++; + sort = 1; continue; case 'm': @@ -148,7 +148,7 @@ main(int argc, char **argv) /* * Reverse sorting order. */ - reverse++; + reverse = 1; continue; default: diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c index 4596161946f..5e8612272e1 100644 --- a/usr.sbin/mopd/mopchk/mopchk.c +++ b/usr.sbin/mopd/mopchk/mopchk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopchk.c,v 1.17 2014/12/13 14:44:59 miod Exp $ */ +/* $OpenBSD: mopchk.c,v 1.18 2015/02/09 23:00:14 deraadt Exp $ */ /* * Copyright (c) 1995-96 Mats O Jansson. All rights reserved. @@ -69,10 +69,10 @@ main(argc, argv) while ((op = getopt(argc, argv, "av")) != -1) { switch (op) { case 'a': - AllFlag++; + AllFlag = 1; break; case 'v': - VersionFlag++; + VersionFlag = 1; break; default: Usage(); diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c index 16c96b860ef..fd9d4b80c56 100644 --- a/usr.sbin/mopd/mopd/mopd.c +++ b/usr.sbin/mopd/mopd/mopd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopd.c,v 1.18 2013/07/05 21:02:07 miod Exp $ */ +/* $OpenBSD: mopd.c,v 1.19 2015/02/09 23:00:14 deraadt Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -75,22 +75,22 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, "34adfv")) != -1) switch (c) { case '3': - Not3Flag++; + Not3Flag = 1; break; case '4': - Not4Flag++; + Not4Flag = 1; break; case 'a': - AllFlag++; + AllFlag = 1; break; case 'd': DebugFlag++; break; case 'f': - ForegroundFlag++; + ForegroundFlag = 1; break; case 'v': - VersionFlag++; + VersionFlag = 1; break; default: Usage(); diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c index a023e82eced..f6fe7f7f61a 100644 --- a/usr.sbin/mopd/mopprobe/mopprobe.c +++ b/usr.sbin/mopd/mopprobe/mopprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopprobe.c,v 1.14 2013/07/05 21:02:07 miod Exp $ */ +/* $OpenBSD: mopprobe.c,v 1.15 2015/02/09 23:00:14 deraadt Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -75,19 +75,19 @@ main(int argc, char *argv[]) while ((op = getopt(argc, argv, "34aov")) != -1) { switch (op) { case '3': - Not3Flag++; + Not3Flag = 1; break; case '4': - Not4Flag++; + Not4Flag = 1; break; case 'a': - AllFlag++; + AllFlag = 1; break; case 'o': - OnceFlag++; + OnceFlag = 1; break; case 'v': - VerboseFlag++; + VerboseFlag = 1; break; default: Usage(); diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c index 0c69eec6055..5bcb6292b73 100644 --- a/usr.sbin/mopd/moptrace/moptrace.c +++ b/usr.sbin/mopd/moptrace/moptrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moptrace.c,v 1.12 2013/07/05 21:02:07 miod Exp $ */ +/* $OpenBSD: moptrace.c,v 1.13 2015/02/09 23:00:14 deraadt Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -69,13 +69,13 @@ main(int argc, char *argv[]) while ((op = getopt(argc, argv, "34ad")) != -1) { switch (op) { case '3': - Not3Flag++; + Not3Flag = 1; break; case '4': - Not4Flag++; + Not4Flag = 1; break; case 'a': - AllFlag++; + AllFlag = 1; break; case 'd': DebugFlag++; diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c index 6f56bee9caa..bdacd72ac68 100644 --- a/usr.sbin/pppd/chat/chat.c +++ b/usr.sbin/pppd/chat/chat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chat.c,v 1.30 2013/04/21 17:50:29 tedu Exp $ */ +/* $OpenBSD: chat.c,v 1.31 2015/02/09 23:00:14 deraadt Exp $ */ /* * Chat -- a program for automatic session establishment (i.e. dial @@ -242,19 +242,19 @@ main(argc, argv) while ((option = getopt(argc, argv, "esSvVt:r:f:T:U:")) != -1) { switch (option) { case 'e': - ++echo; + echo = 1; break; case 'v': - ++verbose; + verbose = 1; break; case 'V': - ++Verbose; + Verbose = 1; break; case 's': - ++to_stderr; + to_stderr = 1; break; case 'S': diff --git a/usr.sbin/pppd/pppstats/pppstats.c b/usr.sbin/pppd/pppstats/pppstats.c index 640ca0c82da..a606caf129a 100644 --- a/usr.sbin/pppd/pppstats/pppstats.c +++ b/usr.sbin/pppd/pppstats/pppstats.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pppstats.c,v 1.11 2015/01/16 06:40:19 deraadt Exp $ */ +/* $OpenBSD: pppstats.c,v 1.12 2015/02/09 23:00:14 deraadt Exp $ */ /* * print PPP statistics: @@ -318,19 +318,19 @@ main(argc, argv) while ((c = getopt(argc, argv, "advrzc:w:")) != -1) { switch (c) { case 'a': - ++aflag; + aflag = 1; break; case 'd': - ++dflag; + dflag = 1; break; case 'v': - ++vflag; + vflag = 1; break; case 'r': - ++rflag; + rflag = 1; break; case 'z': - ++zflag; + zflag = 1; break; case 'c': count = atoi(optarg); diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c index d2e3acfba32..5d782bdd49e 100644 --- a/usr.sbin/quotaon/quotaon.c +++ b/usr.sbin/quotaon/quotaon.c @@ -72,7 +72,7 @@ main(int argc, char *argv[]) if (whoami == (char *)1) whoami = *argv; if (strcmp(whoami, "quotaoff") == 0) - offmode++; + offmode = 1; else if (strcmp(whoami, "quotaon") != 0) { fprintf(stderr, "Name must be quotaon or quotaoff not %s\n", whoami); @@ -81,16 +81,16 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "avug")) != -1) { switch (ch) { case 'a': - aflag++; + aflag = 1; break; case 'g': - gflag++; + gflag = 1; break; case 'u': - uflag++; + uflag = 1; break; case 'v': - vflag++; + vflag = 1; break; default: usage(whoami); @@ -101,8 +101,8 @@ main(int argc, char *argv[]) if (argc <= 0 && !aflag) usage(whoami); if (!gflag && !uflag) { - gflag++; - uflag++; + gflag = 1; + uflag = 1; } setfsent(); while ((fs = getfsent()) != NULL) { diff --git a/usr.sbin/rdate/rdate.c b/usr.sbin/rdate/rdate.c index d14bb783a62..363fc2a1cb6 100644 --- a/usr.sbin/rdate/rdate.c +++ b/usr.sbin/rdate/rdate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rdate.c,v 1.31 2015/01/16 06:40:20 deraadt Exp $ */ +/* $OpenBSD: rdate.c,v 1.32 2015/02/09 23:00:14 deraadt Exp $ */ /* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */ /* @@ -92,19 +92,19 @@ main(int argc, char **argv) break; case 'p': - pr++; + pr = 1; break; case 's': - silent++; + silent = 1; break; case 'a': - slidetime++; + slidetime = 1; break; case 'n': - ntp++; + ntp = 1; break; case 'o': @@ -116,7 +116,7 @@ main(int argc, char **argv) break; case 'v': - verbose++; + verbose = 1; break; default: diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c index c9210fbce23..40a862a8b09 100644 --- a/usr.sbin/tcpdump/tcpdump.c +++ b/usr.sbin/tcpdump/tcpdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpdump.c,v 1.67 2014/11/26 18:34:52 millert Exp $ */ +/* $OpenBSD: tcpdump.c,v 1.68 2015/02/09 23:00:14 deraadt Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -230,12 +230,12 @@ main(int argc, char **argv) switch (op) { case 'A': - if (xflag == 0) ++xflag; - ++Aflag; + xflag = 1; + Aflag = 1; break; case 'a': - ++aflag; + aflag = 1; break; case 'c': @@ -257,11 +257,11 @@ main(int argc, char **argv) ++dflag; break; case 'e': - ++eflag; + eflag = 1; break; case 'f': - ++fflag; + fflag = 1; break; case 'F': @@ -273,21 +273,21 @@ main(int argc, char **argv) break; case 'I': - ++Iflag; + Iflag = 1; break; case 'l': setvbuf(stdout, NULL, _IOLBF, 0); break; case 'L': - ++Lflag; + Lflag = 1; break; case 'n': - ++nflag; + nflag = 1; break; case 'N': - ++Nflag; + Nflag = 1; break; case 'O': @@ -299,11 +299,11 @@ main(int argc, char **argv) break; case 'p': - ++pflag; + pflag = 1; break; case 'q': - ++qflag; + qflag = 1; break; case 'r': @@ -317,7 +317,7 @@ main(int argc, char **argv) break; case 'S': - ++Sflag; + Sflag = 1; break; case 't': @@ -375,12 +375,12 @@ main(int argc, char **argv) break; case 'x': - ++xflag; + xflag = 1; break; case 'X': - ++Xflag; - if (xflag == 0) ++xflag; + Xflag = 1; + xflag = 1; break; case 'E': diff --git a/usr.sbin/tokeninit/tokeninit.c b/usr.sbin/tokeninit/tokeninit.c index c3fd879502f..91c42b0a938 100644 --- a/usr.sbin/tokeninit/tokeninit.c +++ b/usr.sbin/tokeninit/tokeninit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tokeninit.c,v 1.8 2015/01/16 06:40:22 deraadt Exp $ */ +/* $OpenBSD: tokeninit.c,v 1.9 2015/02/09 23:00:14 deraadt Exp $ */ /*- * Copyright (c) 1995 Migration Associates Corp. All Rights Reserved @@ -97,7 +97,7 @@ main(int argc, char **argv) break; case 'h': - hexformat++; + hexformat = 1; break; case 'm': @@ -112,7 +112,7 @@ main(int argc, char **argv) break; case 'v': /* verbose */ - verbose++; + verbose = 1; break; default: fprintf(stderr, diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c index 89527f4ebb8..d3623ccd888 100644 --- a/usr.sbin/traceroute/traceroute.c +++ b/usr.sbin/traceroute/traceroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traceroute.c,v 1.136 2015/01/20 18:44:16 florian Exp $ */ +/* $OpenBSD: traceroute.c,v 1.137 2015/02/09 23:00:15 deraadt Exp $ */ /* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */ /* @@ -440,7 +440,7 @@ main(int argc, char *argv[]) "AcDdf:g:Ilm:nP:p:q:Ss:t:V:vw:x")) != -1) switch (ch) { case 'A': - Aflag++; + Aflag = 1; break; case 'c': incflag = 0; @@ -480,7 +480,7 @@ main(int argc, char *argv[]) proto = IPPROTO_ICMP; break; case 'l': - ttl_flag++; + ttl_flag = 1; break; case 'm': errno = 0; @@ -493,7 +493,7 @@ main(int argc, char *argv[]) max_ttl = (u_int8_t)l; break; case 'n': - nflag++; + nflag = 1; break; case 'p': errno = 0; @@ -559,7 +559,7 @@ main(int argc, char *argv[]) last_tos = tos; break; case 'v': - verbose++; + verbose = 1; break; case 'V': rtableid = (unsigned int)strtonum(optarg, 0, diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index 179cc3467c5..f5050904ae0 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trpt.c,v 1.30 2015/01/16 06:40:22 deraadt Exp $ */ +/* $OpenBSD: trpt.c,v 1.31 2015/02/09 23:00:15 deraadt Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -135,14 +135,14 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "afjM:N:p:st")) != -1) { switch (ch) { case 'a': - ++aflag; + aflag = 1; break; case 'f': - ++follow; + follow = 1; setvbuf(stdout, NULL, _IOLBF, 0); break; case 'j': - ++jflag; + jflag = 1; break; case 'p': if (npcbs >= TCP_NDEBUG) @@ -156,10 +156,10 @@ main(int argc, char *argv[]) npcbs++; break; case 's': - ++sflag; + sflag = 1; break; case 't': - ++tflag; + tflag = 1; break; case 'N': sys = optarg; diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c index db8cd2dbb85..6d4dbe0c9e8 100644 --- a/usr.sbin/usbdevs/usbdevs.c +++ b/usr.sbin/usbdevs/usbdevs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdevs.c,v 1.22 2014/11/17 05:37:32 jsg Exp $ */ +/* $OpenBSD: usbdevs.c,v 1.23 2015/02/09 23:00:15 deraadt Exp $ */ /* $NetBSD: usbdevs.c,v 1.19 2002/02/21 00:34:31 christos Exp $ */ /* @@ -191,7 +191,7 @@ main(int argc, char **argv) errx(1, "addr %s", errstr); break; case 'd': - showdevs++; + showdevs = 1; break; case 'f': dev = optarg; diff --git a/usr.sbin/wsconscfg/wsconscfg.c b/usr.sbin/wsconscfg/wsconscfg.c index 16252ecca89..3c447cdd79e 100644 --- a/usr.sbin/wsconscfg/wsconscfg.c +++ b/usr.sbin/wsconscfg/wsconscfg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconscfg.c,v 1.13 2008/05/17 23:31:52 sobrado Exp $ */ +/* $OpenBSD: wsconscfg.c,v 1.14 2015/02/09 23:00:15 deraadt Exp $ */ /* $NetBSD: wsconscfg.c,v 1.4 1999/07/29 18:24:10 augustss Exp $ */ /* @@ -86,14 +86,14 @@ main(int argc, char *argv[]) wsdev = optarg; break; case 'd': - delete++; + delete = 1; break; case 'k': - kbd++; + kbd = 1; break; case 'm': - mux++; - kbd++; + mux = 1; + kbd = 1; break; case 't': strlcpy(asd.screentype, optarg, WSSCREEN_NAME_SIZE); diff --git a/usr.sbin/wsfontload/wsfontload.c b/usr.sbin/wsfontload/wsfontload.c index e404c0aae0d..f4cda028aec 100644 --- a/usr.sbin/wsfontload/wsfontload.c +++ b/usr.sbin/wsfontload/wsfontload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfontload.c,v 1.13 2013/10/20 16:09:25 miod Exp $ */ +/* $OpenBSD: wsfontload.c,v 1.14 2015/02/09 23:00:15 deraadt Exp $ */ /* $NetBSD: wsfontload.c,v 1.2 2000/01/05 18:46:43 ad Exp $ */ /* @@ -116,7 +116,7 @@ main(int argc, char *argv[]) f.encoding = getencoding(optarg); break; case 'l': - list++; + list = 1; break; case 'N': strlcpy(f.name, optarg, WSFONT_NAME_SIZE); diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c index 5f373f5aad9..907c25e4c4b 100644 --- a/usr.sbin/ypserv/makedbm/makedbm.c +++ b/usr.sbin/ypserv/makedbm/makedbm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: makedbm.c,v 1.32 2015/01/16 06:40:23 deraadt Exp $ */ +/* $OpenBSD: makedbm.c,v 1.33 2015/02/09 23:00:15 deraadt Exp $ */ /* * Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se> @@ -313,39 +313,39 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "Ublsui:o:m:d:")) != -1) switch (ch) { case 'U': - uflag++; - Uflag++; + uflag = 1; + Uflag = 1; break; case 'b': - bflag++; - aflag++; + bflag = 1; + aflag = 1; break; case 'l': - lflag++; - aflag++; + lflag = 1; + aflag = 1; break; case 's': - sflag++; - aflag++; + sflag = 1; + aflag = 1; break; case 'i': yp_input_file = optarg; - aflag++; + aflag = 1; break; case 'o': yp_output_file = optarg; - aflag++; + aflag = 1; break; case 'm': yp_master_name = optarg; - aflag++; + aflag = 1; break; case 'd': yp_domain_name = optarg; - aflag++; + aflag = 1; break; case 'u': - uflag++; + uflag = 1; break; default: usage(); diff --git a/usr.sbin/ypserv/mkalias/mkalias.c b/usr.sbin/ypserv/mkalias/mkalias.c index e15b0388ae1..9700ae349f3 100644 --- a/usr.sbin/ypserv/mkalias/mkalias.c +++ b/usr.sbin/ypserv/mkalias/mkalias.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkalias.c,v 1.27 2015/01/16 06:40:23 deraadt Exp $ */ +/* $OpenBSD: mkalias.c,v 1.28 2015/02/09 23:00:15 deraadt Exp $ */ /* * Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se> @@ -137,7 +137,7 @@ usage(void) int main(int argc, char *argv[]) { - int eflag = 0, dflag = 0, nflag = 0, sflag = 0; + int eflag = 0, dflag = 0, nflag = 0; int uflag = 0, vflag = 0, Eflag = 0; int status, ch, fd; char *input = NULL, *output = NULL; @@ -153,26 +153,25 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "Edensuv")) != -1) switch (ch) { case 'E': - eflag++; /* Check hostname */ - Eflag++; /* .. even check MX records */ + eflag = 1; /* Check hostname */ + Eflag = 1; /* .. even check MX records */ break; case 'd': - dflag++; /* Don't check DNS hostname */ + dflag = 1; /* Don't check DNS hostname */ break; case 'e': - eflag++; /* Check hostname */ + eflag = 1; /* Check hostname */ break; case 'n': - nflag++; /* Capitalize name parts */ + nflag = 1; /* Capitalize name parts */ break; - case 's': - sflag++; /* Don't know... */ + case 's': /* Ignore */ break; case 'u': - uflag++; /* Don't check UUCP hostname */ + uflag = 1; /* Don't check UUCP hostname */ break; case 'v': - vflag++; /* Verbose */ + vflag = 1; /* Verbose */ break; default: usage(); diff --git a/usr.sbin/ypserv/mknetid/mknetid.c b/usr.sbin/ypserv/mknetid/mknetid.c index ec1b3b10af0..ff31ffe7392 100644 --- a/usr.sbin/ypserv/mknetid/mknetid.c +++ b/usr.sbin/ypserv/mknetid/mknetid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mknetid.c,v 1.21 2015/01/16 06:40:23 deraadt Exp $ */ +/* $OpenBSD: mknetid.c,v 1.22 2015/02/09 23:00:15 deraadt Exp $ */ /* * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se> @@ -505,7 +505,7 @@ main(int argc, char *argv[]) MasterPasswdFile = optarg; break; case 'q': - qflag++; + qflag = 1; break; default: usage(); diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.c b/usr.sbin/ypserv/ypxfr/ypxfr.c index 61f208ed759..b7ebfe6f904 100644 --- a/usr.sbin/ypserv/ypxfr/ypxfr.c +++ b/usr.sbin/ypserv/ypxfr/ypxfr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypxfr.c,v 1.38 2015/01/16 06:40:23 deraadt Exp $ */ +/* $OpenBSD: ypxfr.c,v 1.39 2015/02/09 23:00:15 deraadt Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -357,7 +357,7 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "cd:fh:s:C:")) != -1) switch (ch) { case 'c': - cflag++; + cflag = 1; break; case 'd': if (strchr(optarg, '/')) /* Ha ha, we are not listening */ @@ -365,7 +365,7 @@ main(int argc, char *argv[]) domain = optarg; break; case 'f': - fflag++; + fflag = 1; break; case 'h': host = optarg; @@ -378,7 +378,7 @@ main(int argc, char *argv[]) case 'C': if (optind + 3 >= argc) usage(); - Cflag++; + Cflag = 1; tid = optarg; prog = argv[optind++]; ipadd = argv[optind++]; |