===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- src/usr.bin/ssh/scp.c	2006/04/01 05:42:20	1.140
+++ src/usr.bin/ssh/scp.c	2006/04/01 05:50:29	1.141
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.140 2006/04/01 05:42:20 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.141 2006/04/01 05:50:29 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -413,7 +413,6 @@
 {
 	char *bp, *host, *src, *suser, *thost, *tuser, *arg;
 	arglist alist;
-	size_t len;
 	int i;
 
 	memset(&alist, '\0', sizeof(alist));
@@ -479,9 +478,7 @@
 				errs = 1;
 		} else {	/* local to remote */
 			if (remin == -1) {
-				len = strlen(targ) + CMDNEEDS + 20;
-				bp = xmalloc(len);
-				(void) snprintf(bp, len, "%s -t %s", cmd, targ);
+				xasprintf(&bp, "%s -t %s", cmd, targ);
 				host = cleanhostname(thost);
 				if (do_cmd(host, tuser, bp, &remin,
 				    &remout) < 0)
@@ -500,7 +497,6 @@
 {
 	char *bp, *host, *src, *suser;
 	arglist alist;
-	size_t len;
 	int i;
 
 	memset(&alist, '\0', sizeof(alist));
@@ -533,9 +529,7 @@
 				suser = pwd->pw_name;
 		}
 		host = cleanhostname(host);
-		len = strlen(src) + CMDNEEDS + 20;
-		bp = xmalloc(len);
-		(void) snprintf(bp, len, "%s -f %s", cmd, src);
+		xasprintf(&bp, "%s -f %s", cmd, src);
 		if (do_cmd(host, suser, bp, &remin, &remout) < 0) {
 			(void) xfree(bp);
 			++errs;