summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-26 22:25:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:48 -0500
commit731e64cdcfebd39ac32aa87d34dcf511caeda57f (patch)
tree311b3e8f11c16e2327685e4b871d41265ae468a3 /source4/ntvfs
parent2970ff9bd9e6b2d4d40eb3c5c2845e62141fe6f7 (diff)
downloadsamba-731e64cdcfebd39ac32aa87d34dcf511caeda57f.tar.gz
samba-731e64cdcfebd39ac32aa87d34dcf511caeda57f.tar.bz2
samba-731e64cdcfebd39ac32aa87d34dcf511caeda57f.zip
r3268: - fixed wildcard handling in new dirlist code
- ensure that d_name from readdir is not used after closedir (This used to be commit 5352613342c58192ae00618977041b98cd0ff7b6)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/posix/pvfs_dirlist.c53
1 files changed, 41 insertions, 12 deletions
diff --git a/source4/ntvfs/posix/pvfs_dirlist.c b/source4/ntvfs/posix/pvfs_dirlist.c
index 3f5b606bf9..79f014d967 100644
--- a/source4/ntvfs/posix/pvfs_dirlist.c
+++ b/source4/ntvfs/posix/pvfs_dirlist.c
@@ -28,6 +28,7 @@ struct pvfs_dir {
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 @@ static NTSTATUS pvfs_list_no_wildcard(struct pvfs_state *pvfs, struct pvfs_filen
dir->dir = NULL;
dir->offset = 0;
+ dir->pattern = NULL;
return NT_STATUS_OK;
}
@@ -110,6 +112,11 @@ NTSTATUS pvfs_list_start(struct pvfs_state *pvfs, struct pvfs_filename *name,
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 @@ const char *pvfs_list_next(struct pvfs_dir *dir, uint_t *ofs)
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;
+
+ 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->offset = telldir(dir->dir);
- (*ofs) = dir->offset;
+ dir->offset = telldir(dir->dir);
+ (*ofs) = dir->offset;
- dir->last_name = de->d_name;
+ if (dir->last_name) talloc_free(dir->last_name);
+ dir->last_name = talloc_strdup(dir, de->d_name);
- return dir->last_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 @@ void pvfs_list_hibernate(struct pvfs_dir *dir)
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 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
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 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
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;
}
}