Latest line-offset tweaks.

[rsync/rsync-patches.git] / perdir-exclude-from.diff

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;