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

This adds the --ignore-case option, which makes rsync compare filenames
in a case-insensitive manner.

--- old/flist.c
+++ new/flist.c
@@ -32,6 +32,7 @@ extern int am_sender;
 extern int do_progress;
 extern int always_checksum;
 extern int module_id;
+extern int ignore_case;
 extern int ignore_errors;
 extern int numeric_ids;
 extern int recurse;
@@ -1786,7 +1787,7 @@ int f_name_cmp(struct file_struct *f1, s
 	if (type1 != type2)
 		return type1 == t_PATH ? 1 : -1;
 
-	do {
+	while (1) {
 		if (!*c1) {
 			switch (state1) {
 			case s_DIR:
@@ -1849,7 +1850,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;
+			ch2 = islower(*c2) ? toupper(*c2) : *c2;
+			c1++, c2++;
+			if ((dif = (int)ch1 - (int)ch2) != 0)
+				break;
+		} else if ((dif = (int)*c1++ - (int)*c2++) != 0)
+			break;
+	}
 
 	return dif;
 }
--- 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))
 
+extern int ignore_case;
+
 #ifdef WILD_TEST_ITERATIONS
 int wildmatch_iteration_count;
 #endif
@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const 
     for ( ; (p_ch = *p) != '\0'; text++, p++) {
 	int matched, special;
 	uchar t_ch, prev_ch;
+	if (ignore_case && ISUPPER(p_ch))
+	    p_ch = tolower(p_ch);
 	while ((t_ch = *text) == '\0') {
 	    if (*a == NULL) {
 		if (p_ch != '*')
@@ -288,10 +292,14 @@ static const uchar *trailing_N_elements(
 int wildmatch(const char *pattern, const char *text)
 {
     static const uchar *nomore[1]; /* A NULL pointer. */
+    int ret;
 #ifdef WILD_TEST_ITERATIONS
     wildmatch_iteration_count = 0;
 #endif
-    return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
+    force_lower_case = ignore_case;
+    ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
+    force_lower_case = 0;
+    return ret;
 }
 
 /* Match the "pattern" against the forced-to-lower-case "text" string. */
--- old/options.c
+++ new/options.c
@@ -111,6 +111,7 @@ OFF_T max_size = 0;
 OFF_T min_size = 0;
 int ignore_errors = 0;
 int modify_window = 0;
+int ignore_case = 0;
 int blocking_io = -1;
 int checksum_seed = 0;
 int inplace = 0;
@@ -359,6 +360,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,"     --sockopts=OPTIONS      specify custom TCP options\n");
@@ -521,6 +523,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},
+  {"ignore-case",      0,  POPT_ARG_NONE,   &ignore_case, 0, 0, 0 },
   {"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
 		args[ac++] = arg;
 	}
 
+	if (ignore_case)
+		args[ac++] = "--ignore-case";
+
 	if (partial_dir && am_sender) {
 		if (partial_dir != tmp_partialdir) {
 			args[ac++] = "--partial-dir";
--- old/wildtest.c
+++ new/wildtest.c
@@ -32,6 +32,7 @@ int fnmatch_errors = 0;
 #endif
 
 int wildmatch_errors = 0;
+int ignore_case = 0;
 
 typedef char bool;
Commit	Line	Data
992633a5 WD	1	This adds the --ignore-case option, which makes rsync compare filenames
992633a5 WD	2	in a case-insensitive manner.
8a524ae0	3
9a7eef96 WD	4	--- old/flist.c
9a7eef96 WD	5	+++ new/flist.c
3f053c45	6	@@ -32,6 +32,7 @@ extern int am_sender;
9c657c9f WD	7	extern int do_progress;
	8	extern int always_checksum;
	9	extern int module_id;
	10	+extern int ignore_case;
	11	extern int ignore_errors;
	12	extern int numeric_ids;
	13	extern int recurse;
3f053c45 WD	14	@@ -1786,7 +1787,7 @@ int f_name_cmp(struct file_struct *f1, s
3f053c45 WD	15	if (type1 != type2)
9c657c9f WD	16	return type1 == t_PATH ? 1 : -1;
9c657c9f WD	17
3f053c45 WD	18	- do {
	19	+ while (1) {
	20	if (!*c1) {
	21	switch (state1) {
	22	case s_DIR:
	23	@@ -1849,7 +1850,16 @@ int f_name_cmp(struct file_struct *f1, s
	24	if (type1 != type2)
	25	return type1 == t_PATH ? 1 : -1;
	26	}
	27	- } while ((dif = (int)c1++ - (int)c2++) == 0);
9c657c9f WD	28	+ if (ignore_case) {
	29	+ uchar ch1, ch2;
	30	+ ch1 = islower(c1) ? toupper(c1) : *c1;
	31	+ ch2 = islower(c2) ? toupper(c2) : *c2;
	32	+ c1++, c2++;
	33	+ if ((dif = (int)ch1 - (int)ch2) != 0)
	34	+ break;
	35	+ } else if ((dif = (int)c1++ - (int)c2++) != 0)
3f053c45 WD	36	+ break;
	37	+ }
	38
	39	return dif;
	40	}
9a7eef96 WD	41	--- old/lib/wildmatch.c
9a7eef96 WD	42	+++ new/lib/wildmatch.c
992633a5 WD	43	@@ -53,6 +53,8 @@
	44	#define ISUPPER(c) (ISASCII(c) && isupper(c))
	45	#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
	46
	47	+extern int ignore_case;
	48	+
	49	#ifdef WILD_TEST_ITERATIONS
	50	int wildmatch_iteration_count;
	51	#endif
66e2df0e	52	@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const
ffadcb36 WD	53	for ( ; (p_ch = *p) != '\0'; text++, p++) {
	54	int matched, special;
	55	uchar t_ch, prev_ch;
	56	+ if (ignore_case && ISUPPER(p_ch))
	57	+ p_ch = tolower(p_ch);
66e2df0e WD	58	while ((t_ch = *text) == '\0') {
	59	if (*a == NULL) {
	60	if (p_ch != '*')
	61	@@ -288,10 +292,14 @@ static const uchar *trailing_N_elements(
ffadcb36 WD	62	int wildmatch(const char pattern, const char text)
ffadcb36 WD	63	{
66e2df0e	64	static const uchar nomore[1]; / A NULL pointer. */
ffadcb36 WD	65	+ int ret;
	66	#ifdef WILD_TEST_ITERATIONS
	67	wildmatch_iteration_count = 0;
	68	#endif
66e2df0e	69	- return dowild((const uchar)pattern, (const uchar)text, nomore) == TRUE;
ffadcb36	70	+ force_lower_case = ignore_case;
66e2df0e	71	+ ret = dowild((const uchar)pattern, (const uchar)text, nomore) == TRUE;
ffadcb36	72	+ force_lower_case = 0;
66e2df0e	73	+ return ret;
ffadcb36 WD	74	}
	75
	76	/* Match the "pattern" against the forced-to-lower-case "text" string. */
9a7eef96 WD	77	--- old/options.c
9a7eef96 WD	78	+++ new/options.c
afcb578c	79	@@ -111,6 +111,7 @@ OFF_T max_size = 0;
56208f7b	80	OFF_T min_size = 0;
5f7bb027 WD	81	int ignore_errors = 0;
	82	int modify_window = 0;
	83	+int ignore_case = 0;
	84	int blocking_io = -1;
	85	int checksum_seed = 0;
f6c3b300	86	int inplace = 0;
3f053c45	87	@@ -359,6 +360,7 @@ void usage(enum logcode F)
a7219d20 WD	88	rprintf(F," --include-from=FILE read include patterns from FILE\n");
a7219d20 WD	89	rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
896871f8	90	rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
5f7bb027	91	+ rprintf(F," --ignore-case ignore case when comparing filenames\n");
2b06a19d	92	rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
37da98ae	93	rprintf(F," --port=PORT specify double-colon alternate port number\n");
9a7eef96	94	rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
3f053c45	95	@@ -521,6 +523,7 @@ static struct poptOption long_options[]
edea1111 WD	96	{"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
	97	{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
	98	{"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
5f7bb027	99	+ {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
edea1111 WD	100	{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
	101	{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
	102	{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
3f053c45	103	@@ -1684,6 +1687,9 @@ void server_options(char *args,int arg
5f7bb027 WD	104	args[ac++] = arg;
5f7bb027 WD	105	}
7628f156	106
5f7bb027 WD	107	+ if (ignore_case)
5f7bb027 WD	108	+ args[ac++] = "--ignore-case";
7628f156	109	+
afbebe13	110	if (partial_dir && am_sender) {
9a7eef96	111	if (partial_dir != tmp_partialdir) {
27a7053c	112	args[ac++] = "--partial-dir";
9a7eef96 WD	113	--- old/wildtest.c
9a7eef96 WD	114	+++ new/wildtest.c
3f053c45	115	@@ -32,6 +32,7 @@ int fnmatch_errors = 0;
992633a5 WD	116	#endif
	117
	118	int wildmatch_errors = 0;
	119	+int ignore_case = 0;
	120
	121	typedef char bool;
5f7bb027	122