./configure (optional if already run)
make
---- old/exclude.c
-+++ new/exclude.c
-@@ -32,6 +32,7 @@ extern int io_error;
- extern int local_server;
- extern int prune_empty_dirs;
- extern int ignore_perishable;
-+extern int ignore_case;
- extern int delete_mode;
- extern int delete_excluded;
- extern int cvs_exclude;
-@@ -580,16 +581,17 @@ static int rule_matches(char *name, stru
+TODO:
+
+ - Make this code handle multibyte character encodings, and honor the
+ --iconv setting when converting case.
+
+diff --git a/exclude.c b/exclude.c
+--- a/exclude.c
++++ b/exclude.c
+@@ -21,6 +21,7 @@
+ */
+
+ #include "rsync.h"
++#include "ifuncs.h"
+
+ extern int verbose;
+ extern int am_server;
+@@ -580,16 +581,15 @@ static int rule_matches(char *fname, struct filter_struct *ex, int name_is_dir)
if (litmatch_array(pattern, strings, slash_handling))
return ret_match;
} else if (anchored_match) {
- if (strcmp(name, pattern) == 0)
-+ if ((ignore_case ? strcasecmp(name, pattern)
-+ : strcmp(name, pattern)) == 0)
++ if (ic_strEQ(name, pattern))
return ret_match;
} else {
int l1 = strlen(name);
- strcmp(name+(l1-l2),pattern) == 0 &&
- (l1==l2 || name[l1-(l2+1)] == '/')) {
+ if (l2 <= l1
-+ && (ignore_case ? strcasecmp(name + (l1-l2), pattern)
-+ : strcmp(name + (l1-l2), pattern)) == 0
++ && ic_strEQ(name + (l1-l2), pattern)
+ && (l1 == l2 || name[l1 - (l2+1)] == '/'))
return ret_match;
- }
}
return !ret_match;
---- old/flist.c
-+++ new/flist.c
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
@@ -35,6 +35,7 @@ extern int inc_recurse;
extern int do_progress;
extern int always_checksum;
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
-@@ -2453,7 +2454,7 @@ enum fnc_type { t_PATH, t_ITEM };
- int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
+@@ -2619,6 +2620,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
{
int dif;
-- const uchar *c1, *c2;
-+ const uchar *c1, *c2, ch1, ch2;
+ const uchar *c1, *c2;
++ uchar ch1, ch2;
enum fnc_state state1, state2;
enum fnc_type type1, type2;
enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -2563,7 +2564,15 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -2729,7 +2731,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
- } while ((dif = (int)*c1++ - (int)*c2++) == 0);
-+ ch1 = CVAL(c1++, 0);
-+ ch2 = CVAL(c2++, 0);
++ ch1 = *c1++;
++ ch2 = *c2++;
+ if (ignore_case) {
-+ if (islower(ch1))
-+ ch1 = toupper(ch1);
-+ if (islower(ch2))
-+ ch2 = toupper(ch2);
++ if (isupper(ch1))
++ ch1 = tolower(ch1);
++ if (isupper(ch2))
++ ch2 = tolower(ch2);
+ }
-+ } while ((dif = ch1 - ch2) == 0);
++ } while ((dif = (int)ch1 - (int)ch2) == 0);
return dif;
}
---- old/lib/wildmatch.c
-+++ new/lib/wildmatch.c
+diff --git a/ifuncs.h b/ifuncs.h
+--- a/ifuncs.h
++++ b/ifuncs.h
+@@ -98,3 +98,38 @@ toUpper(const char *ptr)
+ {
+ return toupper(*(unsigned char *)ptr);
+ }
++
++static inline int
++strEQ(const char *s1, const char *s2)
++{
++ return strcmp(s1, s2) == 0;
++}
++
++static inline int
++strnEQ(const char *s1, const char *s2, size_t n)
++{
++ return strncmp(s1, s2, n) == 0;
++}
++
++static inline int
++ic_strEQ(const char *s1, const char *s2)
++{
++ extern int ignore_case;
++ if (ignore_case)
++ return strcasecmp(s1, s2) == 0;
++ return strcmp(s1, s2) == 0;
++}
++
++static inline int
++ic_strnEQ(const char *s1, const char *s2, size_t n)
++{
++ extern int ignore_case;
++ if (ignore_case)
++ return strncasecmp(s1, s2, n) == 0;
++ return strncmp(s1, s2, n) == 0;
++}
++
++#define strNE(s1,s2) (!strEQ(s1,s2))
++#define strnNE(s1,s2,n) (!strnEQ(s1,s2,n))
++#define ic_strNE(s1,s2) (!ic_strEQ(s1,s2))
++#define ic_strnNE(s1,s2) (!ic_strnEQ(s1,s2,n))
+diff --git a/lib/wildmatch.c b/lib/wildmatch.c
+--- a/lib/wildmatch.c
++++ b/lib/wildmatch.c
@@ -53,6 +53,8 @@
#define ISUPPER(c) (ISASCII(c) && isupper(c))
#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
#ifdef WILD_TEST_ITERATIONS
int wildmatch_iteration_count;
#endif
-@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const
+@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
for ( ; (p_ch = *p) != '\0'; text++, p++) {
int matched, special;
uchar t_ch, prev_ch;
while ((t_ch = *text) == '\0') {
if (*a == NULL) {
if (p_ch != '*')
-@@ -237,12 +241,21 @@ static int dowild(const uchar *p, const
+@@ -237,12 +241,21 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
* of "text" and any strings in array "a". */
static int doliteral(const uchar *s, const uchar *text, const uchar*const *a)
{
return FALSE;
}
-@@ -288,10 +301,14 @@ static const uchar *trailing_N_elements(
+@@ -288,10 +301,14 @@ static const uchar *trailing_N_elements(const uchar*const **a_ptr, int count)
int wildmatch(const char *pattern, const char *text)
{
static const uchar *nomore[1]; /* A NULL pointer. */
}
/* Match the "pattern" against the forced-to-lower-case "text" string. */
-@@ -331,12 +348,14 @@ int wildmatch_array(const char *pattern,
+@@ -331,12 +348,14 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
if (!text)
return FALSE;
continue;
}
if (*text++ == '/' && (matched = dowild(p, text, a)) != FALSE
-@@ -344,6 +363,9 @@ int wildmatch_array(const char *pattern,
+@@ -344,6 +363,9 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
break;
}
}
return matched == TRUE;
}
---- old/options.c
-+++ new/options.c
-@@ -114,6 +114,7 @@ OFF_T max_size = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -116,6 +116,7 @@ OFF_T max_size = 0;
OFF_T min_size = 0;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
-@@ -389,6 +390,7 @@ void usage(enum logcode F)
- rprintf(F," --include-from=FILE read include patterns from FILE\n");
+@@ -402,6 +403,7 @@ void usage(enum logcode F)
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," -s, --protect-args no space-splitting; only wildcard special-chars\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," --sockopts=OPTIONS specify custom TCP options\n");
-@@ -577,6 +579,8 @@ static struct poptOption long_options[]
+@@ -595,6 +597,8 @@ static struct poptOption long_options[] = {
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
{"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_VAL, &eol_nulls, 1, 0, 0},
{"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
-@@ -1850,6 +1854,9 @@ void server_options(char **args,int *arg
+@@ -1908,6 +1912,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
if (partial_dir && am_sender) {
if (partial_dir != tmp_partialdir) {
args[ac++] = "--partial-dir";
---- old/wildtest.c
-+++ new/wildtest.c
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -402,6 +402,7 @@ to the detailed description below for a complete description. verb(
+ --files-from=FILE read list of source-file names from FILE
+ -0, --from0 all *from/filter files are delimited by 0s
+ -s, --protect-args no space-splitting; wildcard chars only
++ --ignore-case ignore case when comparing filenames
+ --address=ADDRESS bind address for outgoing socket to daemon
+ --port=PORT specify double-colon alternate port number
+ --sockopts=OPTIONS specify custom TCP options
+@@ -1409,6 +1410,10 @@ If you use this option with bf(--iconv), the args will also be translated
+ from the local to the remote character set. The translation happens before
+ wild-cards are expanded. See also the bf(--files-from) option.
+
++dit(bf(--ignore-case)) This option tells rsync to ignore upper-/lower-case
++differences when comparing filenames. This can avoid problems when sending
++files to a filesystem that ignores these differences.
++
+ dit(bf(-T, --temp-dir=DIR)) This option instructs rsync to use DIR as a
+ scratch directory when creating temporary copies of the files transferred
+ on the receiving side. The default behavior is to create each temporary
+diff --git a/wildtest.c b/wildtest.c
+--- a/wildtest.c
++++ b/wildtest.c
@@ -31,6 +31,7 @@ int fnmatch_errors = 0;
#endif
git.samba.org / rsync-patches.git / blobdiff