spacing

11 files changed, 54 insertions, 56 deletions

diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 9885215c49b..2c5430e62b4 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cp.c,v 1.26 2003/06/02 23:32:06 millert Exp $	*/
+/*	$OpenBSD: cp.c,v 1.27 2003/07/29 00:24:14 deraadt Exp $	*/
 /*	$NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $	*/
 
 /*
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)cp.c	8.5 (Berkeley) 4/29/95";
 #else
-static char rcsid[] = "$OpenBSD: cp.c,v 1.26 2003/06/02 23:32:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: cp.c,v 1.27 2003/07/29 00:24:14 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -249,13 +249,11 @@ find_last_component(char *path)
 		p = path;
 	else {
 		/* Special case foo/ */
-	        if (!*(p+1)) {
-			while ((p >= path) &&
-			       *p == '/')
+		if (!*(p+1)) {
+			while ((p >= path) && *p == '/')
 				p--;
 
-			while ((p >= path) &&
-			       *p != '/')
+			while ((p >= path) && *p != '/')
 				p--;
 		}
 
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 30410a3a9fb..2b86dbc6215 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utils.c,v 1.22 2003/06/02 23:32:06 millert Exp $	*/
+/*	$OpenBSD: utils.c,v 1.23 2003/07/29 00:24:14 deraadt Exp $	*/
 /*	$NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #else
-static char rcsid[] = "$OpenBSD: utils.c,v 1.22 2003/06/02 23:32:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: utils.c,v 1.23 2003/07/29 00:24:14 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -301,9 +301,9 @@ void
 usage(void)
 {
 	(void)fprintf(stderr,
-            "usage: %s [-R [-H | -L | -P]] [-fip] src target\n", __progname);
+	    "usage: %s [-R [-H | -L | -P]] [-fip] src target\n", __progname);
 	(void)fprintf(stderr,
-            "       %s [-R [-H | -L | -P]] [-fip] src1 ... srcN directory\n",
-             __progname);
+	    "       %s [-R [-H | -L | -P]] [-fip] src1 ... srcN directory\n",
+	    __progname);
 	exit(1);
 }
diff --git a/bin/date/date.c b/bin/date/date.c
index 0ad378231b8..41117bdfdf5 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: date.c,v 1.24 2003/06/02 23:32:07 millert Exp $	*/
+/*	$OpenBSD: date.c,v 1.25 2003/07/29 00:24:15 deraadt Exp $	*/
 /*	$NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: date.c,v 1.24 2003/06/02 23:32:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: date.c,v 1.25 2003/07/29 00:24:15 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -266,7 +266,7 @@ usage(void)
 {
 	(void)fprintf(stderr,
 	    "usage: %s [-anu] [-d dst] [-r seconds] [-t west] [+format]\n",
-             __progname);
+	     __progname);
 	(void)fprintf(stderr,
 	    "%-*s[[[[[[cc]yy]mm]dd]HH]MM[.SS]]\n", strlen(__progname) + 8, "");
 	exit(1);
diff --git a/bin/df/df.c b/bin/df/df.c
index 339f7ed80d9..e16d5f2c88d 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: df.c,v 1.36 2003/07/02 21:19:33 deraadt Exp $	*/
+/*	$OpenBSD: df.c,v 1.37 2003/07/29 00:24:15 deraadt Exp $	*/
 /*	$NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)df.c	8.7 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: df.c,v 1.36 2003/07/02 21:19:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: df.c,v 1.37 2003/07/29 00:24:15 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -479,7 +479,7 @@ void
 usage(void)
 {
 	(void)fprintf(stderr,
-            "usage: %s [-hiklnP] [-t type] [file | file_system ...]\n",
-             __progname);
+	    "usage: %s [-hiklnP] [-t type] [file | file_system ...]\n",
+	    __progname);
 	exit(1);
 }
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index a8df4a9ccb3..1b8db40568f 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kill.c,v 1.7 2003/06/02 23:32:08 millert Exp $	*/
+/*	$OpenBSD: kill.c,v 1.8 2003/07/29 00:24:15 deraadt Exp $	*/
 /*	$NetBSD: kill.c,v 1.11 1995/09/07 06:30:27 jtc Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: kill.c,v 1.7 2003/06/02 23:32:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: kill.c,v 1.8 2003/07/29 00:24:15 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -178,11 +178,11 @@ void
 usage(void)
 {
 	(void)fprintf(stderr, "usage: %s [-s signal_name] pid ...\n",
-            __progname);
+	    __progname);
 	(void)fprintf(stderr, "       %s -l [exit_status]\n", __progname);
 	(void)fprintf(stderr, "       %s -signal_name pid ...\n",
-            __progname);
+	    __progname);
 	(void)fprintf(stderr, "       %s -signal_number pid ...\n",
-            __progname);
+	    __progname);
 	exit(1);
 }
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 29bb7f295d2..0ce468231d0 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.9 2003/06/11 23:42:12 deraadt Exp $	*/
+/*	$OpenBSD: util.c,v 1.10 2003/07/29 00:24:15 deraadt Exp $	*/
 /*	$NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)util.c	8.5 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: util.c,v 1.9 2003/06/11 23:42:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.10 2003/07/29 00:24:15 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,6 +68,6 @@ usage(void)
 {
 	(void)fprintf(stderr,
 	    "usage: %s [-1ACFLRSTWacdfiklmnopqrstux] [file ...]\n",
-             __progname);
+	     __progname);
 	exit(1);
 }
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index bdab5551512..d4a6b4a99dd 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkdir.c,v 1.15 2003/06/02 23:32:08 millert Exp $	*/
+/*	$OpenBSD: mkdir.c,v 1.16 2003/07/29 00:24:15 deraadt Exp $	*/
 /*	$NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #else
-static char rcsid[] = "$OpenBSD: mkdir.c,v 1.15 2003/06/02 23:32:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: mkdir.c,v 1.16 2003/07/29 00:24:15 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -114,19 +114,19 @@ main(int argc, char *argv[])
 			if (mkdir(*argv, mode) < 0) {
 				warn("%s", *argv);
 				exitval = 1;
-		 	} else {
-                       		/*
-                 		 * The mkdir() and umask() calls both honor only the low
-                 		 * nine bits, so if you try to set a mode including the
-                 		 * sticky, setuid, setgid bits you lose them.  Don't do
-                 		 * this unless the user has specifically requested a mode
-                 		 * as chmod will (obviously) ignore the umask.
-                 		 */
+			} else {
+				/*
+				 * The mkdir() and umask() calls both honor only the low
+				 * nine bits, so if you try to set a mode including the
+				 * sticky, setuid, setgid bits you lose them.  Don't do
+				 * this unless the user has specifically requested a mode
+				 * as chmod will (obviously) ignore the umask.
+				 */
 				if (mode > 0777 && chmod(*argv, mode) == -1) {
 					warn("%s", *argv);
 					exitval = 1;
 				}
-			}	
+			}
 		}
 	}
 	exit(exitval);
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 33edd4a272d..352535b41e3 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mv.c,v 1.28 2003/06/02 23:32:08 millert Exp $	*/
+/*	$OpenBSD: mv.c,v 1.29 2003/07/29 00:24:15 deraadt Exp $	*/
 /*	$NetBSD: mv.c,v 1.9 1995/03/21 09:06:52 cgd Exp $	*/
 
 /*
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: mv.c,v 1.28 2003/06/02 23:32:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: mv.c,v 1.29 2003/07/29 00:24:15 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -401,6 +401,6 @@ usage(void)
 {
 	(void)fprintf(stderr, "usage: %s [-fi] source target\n", __progname);
 	(void)fprintf(stderr, "       %s [-fi] source ... directory\n",
-            __progname);
+	    __progname);
 	exit(1);
 }
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index e99fa1482a4..644b111a089 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ps.c,v 1.33 2003/06/11 23:42:12 deraadt Exp $	*/
+/*	$OpenBSD: ps.c,v 1.34 2003/07/29 00:24:15 deraadt Exp $	*/
 /*	$NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: ps.c,v 1.33 2003/06/11 23:42:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ps.c,v 1.34 2003/07/29 00:24:15 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -118,9 +118,9 @@ main(int argc, char *argv[])
 	size_t size;
 
 	if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 &&
-	     ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 &&
-	     ioctl(STDIN_FILENO,  TIOCGWINSZ, (char *)&ws) == -1) ||
-	     ws.ws_col == 0)
+	    ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 &&
+	    ioctl(STDIN_FILENO,  TIOCGWINSZ, (char *)&ws) == -1) ||
+	    ws.ws_col == 0)
 		termwidth = 79;
 	else
 		termwidth = ws.ws_col - 1;
@@ -501,8 +501,8 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-            "usage: %s [-][acCehjklmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]\n",
-	     __progname);	
+	    "usage: %s [-][acCehjklmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]\n",
+	    __progname);	
 	(void)fprintf(stderr,
 	    "%-*s[-M core] [-N system] [-W swap]\n", strlen(__progname) + 8, "");
 	(void)fprintf(stderr, "       %s [-L]\n", __progname);
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 8e6f07d459d..7b76a268a31 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcp.c,v 1.37 2003/07/28 06:05:35 tedu Exp $	*/
+/*	$OpenBSD: rcp.c,v 1.38 2003/07/29 00:24:16 deraadt Exp $	*/
 /*	$NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #else
-static const char rcsid[] = "$OpenBSD: rcp.c,v 1.37 2003/07/28 06:05:35 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: rcp.c,v 1.38 2003/07/29 00:24:16 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -844,13 +844,13 @@ usage(void)
 {
 #ifdef KERBEROS
 	(void)fprintf(stderr, "usage: %s [-Kpx] [-k realm] f1 f2\n",
-            __progname);
+	    __progname);
  	(void)fprintf(stderr, "       %s [-Kprx] [-k realm] f1 ... fn directory\n",
-            __progname);
+	    __progname);
 #else
 	(void)fprintf(stderr,
 	    "usage: %s [-p] f1 f2; or: rcp [-pr] f1 ... fn directory\n",
-             __progname);
+	    __progname);
 #endif
 	exit(1);
 }
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index 6ddecd86075..c8f5146f0a3 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmail.c,v 1.16 2003/06/10 21:15:18 millert Exp $	*/
+/*	$OpenBSD: rmail.c,v 1.17 2003/07/29 00:24:16 deraadt Exp $	*/
 /*	$NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)rmail.c	8.3 (Berkeley) 5/15/95";
 #else
-static char rcsid[] = "$OpenBSD: rmail.c,v 1.16 2003/06/10 21:15:18 millert Exp $";
+static char rcsid[] = "$OpenBSD: rmail.c,v 1.17 2003/07/29 00:24:16 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -358,6 +358,6 @@ void
 usage(void)
 {
 	(void)fprintf(stderr, "usage: %s [-T] [-D domain] user ...\n",
-            __progname);
+	    __progname);
 	exit(EX_USAGE);
 }