From 85fe8c194a061b79a6f3a459199442863782d259 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 17 May 2006 06:30:59 +0000
Subject: [PATCH] Fixed some patch fuzz.

---
 threaded-receiver.diff | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/threaded-receiver.diff b/threaded-receiver.diff
index 1442b3e..dc6a1c7 100644
--- a/threaded-receiver.diff
+++ b/threaded-receiver.diff
@@ -137,7 +137,7 @@ After applying this patch, run these commands for a successful build:
  				continue;
  		}
  
-@@ -1187,7 +1191,7 @@ static void recv_generator(char *fname, 
+@@ -1185,7 +1189,7 @@ static void recv_generator(char *fname, 
  		return;
  	}
  
@@ -146,7 +146,7 @@ After applying this patch, run these commands for a successful build:
  		return;
  
  	if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
-@@ -1242,7 +1246,7 @@ static void recv_generator(char *fname, 
+@@ -1240,7 +1244,7 @@ static void recv_generator(char *fname, 
  		goto notify_others;
  	}
  
@@ -155,7 +155,7 @@ After applying this patch, run these commands for a successful build:
  		if (!(backupptr = get_backup_name(fname))) {
  			close(fd);
  			return;
-@@ -1333,9 +1337,12 @@ void generate_files(int f_out, struct fi
+@@ -1331,9 +1335,12 @@ void generate_files(int f_out, struct fi
  	int save_ignore_existing = ignore_existing;
  	int save_ignore_non_existing = ignore_non_existing;
  	int save_do_progress = do_progress;
@@ -169,7 +169,7 @@ After applying this patch, run these commands for a successful build:
  	if (protocol_version >= 29) {
  		itemizing = 1;
  		maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
-@@ -1363,7 +1370,7 @@ void generate_files(int f_out, struct fi
+@@ -1361,7 +1368,7 @@ void generate_files(int f_out, struct fi
  		do_delete_pass(flist);
  	do_progress = 0;
  
@@ -178,7 +178,7 @@ After applying this patch, run these commands for a successful build:
  		whole_file = 0;
  	if (verbose >= 2) {
  		rprintf(FINFO, "delta-transmission %s\n",
-@@ -1372,12 +1379,6 @@ void generate_files(int f_out, struct fi
+@@ -1370,12 +1377,6 @@ void generate_files(int f_out, struct fi
  			: "enabled");
  	}
  
@@ -191,7 +191,7 @@ After applying this patch, run these commands for a successful build:
  	for (i = 0; i < flist->count; i++) {
  		struct file_struct *file = flist->files[i];
  
-@@ -1421,23 +1422,34 @@ void generate_files(int f_out, struct fi
+@@ -1419,23 +1420,34 @@ void generate_files(int f_out, struct fi
  		delete_in_dir(NULL, NULL, NULL, NULL);
  
  	phase++;
@@ -232,7 +232,7 @@ After applying this patch, run these commands for a successful build:
  		if (local_name)
  			strlcpy(fbuf, local_name, sizeof fbuf);
  		else
-@@ -1449,27 +1461,43 @@ void generate_files(int f_out, struct fi
+@@ -1447,27 +1459,43 @@ void generate_files(int f_out, struct fi
  	phase++;
  	ignore_non_existing = save_ignore_non_existing;
  	ignore_existing = save_ignore_existing;
@@ -768,9 +768,9 @@ After applying this patch, run these commands for a successful build:
  	{ RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
  	{ RERR_WAITCHILD  , "waitpid() failed" },
  	{ RERR_MALLOC     , "error allocating core memory buffers" },
-@@ -227,8 +225,8 @@ void rwrite(enum logcode code, char *buf
- 	if (quiet && code == FINFO)
- 		return;
+@@ -224,8 +222,8 @@ void rwrite(enum logcode code, char *buf
+ 	if (len < 0)
+ 		exit_cleanup(RERR_MESSAGEIO);
  
 -	if (am_server && msg_fd_out >= 0) {
 -		/* Pass the message to our sibling. */
-- 
2.34.1