X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1e82e2cea6b34a658a91257d53aabc46f5791a89..e51094b7210fc31fa67cc218c1bd30de841a426e:/receiver.c

diff --git a/receiver.c b/receiver.c
index da383be7..5d191482 100644
--- a/receiver.c
+++ b/receiver.c
@@ -23,12 +23,15 @@
 extern int verbose;
 extern int recurse;
 extern int delete_mode;
+extern int delete_after;
+extern int max_delete;
 extern int csum_length;
 extern struct stats stats;
 extern int dry_run;
 extern int am_server;
 extern int relative_paths;
 extern int preserve_hard_links;
+extern int preserve_perms;
 extern int cvs_exclude;
 extern int io_error;
 extern char *tmpdir;
@@ -39,21 +42,27 @@ extern char *backup_dir;
 extern char *backup_suffix;
 extern int backup_suffix_len;
 extern int cleanup_got_literal;
+extern int module_id;
+extern int ignore_errors;
+extern int orig_umask;
+extern int keep_partial;
+extern int checksum_seed;
 
 static void delete_one(char *fn, int is_dir)
 {
 	if (!is_dir) {
 		if (robust_unlink(fn) != 0) {
-			rprintf(FERROR, "delete_one: unlink %s failed: %s\n",
-				full_fname(fn), strerror(errno));
+			rsyserr(FERROR, errno, "delete_one: unlink %s failed",
+				full_fname(fn));
 		} else if (verbose) {
 			rprintf(FINFO, "deleting %s\n", fn);
 		}
 	} else {
 		if (do_rmdir(fn) != 0) {
 			if (errno != ENOTEMPTY && errno != EEXIST) {
-				rprintf(FERROR, "delete_one: rmdir %s failed: %s\n",
-					full_fname(fn), strerror(errno));
+				rsyserr(FERROR, errno,
+					"delete_one: rmdir %s failed",
+					full_fname(fn));
 			}
 		} else if (verbose) {
 			rprintf(FINFO, "deleting directory %s\n", fn);
@@ -76,9 +85,6 @@ void delete_files(struct file_list *flist)
 	struct file_list *local_file_list;
 	int i, j;
 	char *argv[1], fbuf[MAXPATHLEN];
-	extern int module_id;
-	extern int ignore_errors;
-	extern int max_delete;
 	static int deletion_count;
 
 	if (cvs_exclude)
@@ -100,12 +106,14 @@ void delete_files(struct file_list *flist)
 			continue;
 
 		if (verbose > 1)
-			rprintf(FINFO,"deleting in %s\n", fbuf);
+			rprintf(FINFO, "deleting in %s\n", fbuf);
 
 		for (i = local_file_list->count-1; i >= 0; i--) {
-			if (max_delete && deletion_count > max_delete) break;
-			if (!local_file_list->files[i]->basename) continue;
-			if (-1 == flist_find(flist,local_file_list->files[i])) {
+			if (max_delete && deletion_count > max_delete)
+				break;
+			if (!local_file_list->files[i]->basename)
+				continue;
+			if (flist_find(flist,local_file_list->files[i]) < 0) {
 				char *f = f_name(local_file_list->files[i]);
 				if (make_backups && (backup_dir || !is_backup_file(f))) {
 					(void) make_backup(f);
@@ -199,7 +207,7 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
 
 	read_sum_head(f_in, &sum);
 
-	sum_init();
+	sum_init(checksum_seed);
 
 	while ((i = recv_token(f_in, &data)) != 0) {
 		if (do_progress)
@@ -217,8 +225,8 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
 			sum_update(data,i);
 
 			if (fd != -1 && write_file(fd,data,i) != i) {
-				rprintf(FERROR, "write failed on %s: %s\n",
-					full_fname(fname), strerror(errno));
+				rsyserr(FERROR, errno, "write failed on %s",
+					full_fname(fname));
 				exit_cleanup(RERR_FILEIO);
 			}
 			offset += i;
@@ -245,8 +253,8 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
 		}
 
 		if (fd != -1 && write_file(fd,map,len) != (int) len) {
-			rprintf(FERROR, "write failed on %s: %s\n",
-				full_fname(fname), strerror(errno));
+			rsyserr(FERROR, errno, "write failed on %s",
+				full_fname(fname));
 			exit_cleanup(RERR_FILEIO);
 		}
 		offset += len;
@@ -258,8 +266,8 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
 		end_progress(total_size);
 
 	if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-		rprintf(FERROR, "write failed on %s: %s\n",
-			full_fname(fname), strerror(errno));
+		rsyserr(FERROR, errno, "write failed on %s",
+			full_fname(fname));
 		exit_cleanup(RERR_FILEIO);
 	}
 
@@ -294,10 +302,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 	struct file_struct *file;
 	int phase=0;
 	int recv_ok;
-	extern struct stats stats;
-	extern int preserve_perms;
-	extern int delete_after;
-	extern int orig_umask;
 	struct stats initial_stats;
 
 	if (verbose > 2) {
@@ -369,8 +373,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 		}
 
 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
-			rprintf(FERROR, "fstat %s failed: %s\n",
-				full_fname(fnamecmp), strerror(errno));
+			rsyserr(FERROR, errno, "fstat %s failed",
+				full_fname(fnamecmp));
 			receive_data(f_in,NULL,-1,NULL,file->length);
 			close(fd1);
 			continue;
@@ -434,8 +438,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
 		}
 		if (fd2 == -1) {
-			rprintf(FERROR, "mkstemp %s failed: %s\n",
-				full_fname(fnametmp), strerror(errno));
+			rsyserr(FERROR, errno, "mkstemp %s failed",
+				full_fname(fnametmp));
 			receive_data(f_in,mapbuf,-1,NULL,file->length);
 			if (mapbuf) unmap_file(mapbuf);
 			if (fd1 != -1) close(fd1);
@@ -457,12 +461,19 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 		if (fd1 != -1) {
 			close(fd1);
 		}
-		close(fd2);
+		if (close(fd2) < 0) {
+			rsyserr(FERROR, errno, "close failed on %s",
+				full_fname(fnametmp));
+			exit_cleanup(RERR_FILEIO);
+		}
 
 		if (verbose > 2)
 			rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
 
-		finish_transfer(fname, fnametmp, file);
+		if (recv_ok || keep_partial)
+			finish_transfer(fname, fnametmp, file, recv_ok);
+		else
+			do_unlink(fnametmp);
 
 		cleanup_disable();