From: Wayne Davison <wayned@samba.org>
Date: Tue, 1 Mar 2005 06:22:49 +0000 (+0000)
Subject: Updated to apply cleanly.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/a2f301712a46044970eaae7019ad0c6a784a69bd

Updated to apply cleanly.
---

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index b4ad3d0..9449ee9 100644
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -115,9 +115,9 @@ This patch adds the following options:
  
  	if (verbose > 2) {
  		rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c	2005-02-27 07:33:41
+--- orig/clientserver.c	2005-03-01 03:39:47
 +++ clientserver.c	2004-07-03 20:22:18
-@@ -354,6 +354,9 @@ static int rsync_module(int f_in, int f_
+@@ -351,6 +351,9 @@ static int rsync_module(int f_in, int f_
  		   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
  
  	log_init();
@@ -127,7 +127,7 @@ This patch adds the following options:
  
  	if (use_chroot) {
  		/*
-@@ -476,6 +479,9 @@ static int rsync_module(int f_in, int f_
+@@ -473,6 +476,9 @@ static int rsync_module(int f_in, int f_
  			rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
  				am_sender ? "on" : "to",
  				request, auth_user, host, addr);
@@ -697,9 +697,9 @@ This patch adds the following options:
  {
  	int i;
  	for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c	2005-02-28 02:16:55
+--- orig/main.c	2005-03-01 03:39:47
 +++ main.c	2004-07-03 20:22:18
-@@ -139,6 +139,9 @@ static void report(int f)
+@@ -138,6 +138,9 @@ static void report(int f)
  
  	if (am_daemon) {
  		log_exit(0, __FILE__, __LINE__);
diff --git a/acls.diff b/acls.diff
index c944226..bb35674 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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ 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. */
-@@ -1259,6 +1285,8 @@ void server_options(char **args,int *arg
+@@ -1261,6 +1287,8 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
@@ -4748,7 +4748,7 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo	2005-02-28 02:16:55
+--- orig/rsync.yo	2005-03-01 01:22:59
 +++ rsync.yo	2004-07-03 20:11:58
 @@ -317,6 +317,7 @@ to the detailed description below for a 
   -H, --hard-links            preserve hard links
diff --git a/append.diff b/append.diff
index a5d973b..e079fb2 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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-02-16 15:36:40
 @@ -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)
-@@ -1114,6 +1120,14 @@ int parse_arguments(int *argc, const cha
+@@ -1105,6 +1111,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;
  
-@@ -1413,7 +1427,9 @@ void server_options(char **args,int *arg
+@@ -1415,7 +1429,9 @@ void server_options(char **args,int *arg
  	if (opt_ignore_existing && am_sender)
  		args[ac++] = "--ignore-existing";
  
@@ -246,7 +246,7 @@ an ftp client, appending new data onto the end of the files it updates.
  			continue;
  		}
  
---- orig/rsync.yo	2005-02-28 02:16:55
+--- orig/rsync.yo	2005-03-01 01:22:59
 +++ rsync.yo	2005-02-11 20:36:38
 @@ -309,6 +309,7 @@ to the detailed description below for a 
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)
diff --git a/atimes.diff b/atimes.diff
index 69365b7..636a82f 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2005-02-16 17:08:13
+--- orig/batch.c	2005-03-01 01:22:58
 +++ batch.c	2004-07-03 20:15:41
-@@ -205,6 +205,8 @@ void show_flist(int index, struct file_s
+@@ -202,6 +202,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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ 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 },
-@@ -1267,6 +1270,8 @@ void server_options(char **args,int *arg
+@@ -1269,6 +1272,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -260,7 +260,7 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2005-02-28 02:16:55
+--- orig/rsync.yo	2005-03-01 01:22:59
 +++ rsync.yo	2005-01-24 01:57:18
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index edc65dc..fa1af3c 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -156,7 +156,7 @@ Marc St-Onge
  	else
  		ok = do_rmdir(fname) == 0;
  	if (ok) {
---- orig/options.c	2005-03-01 01:22:59
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-03-01 01:25:39
 @@ -127,10 +127,14 @@ int no_detach
  int write_batch = 0;
diff --git a/chmod-option.diff b/chmod-option.diff
index 4b57fd2..8ec27c3 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-01 01:22:59
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-03-01 01:26:56
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
diff --git a/date-only.diff b/date-only.diff
index be0ccf5..a938cad 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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ 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 },
-@@ -1373,6 +1376,9 @@ void server_options(char **args,int *arg
+@@ -1375,6 +1378,9 @@ void server_options(char **args,int *arg
  	if (size_only)
  		args[ac++] = "--size-only";
  
@@ -70,7 +70,7 @@ Jeremy Bornstein
  	if (modify_window_set) {
  		if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
  			goto oom;
---- orig/rsync.yo	2005-02-28 02:16:55
+--- orig/rsync.yo	2005-03-01 01:22:59
 +++ rsync.yo	2005-02-11 22:49:10
 @@ -350,6 +350,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
diff --git a/fname-convert.diff b/fname-convert.diff
index 3105dec..eac4927 100644
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -409,9 +409,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  	{ RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
  	{ RERR_WAITCHILD  , "some error returned by waitpid()" },
  	{ RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c	2005-02-28 02:16:55
+--- orig/main.c	2005-03-01 03:39:47
 +++ main.c	2004-07-22 00:31:47
-@@ -363,7 +363,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -362,7 +362,7 @@ static pid_t do_cmd(char *cmd, char *mac
  			whole_file = 1;
  		ret = local_child(argc, args, f_in, f_out, child_main);
  	} else
@@ -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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ 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 96c3e21..e3817d0 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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ 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 },
-@@ -1421,6 +1424,9 @@ void server_options(char **args,int *arg
+@@ -1423,6 +1426,9 @@ void server_options(char **args,int *arg
  		args[ac++] = tmpdir;
  	}
  
diff --git a/ignore-case.diff b/ignore-case.diff
index 17dbb2f..2fc136d 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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ 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 },
-@@ -1385,6 +1388,9 @@ void server_options(char **args,int *arg
+@@ -1387,6 +1390,9 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
diff --git a/link-by-hash.diff b/link-by-hash.diff
index edc1497..eb6cf59 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-01 01:22:59
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-03-01 01:27:55
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
diff --git a/links-depth.diff b/links-depth.diff
index 316e921..94c5e90 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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-01-28 19:33:24
 @@ -43,6 +43,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
@@ -88,7 +88,7 @@ in this modified version.
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
---- orig/rsync.yo	2005-02-28 02:16:55
+--- orig/rsync.yo	2005-03-01 01:22:59
 +++ rsync.yo	2005-01-28 19:33:40
 @@ -311,6 +311,7 @@ to the detailed description below for a 
       --inplace               update destination files in-place
diff --git a/openssl-support.diff b/openssl-support.diff
index dc66782..9487113 100644
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -72,7 +72,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  	if (verbose > 3) {
  		rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
  			code, safe_fname(file), line);
---- orig/clientserver.c	2005-03-01 01:22:59
+--- orig/clientserver.c	2005-03-01 03:39:47
 +++ clientserver.c	2004-10-08 20:44:59
 @@ -45,6 +45,9 @@ extern int select_timeout;
  extern int orig_umask;
@@ -84,7 +84,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern char *bind_address;
  extern struct filter_list_struct server_filter_list;
  extern char *config_file;
-@@ -102,8 +105,18 @@ int start_socket_client(char *host, char
+@@ -99,8 +102,18 @@ int start_socket_client(char *host, char
  		exit_cleanup(RERR_SOCKETIO);
  
  	ret = start_inband_exchange(user, path, fd, fd, argc);
@@ -104,7 +104,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  }
  
  int start_inband_exchange(char *user, char *path, int f_in, int f_out, 
-@@ -164,6 +177,33 @@ int start_inband_exchange(char *user, ch
+@@ -161,6 +174,33 @@ int start_inband_exchange(char *user, ch
  	if (verbose > 1)
  		print_child_argv(sargs);
  
@@ -138,7 +138,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  	p = strchr(path,'/');
  	if (p) *p = 0;
  	io_printf(f_out, "%s\n", path);
-@@ -192,6 +232,10 @@ int start_inband_exchange(char *user, ch
+@@ -189,6 +229,10 @@ int start_inband_exchange(char *user, ch
  			 * server to terminate the listing of modules.
  			 * We don't want to go on and transfer
  			 * anything; just exit. */
@@ -149,7 +149,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  			exit(0);
  		}
  
-@@ -199,6 +243,10 @@ int start_inband_exchange(char *user, ch
+@@ -196,6 +240,10 @@ int start_inband_exchange(char *user, ch
  			rprintf(FERROR, "%s\n", line);
  			/* This is always fatal; the server will now
  			 * close the socket. */
@@ -160,7 +160,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  			return RERR_STARTCLIENT;
  		} else {
  			rprintf(FINFO,"%s\n", line);
-@@ -552,6 +600,7 @@ static void send_listing(int fd)
+@@ -549,6 +597,7 @@ static void send_listing(int fd)
  		io_printf(fd,"@RSYNCD: EXIT\n");
  }
  
@@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  /* this is called when a connection is established to a client
     and we want to start talking. The setup of the system is done from
     here */
-@@ -601,6 +650,9 @@ int start_daemon(int f_in, int f_out)
+@@ -598,6 +647,9 @@ int start_daemon(int f_in, int f_out)
  	if (protocol_version > remote_protocol)
  		protocol_version = remote_protocol;
  
@@ -178,7 +178,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  	line[0] = 0;
  	if (!read_line(f_in, line, sizeof line - 1))
  		return -1;
-@@ -610,6 +662,20 @@ int start_daemon(int f_in, int f_out)
+@@ -607,6 +659,20 @@ int start_daemon(int f_in, int f_out)
  		return -1;
  	}
  
@@ -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-01 01:22:59
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-03-01 01:34:42
 @@ -155,6 +155,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index f56cc3f..ed2cfc3 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-02-25 18:44:31
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2004-09-09 01:59:08
 @@ -402,8 +402,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
@@ -73,7 +73,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
  		preserve_devices = 1;
  	}
  
-@@ -1259,10 +1267,16 @@ void server_options(char **args,int *arg
+@@ -1261,10 +1269,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 4972dba..adef8e5 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) {
  		char fname2[MAXPATHLEN];
---- orig/options.c	2005-03-01 01:22:59
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
diff --git a/time-limit.diff b/time-limit.diff
index f6d907f..427ba70 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-01 01:22:59
+--- orig/options.c	2005-03-01 05:49:24
 +++ options.c	2005-01-28 19:35:23
 @@ -105,6 +105,7 @@ int checksum_seed = 0;
  int inplace = 0;