use snprintf; ok cloder dhill@mindcry.org

5 files changed, 16 insertions, 31 deletions

diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index 53ab74139a8..8ddd857e7c3 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmail.c,v 1.19 2003/09/26 15:55:22 deraadt Exp $	*/
+/*	$OpenBSD: rmail.c,v 1.20 2005/11/12 13:27:59 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.19 2003/09/26 15:55:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rmail.c,v 1.20 2005/11/12 13:27:59 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -283,11 +283,8 @@ main(int argc, char *argv[])
 		if (strchr(*argv, ',') == NULL || strchr(*argv, '<') != NULL)
 			args[i++] = *argv;
 		else {
-			int len = strlen(*argv) + 3;
-
-			if ((args[i] = malloc(len)) == NULL)
+			if (asprintf(&args[i++], "<%s>", *argv) == -1)
 				err(EX_TEMPFAIL, "Cannot malloc");
-			snprintf(args[i++], len, "<%s>", *argv);
 		}
 		argv++;
 	}
diff --git a/libexec/login_krb5/login_krb5.c b/libexec/login_krb5/login_krb5.c
index 3af4159abac..dcd30139bc6 100644
--- a/libexec/login_krb5/login_krb5.c
+++ b/libexec/login_krb5/login_krb5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_krb5.c,v 1.21 2005/04/13 18:46:03 biorn Exp $	*/
+/*	$OpenBSD: login_krb5.c,v 1.22 2005/11/12 13:28:00 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 Hans Insulander <hin@openbsd.org>.
@@ -172,10 +172,8 @@ krb5_login(char *username, char *invokinguser, char *password, int login,
 
 	if (strcmp(username, "root") == 0 && invokinguser[0] != '\0') {
 		char *tmp;
-		int len = strlen(invokinguser)+6;
 
-		tmp = malloc(len);
-		snprintf(tmp, len, "%s/root", invokinguser);
+		asprintf(&tmp, "%s/root", invokinguser);
 		ret = krb5_parse_name(context, tmp, &princ);
 		free(tmp);
 	} else
diff --git a/libexec/login_radius/raddauth.c b/libexec/login_radius/raddauth.c
index 72f2abd4873..a8fa81f1825 100644
--- a/libexec/login_radius/raddauth.c
+++ b/libexec/login_radius/raddauth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raddauth.c,v 1.18 2005/03/02 21:51:17 cloder Exp $	*/
+/*	$OpenBSD: raddauth.c,v 1.19 2005/11/12 13:28:00 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -235,12 +235,8 @@ raddauth(char *username, char *class, char *style, char *challenge,
 	if (auth_port == 0)
 		auth_port = (int)getppid();
 	if (strcmp(style, "radius") != 0) {
-		int len = strlen(username) + strlen(style) + 2;
-
-		userstyle = malloc(len);
-		if (userstyle == NULL)
+		if (asprintf(&userstyle, "%s:%s", username, style) == -1)
 			err(1, NULL);
-		snprintf(userstyle, len, "%s:%s", username, style);
 	} else
 		userstyle = username;
 
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 1d07a59027f..f4098ed3a87 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.95 2005/04/30 07:09:37 deraadt Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.96 2005/11/12 13:27:59 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.95 2005/04/30 07:09:37 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.96 2005/11/12 13:27:59 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1188,19 +1188,16 @@ int
 editit(void)
 {
 	pid_t pid;
-	int stat = 0, len;
+	int stat = 0;
 	char *argp[] = {"sh", "-c", NULL, NULL};
 	char *ed, *p;
 
 	if ((ed = getenv("EDITOR")) == NULL)
 		ed = _PATH_VI;
-	len = strlen(ed) + 1 + strlen(tmpfil) + 1;
-	p = (char *)malloc(len);
-	if (!p) {
+	if (asprintf(&p, "%s %s", ed, tmpfil) == -1) {
 		warn("failed to start editor");
 		return (0);
 	}
-	snprintf(p, len, "%s %s", ed, tmpfil);
 	argp[2] = p;
 
 	/* Turn off signals. */
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 703135d04d4..5fadbdcddcd 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsck.c,v 1.21 2005/10/28 07:30:35 otto Exp $	*/
+/*	$OpenBSD: fsck.c,v 1.22 2005/11/12 13:28:34 deraadt Exp $	*/
 /*	$NetBSD: fsck.c,v 1.7 1996/10/03 20:06:30 christos Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
  *
  */
 
-static const char rcsid[] = "$OpenBSD: fsck.c,v 1.21 2005/10/28 07:30:35 otto Exp $";
+static const char rcsid[] = "$OpenBSD: fsck.c,v 1.22 2005/11/12 13:28:34 deraadt Exp $";
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -403,15 +403,12 @@ maketypelist(char *fslist)
 static char *
 catopt(char *s0, const char *s1, int fr)
 {
-	size_t i;
 	char *cp;
 
 	if (s0 && *s0) {
-		i = strlen(s0) + strlen(s1) + 1 + 1;
-		cp = emalloc(i);
-		(void)snprintf(cp, i, "%s,%s", s0, s1);
-	}
-	else
+		if (asprintf(&cp, "%s,%s", s0, s1) == -1)
+			err(1, "malloc failed");
+	} else
 		cp = estrdup(s1);
 
 	if (s0 && fr)