From 1dd0573e752ec780062187fc8601c7318b12ef50 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 27 Mar 2005 05:28:01 +0000
Subject: [PATCH] Updated to apply cleanly.

---
 ODBC-dblog.diff      |  4 ++--
 acls.diff            |  4 ++--
 append.diff          |  8 ++++----
 atimes.diff          |  8 ++++----
 backup-dir-dels.diff | 14 +++++++-------
 chmod-option.diff    |  6 +++---
 date-only.diff       |  4 ++--
 fname-convert.diff   |  2 +-
 fsync.diff           |  6 +++---
 ignore-case.diff     |  4 ++--
 link-by-hash.diff    |  8 ++++----
 links-depth.diff     |  2 +-
 openssl-support.diff |  6 +++---
 owner-group-mod.diff |  6 +++---
 source-cd.diff       | 12 ++++++------
 time-limit.diff      |  4 ++--
 16 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 7cdc2ac..12b0f66 100644
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -709,9 +709,9 @@ This patch adds the following options:
  		if (f == -1 || !am_sender)
  			return;
  	}
---- orig/receiver.c	2005-03-16 02:19:30
+--- orig/receiver.c	2005-03-24 16:41:46
 +++ receiver.c	2005-03-05 00:31:00
-@@ -618,6 +618,9 @@ int recv_files(int f_in, struct file_lis
+@@ -620,6 +620,9 @@ int recv_files(int f_in, struct file_lis
  
  		if (!log_before_transfer)
  			log_item(file, &initial_stats, iflags, NULL);
diff --git a/acls.diff b/acls.diff
index e00c4da..8917341 100644
--- a/acls.diff
+++ b/acls.diff
@@ -4597,7 +4597,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-02-14 02:46:05
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -4679,7 +4679,7 @@ ACLs to a non-ACL-supporting disk should complain.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1269,6 +1295,8 @@ void server_options(char **args,int *arg
+@@ -1264,6 +1290,8 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
diff --git a/append.diff b/append.diff
index 510305d..20306a9 100644
--- a/append.diff
+++ b/append.diff
@@ -130,7 +130,7 @@ an ftp client, appending new data onto the end of the files it updates.
  			matched(f, s, buf, j, -2);
  		matched(f, s, buf, len, -1);
  	}
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-03-11 11:21:34
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/
@@ -173,7 +173,7 @@ an ftp client, appending new data onto the end of the files it updates.
  					break;
  				}
  				if (!is_wild)
-@@ -1113,6 +1119,14 @@ int parse_arguments(int *argc, const cha
+@@ -1108,6 +1114,14 @@ int parse_arguments(int *argc, const cha
  			bwlimit_writemax = 512;
  	}
  
@@ -188,7 +188,7 @@ an ftp client, appending new data onto the end of the files it updates.
  	if (delay_updates && !partial_dir)
  		partial_dir = partialdir_for_delayupdate;
  
-@@ -1423,7 +1437,9 @@ void server_options(char **args,int *arg
+@@ -1418,7 +1432,9 @@ void server_options(char **args,int *arg
  	if (opt_ignore_existing && am_sender)
  		args[ac++] = "--ignore-existing";
  
@@ -199,7 +199,7 @@ an ftp client, appending new data onto the end of the files it updates.
  		args[ac++] = "--inplace";
  
  	if (tmpdir) {
---- orig/receiver.c	2005-03-16 02:19:30
+--- orig/receiver.c	2005-03-24 16:41:46
 +++ receiver.c	2005-02-11 20:26:32
 @@ -44,6 +44,7 @@ extern int remove_sent_files;
  extern int module_id;
diff --git a/atimes.diff b/atimes.diff
index 8abbad9..1a2799c 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2005-03-16 02:19:29
+--- orig/batch.c	2005-03-27 05:13:14
 +++ batch.c	2004-07-03 20:15:41
-@@ -197,6 +197,8 @@ void show_flist(int index, struct file_s
+@@ -207,6 +207,8 @@ void show_flist(int index, struct file_s
  		rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
  		rprintf(FINFO, "flist->modtime=%#lx\n",
  			(long unsigned) fptr[i]->modtime);
@@ -147,7 +147,7 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
  		return;
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-02-21 10:53:28
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
@@ -173,7 +173,7 @@ command before "make":
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0, 'q', 0, 0 },
-@@ -1277,6 +1280,8 @@ void server_options(char **args,int *arg
+@@ -1272,6 +1275,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index e74694e..935f3fe 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -157,7 +157,7 @@ Marc St-Onge
  	else
  		ok = do_rmdir(fname) == 0;
  	if (ok) {
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-03-01 01:25:39
 @@ -127,10 +127,14 @@ int no_detach
  int write_batch = 0;
@@ -209,7 +209,7 @@ Marc St-Onge
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
-@@ -1012,6 +1022,8 @@ int parse_arguments(int *argc, const cha
+@@ -1007,6 +1017,8 @@ int parse_arguments(int *argc, const cha
  			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
  		if (backup_dir)
  			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -218,7 +218,7 @@ Marc St-Onge
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1046,6 +1058,14 @@ int parse_arguments(int *argc, const cha
+@@ -1041,6 +1053,14 @@ int parse_arguments(int *argc, const cha
  				return 0;
  			}
  		}
@@ -233,7 +233,7 @@ Marc St-Onge
  	}
  
  	if (!backup_suffix)
-@@ -1057,6 +1077,16 @@ int parse_arguments(int *argc, const cha
+@@ -1052,6 +1072,16 @@ int parse_arguments(int *argc, const cha
  			backup_suffix);
  		return 0;
  	}
@@ -250,7 +250,7 @@ Marc St-Onge
  	if (backup_dir) {
  		backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
  		backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
-@@ -1078,6 +1108,31 @@ int parse_arguments(int *argc, const cha
+@@ -1073,6 +1103,31 @@ int parse_arguments(int *argc, const cha
  			"--suffix cannot be a null string without --backup-dir\n");
  		return 0;
  	}
@@ -282,7 +282,7 @@ Marc St-Onge
  	if (make_backups && !backup_dir)
  		omit_dir_times = 1;
  
-@@ -1356,6 +1411,10 @@ void server_options(char **args,int *arg
+@@ -1351,6 +1406,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -293,7 +293,7 @@ Marc St-Onge
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1364,7 +1423,13 @@ void server_options(char **args,int *arg
+@@ -1359,7 +1418,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}
diff --git a/chmod-option.diff b/chmod-option.diff
index d05f546..e06dce9 100644
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -225,7 +225,7 @@ command before "make":
  	file->uid = st.st_uid;
  	file->gid = st.st_gid;
  
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-03-01 01:26:56
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -260,7 +260,7 @@ command before "make":
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
-@@ -1081,6 +1086,13 @@ int parse_arguments(int *argc, const cha
+@@ -1076,6 +1081,13 @@ int parse_arguments(int *argc, const cha
  	if (make_backups && !backup_dir)
  		omit_dir_times = 1;
  
@@ -274,7 +274,7 @@ command before "make":
  	if (log_format) {
  		if (strstr(log_format, "%i") != NULL)
  			log_format_has_i = 1;
-@@ -1443,6 +1455,11 @@ void server_options(char **args,int *arg
+@@ -1438,6 +1450,11 @@ void server_options(char **args,int *arg
  		}
  	}
  
diff --git a/date-only.diff b/date-only.diff
index 9a61681..1382cec 100644
--- a/date-only.diff
+++ b/date-only.diff
@@ -34,7 +34,7 @@ Jeremy Bornstein
  	if (st->st_size != file->length)
  		return 0;
  
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-01-28 19:14:15
 @@ -89,6 +89,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
@@ -60,7 +60,7 @@ Jeremy Bornstein
    {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
    {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
-@@ -1383,6 +1386,9 @@ void server_options(char **args,int *arg
+@@ -1378,6 +1381,9 @@ void server_options(char **args,int *arg
  	if (size_only)
  		args[ac++] = "--size-only";
  
diff --git a/fname-convert.diff b/fname-convert.diff
index f71005a..9a624f3 100644
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -420,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  	if (dir)
  		free(dir);
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-02-14 02:50:32
 @@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
diff --git a/fsync.diff b/fsync.diff
index 3b30436..121c855 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,7 +1,7 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-01-28 19:30:47
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/
@@ -27,7 +27,7 @@ to be called on every file we write.
    {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
-@@ -1431,6 +1434,9 @@ void server_options(char **args,int *arg
+@@ -1426,6 +1429,9 @@ void server_options(char **args,int *arg
  		args[ac++] = tmpdir;
  	}
  
@@ -37,7 +37,7 @@ to be called on every file we write.
  	if (basis_dir[0] && am_sender) {
  		/* the server only needs this option if it is not the sender,
  		 *   and it may be an older version that doesn't know this
---- orig/receiver.c	2005-03-16 02:19:30
+--- orig/receiver.c	2005-03-24 16:41:46
 +++ receiver.c	2005-02-20 00:17:37
 @@ -37,6 +37,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
diff --git a/ignore-case.diff b/ignore-case.diff
index cbd64a5..a69fc2d 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -35,7 +35,7 @@ in a case-insensitive manner.
  	  case '?':
  	    /* Match anything but '/'. */
  	    if (*text == '/')
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2004-10-14 17:22:51
 @@ -100,6 +100,7 @@ int max_delete = 0;
  OFF_T max_size = 0;
@@ -61,7 +61,7 @@ in a case-insensitive manner.
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
-@@ -1395,6 +1398,9 @@ void server_options(char **args,int *arg
+@@ -1390,6 +1393,9 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
diff --git a/link-by-hash.diff b/link-by-hash.diff
index 4769437..377c75b 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,7 +365,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-03-01 01:27:55
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -422,7 +422,7 @@ the file's name.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1443,6 +1461,11 @@ void server_options(char **args,int *arg
+@@ -1438,6 +1456,11 @@ void server_options(char **args,int *arg
  		}
  	}
  
@@ -434,7 +434,7 @@ the file's name.
  	if (files_from && (!am_sender || filesfrom_host)) {
  		if (filesfrom_host) {
  			args[ac++] = "--files-from";
---- orig/receiver.c	2005-03-16 02:19:30
+--- orig/receiver.c	2005-03-24 16:41:46
 +++ receiver.c	2005-01-15 21:29:13
 @@ -51,6 +51,7 @@ extern int delay_updates;
  extern struct stats stats;
@@ -505,7 +505,7 @@ the file's name.
  }
  
  static void handle_delayed_updates(struct file_list *flist, char *local_name)
-@@ -613,8 +624,12 @@ int recv_files(int f_in, struct file_lis
+@@ -615,8 +626,12 @@ int recv_files(int f_in, struct file_lis
  			rprintf(FINFO, "%s\n", safe_fname(fname));
  
  		/* recv file data */
diff --git a/links-depth.diff b/links-depth.diff
index d6325ad..494eced 100644
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -62,7 +62,7 @@ in this modified version.
  #else
  	linkname_len = 0;
  #endif
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-01-28 19:33:24
 @@ -43,6 +43,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
diff --git a/openssl-support.diff b/openssl-support.diff
index 7073a7b..5eb6bbd 100644
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -223,7 +223,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  AC_MSG_CHECKING([whether to call shutdown on all sockets])
  case $host_os in
  	*cygwin* ) AC_MSG_RESULT(yes)
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-03-01 01:34:42
 @@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
@@ -322,7 +322,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1116,6 +1149,17 @@ int parse_arguments(int *argc, const cha
+@@ -1111,6 +1144,17 @@ int parse_arguments(int *argc, const cha
  	if (delay_updates && !partial_dir)
  		partial_dir = partialdir_for_delayupdate;
  
@@ -340,7 +340,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  	if (inplace) {
  #ifdef HAVE_FTRUNCATE
  		if (partial_dir) {
-@@ -1483,11 +1527,28 @@ char *check_for_hostspec(char *s, char *
+@@ -1478,11 +1522,28 @@ char *check_for_hostspec(char *s, char *
  {
  	char *p;
  	int not_host;
diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index 65c5606..37f1ce3 100644
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -34,7 +34,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +			preserve_gid = 2;
 +	}
  }
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2004-09-09 01:59:08
 @@ -404,8 +404,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
@@ -62,7 +62,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
  		case 'v':
  			verbose++;
  			break;
-@@ -954,8 +962,8 @@ int parse_arguments(int *argc, const cha
+@@ -949,8 +957,8 @@ int parse_arguments(int *argc, const cha
  #endif
  		preserve_perms = 1;
  		preserve_times = 1;
@@ -73,7 +73,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
  		preserve_devices = 1;
  	}
  
-@@ -1269,10 +1277,16 @@ void server_options(char **args,int *arg
+@@ -1264,10 +1272,16 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
diff --git a/source-cd.diff b/source-cd.diff
index b5f8acd..4bb7545 100644
--- a/source-cd.diff
+++ b/source-cd.diff
@@ -36,7 +36,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  
  	while (1) {
  		struct file_struct *file;
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
@@ -62,9 +62,9 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -918,6 +921,11 @@ int parse_arguments(int *argc, const cha
- 			batch_name = NULL;
- 		}
+@@ -913,6 +916,11 @@ int parse_arguments(int *argc, const cha
+ 		} else if (dry_run)
+ 			write_batch = 0;
  	}
 +	if (source_cd && files_from) {
 +		snprintf(err_buf, sizeof err_buf,
@@ -74,7 +74,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  	if (read_batch && files_from) {
  		snprintf(err_buf, sizeof err_buf,
  			"--read-batch cannot be used with --files-from\n");
-@@ -1012,6 +1020,14 @@ int parse_arguments(int *argc, const cha
+@@ -1007,6 +1015,14 @@ int parse_arguments(int *argc, const cha
  			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
  		if (backup_dir)
  			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -89,7 +89,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1405,6 +1421,11 @@ void server_options(char **args,int *arg
+@@ -1400,6 +1416,11 @@ void server_options(char **args,int *arg
  	} else if (keep_partial)
  		args[ac++] = "--partial";
  
diff --git a/time-limit.diff b/time-limit.diff
index 1dfa842..73b24a4 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -41,7 +41,7 @@ Do we need configure support for mktime()?
  	if (t - last_io >= io_timeout) {
  		if (!am_server && !am_daemon) {
  			rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
---- orig/options.c	2005-03-17 09:05:21
+--- orig/options.c	2005-03-24 16:41:46
 +++ options.c	2005-01-28 19:35:23
 @@ -105,6 +105,7 @@ int checksum_seed = 0;
  int inplace = 0;
@@ -114,7 +114,7 @@ Do we need configure support for mktime()?
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1352,6 +1388,15 @@ void server_options(char **args,int *arg
+@@ -1347,6 +1383,15 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
-- 
2.34.1