Latest line-offset tweaks.

diff --git a/chmod-option.diff b/chmod-option.diff
index 12e81b1..a9bc07e 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -215,7 +215,7 @@
  extern struct exclude_list_struct exclude_list;
  extern struct exclude_list_struct server_exclude_list;
  extern struct exclude_list_struct local_exclude_list;
-@@ -863,7 +866,10 @@ skip_excludes:
+@@ -853,7 +856,10 @@ skip_excludes:
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;

diff --git a/ignore-case.diff b/ignore-case.diff
index e04eae0..8b1286c 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -74,7 +74,7 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
                args[ac++] = "--partial";
 --- util.c     14 Apr 2004 23:33:34 -0000      1.135
 +++ util.c     15 Apr 2004 19:16:00 -0000
-@@ -919,6 +919,19 @@ int u_strcmp(const char *cs1, const char
+@@ -925,6 +925,19 @@ int u_strcmp(const char *cs1, const char
  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 52557c0..da8c29a 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -612,7 +612,7 @@ Patch Summary:
                    ret == -2 ? "copy" : "rename",
 --- rsync.h    14 Apr 2004 23:33:37 -0000      1.196
 +++ rsync.h    15 Apr 2004 19:19:00 -0000
-@@ -519,6 +519,14 @@ struct stats {
+@@ -517,6 +517,14 @@ struct stats {
        int current_file_index;
  };
  

diff --git a/perdir-exclude-from.diff b/perdir-exclude-from.diff
index b123b4f..7f8eab0 100644 (file)
--- a/perdir-exclude-from.diff
+++ b/perdir-exclude-from.diff
@@ -165,7 +165,7 @@
  }
  
  /* used by the one_file_system code */
-@@ -957,8 +965,12 @@ void send_file_name(int f, struct file_l
+@@ -947,8 +955,12 @@ void send_file_name(int f, struct file_l
        if (recursive && S_ISDIR(file->mode)
            && !(file->flags & FLAG_MOUNT_POINT)) {
                struct exclude_list_struct last_list = local_exclude_list;
@@ -179,7 +179,7 @@
                free_exclude_list(&local_exclude_list);
                local_exclude_list = last_list;
        }
-@@ -1004,6 +1016,18 @@ static void send_directory(int f, struct
+@@ -994,6 +1006,18 @@ static void send_directory(int f, struct
                        io_error |= IOERR_GENERAL;
                        rprintf(FINFO,
                                "cannot cvs-exclude in long-named directory %s\n",
@@ -240,7 +240,7 @@
  void add_exclude_file(struct exclude_list_struct *listp, const char *fname,
 --- rsync.h    14 Apr 2004 23:33:37 -0000      1.196
 +++ rsync.h    15 Apr 2004 21:02:11 -0000
-@@ -504,6 +504,7 @@ struct exclude_struct {
+@@ -502,6 +502,7 @@ struct exclude_struct {
  struct exclude_list_struct {
        struct exclude_struct *head;
        struct exclude_struct *tail;