X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9486289ce452ab82ca8b3f16fae8c2ef5247a923..7a6421fa764dd0f609e2a5024ec8b3bc577575a1:/rsync.c

diff --git a/rsync.c b/rsync.c
index 9d3b1c56..950d575f 100644
--- a/rsync.c
+++ b/rsync.c
@@ -111,7 +111,7 @@ static int delete_file(char *fname)
 		if (strcmp(dname,".")==0 ||
 		    strcmp(dname,"..")==0)
 			continue;
-		strncpy(buf, fname, (MAXPATHLEN-strlen(dname))-2);
+		strlcpy(buf, fname, (MAXPATHLEN-strlen(dname))-2);
 		strcat(buf, "/");
 		strcat(buf, dname);
 		buf[MAXPATHLEN-1] = 0;
@@ -976,8 +976,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 
 	  fname[0] = 0;
 	  if (file->basedir) {
-		  strncpy(fname,file->basedir,MAXPATHLEN-1);
-		  fname[MAXPATHLEN-1] = 0;
+		  strlcpy(fname,file->basedir,MAXPATHLEN-1);
 		  if (strlen(fname) == MAXPATHLEN-1) {
 			  io_error = 1;
 			  rprintf(FERROR, "send_files failed on long-named directory %s\n",