X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/36e715fdf295b975105dce63581d9cf9f154f34f..ae306a2933c7617493d80f46d891911634ec43d0:/transliterate.diff

diff --git a/transliterate.diff b/transliterate.diff
index 845317a..0ecfb6c 100644
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -83,6 +83,9 @@ extern int filesfrom_convert;
+@@ -84,6 +84,9 @@ extern int filesfrom_convert;
  extern iconv_t ic_send, ic_recv;
  #endif
  
@@ -26,7 +26,7 @@ diff --git a/flist.c b/flist.c
  #define PTR_SIZE (sizeof (struct file_struct *))
  
  int io_error;
-@@ -616,6 +619,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -619,6 +622,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  		stats.total_size += F_LENGTH(file);
  }
  
@@ -51,7 +51,7 @@ diff --git a/flist.c b/flist.c
  static struct file_struct *recv_file_entry(struct file_list *flist,
  					   int xflags, int f)
  {
-@@ -684,6 +705,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -687,6 +708,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  	}
  #endif
  
@@ -121,7 +121,7 @@ diff --git a/options.c b/options.c
  	am_starting_up = 0;
  
  	return 1;
-@@ -2053,6 +2082,12 @@ void server_options(char **args, int *argc_p)
+@@ -2061,6 +2090,12 @@ void server_options(char **args, int *argc_p)
  	else if (remove_source_files)
  		args[ac++] = "--remove-sent-files";
  
@@ -131,9 +131,9 @@ diff --git a/options.c b/options.c
 +		args[ac++] = arg;
 +	}
 +
- 	*argc_p = ac;
- 	return;
- 
+ 	if (ac > MAX_SERVER_ARGS) { /* Not possible... */
+ 		rprintf(FERROR, "argc overflow in server_options().\n");
+ 		exit_cleanup(RERR_MALLOC);
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
@@ -145,7 +145,7 @@ diff --git a/rsync.yo b/rsync.yo
       --checksum-seed=NUM     set block/file checksum seed (advanced)
   -4, --ipv4                  prefer IPv4
   -6, --ipv6                  prefer IPv6
-@@ -2077,6 +2078,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2089,6 +2090,22 @@ daemon uses the charset specified in its "charset" configuration parameter
  regardless of the remote charset you actually pass.  Thus, you may feel free to
  specify just the local charset for a daemon transfer (e.g. bf(--iconv=utf8)).