X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bd6abc4939621c455f931905f0530115eb8c443c..ac1d2d338450eb005abf03002f5784097caf7e19:/sender.c

diff --git a/sender.c b/sender.c
index e73ae62f..51ceff46 100644
--- a/sender.c
+++ b/sender.c
@@ -157,10 +157,11 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		stats.num_transferred_files++;
 		stats.total_transferred_size += file->length;
 
-		fname[0] = 0;
 		if (file->basedir) {
-			offset = stringjoin(fname, sizeof fname,
-					    file->basedir, "/", NULL);
+			/* N.B. We're sure that this fits, so offset is OK. */
+			offset = strlcpy(fname, file->basedir, sizeof fname);
+			if (!offset || fname[offset-1] != '/')
+				fname[offset++] = '/';
 		} else
 			offset = 0;
 		f_name_to(file, fname + offset);