KNF

5 files changed, 104 insertions, 74 deletions

diff --git a/smtpd/lka_session.c b/smtpd/lka_session.c
index 67522dbb..99ec94a0 100644
--- a/smtpd/lka_session.c
+++ b/smtpd/lka_session.c
@@ -83,7 +83,7 @@ static char *tokens[] = {
 	"dest.user",
 	"dest.domain",
 	"rcpt.user",
-	"rcpt.domain"	
+	"rcpt.domain"
 };
 
 void
@@ -162,7 +162,7 @@ lka_resume(struct lka_session *lks)
 		goto error;
 
 	/* pop next node and expand it */
-	while((xn = TAILQ_FIRST(&lks->nodes))) {
+	while ((xn = TAILQ_FIRST(&lks->nodes))) {
 		TAILQ_REMOVE(&lks->nodes, xn, tq_entry);
 		lka_expand(lks, xn->rule, xn);
 		if (lks->flags & F_WAITING)
@@ -173,7 +173,7 @@ lka_resume(struct lka_session *lks)
 
 	/* delivery list is empty, reject */
 	if (TAILQ_FIRST(&lks->deliverylist) == NULL) {
-		log_debug("debug: lka_done: expansion led to empty delivery list");
+		log_debug("debug: lka_done: expanded to empty delivery list");
 		lks->flags |= F_ERROR;
 	}
     error:
@@ -255,13 +255,14 @@ lka_expand(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 			if (r == -1) {
 				lks->flags |= F_ERROR;
 				lks->ss.code = 451;
-				log_debug(
-				    "lka_expand: error in virtual alias lookup");
+				log_debug("debug: lka_expand: "
+				    "error in virtual alias lookup");
 			}
 			else if (r == 0) {
 				lks->flags |= F_ERROR;
 				lks->ss.code = 530;
-				log_debug("debug: lka_expand: no aliases for virtual");
+				log_debug("debug: lka_expand: "
+				    "no aliases for virtual");
 			}
 		}
 		else {
@@ -276,7 +277,8 @@ lka_expand(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 		break;
 
 	case EXPAND_USERNAME:
-		log_debug("debug: lka_expand: expanding username: %s [depth=%d]", xn->u.user, xn->depth);
+		log_debug("debug: lka_expand: username: %s [depth=%d]",
+		    xn->u.user, xn->depth);
 
 		if (xn->sameuser) {
 			log_debug("debug: lka_expand: same user, submitting");
@@ -289,9 +291,11 @@ lka_expand(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 		lks->expand.parent = xn;
 		lks->expand.alias = 1;
 		if (rule->r_atable) {
-			r = aliases_get(rule->r_atable, &lks->expand, xn->u.user);
+			r = aliases_get(rule->r_atable, &lks->expand,
+			    xn->u.user);
 			if (r == -1) {
-				log_debug("debug: lka_expand: error in alias lookup");
+				log_debug("debug: lka_expand: "
+				    "error in alias lookup");
 				lks->flags |= F_ERROR;
 				lks->ss.code = 451;
 			}
@@ -301,7 +305,8 @@ lka_expand(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 
 		/* a username should not exceed the size of a system user */
 		if (strlen(xn->u.user) >= sizeof fwreq.as_user) {
-			log_debug("debug: lka_expand: user-part too long to be a system user");
+			log_debug("debug: lka_expand: "
+			    "user-part too long to be a system user");
 			lks->flags |= F_ERROR;
 			lks->ss.code = 530;
 			break;
@@ -310,7 +315,8 @@ lka_expand(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 		bzero(&u, sizeof (u));
 		ub = user_backend_lookup(USER_PWD);
 		if (! ub->getbyname(&u, xn->u.user)) {
-			log_debug("debug: lka_expand: user-part does not match system user");
+			log_debug("debug: lka_expand: "
+			    "user-part does not match system user");
 			lks->flags |= F_ERROR;
 			lks->ss.code = 530;
 			break;
@@ -327,12 +333,14 @@ lka_expand(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 		break;
 
 	case EXPAND_FILENAME:
-		log_debug("debug: lka_expand: expanding filename: %s [depth=%d]", xn->u.buffer, xn->depth);
+		log_debug("debug: lka_expand: filename: %s [depth=%d]",
+		    xn->u.buffer, xn->depth);
 		lka_submit(lks, rule, xn);
 		break;
 
 	case EXPAND_FILTER:
-		log_debug("debug: lka_expand: expanding filter: %s [depth=%d]", xn->u.buffer, xn->depth);
+		log_debug("debug: lka_expand: filter: %s [depth=%d]",
+		    xn->u.buffer, xn->depth);
 		lka_submit(lks, rule, xn);
 		break;
 	}
@@ -341,10 +349,11 @@ lka_expand(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 static struct expandnode *
 lka_find_ancestor(struct expandnode *xn, enum expand_type type)
 {
-	while(xn && (xn->type != type))
+	while (xn && (xn->type != type))
 		xn = xn->parent;
 	if (xn == NULL) {
-		log_warnx("warn: lka_find_ancestor: no ancestors of type %i", type);
+		log_warnx("warn: lka_find_ancestor: no ancestors of type %i",
+		    type);
 		fatalx(NULL);
 	}
 	return (xn);
@@ -387,16 +396,17 @@ lka_submit(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 		if ((xn->type == EXPAND_FILTER || xn->type == EXPAND_FILENAME)
 		    && xn->alias) {
 			strlcpy(ep->agent.mda.user.username, SMTPD_USER,
-			    sizeof (ep->agent.mda.user.username));
+			    sizeof(ep->agent.mda.user.username));
 		}
 		else {
 			xn2 = lka_find_ancestor(xn, EXPAND_USERNAME);
 			strlcpy(ep->agent.mda.user.username, xn2->u.user,
-			    sizeof (ep->agent.mda.user.username));
+			    sizeof(ep->agent.mda.user.username));
 		}
 
 		ub = user_backend_lookup(USER_PWD);
-		if (! ub->getbyname(&ep->agent.mda.user, ep->agent.mda.user.username)) {
+		if (! ub->getbyname(&ep->agent.mda.user,
+			ep->agent.mda.user.username)) {
 			lks->flags |= F_ERROR;
 			lks->ss.code = 451;
 			free(ep);
@@ -420,9 +430,9 @@ lka_submit(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 			tag = mailaddr_tag(&ep->dest);
 			if (rule->r_action == A_MAILDIR && tag && tag[0]) {
 				strlcat(ep->agent.mda.buffer, "/.",
-				    sizeof (ep->agent.mda.buffer));
+				    sizeof(ep->agent.mda.buffer));
 				strlcat(ep->agent.mda.buffer, tag,
-				    sizeof (ep->agent.mda.buffer));
+				    sizeof(ep->agent.mda.buffer));
 			}
 		}
 		else
@@ -433,7 +443,8 @@ lka_submit(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 			lks->flags |= F_ERROR;
 			lks->ss.code = 451;
 			log_warnx("warn: format string error while"
-			    " expanding for user %s", ep->agent.mda.user.username);
+			    " expanding for user %s",
+			    ep->agent.mda.user.username);
 			free(ep);
 			return;
 		}
@@ -447,7 +458,8 @@ lka_submit(struct lka_session *lks, struct rule *rule, struct expandnode *xn)
 
 
 static size_t
-lka_expand_token(char *dest, size_t len, const char *token, const struct envelope *ep)
+lka_expand_token(char *dest, size_t len, const char *token,
+    const struct envelope *ep)
 {
 	char		rtoken[MAXTOKENLEN];
 	const char     *string;
@@ -462,7 +474,8 @@ lka_expand_token(char *dest, size_t len, const char *token, const struct envelop
 		return 0;
 
 	/* token[x[:y]] -> extracts optional x and y, converts into offsets */
-	if ((lbracket = strchr(rtoken, '[')) && (rbracket = strchr(rtoken, ']'))) {
+	if ((lbracket = strchr(rtoken, '[')) &&
+	    (rbracket = strchr(rtoken, ']'))) {
 		/* ] before [ ... or empty */
 		if (rbracket < lbracket || rbracket - lbracket <= 1)
 			return 0;
@@ -470,16 +483,18 @@ lka_expand_token(char *dest, size_t len, const char *token, const struct envelop
 		 content  = lbracket + 1;
 
 		 if ((sep = strchr(content, ':')) == NULL)
-			 begoff = strtonum(content, -EXPAND_BUFFER, EXPAND_BUFFER, &errstr);
+			 begoff = strtonum(content, -EXPAND_BUFFER,
+			     EXPAND_BUFFER, &errstr);
 		 else {
 			 *sep = '\0';
 			 if (content != sep)
-				 begoff = strtonum(content, -EXPAND_BUFFER, EXPAND_BUFFER, &errstr);
+				 begoff = strtonum(content, -EXPAND_BUFFER,
+				     EXPAND_BUFFER, &errstr);
 			 sep++;
 			 if (*sep) {
 				 if (errstr == NULL)
-					 endoff = strtonum(sep, -EXPAND_BUFFER, EXPAND_BUFFER,
-					     &errstr);
+					 endoff = strtonum(sep, -EXPAND_BUFFER,
+					     EXPAND_BUFFER, &errstr);
 				 if (endoff == 0)
 					 return 0;
 			 }
@@ -522,7 +537,9 @@ lka_expand_token(char *dest, size_t len, const char *token, const struct envelop
 	if (begoff >= i)
 		return 0;
 
-	/* end offset beyond end of string or unspecified, make it end of string */
+	/* end offset beyond end of string or unspecified,
+	 * make it end of string
+	 */
 	if (endoff >= i || endoff == 0)
 		endoff = i;
 
@@ -556,7 +573,7 @@ lka_expand_format(char *buf, size_t len, const struct envelope *ep)
 	size_t		ret, tmpret;
 
 	if (len < sizeof tmpbuf)
-		fatalx("lka_expand_format: tmp buffer smaller than rule buffer");
+		fatalx("lka_expand_format: tmp buffer < rule buffer");
 
 	bzero(tmpbuf, sizeof tmpbuf);
 	pbuf = buf;
@@ -565,7 +582,8 @@ lka_expand_format(char *buf, size_t len, const struct envelope *ep)
 
 	/* special case: ~/ only allowed expanded at the beginning */
 	if (strncmp(pbuf, "~/", 2) == 0) {
-		tmpret = snprintf(ptmp, sizeof tmpbuf, "%s/", ep->agent.mda.user.directory);
+		tmpret = snprintf(ptmp, sizeof tmpbuf, "%s/",
+		    ep->agent.mda.user.directory);
 		if (tmpret >= sizeof tmpbuf) {
 			log_warnx("warn: user directory for %s too large",
 			    ep->agent.mda.user.directory);
@@ -601,7 +619,8 @@ lka_expand_format(char *buf, size_t len, const struct envelope *ep)
 			return 0;
 		*strchr(memcpy(token, pbuf+2, ebuf-pbuf-1), '}') = '\0';
 
-		if ((exptoklen = lka_expand_token(exptok, sizeof exptok, token, ep)) == 0)
+		exptoklen = lka_expand_token(exptok, sizeof exptok, token, ep);
+		if (exptoklen == 0)
 			return 0;
 
 		if (! lowercase(exptok, exptok, sizeof exptok))
diff --git a/smtpd/log.c b/smtpd/log.c
index c5738952..df0c074f 100644
--- a/smtpd/log.c
+++ b/smtpd/log.c
@@ -38,7 +38,7 @@ int	 verbose;
 
 void	 vlog(int, const char *, va_list);
 void	 logit(int, const char *, ...)
-    __attribute__ ((format (printf, 2, 3)));
+    __attribute__((format (printf, 2, 3)));
 
 
 void
diff --git a/smtpd/log.h b/smtpd/log.h
index ce2e454e..1b58f205 100644
--- a/smtpd/log.h
+++ b/smtpd/log.h
@@ -19,14 +19,14 @@
 void		log_init(int);
 void		log_verbose(int);
 void		log_warn(const char *, ...)
-    __attribute__ ((format (printf, 1, 2)));
+    __attribute__((format (printf, 1, 2)));
 void		log_warnx(const char *, ...)
-    __attribute__ ((format (printf, 1, 2)));
+    __attribute__((format (printf, 1, 2)));
 void		log_info(const char *, ...)
-    __attribute__ ((format (printf, 1, 2)));
+    __attribute__((format (printf, 1, 2)));
 void		log_debug(const char *, ...)
-    __attribute__ ((format (printf, 1, 2)));
+    __attribute__((format (printf, 1, 2)));
 void		log_trace(int, const char *, ...)
-    __attribute__ ((format (printf, 2, 3)));
+    __attribute__((format (printf, 2, 3)));
 __dead void	fatal(const char *);
 __dead void	fatalx(const char *);
diff --git a/smtpd/makemap.c b/smtpd/makemap.c
index d9c113e2..969a7469 100644
--- a/smtpd/makemap.c
+++ b/smtpd/makemap.c
@@ -151,15 +151,18 @@ main(int argc, char *argv[])
 
 		p = strstr(argv[1], ".db");
 		if (p == NULL || strcmp(p, ".db") != 0) {
-			if (! bsnprintf(dbname, sizeof dbname, "%s.db", argv[1]))
+			if (! bsnprintf(dbname, sizeof dbname, "%s.db",
+				argv[1]))
 				errx(1, "database name too long");
 		}
 		else {
-			if (strlcpy(dbname, argv[1], sizeof dbname) >= sizeof dbname)
+			if (strlcpy(dbname, argv[1], sizeof dbname)
+			    >= sizeof dbname)
 				errx(1, "database name too long");
 		}
 
-		execlp(execname, execname, "-d", argv[0], "-o", dbname, "-", NULL);
+		execlp(execname, execname, "-d", argv[0], "-o", dbname, "-",
+		    NULL);
 		err(1, "execlp");
 	}
 
@@ -197,7 +200,8 @@ main(int argc, char *argv[])
 	if (strcmp(source, "-") != 0)
 		if (fchmod(db->fd(db), sb.st_mode) == -1 ||
 		    fchown(db->fd(db), sb.st_uid, sb.st_gid) == -1) {
-			warn("couldn't carry ownership and perms to %s", dbname);
+			warn("couldn't carry ownership and perms to %s",
+			    dbname);
 			goto bad;
 		}
 
@@ -364,7 +368,7 @@ parse_setentry(char *line, size_t len, size_t lineno)
 	if (db->put(db, &key, &val, 0) == -1) {
 		warn("dbput");
 		return 0;
-	}	
+	}
 
 	dbputs++;
 
@@ -384,9 +388,9 @@ int
 make_aliases(DBT *val, char *text)
 {
 	struct expandnode	xn;
-	char	       	*subrcpt;
-	char	       	*endp;
-	char		*origtext;
+	char		       *subrcpt;
+	char		       *endp;
+	char		       *origtext;
 
 	val->data = NULL;
 	val->size = 0;
@@ -448,7 +452,7 @@ usage(void)
 	if (mode == P_NEWALIASES)
 		fprintf(stderr, "usage: %s [-f file]\n", __progname);
 	else
-		fprintf(stderr, "usage: %s [-d dbtype] [-o dbfile] [-t type] file\n",
-		    __progname);
+		fprintf(stderr, "usage: %s [-d dbtype] [-o dbfile] "
+		    "[-t type] file\n", __progname);
 	exit(1);
 }
diff --git a/smtpd/mda.c b/smtpd/mda.c
index 8002298b..556e16eb 100644
--- a/smtpd/mda.c
+++ b/smtpd/mda.c
@@ -122,8 +122,8 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 				if (!strcmp(name, u->name))
 					break;
 			if (u && u->evpcount >= MDA_MAXEVPUSER) {
-				log_debug("debug: mda: too many envelopes for \"%s\"",
-				    u->name);
+				log_debug("debug: mda: too many envelopes for "
+				    "\"%s\"", u->name);
 				envelope_set_errormsg(ep,
 				    "User envelope limit reached");
 				imsg_compose_event(env->sc_ievs[PROC_QUEUE],
@@ -139,8 +139,8 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 				TAILQ_INSERT_TAIL(&users, u, entry);
 			}
 			if (u->runnable == 0 && u->running < MDA_MAXSESSUSER) {
-				log_debug("debug: mda: \"%s\" immediatly runnable",
-				    u->name);
+				log_debug("debug: mda: \"%s\" immediatly "
+				    "runnable", u->name);
 				TAILQ_INSERT_TAIL(&runnable, u, entry_runnable);
 				u->runnable = 1;
 			}
@@ -194,7 +194,8 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 				    s->evp->rcpt.user,
 				    s->evp->rcpt.domain);
 			if (n == -1) {
-				log_warn("warn: mda: fail to write delivery info");
+				log_warn("warn: mda: "
+				    "fail to write delivery info");
 				envelope_set_errormsg(s->evp, "Out of memory");
 				mda_done(s, IMSG_QUEUE_DELIVERY_TEMPFAIL);
 				return;
@@ -207,17 +208,17 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 			case A_MDA:
 				deliver.mode = A_MDA;
 				strlcpy(deliver.user, d_mda->user.username,
-				    sizeof (deliver.user));
+				    sizeof(deliver.user));
 				strlcpy(deliver.to, d_mda->buffer,
-				    sizeof deliver.to);
+				    sizeof(deliver.to));
 				break;
-				
+
 			case A_MBOX:
 				deliver.mode = A_MBOX;
 				strlcpy(deliver.user, "root",
-				    sizeof (deliver.user));
+				    sizeof(deliver.user));
 				strlcpy(deliver.to, d_mda->user.username,
-				    sizeof (deliver.to));
+				    sizeof(deliver.to));
 				snprintf(deliver.from, sizeof(deliver.from),
 				    "%s@%s", ep->sender.user,
 				    ep->sender.domain);
@@ -226,9 +227,9 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 			case A_MAILDIR:
 				deliver.mode = A_MAILDIR;
 				strlcpy(deliver.user, d_mda->user.username,
-				    sizeof deliver.user);
+				    sizeof(deliver.user));
 				strlcpy(deliver.to, d_mda->buffer,
-				    sizeof deliver.to);
+				    sizeof(deliver.to));
 				break;
 
 			case A_FILENAME:
@@ -275,7 +276,8 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 			 */
 			output[0] = '\0';
 			if (imsg->fd != -1)
-				mda_getlastline(imsg->fd, output, sizeof output);
+				mda_getlastline(imsg->fd, output,
+				    sizeof output);
 
 			/*
 			 * Choose between parent's description of error and
@@ -295,7 +297,8 @@ mda_imsg(struct imsgev *iev, struct imsg *imsg)
 			if (error) {
 				msg = IMSG_QUEUE_DELIVERY_TEMPFAIL;
 				envelope_set_errormsg(s->evp, "%s", error);
-				snprintf(stat, sizeof stat, "Error (%s)", error);
+				snprintf(stat, sizeof stat, "Error (%s)",
+				    error);
 			}
 			log_envelope(s->evp, NULL, error ? "TempFail" : "Ok",
 				     error ? stat : "Delivered");
@@ -404,10 +407,10 @@ mda_io(struct io *io, int evt)
 	char			*ln, buf[256];
 	size_t			 len;
 
-	log_trace(TRACE_IO, "mda: %p: %s %s", s, io_strevent(evt), io_strio(io));
-
-	switch(evt) {
+	log_trace(TRACE_IO, "mda: %p: %s %s", s, io_strevent(evt),
+	    io_strio(io));
 
+	switch (evt) {
 	case IO_LOWAT:
 
 		/* done */
@@ -562,11 +565,13 @@ mda_drain(void)
 	while ((user = (TAILQ_FIRST(&runnable)))) {
 
 		if (running >= MDA_MAXSESS) {
-			log_debug("debug: mda: maximum number of session reached");
+			log_debug("debug: mda: "
+			    "maximum number of session reached");
 			return;
 		}
 
-		log_debug("debug: mda: new session for user \"%s\"", user->name);
+		log_debug("debug: mda: new session for user \"%s\"",
+		    user->name);
 
 		s = xcalloc(1, sizeof *s, "mda_drain");
 		s->user = user;
@@ -602,7 +607,8 @@ mda_drain(void)
 		    user->running < MDA_MAXSESSUSER) {
 			TAILQ_INSERT_TAIL(&runnable, user, entry_runnable);
 			user->runnable = 1;
-			log_debug("debug: mda: user \"%s\" still runnable", user->name);
+			log_debug("debug: mda: user \"%s\" still runnable",
+			    user->name);
 		}
 	}
 }
@@ -621,16 +627,17 @@ mda_done(struct mda_session *s, int msg)
 	stat_decrement("mda.running", 1);
 
 	if (TAILQ_FIRST(&s->user->envelopes) == NULL && s->user->running == 0) {
-		log_debug("debug: mda: all done for user \"%s\"", s->user->name);
+		log_debug("debug: mda: "
+		    "all done for user \"%s\"", s->user->name);
 		TAILQ_REMOVE(&users, s->user, entry);
 		free(s->user);
 	} else if (s->user->runnable == 0 &&
-		   TAILQ_FIRST(&s->user->envelopes) &&
-		    s->user->running < MDA_MAXSESSUSER) {
-			log_debug("debug: mda: user \"%s\" becomes runnable",
-			    s->user->name);
-			TAILQ_INSERT_TAIL(&runnable, s->user, entry_runnable);
-			s->user->runnable = 1;
+	    TAILQ_FIRST(&s->user->envelopes) &&
+	    s->user->running < MDA_MAXSESSUSER) {
+		log_debug("debug: mda: user \"%s\" becomes runnable",
+		    s->user->name);
+		TAILQ_INSERT_TAIL(&runnable, s->user, entry_runnable);
+		s->user->runnable = 1;
 	}
 
 	if (s->datafp)