svn commit: samba r3268 - in branches/SAMBA_4_0/source/ntvfs/posix: .

[tridge at samba.org]

Author: tridge
Date: 2004-10-26 22:25:34 +0000 (Tue, 26 Oct 2004)
New Revision: 3268

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/ntvfs/posix&rev=3268&nolog=1

Log:
- fixed wildcard handling in new dirlist code

- ensure that d_name from readdir is not used after closedir


Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c	2004-10-26 21:43:34 UTC (rev 3267)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c	2004-10-26 22:25:34 UTC (rev 3268)
@@ -28,6 +28,7 @@
 	struct pvfs_state *pvfs;
 	BOOL no_wildcard;
 	char *last_name;
+	const char *pattern;
 	off_t offset;
 	DIR *dir;
 	const char *unix_path;
@@ -60,6 +61,7 @@
 
 	dir->dir = NULL;
 	dir->offset = 0;
+	dir->pattern = NULL;
 
 	return NT_STATUS_OK;
 }
@@ -110,6 +112,11 @@
 	if (!dir->unix_path) {
 		return NT_STATUS_NO_MEMORY;
 	}
+
+	dir->pattern = talloc_strdup(dir, pattern);
+	if (dir->pattern == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
 	
 	dir->dir = opendir(name->full_name);
 	if (!dir->dir) { 
@@ -147,20 +154,35 @@
 		dir->offset = *ofs;
 	}
 	
-	de = readdir(dir->dir);
-	if (de == NULL) {
-		dir->last_name = NULL;
-		dir->end_of_search = True;
-		pvfs_list_hibernate(dir);
-		return NULL;
-	}
+	while ((de = readdir(dir->dir))) {
+		const char *dname = de->d_name;
 
-	dir->offset = telldir(dir->dir);
-	(*ofs) = dir->offset;
+		if (ms_fnmatch(dir->pattern, dname, 
+			       dir->pvfs->tcon->smb_conn->negotiate.protocol) != 0) {
+			char *short_name = pvfs_short_name_component(dir->pvfs, dname);
+			if (short_name == NULL ||
+			    ms_fnmatch(dir->pattern, short_name, 
+				       dir->pvfs->tcon->smb_conn->negotiate.protocol) != 0) {
+				talloc_free(short_name);
+				continue;
+			}
+			talloc_free(short_name);
+		}
 
-	dir->last_name = de->d_name;
+		dir->offset = telldir(dir->dir);
+		(*ofs) = dir->offset;
 
-	return dir->last_name;
+		if (dir->last_name) talloc_free(dir->last_name);
+		dir->last_name = talloc_strdup(dir, de->d_name);
+
+		return dir->last_name;
+	}
+
+	if (dir->last_name) talloc_free(dir->last_name);
+	dir->last_name = NULL;
+	dir->end_of_search = True;
+	pvfs_list_hibernate(dir);
+	return NULL;
 }
 
 /* 
@@ -173,6 +195,10 @@
 		closedir(dir->dir);
 		dir->dir = NULL;
 	}
+	if (!dir->no_wildcard && dir->last_name) {
+		talloc_free(dir->last_name);
+		dir->last_name = NULL;
+	}
 }
 
 
@@ -233,7 +259,8 @@
 		return status;
 	}
 
-	if (StrCaseCmp(name, dir->last_name) == 0) {
+	if (dir->last_name &&
+	    StrCaseCmp(name, dir->last_name) == 0) {
 		*ofs = dir->offset;
 		return NT_STATUS_OK;
 	}
@@ -244,6 +271,8 @@
 		if (StrCaseCmp(name, de->d_name) == 0) {
 			dir->offset = telldir(dir->dir);
 			*ofs = dir->offset;
+			if (dir->last_name) talloc_free(dir->last_name);
+			dir->last_name = talloc_strdup(dir, de->d_name);
 			return NT_STATUS_OK;
 		}
 	}