Commit cabd60fd authored by Wayne Davison's avatar Wayne Davison

- Changed some sprintf() calls to snprintf() calls.

- Changed two last strcpy() calls to strlcpy() calls.
parent 10944395
...@@ -1700,15 +1700,15 @@ static void output_flist(struct file_list *flist) ...@@ -1700,15 +1700,15 @@ static void output_flist(struct file_list *flist)
for (i = 0; i < flist->count; i++) { for (i = 0; i < flist->count; i++) {
file = flist->files[i]; file = flist->files[i];
if ((am_root || am_sender) && preserve_uid) if ((am_root || am_sender) && preserve_uid)
sprintf(uidbuf, " uid=%ld", (long)file->uid); snprintf(uidbuf, sizeof uidbuf, " uid=%ld", (long)file->uid);
else else
*uidbuf = '\0'; *uidbuf = '\0';
if (preserve_gid && file->gid != GID_NONE) if (preserve_gid && file->gid != GID_NONE)
sprintf(gidbuf, " gid=%ld", (long)file->gid); snprintf(gidbuf, sizeof gidbuf, " gid=%ld", (long)file->gid);
else else
*gidbuf = '\0'; *gidbuf = '\0';
if (!am_sender) if (!am_sender)
sprintf(depthbuf, "%d", file->dir.depth); snprintf(depthbuf, sizeof depthbuf, "%d", file->dir.depth);
rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n", rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
who, i, am_sender ? NS(file->dir.root) : depthbuf, who, i, am_sender ? NS(file->dir.root) : depthbuf,
file->dirname ? file->dirname : "", file->dirname ? file->dirname : "",
...@@ -1876,9 +1876,9 @@ char *f_name(struct file_struct *f, char *fbuf) ...@@ -1876,9 +1876,9 @@ char *f_name(struct file_struct *f, char *fbuf)
int len = strlen(f->dirname); int len = strlen(f->dirname);
memcpy(fbuf, f->dirname, len); memcpy(fbuf, f->dirname, len);
fbuf[len] = '/'; fbuf[len] = '/';
strcpy(fbuf + len + 1, f->basename); strlcpy(fbuf + len + 1, f->basename, MAXPATHLEN - (len + 1));
} else } else
strcpy(fbuf, f->basename); strlcpy(fbuf, f->basename, MAXPATHLEN);
return fbuf; return fbuf;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment