Fixed some patch fuzz.

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

diff --git a/ignore-case.diff b/ignore-case.diff
index 0ac2402..9b0b881 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,6 +1,12 @@
 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
 @@ -32,6 +32,7 @@ extern int am_sender;
@@ -11,7 +17,7 @@ in a case-insensitive manner.
  extern int ignore_errors;
  extern int numeric_ids;
  extern int recurse;
-@@ -1786,7 +1787,7 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -1783,7 +1784,7 @@ int f_name_cmp(struct file_struct *f1, s
        if (type1 != type2)
                return type1 == t_PATH ? 1 : -1;
  
@@ -20,7 +26,7 @@ in a case-insensitive manner.
                if (!*c1) {
                        switch (state1) {
                        case s_DIR:
-@@ -1849,7 +1850,16 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -1846,7 +1847,16 @@ int f_name_cmp(struct file_struct *f1, s
                        if (type1 != type2)
                                return type1 == t_PATH ? 1 : -1;
                }
@@ -84,7 +90,7 @@ in a case-insensitive manner.
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -359,6 +360,7 @@ void usage(enum logcode F)
+@@ -361,6 +362,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");
@@ -92,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");
-@@ -521,6 +523,7 @@ static struct poptOption long_options[] 
+@@ -525,6 +527,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},
@@ -100,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 },
-@@ -1684,6 +1687,9 @@ void server_options(char **args,int *arg
+@@ -1688,6 +1691,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }