- djm@cvs.openbsd.org 2006/04/01 05:50:29

     [scp.c]
     xasprintification; ok deraadt@

diff --git a/ChangeLog b/ChangeLog
index 6b4895ea371a1ba24ed200f9aa3101776e7b36d2..78fafbb864dcf73e12e4d412b868f9ae5b3fe210 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - deraadt@cvs.openbsd.org 2006/04/01 05:42:20
      [scp.c]
      minimal lint cleanup (unused crud, and some size_t); ok djm
+   - djm@cvs.openbsd.org 2006/04/01 05:50:29
+     [scp.c]
+     xasprintification; ok deraadt@
 
 20060421
  - (djm) [Makefile.in configure.ac session.c sshpty.c]

diff --git a/scp.c b/scp.c
index 6c8bbcdb765c417c332be64e22689ec9b9b3f910..2778f8f80189890144a9cdc03face10e38ee99af 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -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).
@@ -422,7 +422,6 @@ toremote(char *targ, int argc, char **argv)
 {
        char *bp, *host, *src, *suser, *thost, *tuser, *arg;
        arglist alist;
-       size_t len;
        int i;
 
        memset(&alist, '\0', sizeof(alist));
@@ -488,9 +487,7 @@ toremote(char *targ, int argc, char **argv)
                                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)
@@ -509,7 +506,6 @@ tolocal(int argc, char **argv)
 {
        char *bp, *host, *src, *suser;
        arglist alist;
-       size_t len;
        int i;
 
        memset(&alist, '\0', sizeof(alist));
@@ -542,9 +538,7 @@ tolocal(int argc, char **argv)
                                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;