Fixed failing hunks.

[rsync/rsync-patches.git] / ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index 267ebb0..682b8d0 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,9 +1,15 @@
 This adds the --ignore-case option, which makes rsync compare filenames
 in a case-insensitive manner.
 
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/ignore-case.diff
+    ./configure                            (optional if already run)
+    make
+
 --- old/flist.c
 +++ new/flist.c
-@@ -37,6 +37,7 @@ extern int am_sender;
+@@ -34,6 +34,7 @@ extern int incremental;
  extern int do_progress;
  extern int always_checksum;
  extern int module_id;
@@ -11,11 +17,20 @@ in a case-insensitive manner.
  extern int ignore_errors;
  extern int numeric_ids;
  extern int recurse;
-@@ -1801,7 +1802,14 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -2161,7 +2162,7 @@ int f_name_cmp(struct file_struct *f1, s
+       if (type1 != type2)
                return type1 == t_PATH ? 1 : -1;
  
-       while (1) {
--              if ((dif = (int)*c1++ - (int)*c2++) != 0)
+-      do {
++      while (1) {
+               if (!*c1) {
+                       switch (state1) {
+                       case s_DIR:
+@@ -2224,7 +2225,16 @@ int f_name_cmp(struct file_struct *f1, s
+                       if (type1 != type2)
+                               return type1 == t_PATH ? 1 : -1;
+               }
+-      } while ((dif = (int)*c1++ - (int)*c2++) == 0);
 +              if (ignore_case) {
 +                      uchar ch1, ch2;
 +                      ch1 = islower(*c1) ? toupper(*c1) : *c1;
@@ -24,9 +39,11 @@ in a case-insensitive manner.
 +                      if ((dif = (int)ch1 - (int)ch2) != 0)
 +                              break;
 +              } else if ((dif = (int)*c1++ - (int)*c2++) != 0)
-                       break;
-               if (!*c1) {
-                       switch (state1) {
++                      break;
++      }
+ 
+       return dif;
+ }
 --- old/lib/wildmatch.c
 +++ new/lib/wildmatch.c
 @@ -53,6 +53,8 @@
@@ -73,7 +90,7 @@ in a case-insensitive manner.
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -350,6 +351,7 @@ void usage(enum logcode F)
+@@ -358,6 +359,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include-from=FILE     read include patterns from FILE\n");
    rprintf(F,"     --files-from=FILE       read list of source-file names from FILE\n");
    rprintf(F," -0, --from0                 all *-from/filter files are delimited by 0s\n");
@@ -81,7 +98,7 @@ in a case-insensitive manner.
    rprintf(F,"     --address=ADDRESS       bind address for outgoing socket to daemon\n");
    rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
    rprintf(F,"     --sockopts=OPTIONS      specify custom TCP options\n");
-@@ -503,6 +505,7 @@ static struct poptOption long_options[] 
+@@ -523,6 +525,7 @@ static struct poptOption long_options[] 
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
@@ -89,7 +106,7 @@ in a case-insensitive manner.
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1657,6 +1660,9 @@ void server_options(char **args,int *arg
+@@ -1704,6 +1707,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -101,7 +118,7 @@ in a case-insensitive manner.
                        args[ac++] = "--partial-dir";
 --- old/wildtest.c
 +++ new/wildtest.c
-@@ -16,6 +16,7 @@ int fnmatch_errors = 0;
+@@ -32,6 +32,7 @@ int fnmatch_errors = 0;
  #endif
  
  int wildmatch_errors = 0;