svn commit: samba r2824 - in branches/SAMBA_3_0/source: lib torture

[tridge at samba.org]

Author: tridge
Date: 2004-10-05 03:26:02 +0000 (Tue, 05 Oct 2004)
New Revision: 2824

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source&rev=2824&nolog=1

Log:
restored the is_case_sensitive option to ms_fnmatch() in Samba3. It is
very rarely used, but we sohuldn't be removing a feature in a minor
release of this kind.

Modified:
   branches/SAMBA_3_0/source/lib/ms_fnmatch.c
   branches/SAMBA_3_0/source/lib/util.c
   branches/SAMBA_3_0/source/torture/masktest.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/ms_fnmatch.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ms_fnmatch.c	2004-10-05 01:36:37 UTC (rev 2823)
+++ branches/SAMBA_3_0/source/lib/ms_fnmatch.c	2004-10-05 03:26:02 UTC (rev 2824)
@@ -55,7 +55,8 @@
   not contain a '.', otherwise it points at the last dot in 'n'.
 */
 static int ms_fnmatch_core(const smb_ucs2_t *p, const smb_ucs2_t *n, 
-			   struct max_n *max_n, const smb_ucs2_t *ldot)
+			   struct max_n *max_n, const smb_ucs2_t *ldot,
+			   BOOL is_case_sensitive)
 {
 	smb_ucs2_t c;
 	int i;
@@ -68,7 +69,7 @@
 				return null_match(p);
 			}
 			for (i=0; n[i]; i++) {
-				if (ms_fnmatch_core(p, n+i, max_n+1, ldot) == 0) {
+				if (ms_fnmatch_core(p, n+i, max_n+1, ldot, is_case_sensitive) == 0) {
 					return 0;
 				}
 			}
@@ -86,9 +87,9 @@
 				return -1;
 			}
 			for (i=0; n[i]; i++) {
-				if (ms_fnmatch_core(p, n+i, max_n+1, ldot) == 0) return 0;
+				if (ms_fnmatch_core(p, n+i, max_n+1, ldot, is_case_sensitive) == 0) return 0;
 				if (n+i == ldot) {
-					if (ms_fnmatch_core(p, n+i+1, max_n+1, ldot) == 0) return 0;
+					if (ms_fnmatch_core(p, n+i+1, max_n+1, ldot, is_case_sensitive) == 0) return 0;
 					if (!max_n->postdot || max_n->postdot > n) max_n->postdot = n;
 					return -1;
 				}
@@ -125,8 +126,13 @@
 			break;
 
 		default:
-			if (c != *n && toupper_w(c) != toupper_w(*n)) {
-				return -1;
+			if (c != *n) {
+				if (is_case_sensitive) {
+					return -1;
+				}
+				if (toupper_w(c) != toupper_w(*n)) {
+					return -1;
+				}
 			}
 			n++;
 			break;
@@ -140,7 +146,8 @@
 	return -1;
 }
 
-int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol)
+int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol, 
+	       BOOL is_case_sensitive)
 {
 	wpstring p, s;
 	int ret, count, i;
@@ -153,7 +160,11 @@
 	if (strpbrk(pattern, "<>*?\"") == NULL) {
 		/* this is not just an optmisation - it is essential
 		   for LANMAN1 correctness */
-		return StrCaseCmp(pattern, string);
+		if (is_case_sensitive) {
+			return strcmp(pattern, string);
+		} else {
+			return StrCaseCmp(pattern, string);
+		}
 	}
 
 	pstrcpy_wa(p, pattern);
@@ -190,7 +201,7 @@
 		}
 	}
 
-	ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')));
+	ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')), is_case_sensitive);
 
 	if (max_n) {
 		free(max_n);
@@ -203,5 +214,5 @@
 /* a generic fnmatch function - uses for non-CIFS pattern matching */
 int gen_fnmatch(const char *pattern, const char *string)
 {
-	return ms_fnmatch(pattern, string, PROTOCOL_NT1);
+	return ms_fnmatch(pattern, string, PROTOCOL_NT1, False);
 }

Modified: branches/SAMBA_3_0/source/lib/util.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util.c	2004-10-05 01:36:37 UTC (rev 2823)
+++ branches/SAMBA_3_0/source/lib/util.c	2004-10-05 03:26:02 UTC (rev 2824)
@@ -2325,7 +2325,7 @@
 	if (strcmp(pattern,".") == 0)
 		return False;
 	
-	return ms_fnmatch(pattern, string, Protocol) == 0;
+	return ms_fnmatch(pattern, string, Protocol, is_case_sensitive) == 0;
 }
 
 /*******************************************************************

Modified: branches/SAMBA_3_0/source/torture/masktest.c
===================================================================
--- branches/SAMBA_3_0/source/torture/masktest.c	2004-10-05 01:36:37 UTC (rev 2823)
+++ branches/SAMBA_3_0/source/torture/masktest.c	2004-10-05 03:26:02 UTC (rev 2824)
@@ -140,7 +140,7 @@
 
 	if (strcmp(file,"..") == 0) file = ".";
 
-	return ms_fnmatch(pattern, file, cli->protocol)==0;
+	return ms_fnmatch(pattern, file, cli->protocol, False) == 0;
 }
 
 static char *reg_test(struct cli_state *cli, char *pattern, char *long_name, char *short_name)