KNF

20 files changed, 87 insertions, 71 deletions

diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c
index 6e8ac41b935..894c1bfcff1 100644
--- a/usr.sbin/amd/amd/afs_ops.c
+++ b/usr.sbin/amd/amd/afs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: afs_ops.c,v 1.2 1996/03/25 15:54:43 niklas Exp $	*/
+/*	$OpenBSD: afs_ops.c,v 1.3 2001/03/02 06:22:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -45,6 +45,8 @@
 #define NFS
 #define NFSCLIENT
 
+#include <unistd.h>
+
 #include <sys/stat.h>
 #ifdef NFS_3
 typedef nfs_fh fhandle_t;
@@ -155,7 +157,7 @@ char *opts;
 	bzero((voidp) &sin, sizeof(sin));
 	sin.sin_family = AF_INET;
 	sin.sin_addr = myipaddr;
-	if (port = hasmntval(&mnt, "port")) {
+	if ((port = hasmntval(&mnt, "port"))) {
 		sin.sin_port = htons(port);
 	} else {
 		plog(XLOG_ERROR, "no port number specified for %s", dir);
@@ -197,10 +199,10 @@ char *opts;
 	 * Parse a subset of the standard nfs options.  The
 	 * others are probably irrelevant for this application
 	 */
-	if (nfs_args.timeo = hasmntval(&mnt, "timeo"))
+	if ((nfs_args.timeo = hasmntval(&mnt, "timeo")))
 		nfs_args.flags |= NFSMNT_TIMEO;
 
-	if (nfs_args.retrans = hasmntval(&mnt, "retrans"))
+	if ((nfs_args.retrans = hasmntval(&mnt, "retrans")))
 		nfs_args.flags |= NFSMNT_RETRANS;
 
 #ifdef NFSMNT_BIODS
@@ -1029,29 +1031,30 @@ int mpe;
 			cp->retry = TRUE;
 		}
 
-		if (!this_error)
-		if (p->fs_flags & FS_MBACKGROUND) {
-			mf->mf_flags |= MFF_MOUNTING;	/*XXX*/
+		if (!this_error) {
+			if ((p->fs_flags & FS_MBACKGROUND)) {
+				mf->mf_flags |= MFF_MOUNTING;	/*XXX*/
 #ifdef DEBUG
-			dlog("backgrounding mount of \"%s\"", mf->mf_mount);
+				dlog("backgrounding mount of \"%s\"", mf->mf_mount);
 #endif /* DEBUG */
-			if (cp->callout) {
-				untimeout(cp->callout);
-				cp->callout = 0;
-			}
-			run_task(try_mount, (voidp) mp, afs_cont, (voidp) cp);
-			mf->mf_flags |= MFF_MKMNT;	/* XXX */
-			if (mf_retry) free_mntfs(mf_retry);
-			return -1;
-		} else {
+				if (cp->callout) {
+					untimeout(cp->callout);
+					cp->callout = 0;
+				}
+				run_task(try_mount, (voidp) mp, afs_cont, (voidp) cp);
+				mf->mf_flags |= MFF_MKMNT;	/* XXX */
+				if (mf_retry) free_mntfs(mf_retry);
+				return -1;
+			} else {
 #ifdef DEBUG
-			dlog("foreground mount of \"%s\" ...", mf->mf_info);
+				dlog("foreground mount of \"%s\" ...", mf->mf_info);
 #endif /* DEBUG */
-			this_error = try_mount((voidp) mp);
-			if (this_error < 0) {
-				if (!mf_retry)
-					mf_retry = dup_mntfs(mf);
-				cp->retry = TRUE;
+				this_error = try_mount((voidp) mp);
+				if (this_error < 0) {
+					if (!mf_retry)
+						mf_retry = dup_mntfs(mf);
+					cp->retry = TRUE;
+				}
 			}
 		}
 
diff --git a/usr.sbin/amd/amd/am_ops.c b/usr.sbin/amd/amd/am_ops.c
index 4f64272b28e..075fa7645cc 100644
--- a/usr.sbin/amd/amd/am_ops.c
+++ b/usr.sbin/amd/amd/am_ops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)am_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: am_ops.c,v 1.1 1995/10/18 08:47:10 deraadt Exp $
+ *	$Id: am_ops.c,v 1.2 2001/03/02 06:22:01 deraadt Exp $
  */
 
 #include "am.h"
@@ -143,7 +143,7 @@ char *map;
 		/*
 		 * Next find the correct filesystem type
 		 */
-		for (vp = vops; rop = *vp; vp++)
+		for (vp = vops; (rop = *vp); vp++)
 			if (strcmp(rop->fs_type, fo->opt_type) == 0)
 				break;
 
@@ -168,7 +168,7 @@ char *map;
 	if (fo->fs_mtab)
 		free((voidp) fo->fs_mtab);
 
-	if (fo->fs_mtab = (*rop->fs_match)(fo))
+	if ((fo->fs_mtab = (*rop->fs_match)(fo)))
 		return rop;
 
 	/*
diff --git a/usr.sbin/amd/amd/clock.c b/usr.sbin/amd/amd/clock.c
index d2cdef0793d..4c5c25f9859 100644
--- a/usr.sbin/amd/amd/clock.c
+++ b/usr.sbin/amd/amd/clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	8.1 (Berkeley) 6/6/93
- *	$Id: clock.c,v 1.1 1995/10/18 08:47:10 deraadt Exp $
+ *	$Id: clock.c,v 1.2 2001/03/02 06:22:02 deraadt Exp $
  */
 
 /*
@@ -132,7 +132,7 @@ voidp closure;
 	/*
 	 * Find the correct place in the list
 	 */
-	for (cp = &callouts; cp2 = cp->c_next; cp = cp2)
+	for (cp = &callouts; (cp2 = cp->c_next); cp = cp2)
 		if (cp2->c_time >= t)
 			break;
 
@@ -156,7 +156,7 @@ void untimeout(id)
 int id;
 {
 	callout *cp, *cp2;
-	for (cp = &callouts; cp2 = cp->c_next; cp = cp2) {
+	for (cp = &callouts; (cp2 = cp->c_next); cp = cp2) {
 		if (cp2->c_id == id) {
 			cp->c_next = cp2->c_next;
 			free_callout(cp2);
@@ -233,7 +233,7 @@ int softclock()
 	 * Return number of seconds to next event,
 	 * or 0 if there is no event.
 	 */
-	if (cp = callouts.c_next)
+	if ((cp = callouts.c_next))
 		return cp->c_time - now;
 	return 0;
 }
diff --git a/usr.sbin/amd/amd/host_ops.c b/usr.sbin/amd/amd/host_ops.c
index a1d63d1094e..1bbc996d64b 100644
--- a/usr.sbin/amd/amd/host_ops.c
+++ b/usr.sbin/amd/amd/host_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: host_ops.c,v 1.3 1997/01/31 14:41:58 graichen Exp $	*/
+/*	$OpenBSD: host_ops.c,v 1.4 2001/03/02 06:22:02 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -356,7 +356,7 @@ mntfs *mf;
 			ep[j] = 0;
 		} else {
 			k = j;
-			if (error = fetch_fhandle(client, ep[j]->ex_dir, &fp[j]))
+			if ((error = fetch_fhandle(client, ep[j]->ex_dir, &fp[j])))
 				ep[j] = 0;
 		}
 	}
diff --git a/usr.sbin/amd/amd/info_nis.c b/usr.sbin/amd/amd/info_nis.c
index f145dedb697..68212e9fcd4 100644
--- a/usr.sbin/amd/amd/info_nis.c
+++ b/usr.sbin/amd/amd/info_nis.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)info_nis.c	8.1 (Berkeley) 6/6/93
- *	$Id: info_nis.c,v 1.3 1996/05/26 10:39:51 deraadt Exp $
+ *	$Id: info_nis.c,v 1.4 2001/03/02 06:22:02 deraadt Exp $
  */
 
 /*
@@ -45,6 +45,8 @@
 
 #include "am.h"
 
+#include <unistd.h>
+
 #ifdef HAS_NIS_MAPS
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
diff --git a/usr.sbin/amd/amd/info_union.c b/usr.sbin/amd/amd/info_union.c
index 834fa8ad8be..b0311a2e3f1 100644
--- a/usr.sbin/amd/amd/info_union.c
+++ b/usr.sbin/amd/amd/info_union.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)info_union.c	8.1 (Berkeley) 6/6/93
- *	$Id: info_union.c,v 1.1 1995/10/18 08:47:10 deraadt Exp $
+ *	$Id: info_union.c,v 1.2 2001/03/02 06:22:02 deraadt Exp $
  */
 
 /*
@@ -120,7 +120,7 @@ void (*fn)();
 #ifdef DEBUG
 		dlog("Reading directory %s...", *dir);
 #endif
-		while (dp = readdir(dirp)) {
+		while ((dp = readdir(dirp))) {
 			char *val;
 			if (dp->d_name[0] == '.' &&
 					(dp->d_name[1] == '\0' ||
diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c
index 693ffc85d8a..ec2ece5db48 100644
--- a/usr.sbin/amd/amd/map.c
+++ b/usr.sbin/amd/amd/map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.c,v 1.3 1997/01/31 14:41:59 graichen Exp $	*/
+/*	$OpenBSD: map.c,v 1.4 2001/03/02 06:22:03 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -40,11 +40,13 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)map.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: map.c,v 1.3 1997/01/31 14:41:59 graichen Exp $";
+static char *rcsid = "$OpenBSD: map.c,v 1.4 2001/03/02 06:22:03 deraadt Exp $";
 #endif /* not lint */
 
 #include "am.h"
 
+#include <unistd.h>
+
 /*
  * Generation Numbers.
  *
diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c
index 316a8096d82..becc6d1a922 100644
--- a/usr.sbin/amd/amd/mapc.c
+++ b/usr.sbin/amd/amd/mapc.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)mapc.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: mapc.c,v 1.1 1995/10/18 08:47:10 deraadt Exp $";
+static char *rcsid = "$Id: mapc.c,v 1.2 2001/03/02 06:22:03 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -265,7 +265,7 @@ char *key;
 {
 	unsigned int i, j;
 
-	for (i = 0; j = *key++; i += j)
+	for (i = 0; (j = *key++); i += j)
 		;
 
 	return i % NKVHASH;
diff --git a/usr.sbin/amd/amd/mount_fs.c b/usr.sbin/amd/amd/mount_fs.c
index 1374383df74..22d5dc9002e 100644
--- a/usr.sbin/amd/amd/mount_fs.c
+++ b/usr.sbin/amd/amd/mount_fs.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)mount_fs.c	8.1 (Berkeley) 6/6/93
- *	$Id: mount_fs.c,v 1.4 1997/01/31 14:42:00 graichen Exp $
+ *	$Id: mount_fs.c,v 1.5 2001/03/02 06:22:03 deraadt Exp $
  */
 
 #include "am.h"
@@ -44,6 +44,7 @@
 typedef nfs_fh fhandle_t;
 #endif /* NFS_3 */
 
+#include <unistd.h>
 #include <sys/stat.h>
 
 /*
diff --git a/usr.sbin/amd/amd/mtab.c b/usr.sbin/amd/amd/mtab.c
index b8a67e9a42c..2df4a70ad5c 100644
--- a/usr.sbin/amd/amd/mtab.c
+++ b/usr.sbin/amd/amd/mtab.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)mtab.c	8.1 (Berkeley) 6/6/93
- *	$Id: mtab.c,v 1.1 1995/10/18 08:47:11 deraadt Exp $
+ *	$Id: mtab.c,v 1.2 2001/03/02 06:22:04 deraadt Exp $
  */
 
 #include "am.h"
@@ -64,7 +64,7 @@ mntlist *mp;
 {
 	mntlist *mp2;
 
-	while (mp2 = mp) {
+	while ((mp2 = mp)) {
 		mp = mp->mnext;
 		if (mp2->mnt)
 			mnt_free(mp2->mnt);
diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index d739d465dea..08b5ef89c3c 100644
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_ops.c,v 1.6 1997/01/31 14:42:00 graichen Exp $	*/
+/*	$OpenBSD: nfs_ops.c,v 1.7 2001/03/02 06:22:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -40,7 +40,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)nfs_ops.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.6 1997/01/31 14:42:00 graichen Exp $";
+static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.7 2001/03/02 06:22:04 deraadt Exp $";
 #endif /* not lint */
 
 #include "am.h"
@@ -556,11 +556,11 @@ mntfs *mf;
 		strcpy(host + HOSTNAMESZ - 3, "..");
 #endif /* HOSTNAMESZ */
 
-	if (nfs_args.rsize = hasmntval(&mnt, "rsize"))
+	if ((nfs_args.rsize = hasmntval(&mnt, "rsize")))
 		nfs_args.flags |= NFSMNT_RSIZE;
 
 #ifdef NFSMNT_READDIRSIZE
-	if (nfs_args.readdirsize = hasmntval(&mnt, "readdirsize")) {
+	if ((nfs_args.readdirsize = hasmntval(&mnt, "readdirsize"))) {
 		nfs_args.flags |= NFSMNT_READDIRSIZE;
 	} else if (nfs_args.rsize) {
 		nfs_args.readdirsize = nfs_args.rsize;
@@ -568,13 +568,13 @@ mntfs *mf;
 	}
 #endif
 
-	if (nfs_args.wsize = hasmntval(&mnt, "wsize"))
+	if ((nfs_args.wsize = hasmntval(&mnt, "wsize")))
 		nfs_args.flags |= NFSMNT_WSIZE;
 
-	if (nfs_args.timeo = hasmntval(&mnt, "timeo"))
+	if ((nfs_args.timeo = hasmntval(&mnt, "timeo")))
 		nfs_args.flags |= NFSMNT_TIMEO;
 
-	if (nfs_args.retrans = hasmntval(&mnt, "retrans"))
+	if ((nfs_args.retrans = hasmntval(&mnt, "retrans")))
 		nfs_args.flags |= NFSMNT_RETRANS;
 
 #ifdef NFSMNT_BIODS
@@ -584,7 +584,7 @@ mntfs *mf;
 #endif /* NFSMNT_BIODS */
 
 #ifdef NFSMNT_MAXGRPS
-	if (nfs_args.maxgrouplist = hasmntval(&mnt, "maxgroups"))
+	if ((nfs_args.maxgrouplist = hasmntval(&mnt, "maxgroups")))
 		nfs_args.flags |= NFSMNT_MAXGRPS;
 #endif /* NFSMNT_MAXGRPS */
 
diff --git a/usr.sbin/amd/amd/nfs_start.c b/usr.sbin/amd/amd/nfs_start.c
index 0352fd074cc..b7159f159d5 100644
--- a/usr.sbin/amd/amd/nfs_start.c
+++ b/usr.sbin/amd/amd/nfs_start.c
@@ -36,12 +36,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nfs_start.c	8.1 (Berkeley) 6/6/93
- *	$Id: nfs_start.c,v 1.3 1997/12/17 20:37:37 deraadt Exp $
+ *	$Id: nfs_start.c,v 1.4 2001/03/02 06:22:04 deraadt Exp $
  */
 
 #include "am.h"
 #include "amq.h"
-#include <sys/signal.h>
+#include <signal.h>
+#include <unistd.h>
 #include <setjmp.h>
 extern jmp_buf select_intr;
 extern int select_intr_valid;
@@ -104,12 +105,12 @@ static char *max_mem = 0;
 static int do_select(smask, fds, fdp, tvp)
 int smask;
 int fds;
-int *fdp;
+fd_set *fdp;
 struct timeval *tvp;
 {
 	int sig;
 	int nsel;
-	if (sig = setjmp(select_intr)) {
+	if ((sig = setjmp(select_intr))) {
 		select_intr_valid = 0;
 		/* Got a signal */
 		switch (sig) {
@@ -136,8 +137,8 @@ struct timeval *tvp;
 		/*
 		 * Wait for input
 		 */
-		nsel = select(fds, fdp, (int *) 0, (int *) 0,
-				tvp->tv_sec ? tvp : (struct timeval *) 0);
+		nsel = select(fds, fdp, NULL, NULL,
+		    tvp->tv_sec ? tvp : (struct timeval *) 0);
 
 	}
 
@@ -178,7 +179,7 @@ static int rpc_pending_now()
 #endif /* FD_SET */
 
 	tvv.tv_sec = tvv.tv_usec = 0;
-	nsel = select(max_fds+1, fdsp, (int *) 0, (int *) 0, &tvv);
+	nsel = select(max_fds+1, fdsp, NULL, NULL, &tvv);
 	if (nsel < 1) {
 		free(fdsp);
 		return(0);
diff --git a/usr.sbin/amd/amd/nfsx_ops.c b/usr.sbin/amd/amd/nfsx_ops.c
index 0d300c1653d..177bd6dc242 100644
--- a/usr.sbin/amd/amd/nfsx_ops.c
+++ b/usr.sbin/amd/amd/nfsx_ops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nfsx_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: nfsx_ops.c,v 1.1 1995/10/18 08:47:11 deraadt Exp $
+ *	$Id: nfsx_ops.c,v 1.2 2001/03/02 06:22:04 deraadt Exp $
  */
 
 #include "am.h"
@@ -103,7 +103,7 @@ am_opts *fo;
 	 * After deslashifying, overwrite the end of ${fs} with "/"
 	 * to make sure it is unique.
 	 */
-	if (ptr = strchr(fo->opt_fs, ','))
+	if ((ptr = strchr(fo->opt_fs, ',')))
 		*ptr = '\0';
 	deslashify(fo->opt_fs);
 	/*
diff --git a/usr.sbin/amd/amd/opts.c b/usr.sbin/amd/amd/opts.c
index 6c5235a5596..55f19d526d1 100644
--- a/usr.sbin/amd/amd/opts.c
+++ b/usr.sbin/amd/amd/opts.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)opts.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: opts.c,v 1.1 1995/10/18 08:47:11 deraadt Exp $";
+static char *rcsid = "$Id: opts.c,v 1.2 2001/03/02 06:22:04 deraadt Exp $";
 #endif /* not lint */
 
 #include "am.h"
@@ -408,7 +408,7 @@ static char expand_error[] = "No space to expand \"%s\"";
 #endif /* DEBUG */
 	struct opt *op;
 
-	while (dp = strchr(cp, '$')) {
+	while ((dp = strchr(cp, '$'))) {
 		char ch;
 		/*
 		 * First copy up to the $
diff --git a/usr.sbin/amd/amd/pfs_ops.c b/usr.sbin/amd/amd/pfs_ops.c
index 8af68598209..e9d9b67a97c 100644
--- a/usr.sbin/amd/amd/pfs_ops.c
+++ b/usr.sbin/amd/amd/pfs_ops.c
@@ -36,11 +36,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pfs_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: pfs_ops.c,v 1.1 1995/10/18 08:47:12 deraadt Exp $
+ *	$Id: pfs_ops.c,v 1.2 2001/03/02 06:22:04 deraadt Exp $
  */
 
 #include "am.h"
 
+#include <unistd.h>
+
 #ifdef HAS_PFS
 
 /*
diff --git a/usr.sbin/amd/amd/sched.c b/usr.sbin/amd/amd/sched.c
index 76988a247f1..6c03a1489a5 100644
--- a/usr.sbin/amd/amd/sched.c
+++ b/usr.sbin/amd/amd/sched.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sched.c	8.1 (Berkeley) 6/6/93
- *	$Id: sched.c,v 1.2 1997/08/04 19:26:05 deraadt Exp $
+ *	$Id: sched.c,v 1.3 2001/03/02 06:22:04 deraadt Exp $
  */
 
 /*
@@ -44,7 +44,7 @@
  */
 
 #include "am.h"
-#include <sys/signal.h>
+#include <signal.h>
 #include WAIT
 #include <setjmp.h>
 extern jmp_buf select_intr;
@@ -116,7 +116,7 @@ voidp ca;
 
 	mask = sigblock(sigmask(SIGCHLD));
 
-	if (p->pid = background()) {
+	if ((p->pid = background())) {
 		sigsetmask(mask);
 		return;
 	}
diff --git a/usr.sbin/amd/amd/ufs_ops.c b/usr.sbin/amd/amd/ufs_ops.c
index 658b5d7c018..e6bd07099ec 100644
--- a/usr.sbin/amd/amd/ufs_ops.c
+++ b/usr.sbin/amd/amd/ufs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_ops.c,v 1.2 1996/03/25 15:54:50 niklas Exp $	*/
+/*	$OpenBSD: ufs_ops.c,v 1.3 2001/03/02 06:22:05 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -80,7 +80,8 @@ am_opts *fo;
 	return strdup(fo->opt_dev);
 }
 
-static mount_ufs(dir, fs_name, opts)
+static int
+mount_ufs(dir, fs_name, opts)
 char *dir;
 char *fs_name;
 char *opts;
diff --git a/usr.sbin/amd/amd/util.c b/usr.sbin/amd/amd/util.c
index d7e3db73843..6d97f228b6d 100644
--- a/usr.sbin/amd/amd/util.c
+++ b/usr.sbin/amd/amd/util.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)util.c	8.1 (Berkeley) 6/6/93
- *	$Id: util.c,v 1.3 1997/01/31 14:42:02 graichen Exp $
+ *	$Id: util.c,v 1.4 2001/03/02 06:22:05 deraadt Exp $
  */
 
 /*
@@ -45,6 +45,7 @@
 
 #include "am.h"
 #include <ctype.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <netdb.h>
 
@@ -551,7 +552,7 @@ int mode;
 	 * This assumes we are root so that we can do mkdir in a
 	 * mode 555 directory...
 	 */
-	while (sp = strchr(sp+1, '/')) {
+	while ((sp = strchr(sp+1, '/'))) {
 		*sp = '\0';
 		if (mkdir(p2, mode) < 0) {
 			error_so_far = errno;
diff --git a/usr.sbin/amd/amd/wire.c b/usr.sbin/amd/amd/wire.c
index d4ddd188a75..80a830b179b 100644
--- a/usr.sbin/amd/amd/wire.c
+++ b/usr.sbin/amd/amd/wire.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wire.c	8.1 (Berkeley) 6/6/93
- *	$Id: wire.c,v 1.6 2000/02/22 17:29:04 itojun Exp $
+ *	$Id: wire.c,v 1.7 2001/03/02 06:22:05 deraadt Exp $
  */
 
 /*
@@ -53,6 +53,7 @@
 
 #include "am.h"
 
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 #define NO_SUBNET "notknown"
diff --git a/usr.sbin/amd/amd/xutil.c b/usr.sbin/amd/amd/xutil.c
index a7ee6e74da4..c3ac88f5dbd 100644
--- a/usr.sbin/amd/amd/xutil.c
+++ b/usr.sbin/amd/amd/xutil.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)xutil.c	8.1 (Berkeley) 6/6/93
- *	$Id: xutil.c,v 1.3 1999/08/28 13:43:11 millert Exp $
+ *	$Id: xutil.c,v 1.4 2001/03/02 06:22:05 deraadt Exp $
  */
 
 #include "config.h"
@@ -47,7 +47,9 @@
 #include <string.h>
 #endif
 
+#include <unistd.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 
 FILE *logfp = stderr;		/* Log errors to stderr initially */
 #ifdef HAS_SYSLOG