diff options
49 files changed, 208 insertions, 213 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 8056cd27565..13772a8f9b3 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.144 2003/07/07 03:18:11 deraadt Exp $ */ +/* $OpenBSD: ftpd.c,v 1.145 2003/07/29 18:39:22 deraadt Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -70,7 +70,7 @@ static const char copyright[] = static const char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #else static const char rcsid[] = - "$OpenBSD: ftpd.c,v 1.144 2003/07/07 03:18:11 deraadt Exp $"; + "$OpenBSD: ftpd.c,v 1.145 2003/07/29 18:39:22 deraadt Exp $"; #endif #endif /* not lint */ @@ -2281,7 +2281,7 @@ long_passive(char *cmd, int pf) return; } - + if (pdata >= 0) close(pdata); /* @@ -2807,7 +2807,7 @@ copy_dir(char *dir, struct passwd *pw) } else { dirsiz = strlen(cp) + strlen(pw->pw_dir) + 1; if ((newdir = malloc(dirsiz)) == NULL) { - free(user); + free(user); return (NULL); } strlcpy(newdir, pw->pw_dir, dirsiz); diff --git a/libexec/getty/main.c b/libexec/getty/main.c index dcccaa56299..b1802cf668c 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.27 2003/07/05 17:02:08 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.28 2003/07/29 18:39:22 deraadt Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -37,7 +37,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";*/ -static char rcsid[] = "$OpenBSD: main.c,v 1.27 2003/07/05 17:02:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.28 2003/07/29 18:39:22 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -194,7 +194,7 @@ main(int argc, char *argv[]) * The following is a work around for vhangup interactions * which cause great problems getting window systems started. * If the tty line is "-", we do the old style getty presuming - * that the file descriptors are already set up for us. + * that the file descriptors are already set up for us. * J. Gettys - MIT Project Athena. */ if (argc <= 2 || strcmp(argv[2], "-") == 0) { diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c index 2dc91594ac2..100da895690 100644 --- a/libexec/identd/identd.c +++ b/libexec/identd/identd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identd.c,v 1.35 2003/06/28 01:05:21 deraadt Exp $ */ +/* $OpenBSD: identd.c,v 1.36 2003/07/29 18:39:23 deraadt Exp $ */ /* * This program is in the public domain and may be used freely by anyone @@ -141,7 +141,7 @@ alarm_handler(int notused) /* * Main entry point into this daemon */ -int +int main(int argc, char *argv[]) { struct sockaddr_storage sa, sa2; diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c index e0293d51838..b6185d22314 100644 --- a/libexec/identd/parse.c +++ b/libexec/identd/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.37 2003/06/28 01:05:21 deraadt Exp $ */ +/* $OpenBSD: parse.c,v 1.38 2003/07/29 18:39:23 deraadt Exp $ */ /* * This program is in the public domain and may be used freely by anyone @@ -255,11 +255,11 @@ parse(int fd, struct in_addr *laddr, struct in_addr *faddr) gentoken(token, sizeof token); syslog(LOG_NOTICE, "token %s == NO USER", token); n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, + "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, opsys_name, charset_sep, charset_name, token); - if (timed_write(fd, buf, n, IO_TIMEOUT) != n && + if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { - syslog(LOG_NOTICE, "write to %s: %m", + syslog(LOG_NOTICE, "write to %s: %m", gethost4_addr(faddr)); return 1; } @@ -451,11 +451,11 @@ parse6(int fd, struct sockaddr_in6 *laddr, struct sockaddr_in6 *faddr) gentoken(token, sizeof token); syslog(LOG_NOTICE, "token %s == NO USER", token); n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, + "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, opsys_name, charset_sep, charset_name, token); - if (timed_write(fd, buf, n, IO_TIMEOUT) != n && + if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { - syslog(LOG_NOTICE, "write to %s: %m", + syslog(LOG_NOTICE, "write to %s: %m", gethost6(faddr)); return 1; } diff --git a/libexec/login_passwd/login_passwd.c b/libexec/login_passwd/login_passwd.c index 3b6866bda6e..62b29a547d0 100644 --- a/libexec/login_passwd/login_passwd.c +++ b/libexec/login_passwd/login_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_passwd.c,v 1.6 2002/03/19 20:22:21 millert Exp $ */ +/* $OpenBSD: login_passwd.c,v 1.7 2003/07/29 18:39:23 deraadt Exp $ */ /*- * Copyright (c) 2001 Hans Insulander <hin@openbsd.org>. @@ -29,7 +29,7 @@ #include "common.h" int -pwd_login(char *username, char *password, char *wheel, int lastchance, +pwd_login(char *username, char *password, char *wheel, int lastchance, char *class) { struct passwd *pwd; diff --git a/libexec/login_radius/login_radius.c b/libexec/login_radius/login_radius.c index 6c046ddb231..e1f7a826dfb 100644 --- a/libexec/login_radius/login_radius.c +++ b/libexec/login_radius/login_radius.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_radius.c,v 1.4 2003/07/06 21:54:38 deraadt Exp $ */ +/* $OpenBSD: login_radius.c,v 1.5 2003/07/29 18:39:23 deraadt Exp $ */ /*- * Copyright (c) 1996, 1997 Berkeley Software Design, Inc. All rights reserved. @@ -175,7 +175,7 @@ main(int argc, char **argv) emsg = NULL; - c = raddauth(username, class, style, + c = raddauth(username, class, style, strcmp(service, "login") ? challenge : NULL, password, &emsg); if (c == 0) { diff --git a/libexec/login_token/tokendb.c b/libexec/login_token/tokendb.c index f3cc801fcec..d0260e8d39d 100644 --- a/libexec/login_token/tokendb.c +++ b/libexec/login_token/tokendb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tokendb.c,v 1.6 2002/11/21 22:17:41 millert Exp $ */ +/* $OpenBSD: tokendb.c,v 1.7 2003/07/29 18:39:23 deraadt Exp $ */ /*- * Copyright (c) 1995 Migration Associates Corp. All Rights Reserved @@ -229,7 +229,7 @@ tokendb_open(void) /* * Close the token database. We are holding an unknown lock. - * Release it, then close the db. Since little can be done + * Release it, then close the db. Since little can be done * about errors, we ignore them. */ @@ -289,7 +289,7 @@ tokendb_nextrec(int reverse_flag, TOKENDB_Rec *tokenrec) memset(&data, 0, sizeof(data)); - status = (tokendb->seq)(tokendb, &key, &data, + status = (tokendb->seq)(tokendb, &key, &data, reverse_flag ? R_PREV : R_NEXT); if (status) { diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c index eb68d79dc4a..15f72a164bc 100644 --- a/libexec/rpc.rquotad/rquotad.c +++ b/libexec/rpc.rquotad/rquotad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rquotad.c,v 1.17 2003/07/05 17:02:36 deraadt Exp $ */ +/* $OpenBSD: rquotad.c,v 1.18 2003/07/29 18:39:23 deraadt Exp $ */ /* * by Manuel Bouyer (bouyer@ensta.fr). Public domain. @@ -102,7 +102,7 @@ main(int argc, char *argv[]) exit(1); } -void +void rquota_service(struct svc_req *request, SVCXPRT *transp) { switch (request->rq_proc) { @@ -124,7 +124,7 @@ rquota_service(struct svc_req *request, SVCXPRT *transp) } /* read quota for the specified id, and send it */ -void +void sendquota(struct svc_req *request, SVCXPRT *transp) { struct getquota_args getq_args; @@ -175,7 +175,7 @@ sendquota(struct svc_req *request, SVCXPRT *transp) } /* initialise the fs_tab list from entries in /etc/fstab */ -void +void initfs(void) { struct fs_stat *fs_current = NULL; diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index e9654eba04b..7cb62534b70 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rstat_proc.c,v 1.23 2003/07/05 17:02:36 deraadt Exp $ */ +/* $OpenBSD: rstat_proc.c,v 1.24 2003/07/29 18:39:23 deraadt Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -31,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/ /*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.23 2003/07/05 17:02:36 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.24 2003/07/29 18:39:23 deraadt Exp $"; #endif /* @@ -203,7 +203,7 @@ updatestat(void) memset(stats_all.s1.dk_xfer, '\0', sizeof(stats_all.s1.dk_xfer)); for (i = 0; i < dk_ndrive && i < DK_NDRIVE; i++) stats_all.s1.dk_xfer[i] = cur.dk_xfer[i]; - + for (i = 0; i < CPUSTATES; i++) stats_all.s1.cp_time[i] = cp_time[cp_xlat[i]]; (void)getloadavg(avrun, sizeof(avrun) / sizeof(avrun[0])); diff --git a/libexec/spamd-setup/spamd-setup.c b/libexec/spamd-setup/spamd-setup.c index 5a786674ee7..50998c738ce 100644 --- a/libexec/spamd-setup/spamd-setup.c +++ b/libexec/spamd-setup/spamd-setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamd-setup.c,v 1.12 2003/07/06 21:57:27 deraadt Exp $ */ +/* $OpenBSD: spamd-setup.c,v 1.13 2003/07/29 18:39:23 deraadt Exp $ */ /* * Copyright (c) 2003 Bob Beck. All rights reserved. * @@ -795,7 +795,7 @@ main(int argc, char *argv[]) for (i = 0; i < blc; i++) { struct cidr **cidrs, **tmp; if (blists[i].blc > 0) { - cidrs = collapse_blacklist(blists[i].bl, + cidrs = collapse_blacklist(blists[i].bl, blists[i].blc); if (cidrs == NULL) errx(1, "malloc failed"); diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c index fa7b5606ef3..4838a1cf8fa 100644 --- a/libexec/spamd/spamd.c +++ b/libexec/spamd/spamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamd.c,v 1.35 2003/06/11 14:24:46 deraadt Exp $ */ +/* $OpenBSD: spamd.c,v 1.36 2003/07/29 18:39:23 deraadt Exp $ */ /* * Copyright (c) 2002 Theo de Raadt. All rights reserved. @@ -412,15 +412,15 @@ build_reply(struct con *cp) goto bad; } for (; *matches; matches++) { - int used = 0, s = sizeof(matchlists) - 4; + int used = 0, s = sizeof(matchlists) - 4; char *c = cp->obuf + off; int left = cp->osize - off; /* don't report an insane amount of lists in the logs. * just truncate and indicate with ... */ - if (strlen(matchlists) + strlen(matches[0]->tag) + 1 - >= s) + if (strlen(matchlists) + strlen(matches[0]->tag) + 1 + >= s) strlcat(matchlists, " ...", sizeof(matchlists)); else { strlcat(matchlists, " ", s); @@ -537,7 +537,7 @@ closecon(struct con *cp) printf("%s connected for %d seconds.\n", cp->addr, t - cp->s); } if (cp->lists != NULL) { - free(cp->lists); + free(cp->lists); cp->lists = NULL; } if (cp->osize > 0 && cp->obufalloc) { @@ -641,7 +641,7 @@ nextstate(struct con *cp) break; case 99: syslog_r(LOG_INFO, &sdata, "%s: %s -> %s %ldsec by lists:%s", - cp->addr, cp->mail, cp->rcpt, (long)(t - cp->s), + cp->addr, cp->mail, cp->rcpt, (long)(t - cp->s), (cp->lists != NULL) ? cp->lists : ""); closecon(cp); break; @@ -973,7 +973,6 @@ main(int argc, char *argv[]) close(conffd); conffd = -1; } - } if (conffd != -1 && FD_ISSET(conffd, fdsr)) { do_config(); diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c index bd758d5d093..463c0ff23bc 100644 --- a/libexec/talkd/print.c +++ b/libexec/talkd/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.7 2003/06/11 14:24:46 deraadt Exp $ */ +/* $OpenBSD: print.c,v 1.8 2003/07/29 18:39:23 deraadt Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -31,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)print.c 5.8 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: print.c,v 1.7 2003/06/11 14:24:46 deraadt Exp $"; +static char rcsid[] = "$Id: print.c,v 1.8 2003/07/29 18:39:23 deraadt Exp $"; #endif /* not lint */ /* debug print routines */ @@ -55,7 +55,7 @@ void print_request(char *cp, CTL_MSG *mp) { char tbuf[80], *tp; - + if (mp->type > NTYPES) { (void)snprintf(tbuf, sizeof(tbuf), "type %d", mp->type); tp = tbuf; @@ -69,7 +69,7 @@ void print_response(char *cp, CTL_RESPONSE *rp) { char tbuf[80], *tp, abuf[80], *ap; - + if (rp->type > NTYPES) { (void)snprintf(tbuf, sizeof(tbuf), "type %d", rp->type); tp = tbuf; diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 524a1870885..2bb71e9ba60 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.29 2003/07/06 21:57:27 deraadt Exp $ */ +/* $OpenBSD: tftpd.c,v 1.30 2003/07/29 18:39:23 deraadt Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -37,7 +37,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)tftpd.c 5.13 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: tftpd.c,v 1.29 2003/07/06 21:57:27 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tftpd.c,v 1.30 2003/07/29 18:39:23 deraadt Exp $"; #endif /* not lint */ /* @@ -154,7 +154,7 @@ main(int argc, char *argv[]) if (dirs == NULL) { syslog(LOG_ERR, "malloc: %m"); exit(1); - } + } dirs[n++] = argv[optind]; dirs[n] = NULL; ndirs++; @@ -458,7 +458,7 @@ send_data: if (ap->th_opcode == ERROR) goto abort; - + if (ap->th_opcode == ACK) { if (ap->th_block == block) { break; diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c index 8da2b61d975..4bdec2cce66 100644 --- a/libexec/uucpd/uucpd.c +++ b/libexec/uucpd/uucpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uucpd.c,v 1.26 2003/06/02 19:38:25 millert Exp $ */ +/* $OpenBSD: uucpd.c,v 1.27 2003/07/29 18:39:23 deraadt Exp $ */ /* * Copyright (c) 1985 The Regents of the University of California. @@ -40,7 +40,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)uucpd.c 5.10 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: uucpd.c,v 1.26 2003/06/02 19:38:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: uucpd.c,v 1.27 2003/07/29 18:39:23 deraadt Exp $"; #endif /* not lint */ /* @@ -148,7 +148,7 @@ main(int argc, char *argv[]) for(;;) { s = accept(tcp_socket, &hisctladdr, &hisaddrlen); if (s < 0){ - if (errno == EINTR) + if (errno == EINTR) continue; perror("uucpd: accept"); exit(1); diff --git a/sbin/atactl/atactl.c b/sbin/atactl/atactl.c index a22c1285193..db49ca217c9 100644 --- a/sbin/atactl/atactl.c +++ b/sbin/atactl/atactl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atactl.c,v 1.29 2003/07/10 17:42:59 grange Exp $ */ +/* $OpenBSD: atactl.c,v 1.30 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: atactl.c,v 1.4 1999/02/24 18:49:14 jwise Exp $ */ /*- @@ -114,7 +114,7 @@ int smart_cksum(u_int8_t *, int); char *sec_getpass(int, int); struct command commands[] = { - { "dump", device_dump }, + { "dump", device_dump }, { "identify", device_identify }, { "setidle", device_setidle }, { "setstandby", device_setidle }, diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 193ac6a2d68..9c901cdeccd 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.84 2003/07/16 18:03:44 tedu Exp $ */ +/* $OpenBSD: disklabel.c,v 1.85 2003/07/29 18:38:35 deraadt Exp $ */ /* * Copyright (c) 1987, 1993 @@ -39,7 +39,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.84 2003/07/16 18:03:44 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.85 2003/07/29 18:38:35 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -494,7 +494,7 @@ writelabel(int f, char *boot, struct disklabel *lp) * disable after writing. */ writeable = 1; - + if (ioctl(f, DIOCWLABEL, &writeable) < 0) perror("ioctl DIOCWLABEL"); #ifdef __alpha__ @@ -606,7 +606,7 @@ readmbr(int f) signature = *((u_char *)mbr + DOSMBR_SIGNATURE_OFF) | (*((u_char *)mbr + DOSMBR_SIGNATURE_OFF + 1) << 8); bcopy((char *)mbr+DOSPARTOFF, (char *)mbr, sizeof(*dp) * NDOSPART); - + /* * Don't (yet) know disk geometry (BIOS), use * partition table to find OpenBSD partition, and obtain diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index f563dc322d4..6a853bb2da4 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.87 2003/07/16 18:03:44 tedu Exp $ */ +/* $OpenBSD: editor.c,v 1.88 2003/07/29 18:38:35 deraadt Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -17,7 +17,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.87 2003/07/16 18:03:44 tedu Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.88 2003/07/29 18:38:35 deraadt Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -539,7 +539,7 @@ getoff1: } } pp->p_fstype = ui; - + /* Get size */ if (get_size(lp, partno, freep, 1) != 0 || pp->p_size == 0) { pp->p_size = 0; /* effective delete */ @@ -606,7 +606,7 @@ editor_name(struct disklabel *lp, char **mp, char *p) fprintf(stderr, "Partition '%c' is not in use.\n", 'a' + partno); return; } - + /* Not all fstypes can be named */ if (pp->p_fstype == FS_UNUSED || pp->p_fstype == FS_SWAP || pp->p_fstype == FS_BOOT || pp->p_fstype == FS_OTHER) { @@ -648,7 +648,7 @@ editor_modify(struct disklabel *lp, char **mp, u_int32_t *freep, char *p) fprintf(stderr, "Partition '%c' is not in use.\n", 'a' + partno); return; } - + /* Get filesystem type */ if (get_fstype(lp, partno) != 0) { *pp = origpart; /* undo changes */ @@ -836,7 +836,7 @@ next_offset(struct disklabel *lp, u_int32_t *sizep) /* Get a sorted list of the partitions */ if ((spp = sort_partitions(lp, &npartitions)) == NULL) return(starting_sector); - + new_offset = starting_sector; for (i = 0; i < npartitions; i++ ) { /* @@ -1171,7 +1171,7 @@ has_overlap(struct disklabel *lp, u_int32_t *freep, int resolve) (void)free(spp); return(1); } - + /* Overlap! Convert to real part numbers. */ i = ((char *)spp[i] - (char *)lp->d_partitions) / sizeof(**spp); @@ -1557,7 +1557,7 @@ set_bounds(struct disklabel *lp, u_int32_t *freep) } while (ui > lp->d_secperunit - start_temp); ending_sector = start_temp + ui; starting_sector = start_temp; - + /* Recalculate the free sectors */ editor_countfree(lp, freep); } @@ -1602,7 +1602,7 @@ free_chunks(struct disklabel *lp) } else { /* Last partition */ if (spp[i]->p_offset + spp[i]->p_size < ending_sector) { - + chunks[numchunks].start = spp[i]->p_offset + spp[i]->p_size; chunks[numchunks].stop = ending_sector; diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index e65c2813e50..1ef20c3da78 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optr.c,v 1.26 2003/07/28 06:13:26 tedu Exp $ */ +/* $OpenBSD: optr.c,v 1.27 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #else -static const char rcsid[] = "$OpenBSD: optr.c,v 1.26 2003/07/28 06:13:26 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: optr.c,v 1.27 2003/07/29 18:38:35 deraadt Exp $"; #endif #endif /* not lint */ @@ -209,7 +209,7 @@ timeest(void) if (tnow >= tschedule) { tschedule = tnow + 300; if (blockswritten < 500) - return; + return; deltat = tstart_writing - tnow + (1.0 * (tnow - tstart_writing)) / blockswritten * tapesize; diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 70628dae9ec..7162b44c2b9 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.19 2003/07/28 06:13:26 tedu Exp $ */ +/* $OpenBSD: tape.c,v 1.20 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94"; #else -static const char rcsid[] = "$OpenBSD: tape.c,v 1.19 2003/07/28 06:13:26 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: tape.c,v 1.20 2003/07/29 18:38:35 deraadt Exp $"; #endif #endif /* not lint */ @@ -600,7 +600,7 @@ restore_check_point: case X_FINOK: msg("Child %d finishes X_FINOK\n", childpid); break; - case X_ABORT: + case X_ABORT: msg("Child %d finishes X_ABORT\n", childpid); break; case X_REWRITE: @@ -758,12 +758,11 @@ enslave(void) Exit(X_FINOK); } } - + for (i = 0; i < SLAVES; i++) (void) atomic((ssize_t (*)(int, void *, size_t))write, slaves[i].fd, (char *) &slaves[(i + 1) % SLAVES].pid, sizeof(slaves[0].pid)); - master = 0; } diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c index 33ec0975cb2..70835bf4d46 100644 --- a/sbin/fdisk/disk.c +++ b/sbin/fdisk/disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.c,v 1.19 2003/07/02 21:44:57 deraadt Exp $ */ +/* $OpenBSD: disk.c,v 1.20 2003/07/29 18:38:35 deraadt Exp $ */ /* * Copyright (c) 1997, 2001 Tobias Weingartner @@ -227,7 +227,7 @@ DISK_getmetrics(disk_t *disk, DISK_metrics *user) */ int DISK_printmetrics(disk_t *disk, char *units) -{ +{ int i; double size; i = unit_lookup(units); diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c index 286c24f8a3c..35c457aeb1b 100644 --- a/sbin/fdisk/mbr.c +++ b/sbin/fdisk/mbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mbr.c,v 1.18 2003/06/11 06:22:12 deraadt Exp $ */ +/* $OpenBSD: mbr.c,v 1.19 2003/07/29 18:38:35 deraadt Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -174,7 +174,7 @@ MBR_pcopy(disk_t *disk, mbr_t *mbr) int i, fd, offset = 0, reloff = 0; mbr_t mbrd; char mbr_disk[DEV_BSIZE]; - + fd = DISK_open(disk->name, O_RDONLY); MBR_read(fd, offset, mbr_disk); DISK_close(fd); diff --git a/sbin/fdisk/misc.c b/sbin/fdisk/misc.c index 558188804d4..2b3e2351153 100644 --- a/sbin/fdisk/misc.c +++ b/sbin/fdisk/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.13 2003/06/11 06:22:12 deraadt Exp $ */ +/* $OpenBSD: misc.c,v 1.14 2003/07/29 18:38:35 deraadt Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -50,7 +50,7 @@ unit_lookup(char *units) /* default */ if (unit_types[i].abbr == NULL) return (UNIT_TYPE_DEFAULT); - + return (i); } @@ -188,7 +188,7 @@ getuint(disk_t *disk, char *prompt, char *helpstring, u_int32_t oval, int mult = 1; double d; int secpercyl; - + secpercyl = disk->real->sectors * disk->real->heads; /* We only care about the remainder */ diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c index 2e187024d17..812a9cea521 100644 --- a/sbin/fdisk/part.c +++ b/sbin/fdisk/part.c @@ -1,4 +1,4 @@ -/* $OpenBSD: part.c,v 1.35 2003/07/02 21:44:57 deraadt Exp $ */ +/* $OpenBSD: part.c,v 1.36 2003/07/29 18:38:35 deraadt Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -142,21 +142,20 @@ PRT_printall(void) { int i, idrows; - idrows = ((sizeof(part_types)/sizeof(struct part_type))+3)/4; + idrows = ((sizeof(part_types)/sizeof(struct part_type))+3)/4; printf("Choose from the following Partition id values:\n"); for (i = 0; i < idrows; i++) { - printf("%02X %s %02X %s %02X %s" - , part_types[i ].type, part_types[i ].sname - , part_types[i+idrows ].type, part_types[i+idrows ].sname - , part_types[i+idrows*2].type, part_types[i+idrows*2].sname - ); - if ((i+idrows*3) < (sizeof(part_types)/sizeof(struct part_type))) { - printf(" %02X %s\n" - , part_types[i+idrows*3].type, part_types[i+idrows*3].sname ); - } - else - printf( "\n" ); + printf("%02X %s %02X %s %02X %s", + part_types[i].type, part_types[i].sname, + part_types[i+idrows].type, part_types[i+idrows].sname, + part_types[i+idrows*2].type, part_types[i+idrows*2].sname); + if ((i+idrows*3) < (sizeof(part_types)/sizeof(struct part_type))) { + printf(" %02X %s\n", + part_types[i+idrows*3].type, + part_types[i+idrows*3].sname); + } else + printf( "\n" ); } } @@ -289,10 +288,10 @@ PRT_print(int num, prt_t *partn, char *units) printf("%c%1d: %.2X %4d %3d %2d - %4d %3d %2d [%12d:%12.0f%s] %s\n", (partn->flag == 0x80)?'*':' ', num, partn->id, - partn->scyl, partn->shead, partn->ssect, + partn->scyl, partn->shead, partn->ssect, partn->ecyl, partn->ehead, partn->esect, partn->bs, size, - unit_types[i].abbr, + unit_types[i].abbr, PRT_ascii_id(partn->id)); } } diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c index 0159252fd41..83770177f7a 100644 --- a/sbin/fsck/fsutil.c +++ b/sbin/fsck/fsutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsutil.c,v 1.11 2003/06/26 08:01:54 tedu Exp $ */ +/* $OpenBSD: fsutil.c,v 1.12 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $ */ /* @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ #ifndef lint -static const char rcsid[] = "$OpenBSD: fsutil.c,v 1.11 2003/06/26 08:01:54 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: fsutil.c,v 1.12 2003/07/29 18:38:35 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -79,7 +79,7 @@ void errexit(const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); (void) vfprintf(stderr, fmt, ap); va_end(ap); @@ -108,7 +108,7 @@ void pfatal(const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); vmsg(1, fmt, ap); va_end(ap); @@ -119,7 +119,7 @@ void pwarn(const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); vmsg(0, fmt, ap); va_end(ap); @@ -135,7 +135,7 @@ void panic(const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); vmsg(1, fmt, ap); va_end(ap); diff --git a/sbin/fsck_ext2fs/dir.c b/sbin/fsck_ext2fs/dir.c index 13663c0a78c..b67261ba0ec 100644 --- a/sbin/fsck_ext2fs/dir.c +++ b/sbin/fsck_ext2fs/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.11 2003/06/11 06:22:12 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.12 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: dir.c,v 1.5 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -478,7 +478,7 @@ makeentry(ino_t parent, ino_t ino, char *name) struct ext2fs_dinode *dp; struct inodesc idesc; char pathbuf[MAXPATHLEN + 1]; - + if ((parent < EXT2_FIRSTINO && parent != EXT2_ROOTINO) || parent >= maxino || (ino < EXT2_FIRSTINO && ino < EXT2_ROOTINO) || ino >= maxino) diff --git a/sbin/fsck_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c index 9ae52684b74..1b6fa1ac251 100644 --- a/sbin/fsck_ext2fs/inode.c +++ b/sbin/fsck_ext2fs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.13 2003/06/11 06:22:12 deraadt Exp $ */ +/* $OpenBSD: inode.c,v 1.14 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: inode.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -55,7 +55,7 @@ * here. */ -#define fsck_ino_to_fsba(fs, x) \ +#define fsck_ino_to_fsba(fs, x) \ (fs2h32((fs)->e2fs_gd[ino_to_cg(fs, x)].ext2bgd_i_tables) + \ (((x)-1) % (fs)->e2fs.e2fs_ipg)/(fs)->e2fs_ipb) @@ -440,11 +440,11 @@ inocleanup(void) free((char *)inpsort); inphead = inpsort = NULL; } - + void inodirty(void) { - + dirty(pbp); } diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c index d29fcc732ca..60c00a4b8cb 100644 --- a/sbin/fsck_ext2fs/main.c +++ b/sbin/fsck_ext2fs/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.11 2003/06/11 06:22:13 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.12 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $ */ /* @@ -44,7 +44,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.11 2003/06/11 06:22:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.12 2003/07/29 18:38:35 deraadt Exp $"; #endif #endif #endif /* not lint */ @@ -237,7 +237,7 @@ checkfilesys(char *filesys, char *mntpt, long auxdata, int child) * print out summary statistics */ n_bfree = sblock.e2fs.e2fs_fbcount; - + pwarn("%d files, %d used, %d free\n", n_files, n_blks, n_bfree); if (debug && diff --git a/sbin/fsck_ext2fs/setup.c b/sbin/fsck_ext2fs/setup.c index 0c64fc4d4c1..5156cdf29d6 100644 --- a/sbin/fsck_ext2fs/setup.c +++ b/sbin/fsck_ext2fs/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.11 2003/06/11 06:22:13 deraadt Exp $ */ +/* $OpenBSD: setup.c,v 1.12 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: setup.c,v 1.1 1997/06/11 11:22:01 bouyer Exp $ */ /* @@ -261,7 +261,7 @@ readsb(int listerr) /* Copy the superblock in memory */ e2fs_sbload(sblk.b_un.b_fs, &sblock.e2fs); - + /* * run a few consistency checks of the super block */ diff --git a/sbin/fsck_msdos/boot.c b/sbin/fsck_msdos/boot.c index 809d5b0c2b0..8605e4086ba 100644 --- a/sbin/fsck_msdos/boot.c +++ b/sbin/fsck_msdos/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.8 2003/03/11 04:42:25 david Exp $ */ +/* $OpenBSD: boot.c,v 1.9 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: boot.c,v 1.5 1997/10/17 11:19:23 ws Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: boot.c,v 1.8 2003/03/11 04:42:25 david Exp $"; +static char rcsid[] = "$OpenBSD: boot.c,v 1.9 2003/07/29 18:38:35 deraadt Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -57,7 +57,7 @@ readboot(dosfs, boot) int ret = FSOK; if (read(dosfs, block, sizeof block) < sizeof block) { - perror("could not read boot block"); + perror("could not read boot block"); return (FSFATAL); } diff --git a/sbin/fsck_msdos/check.c b/sbin/fsck_msdos/check.c index 20bd39d21b3..991ff747091 100644 --- a/sbin/fsck_msdos/check.c +++ b/sbin/fsck_msdos/check.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check.c,v 1.8 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: check.c,v 1.9 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: check.c,v 1.8 1997/10/17 11:19:29 ws Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: check.c,v 1.8 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: check.c,v 1.9 2003/07/29 18:38:35 deraadt Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -159,7 +159,7 @@ checkfilesys(fname) (void)close(dosfs); return (8); } - + if (!preen) printf("** Phase 4 - Check for Lost Files\n"); diff --git a/sbin/fsck_msdos/dir.c b/sbin/fsck_msdos/dir.c index b0555975efb..b3a48146c68 100644 --- a/sbin/fsck_msdos/dir.c +++ b/sbin/fsck_msdos/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.17 2003/03/30 08:31:53 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.18 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: dir.c,v 1.11 1997/10/17 11:19:35 ws Exp $ */ /* @@ -37,7 +37,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: dir.c,v 1.17 2003/03/30 08:31:53 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.18 2003/07/29 18:38:35 deraadt Exp $"; #endif /* not lint */ #include <stdio.h> @@ -886,7 +886,7 @@ handleDirTree(dosfs, boot, fat) struct fatEntry *fat; { int mod; - + mod = readDosDirSection(dosfs, boot, fat, rootDir); if (mod & FSFATAL) return (FSFATAL); diff --git a/sbin/fsck_msdos/fat.c b/sbin/fsck_msdos/fat.c index f46c3ca5121..5093653f224 100644 --- a/sbin/fsck_msdos/fat.c +++ b/sbin/fsck_msdos/fat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fat.c,v 1.10 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: fat.c,v 1.11 2003/07/29 18:38:35 deraadt Exp $ */ /* $NetBSD: fat.c,v 1.8 1997/10/17 11:19:53 ws Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: fat.c,v 1.10 2002/02/16 21:27:34 millert Exp $"; +static char rcsid[] = "$OpenBSD: fat.c,v 1.11 2003/07/29 18:38:35 deraadt Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -110,7 +110,7 @@ readfat(fs, boot, no, fp) free(fat); return (FSFATAL); } - + (void)memset(fat, 0, sizeof(struct fatEntry) * boot->NumClusters); off = boot->ResSectors + no * boot->FATsecs; @@ -534,7 +534,7 @@ checklost(dosfs, boot, fat) cl_t head; int mod = FSOK; int ret; - + for (head = CLUST_FIRST; head < boot->NumClusters; head++) { /* find next untravelled chain */ if (fat[head].head != head diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c index bbb69cef5a8..24c5c08436d 100644 --- a/sbin/growfs/debug.c +++ b/sbin/growfs/debug.c @@ -2,10 +2,10 @@ * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz * Copyright (c) 1980, 1989, 1993 The Regents of the University of California. * All rights reserved. - * + * * This code is derived from software contributed to Berkeley by * Christoph Herrmann and Thomas-Henning von Kamptz, Munich and Frankfurt. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -22,7 +22,7 @@ * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -418,7 +418,7 @@ dbg_dump_inmap(struct fs *sb, const char *comment, struct cg *cgr) for(k=0; k<32; k+=8) { if(j+k+8<e) { fprintf(dbg_log, - "%02x%02x%02x%02x%02x%02x%02x%02x ", + "%02x%02x%02x%02x%02x%02x%02x%02x ", cp[0], cp[1], cp[2], cp[3], cp[4], cp[5], cp[6], cp[7]); } else { @@ -463,7 +463,7 @@ dbg_dump_frmap(struct fs *sb, const char *comment, struct cg *cgr) for(k=0; k<32; k+=8) { if(j+k+8<e) { fprintf(dbg_log, - "%02x%02x%02x%02x%02x%02x%02x%02x ", + "%02x%02x%02x%02x%02x%02x%02x%02x ", cp[0], cp[1], cp[2], cp[3], cp[4], cp[5], cp[6], cp[7]); } else { @@ -507,7 +507,7 @@ dbg_dump_clmap(struct fs *sb, const char *comment, struct cg *cgr) for(k=0; k<32; k+=8) { if(j+k+8<e) { fprintf(dbg_log, - "%02x%02x%02x%02x%02x%02x%02x%02x ", + "%02x%02x%02x%02x%02x%02x%02x%02x ", cp[0], cp[1], cp[2], cp[3], cp[4], cp[5], cp[6], cp[7]); } else { @@ -601,7 +601,7 @@ dbg_dump_ino(struct fs *sb, const char *comment, struct dinode *ino) { int ictr; int remaining_blocks; - + if(!dbg_log) { return; } @@ -612,7 +612,7 @@ dbg_dump_ino(struct fs *sb, const char *comment, struct dinode *ino) fprintf(dbg_log, "mode u_int16_t 0%o\n", ino->di_mode); fprintf(dbg_log, "nlink int16_t 0x%04x\n", ino->di_nlink); - fprintf(dbg_log, "size u_int64_t 0x%08x%08x\n", + fprintf(dbg_log, "size u_int64_t 0x%08x%08x\n", ((unsigned int *)&(ino->di_size))[1], ((unsigned int *)&(ino->di_size))[0]); fprintf(dbg_log, "atime int32_t 0x%08x\n", ino->di_atime); diff --git a/sbin/init/init.c b/sbin/init/init.c index e97d652feae..76ba0da20a1 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.32 2003/06/02 20:06:15 millert Exp $ */ +/* $OpenBSD: init.c,v 1.33 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */ /*- @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.32 2003/06/02 20:06:15 millert Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.33 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -242,12 +242,12 @@ main(int argc, char *argv[]) */ handle(badsys, SIGSYS, 0); handle(disaster, SIGABRT, SIGFPE, SIGILL, SIGSEGV, - SIGBUS, SIGXCPU, SIGXFSZ, 0); + SIGBUS, SIGXCPU, SIGXFSZ, 0); handle(transition_handler, SIGHUP, SIGTERM, SIGTSTP, SIGUSR1, 0); handle(alrm_handler, SIGALRM, 0); sigfillset(&mask); delset(&mask, SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGSYS, - SIGXCPU, SIGXFSZ, SIGHUP, SIGTERM, SIGUSR1, SIGTSTP, SIGALRM, 0); + SIGXCPU, SIGXFSZ, SIGHUP, SIGTERM, SIGUSR1, SIGTSTP, SIGALRM, 0); sigprocmask(SIG_SETMASK, &mask, NULL); memset(&sa, 0, sizeof sa); sigemptyset(&sa.sa_mask); @@ -647,7 +647,7 @@ single_user(void) warning("single user shell terminated."); sleep(STALL_TIMEOUT); _exit(0); - } else { + } else { warning("single user shell terminated, restarting"); return (state_func_t) single_user; } @@ -711,12 +711,12 @@ runcom(void) if (errno == EINTR) continue; warning("wait for %s on %s failed: %m; going to single user mode", - _PATH_BSHELL, _PATH_RUNCOM); + _PATH_BSHELL, _PATH_RUNCOM); return (state_func_t) single_user; } if (wpid == pid && WIFSTOPPED(status)) { warning("init: %s on %s stopped, restarting\n", - _PATH_BSHELL, _PATH_RUNCOM); + _PATH_BSHELL, _PATH_RUNCOM); kill(pid, SIGCONT); wpid = -1; } @@ -734,7 +734,7 @@ runcom(void) if (!WIFEXITED(status)) { warning("%s on %s terminated abnormally, going to single user mode", - _PATH_BSHELL, _PATH_RUNCOM); + _PATH_BSHELL, _PATH_RUNCOM); return (state_func_t) single_user; } @@ -822,8 +822,8 @@ char ** construct_argv(char *command) { int argc = 0; - char **argv = (char **) malloc(((strlen(command) + 1) / 2 + 1) - * sizeof (char *)); + char **argv = (char **) malloc(((strlen(command) + 1) / 2 + 1) * + sizeof (char *)); static const char separators[] = " \t"; if ((argv[argc++] = strtok(command, separators)) == 0) @@ -921,7 +921,7 @@ setupargv(session_t *sp, struct ttyent *typ) sp->se_window_argv = construct_argv(sp->se_window); if (sp->se_window_argv == 0) { warning("can't parse window for port %s", - sp->se_device); + sp->se_device); free(sp->se_window); sp->se_window = 0; return (0); @@ -978,7 +978,7 @@ start_window_system(session_t *sp) if ((pid = fork()) == -1) { emergency("can't fork for window system on port %s: %m", - sp->se_device); + sp->se_device); /* hope that getty fails and we can try again */ return; } @@ -996,7 +996,7 @@ start_window_system(session_t *sp) execv(sp->se_window_argv[0], sp->se_window_argv); stall("can't exec window system '%s' for port %s: %m", - sp->se_window_argv[0], sp->se_device); + sp->se_window_argv[0], sp->se_device); _exit(1); } @@ -1067,7 +1067,7 @@ start_getty(session_t *sp) if (current_time > sp->se_started && current_time - sp->se_started < GETTY_SPACING) { warning("getty repeating too quickly on port %s, sleeping", - sp->se_device); + sp->se_device); sleep((unsigned) GETTY_SLEEP); } @@ -1083,7 +1083,7 @@ start_getty(session_t *sp) execv(sp->se_getty_argv[0], sp->se_getty_argv); stall("can't exec getty '%s' for port %s: %m", - sp->se_getty_argv[0], sp->se_device); + sp->se_getty_argv[0], sp->se_device); _exit(1); } @@ -1221,8 +1221,8 @@ clean_ttys(void) sp->se_flags |= SE_PRESENT; if (sp->se_index != session_index) { warning("port %s changed utmp index from %d to %d", - sp->se_device, sp->se_index, - session_index); + sp->se_device, sp->se_index, + session_index); sp->se_index = session_index; } if ((typ->ty_status & TTY_ON) == 0 || @@ -1234,7 +1234,7 @@ clean_ttys(void) sp->se_flags &= ~SE_SHUTDOWN; if (setupargv(sp, typ) == 0) { warning("can't parse getty for port %s", - sp->se_device); + sp->se_device); sp->se_flags |= SE_SHUTDOWN; kill(sp->se_process, SIGHUP); } @@ -1338,10 +1338,10 @@ nice_death(void) clang = 0; alarm(DEATH_WATCH); - do + do { if ((pid = waitpid(-1, NULL, 0)) != -1) collect_child(pid); - while (clang == 0 && errno != ECHILD); + } while (clang == 0 && errno != ECHILD); if (errno == ECHILD) goto die; @@ -1379,10 +1379,10 @@ death(void) clang = 0; alarm(DEATH_WATCH); - do + do { if ((pid = waitpid(-1, NULL, 0)) != -1) collect_child(pid); - while (clang == 0 && errno != ECHILD); + } while (clang == 0 && errno != ECHILD); if (errno == ECHILD) return (state_func_t) single_user; diff --git a/sbin/iopctl/iopctl.c b/sbin/iopctl/iopctl.c index 8907b39000e..de43a4c7f14 100644 --- a/sbin/iopctl/iopctl.c +++ b/sbin/iopctl/iopctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iopctl.c,v 1.3 2002/07/03 22:32:33 deraadt Exp $ */ +/* $OpenBSD: iopctl.c,v 1.4 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: iopctl.c,v 1.8 2001/03/20 13:07:51 ad Exp $ */ /*- @@ -114,7 +114,7 @@ main(int argc, char *argv[]) struct iovec iov; dv = "/dev/iop0"; - + while ((ch = getopt(argc, argv, "f:")) != -1) { switch (ch) { case 'f': @@ -170,7 +170,7 @@ show(const char *hdr, const char *fmt, ...) { int i; va_list va; - + for (i = printf("%s", hdr); i < 25; i++) putchar(' '); va_start(va, fmt); @@ -184,11 +184,11 @@ const char * class2str(int class) { int i; - + for (i = 0; i < sizeof(i2oclass) / sizeof(i2oclass[0]); i++) if (class == i2oclass[i].class) return (i2oclass[i].caption); - + return ("unknown"); } @@ -237,7 +237,7 @@ getparam(int tid, int group, void *pbuf, int pbufsize) ((struct i2o_reply *)buf)->reqstatus); if ((rf->msgflags & I2O_MSGFLAGS_FAIL) != 0) errx(EXIT_FAILURE, "I2O_UTIL_PARAMS_GET failed (FAIL)"); -} +} void showlct(char **argv) @@ -282,7 +282,7 @@ showlct(char **argv) sizeof(ident)); show("identity tag", "<%s>", ident); show("event caps", "%x", letoh32(ent->eventcaps)); - + if (i != nent - 1) printf("\n"); } @@ -447,6 +447,6 @@ i2ostrvis(const char *src, int slen, char *dst, int dlen) } src++; } - + dst[lc] = '\0'; } diff --git a/sbin/ipsecadm/pfkdump.c b/sbin/ipsecadm/pfkdump.c index bc5d0b56902..08853fe3655 100644 --- a/sbin/ipsecadm/pfkdump.c +++ b/sbin/ipsecadm/pfkdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkdump.c,v 1.7 2003/07/24 09:59:03 itojun Exp $ */ +/* $OpenBSD: pfkdump.c,v 1.8 2003/07/29 18:38:36 deraadt Exp $ */ /* * Copyright (c) 2003 Markus Friedl. All rights reserved. @@ -264,9 +264,9 @@ print_msg(struct sadb_msg *msg, int promisc) struct sadb_ext *ext; printf("%s: satype %s vers %u len %u seq %u %spid %u\n", - lookup_name(msg_types, msg->sadb_msg_type), - lookup_name(sa_types, msg->sadb_msg_satype), - msg->sadb_msg_version, msg->sadb_msg_len, + lookup_name(msg_types, msg->sadb_msg_type), + lookup_name(sa_types, msg->sadb_msg_satype), + msg->sadb_msg_version, msg->sadb_msg_len, msg->sadb_msg_seq, #if 0 promisc ? "from " : "to ", @@ -302,7 +302,7 @@ print_sa(struct sadb_ext *ext, struct sadb_msg *msg) lookup_name(enc_types, sa->sadb_sa_encrypt)); printf("\t\tstate %s replay %u flags %u\n", lookup_name(states, sa->sadb_sa_state), - sa->sadb_sa_replay, sa->sadb_sa_flags); + sa->sadb_sa_replay, sa->sadb_sa_flags); } void @@ -417,8 +417,8 @@ void print_alg(struct sadb_alg *alg, u_int8_t ext_type) { printf("\t\t%s iv %u min %u max %u\n", - alg_by_ext(ext_type, alg->sadb_alg_id), alg->sadb_alg_ivlen, - alg->sadb_alg_minbits, alg->sadb_alg_maxbits); + alg_by_ext(ext_type, alg->sadb_alg_id), alg->sadb_alg_ivlen, + alg->sadb_alg_minbits, alg->sadb_alg_maxbits); } void @@ -502,7 +502,7 @@ print_ident(struct sadb_ext *ext, struct sadb_msg *msg) struct sadb_ident *ident = (struct sadb_ident *) ext; printf("type %s id %llu: %s\n", - lookup_name(identity_types, ident->sadb_ident_type), + lookup_name(identity_types, ident->sadb_ident_type), ident->sadb_ident_id, (char *)(ident + 1)); } diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 52957d215dc..fe3719e7802 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.31 2003/06/02 20:06:15 millert Exp $ */ +/* $OpenBSD: mount.c,v 1.32 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */ /* @@ -40,7 +40,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.31 2003/06/02 20:06:15 millert Exp $"; +static char rcsid[] = "$OpenBSD: mount.c,v 1.32 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -288,7 +288,7 @@ main(int argc, char * const argv[]) if ((rval == 0 || new) && getuid() == 0 && (mountdfp = fopen(_PATH_MOUNTDPID, "r")) != NULL) { if (fscanf(mountdfp, "%d", &pid) == 1 && - pid > 0 && kill(pid, SIGHUP) == -1 && errno != ESRCH) + pid > 0 && kill(pid, SIGHUP) == -1 && errno != ESRCH) err(1, "signal mountd"); (void)fclose(mountdfp); } @@ -380,7 +380,7 @@ mountfs(const char *vfstype, const char *spec, const char *name, if (verbose) (void)printf("%s on %s type %.*s: %s\n", sf.f_mntfromname, sf.f_mntonname, - MFSNAMELEN, sf.f_fstypename, + MFSNAMELEN, sf.f_fstypename, "already mounted"); return (0); } diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index e8adc3d8a31..01884e8d28c 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_nfs.c,v 1.34 2003/07/06 20:52:40 avsm Exp $ */ +/* $OpenBSD: mount_nfs.c,v 1.35 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $ */ /* @@ -404,7 +404,7 @@ getnfsargs(char *spec, struct nfs_args *nfsargsp) if (strlcpy(nam, spec, sizeof(nam)) >= sizeof(nam)) { errx(1, "hostname too long"); } - + if ((delimp = strchr(spec, '@')) != NULL) { hostp = delimp + 1; } else if ((delimp = strchr(spec, ':')) != NULL) { diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c index 4b68c93797b..69f66ab3078 100644 --- a/sbin/mount_portal/conf.c +++ b/sbin/mount_portal/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.7 2003/06/11 06:22:14 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.8 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.4 1995/04/23 10:33:19 cgd Exp $ */ /* @@ -126,7 +126,6 @@ pinsert(path *p0, qelem *q0) } ins_que(&p0->p_q, q0->q_back); return (1); - } static path * diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c index f86cef6095c..ea4ba3f6fe1 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.25 2003/07/03 22:41:40 tedu Exp $ */ +/* $OpenBSD: mount_portal.c,v 1.26 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: mount_portal.c,v 1.8 1996/04/13 01:31:54 jtc Exp $ */ /* @@ -43,7 +43,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_portal.c 8.6 (Berkeley) 4/26/95"; #else -static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.25 2003/07/03 22:41:40 tedu Exp $"; +static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.26 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -233,7 +233,7 @@ main(int argc, char *argv[]) conf_read(&q, conf); continue; } - + /* * Accept a new connection * Will get EINTR if a signal has arrived, so just diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c index 6bc58c0b660..5f894aa9d9f 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.18 2003/06/11 06:22:14 deraadt Exp $ */ +/* $OpenBSD: ncheck_ffs.c,v 1.19 2003/07/29 18:38:36 deraadt Exp $ */ /*- * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -26,7 +26,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.18 2003/06/11 06:22:14 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.19 2003/07/29 18:38:36 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -204,7 +204,7 @@ getino(ino_t inum) * reading in sector sized pieces. Error recovery is attempted at most * BREADEMAX times before seeking consent from the operator to continue. */ -int breaderrors = 0; +int breaderrors = 0; #define BREADEMAX 32 void @@ -448,7 +448,7 @@ main(int argc, char *argv[]) optarg); addinode((ino_t)ulval); - while (optind < argc) { + while (optind < argc) { errno = 0; ulval = strtoul(argv[optind], &ep, 10); if (argv[optind][0] == '\0' || *ep != '\0') diff --git a/sbin/newlfs/lfs.c b/sbin/newlfs/lfs.c index 796219a20ee..6d145f307f7 100644 --- a/sbin/newlfs/lfs.c +++ b/sbin/newlfs/lfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs.c,v 1.7 2003/06/02 20:06:16 millert Exp $ */ +/* $OpenBSD: lfs.c,v 1.8 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: lfs.c,v 1.8 1995/06/19 21:30:36 cgd Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95"; #else -static char rcsid[] = "$OpenBSD: lfs.c,v 1.7 2003/06/02 20:06:16 millert Exp $"; +static char rcsid[] = "$OpenBSD: lfs.c,v 1.8 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -419,7 +419,6 @@ make_lfs(fd, lp, partp, minfree, block_size, frag_size, seg_size) /* Make all the other dinodes invalid */ for (i = INOPB(lfsp)-3, dip++; i; i--, dip++) dip->di_inumber = LFS_UNUSED_INUM; - /* Link remaining IFILE entries in free list */ for (ip = &ifile[LFS_FIRST_INUM], i = LFS_FIRST_INUM; diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c index 7582adb38a9..36ccf1f7102 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dirs.c,v 1.24 2003/07/28 06:13:26 tedu Exp $ */ +/* $OpenBSD: dirs.c,v 1.25 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: dirs.c,v 1.26 1997/07/01 05:37:49 lukem Exp $ */ /* @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)dirs.c 8.5 (Berkeley) 8/31/94"; #else -static const char rcsid[] = "$OpenBSD: dirs.c,v 1.24 2003/07/28 06:13:26 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: dirs.c,v 1.25 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -593,7 +593,7 @@ setdirmodes(flags) struct modeinfo node; struct entry *ep; char *cp; - + Vprintf(stdout, "Set directory mode, owner, and times.\n"); if (command == 'r' || command == 'R') (void)snprintf(modefile, sizeof(modefile), "%s/rstmode%d", diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c index cfae255ac07..9b8d38be8c2 100644 --- a/sbin/restore/restore.c +++ b/sbin/restore/restore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: restore.c,v 1.11 2003/07/28 06:13:26 tedu Exp $ */ +/* $OpenBSD: restore.c,v 1.12 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: restore.c,v 1.9 1997/06/18 07:10:16 lukem Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)restore.c 8.3 (Berkeley) 9/13/94"; #else -static const char rcsid[] = "$OpenBSD: restore.c,v 1.11 2003/07/28 06:13:26 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: restore.c,v 1.12 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -495,7 +495,7 @@ nodeupdates(name, ino, type) default: panic("[%s] %s: impossible state\n", keyval(key), name); break; - } + } return (descend); } diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c index 7cee1059c17..d1879af9e64 100644 --- a/sbin/restore/symtab.c +++ b/sbin/restore/symtab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: symtab.c,v 1.11 2003/07/28 06:13:26 tedu Exp $ */ +/* $OpenBSD: symtab.c,v 1.12 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: symtab.c,v 1.10 1997/03/19 08:42:54 lukem Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)symtab.c 8.2 (Berkeley) 9/13/94"; #else -static const char rcsid[] = "$OpenBSD: symtab.c,v 1.11 2003/07/28 06:13:26 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: symtab.c,v 1.12 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -428,7 +428,7 @@ freename(name) char *name; { struct strhdr *tp, *np; - + tp = &strtblhdr[strlen(name) / STRTBLINCR]; np = (struct strhdr *)name; np->next = tp->next; diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index e54e5b23e39..6f23ccda8db 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.26 2003/07/28 06:13:26 tedu Exp $ */ +/* $OpenBSD: tape.c,v 1.27 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $ */ /* @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.6 (Berkeley) 9/13/94"; #else -static const char rcsid[] = "$OpenBSD: tape.c,v 1.26 2003/07/28 06:13:26 tedu Exp $"; +static const char rcsid[] = "$OpenBSD: tape.c,v 1.27 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -1256,7 +1256,7 @@ checksum(buf) i += swabl(*buf++); while (--j); } - + if (i != CHECKSUM) { fprintf(stderr, "Checksum error %o, inode %d file %s\n", i, curfile.ino, curfile.name); @@ -1320,7 +1320,7 @@ swabst(cp, sp) case '5': case '6': case '7': case '8': case '9': n = (n * 10) + (*cp++ - '0'); continue; - + case 's': case 'w': case 'h': if (n == 0) n = 1; diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index 7785ee8f595..a0f58bcfff9 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: savecore.c,v 1.35 2003/06/10 16:41:29 deraadt Exp $ */ +/* $OpenBSD: savecore.c,v 1.36 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: savecore.c,v 1.26 1996/03/18 21:16:05 leo Exp $ */ /*- @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)savecore.c 8.3 (Berkeley) 1/2/94"; #else -static char rcsid[] = "$OpenBSD: savecore.c,v 1.35 2003/06/10 16:41:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: savecore.c,v 1.36 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -219,7 +219,7 @@ kmem_setup(void) kvm_t *kd_kern; char errbuf[_POSIX2_LINE_MAX]; int i, hdrsz; - + /* * Some names we need for the currently running system, others for * the system that was running when the dump was made. The values @@ -236,7 +236,7 @@ kmem_setup(void) if (kvm_nlist(kd_kern, current_nl) == -1) syslog(LOG_ERR, "%s: kvm_nlist: %s", _PATH_UNIX, kvm_geterr(kd_kern)); - + for (i = 0; cursyms[i] != -1; i++) if (current_nl[cursyms[i]].n_value == 0) { syslog(LOG_ERR, "%s: %s not in namelist", diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index bdb504e3717..61ac79c2144 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umount.c,v 1.15 2003/06/02 20:06:17 millert Exp $ */ +/* $OpenBSD: umount.c,v 1.16 2003/07/29 18:38:36 deraadt Exp $ */ /* $NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $ */ /*- @@ -40,7 +40,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.15 2003/06/02 20:06:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: umount.c,v 1.16 2003/07/29 18:38:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -124,7 +124,7 @@ main(int argc, char *argv[]) /* -h implies "-t nfs" if no -t flag. */ if ((nfshost != NULL) && (typelist == NULL)) maketypelist("nfs"); - + if (all) errs = umountall(); else diff --git a/sbin/wicontrol/wicontrol.c b/sbin/wicontrol/wicontrol.c index f461b23e59a..8bb530954ef 100644 --- a/sbin/wicontrol/wicontrol.c +++ b/sbin/wicontrol/wicontrol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wicontrol.c,v 1.46 2003/07/02 21:44:58 deraadt Exp $ */ +/* $OpenBSD: wicontrol.c,v 1.47 2003/07/29 18:38:36 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -69,7 +69,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\ Bill Paul. All rights reserved."; static const char rcsid[] = - "@(#) $OpenBSD: wicontrol.c,v 1.46 2003/07/02 21:44:58 deraadt Exp $"; + "@(#) $OpenBSD: wicontrol.c,v 1.47 2003/07/29 18:38:36 deraadt Exp $"; #endif void wi_getval(char *, struct wi_req *); @@ -661,7 +661,7 @@ wi_dumpinfo(char *iface) break; default: break; - } + } printf("\n"); } @@ -699,7 +699,7 @@ wi_dumpinfo(char *iface) break; default: break; - } + } printf("\n"); } } |