KNF

3 files changed, 162 insertions, 188 deletions

diff --git a/usr.sbin/ypserv/mkalias/mkalias.c b/usr.sbin/ypserv/mkalias/mkalias.c
index 31f2f0ac4fe..d3135d532dd 100644
--- a/usr.sbin/ypserv/mkalias/mkalias.c
+++ b/usr.sbin/ypserv/mkalias/mkalias.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkalias.c,v 1.6 2001/02/05 14:47:17 deraadt Exp $ */
+/*	$OpenBSD: mkalias.c,v 1.7 2001/11/19 09:01:28 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mkalias.c,v 1.6 2001/02/05 14:47:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkalias.c,v 1.7 2001/11/19 09:01:28 deraadt Exp $";
 #endif
 
 #include <ctype.h>
@@ -53,18 +53,16 @@ extern char *__progname;		/* from crt0.o */
 
 void
 split_address(address, len, user, host)
-char *address;
-int    len;
-char  *user, *host;
+	char *address;
+	int    len;
+	char  *user, *host;
 {
-	char *c,*s,*r;
+	char *c, *s, *r;
 	int  i = 0;
 
-	if (index(address,'@')) {
-		
+	if (index(address, '@')) {
 		s = user;
-		
-		for(c = address; i < len; i++) {
+		for (c = address; i < len; i++) {
 			if (*c == '@') {
 				*s = '\0';
 				s = host;
@@ -77,11 +75,9 @@ char  *user, *host;
 	
 	}
 		
-	if (r = rindex(address,'!')) {
-		
+	if (r = rindex(address, '!')) {
 		s = host;
-		
-		for(c = address; i < len; i++) {
+		for (c = address; i < len; i++) {
 			if (c == r) {
 				*s = '\0';
 				s = user;
@@ -91,21 +87,20 @@ char  *user, *host;
 			c++;
 		}
 		*s = '\0';
-		
 	}
-		
 }
 
 int
 check_host(address, host, dflag, uflag, Eflag)
-char *address, *host;
-int   dflag, uflag, Eflag;
+	char *address, *host;
+	int   dflag, uflag, Eflag;
 {
 	char answer[PACKETSZ];
 	int  status;
 
-	if ((dflag && index(address,'@')) ||
-	    (uflag && index(address,'!'))) return(0);
+	if ((dflag && index(address, '@')) ||
+	    (uflag && index(address, '!')))
+		return(0);
 
 	if ((_res.options & RES_INIT) == 0)
 		res_init();
@@ -115,32 +110,32 @@ int   dflag, uflag, Eflag;
 	if (status == -1)
 		status = res_search(host, C_IN, T_A, answer, sizeof(answer));
 
-	if ((status == -1) && Eflag)
+	if (status == -1 && Eflag)
 		status = res_search(host, C_IN, T_MX, answer, sizeof(answer));
 
 	return(status == -1);
 }
 
 void
-capitalize(name,len)
-char *name;
-int len;
+capitalize(name, len)
+	char *name;
+	int len;
 {
 	char last = ' ';
 	char *c;
 	int  i = 0;
 
-	for(c = name; i < len; i++) {
-		if (*c == '.') last = '.';
+	for (c = name; i < len; i++) {
+		if (*c == '.')
+			last = '.';
 		c++;
 	}
 	
 	i = 0;
 	if (last == '.') {
-		for(c = name; i < len; i++) {
-			if (last == '.') {
+		for (c = name; i < len; i++) {
+			if (last == '.')
 				*c = toupper(*c);
-			}
 			last = *c++;
 		}
 	}
@@ -148,9 +143,9 @@ int len;
 }
 
 int
-main (argc,argv)
-int argc;
-char *argv[];
+main(argc, argv)
+	int argc;
+	char *argv[];
 {
 	int	usage = 0;
 	int	eflag = 0;
@@ -164,14 +159,14 @@ char *argv[];
 	char	*input = NULL;
 	char	*output = NULL;
 	DBM	*db;
-	datum	key,val;
+	datum	key, val;
 	char	*slash;
 	DBM	*new_db = NULL;
 	static	char mapname[] = "ypdbXXXXXXXXXX";
-	char	db_mapname[MAXPATHLEN],db_outfile[MAXPATHLEN],
+	char	db_mapname[MAXPATHLEN], db_outfile[MAXPATHLEN],
 		db_tempname[MAXPATHLEN];
 	int	status;
-	char	user[4096],host[4096]; /* XXX: DB bsize = 4096 in ypdb.c */
+	char	user[4096], host[4096]; /* XXX: DB bsize = 4096 in ypdb.c */
 	char	datestr[11];
 	char	myname[MAXHOSTNAMELEN];
 	
@@ -279,47 +274,49 @@ fail:
 	     key.dptr != NULL;
 	     key = ypdb_nextkey(db)) {
 		
-	        val = ypdb_fetch(db,key);
+	        val = ypdb_fetch(db, key);
 
-		if (val.dptr == NULL) continue;		/* No value */
-		if ((*key.dptr == '@') && (key.dsize == 1))
+		if (val.dptr == NULL)
+			continue;			/* No value */
+		if (*key.dptr == '@' && key.dsize == 1)
 			continue;			/* Sendmail token */
 		if (strncmp(key.dptr, "YP_", 3)==0)	/* YP token */
 			continue;
-		if (index(val.dptr,',')) continue;	/* List... */
-		if (index(val.dptr,'|')) continue;	/* Pipe... */
+		if (index(val.dptr, ','))
+			continue;			/* List... */
+		if (index(val.dptr, '|'))
+			continue;			/* Pipe... */
 
-		if (!((index(val.dptr,'@')) ||
-		      (index(val.dptr,'!')))) continue;	/* Skip local users */
+		if (!(index(val.dptr, '@') || index(val.dptr, '!')))
+			continue;		/* Skip local users */
 
-		split_address(val.dptr,val.dsize,user,host);
+		split_address(val.dptr, val.dsize, user, host);
 
 		if (eflag && check_host(val.dptr, host, dflag, uflag, Eflag)) {
 			printf("Invalid host %s in %*.*s:%*.*s\n",
-			       host,
-			       key.dsize, key.dsize, key.dptr,
-			       val.dsize, val.dsize, val.dptr);
+			    host,
+			    key.dsize, key.dsize, key.dptr,
+			    val.dsize, val.dsize, val.dptr);
 			continue;
 		}
 
-		if (nflag) {
-			capitalize(key.dptr,key.dsize);
-		}
+		if (nflag)
+			capitalize(key.dptr, key.dsize);
 
 		if (new_db != NULL) {
 			status = ypdb_store(new_db, val, key, YPDB_INSERT);
 			if (status != 0) {
 				printf("%s: problem storing %*.*s %*.*s\n",
-				       __progname,
-				       val.dsize, val.dsize, val.dptr,
-				       key.dsize, key.dsize, key.dptr);
+				   __progname,
+				   val.dsize, val.dsize, val.dptr,
+				   key.dsize, key.dsize, key.dptr);
 			}
 		}
 
 		if (vflag) {
 			printf("%*.*s --> %*.*s\n",
-			       val.dsize, val.dsize, val.dptr,
-			       key.dsize, key.dsize, key.dptr);
+			   val.dsize, val.dsize, val.dptr,
+			   key.dsize, key.dsize, key.dptr);
 		}
 
 	}
@@ -333,9 +330,9 @@ fail:
 		status = ypdb_store(new_db, key, val, YPDB_INSERT);
 		if (status != 0) {
 			printf("%s: problem storing %*.*s %*.*s\n",
-			       __progname,
-			       key.dsize, key.dsize, key.dptr,
-			       val.dsize, val.dsize, val.dptr);
+			   __progname,
+			   key.dsize, key.dsize, key.dptr,
+			   val.dsize, val.dsize, val.dptr);
 		}
 	}
 
@@ -348,26 +345,22 @@ fail:
 		status = ypdb_store(new_db, key, val, YPDB_INSERT);
 		if (status != 0) {
 			printf("%s: problem storing %*.*s %*.*s\n",
-			       __progname,
-			       key.dsize, key.dsize, key.dptr,
-			       val.dsize, val.dsize, val.dptr);
+			   __progname,
+			   key.dsize, key.dsize, key.dptr,
+			   val.dsize, val.dsize, val.dptr);
 		}
 	}
 
-	
-
 	ypdb_close(db);
 
 	if (new_db != NULL) {
 		ypdb_close(new_db);
-		if (rename(db_mapname,db_outfile) < 0) {
+		if (rename(db_mapname, db_outfile) < 0) {
 			perror("rename");
 			fprintf(stderr,"rename %s -> %s failed!\n", db_mapname,
-				db_outfile);
+			    db_outfile);
 			exit(1);
 		}
 	}
-	
 	return(0);
-	
 }
diff --git a/usr.sbin/ypserv/stdethers/stdethers.c b/usr.sbin/ypserv/stdethers/stdethers.c
index 5bf8ca8e34b..e4c92bad2f8 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.c
+++ b/usr.sbin/ypserv/stdethers/stdethers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdethers.c,v 1.3 1997/09/11 19:47:33 deraadt Exp $ */
+/*	$OpenBSD: stdethers.c,v 1.4 2001/11/19 09:01:29 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: stdethers.c,v 1.3 1997/09/11 19:47:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: stdethers.c,v 1.4 2001/11/19 09:01:29 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
@@ -66,7 +66,7 @@ working_ntoa(e)
 	static char a[] = "xx:xx:xx:xx:xx:xx";
 
 	sprintf(a, "%x:%x:%x:%x:%x:%x",
-		e[0], e[1], e[2], e[3], e[4], e[5]);
+	    e[0], e[1], e[2], e[3], e[4], e[5]);
 	return a;
 }
 #endif
@@ -83,67 +83,60 @@ int size;
 			int len = strlen(buf);
 			done += len;
 			if (len > 1 && buf[len-2] == '\\' &&
-					buf[len-1] == '\n') {
+			    buf[len-1] == '\n') {
 				int ch;
 				buf += len - 2;
 				size -= len - 2;
-				*buf = '\n'; buf[1] = '\0';
+				*buf = '\n';
+				buf[1] = '\0';
+
 				/*
 				 * Skip leading white space on next line
 				 */
 				while ((ch = getc(fp)) != EOF &&
-					isascii(ch) && isspace(ch))
-						;
+				    isascii(ch) && isspace(ch))
+					;
 				(void) ungetc(ch, fp);
-			} else {
+			} else
 				return done;
-			}
 		}
 	} while (size > 0 && !feof(fp));
-
 	return done;
 }
 
 int
-main (argc,argv)
-int argc;
-char *argv[];
+main(argc, argv)
+	int argc;
+	char *argv[];
 {
 	FILE	*data_file;
 	char	 data_line[1024];
 	int	 usage = 0;
 	int	 line_no = 0;
 	int	 len;
-	char	*p,*k,*v;
+	char	*p, *k, *v;
 	struct ether_addr eth_addr;
 	char	 hostname[256];
 	
-	if (argc > 2) {
+	if (argc > 2)
 		usage++;
-	}
 	
 	if (usage) {
-		fprintf(stderr,
-			"usage: %s [file]\n",
-			ProgramName);
+		fprintf(stderr, "usage: %s [file]\n", ProgramName);
 		exit(1);
 	}
 	
 	if (argc == 2) {
 		data_file = fopen(argv[1], "r");
 		if (data_file == NULL) {
-			fprintf(stderr,
-				"%s: can't open %s\n",
-				ProgramName,
-				argv[1]);
+			fprintf(stderr, "%s: can't open %s\n",
+			    ProgramName, argv[1]);
 			exit(1);
 		}
-	} else {
+	} else
 		data_file = stdin;
-	}
 	
-	while (read_line(data_file,data_line,sizeof(data_line))) {
-		
+	while (read_line(data_file, data_line, sizeof(data_line))) {
 		line_no++;
 		len = strlen(data_line);
 		
@@ -155,43 +148,38 @@ char *argv[];
 		/*
 		 * Check if we have the whole line
 		 */ 
-		
 		if (data_line[len-1] != '\n') {
 			if (argc == 2) {
 				fprintf(stderr,
-					"line %d in \"%s\" is too long",
-					line_no, argv[1]);
+				    "line %d in \"%s\" is too long",
+				    line_no, argv[1]);
 			} else {
 				fprintf(stderr,
-					"line %d in \"stdin\" is too long",
-					line_no);
+				    "line %d in \"stdin\" is too long",
+				    line_no);
 			}
-		} else {
+		} else
 			data_line[len-1] = '\0';
-		}
 		
 		p = (char *) &data_line;
 		
 		k  = p;				/* save start of key */
-		while (!isspace(*p)) { p++; };	/* find first "space" */
-		while (isspace(*p)) { p++; };	/* move over "space" */
+		while (!isspace(*p))		/* find first "space" */
+			p++;
+		while (isspace(*p))		/* move over "space" */
+			p++;
 		
 		v = p;				/* save start of value */
-		while(*p != '\0') { p++; };	/* find end of string */
+		while(*p != '\0')		/* find end of string */
+			p++;
 		
 		if (ether_line(data_line, &eth_addr, hostname) == 0) {
-			fprintf(stdout, "%s\t%s\n",
-				NTOA(&eth_addr),
-				hostname);
+			fprintf(stdout, "%s\t%s\n", NTOA(&eth_addr),
+			    hostname);
 		} else {
-			fprintf(stderr,
-				"%s: ignoring line %d: \"%s\"\n",
-				ProgramName,
-				line_no,
-				data_line);
+			fprintf(stderr, "%s: ignoring line %d: \"%s\"\n",
+			    ProgramName, line_no, data_line);
 		}
 	}
-	
 	return(0);
-	
 }
diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.c b/usr.sbin/ypserv/stdhosts/stdhosts.c
index 69da225b1c9..044640c7ccf 100644
--- a/usr.sbin/ypserv/stdhosts/stdhosts.c
+++ b/usr.sbin/ypserv/stdhosts/stdhosts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdhosts.c,v 1.4 1997/09/11 19:47:35 deraadt Exp $ */
+/*	$OpenBSD: stdhosts.c,v 1.5 2001/11/19 09:01:29 deraadt Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: stdhosts.c,v 1.4 1997/09/11 19:47:35 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: stdhosts.c,v 1.5 2001/11/19 09:01:29 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
@@ -55,95 +55,88 @@ int size;
 			int len = strlen(buf);
 			done += len;
 			if (len > 1 && buf[len-2] == '\\' &&
-					buf[len-1] == '\n') {
+			    buf[len-1] == '\n') {
 				int ch;
 				buf += len - 2;
 				size -= len - 2;
-				*buf = '\n'; buf[1] = '\0';
+				*buf = '\n';
+				buf[1] = '\0';
 				/*
 				 * Skip leading white space on next line
 				 */
 				while ((ch = getc(fp)) != EOF &&
-					isascii(ch) && isspace(ch))
-						;
+				    isascii(ch) && isspace(ch))
+					;
 				(void) ungetc(ch, fp);
-			} else {
+			} else
 				return done;
-			}
 		}
 	} while (size > 0 && !feof(fp));
-
 	return done;
 }
 
 int
-main (argc,argv)
-int argc;
-char *argv[];
+main(argc, argv)
+	int argc;
+	char *argv[];
 {
-  FILE	*data_file;
-  char	 data_line[1024];
-  int	 usage = 0;
-  int	 line_no = 0;
-  int	 len;
-  char	*p,*k,*v;
-  struct in_addr host_addr;
-
-  if (argc > 2) {
-    usage++;
-  }
-
-  if (usage) {
-    fprintf(stderr,
-	    "%s",
-	    "usage: stdhosts [file]\n");
-    exit(1);
-  }
-
-  if (argc == 2) {
-    data_file = fopen(argv[argc-1], "r");
-  } else {
-    data_file = stdin;
-  }
+	FILE	*data_file;
+	char	 data_line[1024];
+	int	 usage = 0;
+	int	 line_no = 0;
+	int	 len;
+	char	*p, *k, *v;
+	struct in_addr host_addr;
+
+	if (argc > 2)
+		usage++;
+
+	if (usage) {
+		fprintf(stderr, "usage: stdhosts [file]\n");
+		exit(1);
+	}
+
+	if (argc == 2)
+		data_file = fopen(argv[argc-1], "r");
+	else
+		data_file = stdin;
   
-  while (read_line(data_file,data_line,sizeof(data_line))) {
-    
-    line_no++;
-    len = strlen(data_line);
-    
-    if (len > 0) {
-      if (data_line[0] == '#')
-	continue;
-    }
-
-    /*
-     * Check if we have the whole line
-     */ 
-
-    if (data_line[len-1] != '\n') {
-      if (argc == 2) {
-	fprintf(stderr, "line %d in \"%s\" is too long", line_no, argv[1]);
-      } else {
-	fprintf(stderr, "line %d in \"stdin\" is too long", line_no);
-      }
-    } else {
-      data_line[len-1] = '\0';
-    }
-
-    p = (char *) &data_line;
-
-    k  = p;					/* save start of key */
-    while (!isspace(*p)) { p++; };		/* find first "space" */
-    while (isspace(*p)) { *p = '\0'; p++; };	/* replace space with <NUL> */
-    
-    v = p;					/* save start of value */
-    while(*p != '\0') { p++; };			/* find end of string */
-
-    (void)inet_aton(k,&host_addr);
-    printf("%s %s\n",inet_ntoa(host_addr),v);
-
-  }
+	while (read_line(data_file, data_line, sizeof(data_line))) {
+		line_no++;
+		len = strlen(data_line);
+		if (len > 0) {
+			if (data_line[0] == '#')
+				continue;
+		}
 
-  return(0);
-  
+		/*
+		 * Check if we have the whole line
+		 */ 
+
+		if (data_line[len-1] != '\n') {
+			if (argc == 2)
+				fprintf(stderr,
+				    "line %d in \"%s\" is too long",
+				    line_no, argv[1]);
+			else
+				fprintf(stderr,
+				    "line %d in \"stdin\" is too long", line_no);
+		} else
+			data_line[len-1] = '\0';
+
+		p = (char *) &data_line;
+		k = p;				/* save start of key */
+		while (!isspace(*p))	/* find first "space" */
+			p++;
+		while (isspace(*p))	/* replace space with <NUL> */
+			*p = '\0'; p++;
+		
+		v = p;			/* save start of value */
+		while(*p != '\0')	/* find end of string */
+			p++;
+
+		(void)inet_aton(k, &host_addr);
+		printf("%s %s\n", inet_ntoa(host_addr),v);
+	}
+	return(0);
 }