The patches for 3.0.0pre10.

[rsync/rsync-patches.git] / log-checksum.diff

diff --git a/log-checksum.diff b/log-checksum.diff
index 18ca205..2f15ed6 100644 (file)
--- a/log-checksum.diff
+++ b/log-checksum.diff
@@ -9,7 +9,7 @@ compute them.
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -56,6 +56,9 @@ extern char curr_dir[];
+@@ -57,6 +57,9 @@ extern char curr_dir[];
  extern char *module_dir;
  extern unsigned int module_dirlen;
  
@@ -19,7 +19,7 @@ diff --git a/log.c b/log.c
  static int log_initialised;
  static int logfile_was_closed;
  static FILE *logfile_fp;
-@@ -621,6 +624,19 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -622,6 +625,19 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        snprintf(buf2, sizeof buf2, fmt, (double)b);
                        n = buf2;
                        break;
@@ -38,7 +38,7 @@ diff --git a/log.c b/log.c
 +                      break;
                case 'i':
                        if (iflags & ITEM_DELETED) {
-                               n = "*deleting";
+                               n = "*deleting  ";
 diff --git a/match.c b/match.c
 --- a/match.c
 +++ b/match.c
@@ -98,7 +98,7 @@ diff --git a/match.c b/match.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -1476,7 +1476,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1498,7 +1498,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
                else if (log_format_has(stdout_format, 'i'))
                        stdout_format_has_i = itemize_changes | 1;
                if (!log_format_has(stdout_format, 'b')
@@ -155,7 +155,7 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -2065,7 +2065,7 @@ by the server and defaults to the current code(time()).  This option
+@@ -2077,7 +2077,7 @@ by the server and defaults to the current code(time()).  This option
  is used to set a specific checksum seed, which is useful for
  applications that want repeatable block and file checksums, or
  in the case where the user wants a more random checksum seed.
@@ -167,7 +167,7 @@ diff --git a/rsync.yo b/rsync.yo
 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo
-@@ -464,7 +464,8 @@ quote(itemization(
+@@ -511,7 +511,8 @@ quote(itemization(
    it() %a the remote IP address
    it() %b the number of bytes actually transferred
    it() %B the permission bits of the file (e.g. rwxrwxrwt)