Changed the style of the diff headers (use "patch -p1" now).

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

diff --git a/ignore-case.diff b/ignore-case.diff
index b6cc2c7d62ec098c8ef6b6d3ccb12eb3bf507c52..67f98cb75360c6e0de413326c6400ef55b50d057 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,8 +1,8 @@
 This adds the --ignore-case option, which makes rsync compare filenames
 in a case-insensitive manner.
 
---- orig/flist.c       2006-01-19 21:17:11
-+++ flist.c    2006-01-20 20:10:25
+--- old/flist.c
++++ new/flist.c
 @@ -37,6 +37,7 @@ extern int am_sender;
  extern int do_progress;
  extern int always_checksum;
@@ -11,7 +11,7 @@ in a case-insensitive manner.
  extern int ignore_errors;
  extern int numeric_ids;
  extern int recurse;
-@@ -1707,7 +1708,14 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -1801,7 +1802,14 @@ int f_name_cmp(struct file_struct *f1, s
                return type1 == t_PATH ? 1 : -1;
  
        while (1) {
@@ -27,8 +27,8 @@ in a case-insensitive manner.
                        break;
                if (!*c1) {
                        switch (state1) {
---- orig/lib/wildmatch.c       2006-01-14 08:14:31
-+++ lib/wildmatch.c    2006-01-03 17:29:11
+--- old/lib/wildmatch.c
++++ new/lib/wildmatch.c
 @@ -53,6 +53,8 @@
  #define ISUPPER(c) (ISASCII(c) && isupper(c))
  #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
@@ -63,9 +63,9 @@ in a case-insensitive manner.
  }
  
  /* Match the "pattern" against the forced-to-lower-case "text" string. */
---- orig/options.c     2006-01-20 18:44:02
-+++ options.c  2005-10-14 19:19:18
-@@ -105,6 +105,7 @@ OFF_T max_size = 0;
+--- old/options.c
++++ new/options.c
+@@ -110,6 +110,7 @@ OFF_T max_size = 0;
  OFF_T min_size = 0;
  int ignore_errors = 0;
  int modify_window = 0;
@@ -73,15 +73,15 @@ in a case-insensitive manner.
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -339,6 +340,7 @@ void usage(enum logcode F)
+@@ -349,6 +350,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");
 +  rprintf(F,"     --ignore-case           ignore case when comparing filenames\n");
    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,"     --blocking-io           use blocking I/O for the remote shell\n");
-@@ -482,6 +484,7 @@ static struct poptOption long_options[] 
+   rprintf(F,"     --sockopts=OPTIONS      specify custom TCP options\n");
+@@ -501,6 +503,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 +89,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 },
-@@ -1578,6 +1581,9 @@ void server_options(char **args,int *arg
+@@ -1655,6 +1658,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -97,10 +97,10 @@ in a case-insensitive manner.
 +              args[ac++] = "--ignore-case";
 +
        if (partial_dir && am_sender) {
-               if (partial_dir != partialdir_for_delayupdate) {
+               if (partial_dir != tmp_partialdir) {
                        args[ac++] = "--partial-dir";
---- orig/wildtest.c    2006-01-14 08:14:31
-+++ wildtest.c 2006-01-20 20:13:46
+--- old/wildtest.c
++++ new/wildtest.c
 @@ -16,6 +16,7 @@ int fnmatch_errors = 0;
  #endif