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

diff --git a/rsync.c b/rsync.c
index 950d575f..a9c24387 100644
--- a/rsync.c
+++ b/rsync.c
@@ -111,10 +111,7 @@ static int delete_file(char *fname)
 		if (strcmp(dname,".")==0 ||
 		    strcmp(dname,"..")==0)
 			continue;
-		strlcpy(buf, fname, (MAXPATHLEN-strlen(dname))-2);
-		strcat(buf, "/");
-		strcat(buf, dname);
-		buf[MAXPATHLEN-1] = 0;
+		slprintf(buf, sizeof(buf)-1, "%s/%s", fname, dname);
 		if (verbose > 0)
 			rprintf(FINFO,"deleting %s\n", buf);
 		if (delete_file(buf) != 0) {
@@ -818,12 +815,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       }
 
       /* open tmp file */
-      if (strlen(fname) > (MAXPATHLEN-8)) {
-	rprintf(FERROR,"filename too long\n");
-	if (buf) unmap_file(buf);
-	close(fd1);
-	continue;
-      }
       if (tmpdir) {
 	      char *f;
 	      f = strrchr(fname,'/');
@@ -831,9 +822,30 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		      f = fname;
 	      else 
 		      f++;
-	      sprintf(fnametmp,"%s/%s.XXXXXX",tmpdir,f);
+	      if (strlen(tmpdir)+strlen(f)+10 > MAXPATHLEN) {
+		      rprintf(FERROR,"filename too long\n");
+		      if (buf) unmap_file(buf);
+		      close(fd1);
+		      continue;
+	      }
+	      slprintf(fnametmp,sizeof(fnametmp)-1, "%s/.%s.XXXXXX",tmpdir,f);
       } else {
-	      sprintf(fnametmp,"%s.XXXXXX",fname);
+	      char *f = strrchr(fname,'/');
+
+	      if (strlen(fname)+9 > MAXPATHLEN) {
+		      rprintf(FERROR,"filename too long\n");
+		      if (buf) unmap_file(buf);
+		      close(fd1);
+		      continue;
+	      }
+
+	      if (f) {
+		      *f = 0;
+		      slprintf(fnametmp,sizeof(fnametmp)-1,"%s/.%s.XXXXXX",fname,f+1);
+		      *f = '/';
+	      } else {
+		      slprintf(fnametmp,sizeof(fnametmp)-1,".%s.XXXXXX",fname);
+	      }
       }
       if (NULL == do_mktemp(fnametmp)) {
 	rprintf(FERROR,"mktemp %s failed\n",fnametmp);
@@ -878,7 +890,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		rprintf(FERROR,"backup filename too long\n");
 		continue;
 	}
-	sprintf(fnamebak,"%s%s",fname,backup_suffix);
+	slprintf(fnamebak,sizeof(fnamebak)-1,"%s%s",fname,backup_suffix);
 	if (do_rename(fname,fnamebak) != 0 && errno != ENOENT) {
 	  rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
 	  continue;
@@ -983,10 +995,10 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 				  fname);
 			  return;
 		  }
-		  strcat(fname,"/");
+		  strlcat(fname,"/",MAXPATHLEN-1);
 		  offset = strlen(file->basedir)+1;
 	  }
-	  strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
+	  strlcat(fname,f_name(file),MAXPATHLEN-strlen(fname));
 	  
 	  if (verbose > 2) 
 		  rprintf(FINFO,"send_files(%d,%s)\n",i,fname);