d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turn malloc+snprintf into asnprintf.

Browse Source 
Submitted by:	David Hill <hill at phobia dot em ess>
This commit is contained in:
Mark Murray 2003-10-14 20:42:13 +00:00
parent e89ab6e083
commit 0f66784721
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=121095
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/rcp/rcp.c
View File

@ -213,7 +213,7 @@ main(int argc, char *argv[])
void
toremote(char *targ, int argc, char *argv[])
{
int i, len, tos;
int i, tos;
char *bp, *host, *src, *suser, *thost, *tuser;
*targ++ = 0;
@ -240,11 +240,6 @@ toremote(char *targ, int argc, char *argv[])
if (*src == 0)
src = period;
host = strchr(argv[i], '@');
len = strlen(_PATH_RSH) + strlen(argv[i]) +
strlen(src) + (tuser ? strlen(tuser) : 0) +
strlen(thost) + strlen(targ) + CMDNEEDS + 20;
if (!(bp = malloc(len)))
err(1, "malloc");
if (host) {
*host++ = 0;
suser = argv[i];
@ -254,25 +249,26 @@ toremote(char *targ, int argc, char *argv[])
++errs;
continue;
}
(void)snprintf(bp, len,
if (asprintf(&bp,
"%s %s -l %s -n %s %s '%s%s%s:%s'",
_PATH_RSH, host, suser, cmd, src,
tuser ? tuser : "", tuser ? "@" : "",
thost, targ);
thost, targ) == -1)
err(1, "asprintf");
} else
(void)snprintf(bp, len,
if (asprintf(&bp,
"exec %s %s -n %s %s '%s%s%s:%s'",
_PATH_RSH, argv[i], cmd, src,
tuser ? tuser : "", tuser ? "@" : "",
thost, targ);
thost, targ) == -1)
err(1, "asprintf");
(void)susystem(bp, userid);
(void)free(bp);
} else { /* local to remote */
if (rem == -1) {
len = strlen(targ) + CMDNEEDS + 20;
if (!(bp = malloc(len)))
err(1, "malloc");
(void)snprintf(bp, len, "%s -t %s", cmd, targ);
if (asprintf(&bp, "%s -t %s", cmd, targ)
== -1)
err(1, "asprintf");
host = thost;
rem = rcmd_af(&host, port,
pwd->pw_name,