X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/aec6b9f86f75a562768aeb8d3848fd5da6a675c0..027428eb1d7524815d9b29f825033d7902258db5:/receiver.c

diff --git a/receiver.c b/receiver.c
index 8c91ea6f..88552f4b 100644
--- a/receiver.c
+++ b/receiver.c
@@ -40,6 +40,7 @@ extern int io_error;
 extern char *tmpdir;
 extern char *partial_dir;
 extern char *basis_dir[];
+extern int basis_dir_cnt;
 extern int make_backups;
 extern int do_progress;
 extern char *backup_dir;
@@ -56,29 +57,6 @@ extern int inplace;
 extern struct exclude_list_struct server_exclude_list;
 
 
-static void delete_one(char *fn, int is_dir)
-{
-	if (!is_dir) {
-		if (robust_unlink(fn) != 0) {
-			rsyserr(FERROR, errno, "delete_one: unlink %s failed",
-				full_fname(fn));
-		} else if (verbose)
-			rprintf(FINFO, "deleting %s\n", safe_fname(fn));
-	} else {
-		if (do_rmdir(fn) != 0) {
-			if (errno != ENOTEMPTY && errno != EEXIST) {
-				rsyserr(FERROR, errno,
-					"delete_one: rmdir %s failed",
-					full_fname(fn));
-			}
-		} else if (verbose) {
-			rprintf(FINFO, "deleting directory %s\n",
-				safe_fname(fn));
-		}
-	}
-}
-
-
 static int is_backup_file(char *fn)
 {
 	int k = strlen(fn) - backup_suffix_len;
@@ -131,8 +109,10 @@ void delete_files(struct file_list *flist)
 						rprintf(FINFO, "deleting %s\n",
 							safe_fname(f));
 					}
-				} else
-					delete_one(f, S_ISDIR(mode) != 0);
+				} else {
+					delete_file(f, S_ISDIR(mode)
+					    ? DEL_DIR | DEL_NO_RECURSE : 0);
+				}
 				deletion_count++;
 			}
 		}
@@ -219,8 +199,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 	read_sum_head(f_in, &sum);
 
 	if (fd_r >= 0 && size_r > 0) {
-		OFF_T map_size = MAX((OFF_T)sum.blength * 2, 16*1024);
-		mapbuf = map_file(fd_r, size_r, map_size, sum.blength);
+		int32 read_size = MAX(sum.blength * 2, 16*1024);
+		mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
 		if (verbose > 2) {
 			rprintf(FINFO, "recv mapped %s of size %.0f\n",
 				safe_fname(fname_r), (double)size_r);
@@ -453,8 +433,13 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 			case FNAMECMP_BACKUP:
 				fnamecmp = get_backup_name(fname);
 				break;
-			case FNAMECMP_BASIS_DIR:
 			default:
+				if (j >= basis_dir_cnt) {
+					rprintf(FERROR,
+						"invalid basis_dir index: %d.\n",
+						j);
+					exit_cleanup(RERR_PROTOCOL);
+				}
 				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
 					 basis_dir[j], fname);
 				fnamecmp = fnamecmpbuf;