smbd: Fix a typo in a few places

[samba.git] / source3 / modules / vfs_dirsort.c

diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index c6b5ea41c93660336068f9d98d9464243663f5c3..c4baf819b0384cee94d5099dad7e730a1a002bf1 100644 (file)
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -79,7 +79,7 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
                return false;
        }
 
-       dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL);
+       dp = SMB_VFS_NEXT_READDIR(handle, data->fsp, data->source_directory);
        if (dp == NULL) {
                return false;
        }
@@ -120,7 +120,9 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
                data->directory_list[total_count] = *dp;
 
                total_count++;
-               dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL);
+               dp = SMB_VFS_NEXT_READDIR(handle,
+                                         data->fsp,
+                                         data->source_directory);
        } while (dp != NULL);
 
        data->number_of_entries = total_count;
@@ -130,67 +132,6 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
        return true;
 }
 
-static DIR *dirsort_opendir(vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname,
-                               const char *mask,
-                               uint32_t attr)
-{
-       struct dirsort_privates *list_head = NULL;
-       struct dirsort_privates *data = NULL;
-
-       if (SMB_VFS_HANDLE_TEST_DATA(handle)) {
-               /* Find the list head of all open directories. */
-               SMB_VFS_HANDLE_GET_DATA(handle, list_head, struct dirsort_privates,
-                               return NULL);
-       }
-
-       /* set up our private data about this directory */
-       data = talloc_zero(handle->conn, struct dirsort_privates);
-       if (!data) {
-               return NULL;
-       }
-
-       data->smb_fname = cp_smb_filename(data, smb_fname);
-       if (data->smb_fname == NULL) {
-               TALLOC_FREE(data);
-               return NULL;
-       }
-
-       if (ISDOT(data->smb_fname->base_name)) {
-               struct smb_filename *cwd_fname = vfs_GetWd(data, handle->conn);
-               if (cwd_fname == NULL) {
-                       TALLOC_FREE(data);
-                       return NULL;
-               }
-               TALLOC_FREE(data->smb_fname->base_name);
-               data->smb_fname->base_name = talloc_move(data->smb_fname,
-                                               &cwd_fname->base_name);
-               TALLOC_FREE(cwd_fname);
-       }
-
-       /* Open the underlying directory and count the number of entries */
-       data->source_directory = SMB_VFS_NEXT_OPENDIR(handle, smb_fname, mask,
-                                                     attr);
-
-       if (data->source_directory == NULL) {
-               TALLOC_FREE(data);
-               return NULL;
-       }
-
-       if (!open_and_sort_dir(handle, data)) {
-               SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
-               TALLOC_FREE(data);
-               return NULL;
-       }
-
-       /* Add to the private list of all open directories. */
-       DLIST_ADD(list_head, data);
-       SMB_VFS_HANDLE_SET_DATA(handle, list_head, NULL,
-                               struct dirsort_privates, return NULL);
-
-       return data->source_directory;
-}
-
 static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
                                        files_struct *fsp,
                                        const char *mask,
@@ -226,7 +167,7 @@ static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
                SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
                TALLOC_FREE(data);
                /* fd is now closed. */
-               fsp->fh->fd = -1;
+               fsp_set_fd(fsp, -1);
                return NULL;
        }
 
@@ -239,8 +180,8 @@ static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
 }
 
 static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
-                                         DIR *dirp,
-                                         SMB_STRUCT_STAT *sbuf)
+                                     struct files_struct *dirfsp,
+                                     DIR *dirp)
 {
        struct dirsort_privates *data = NULL;
        struct timespec current_mtime;
@@ -272,74 +213,6 @@ static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
        return &data->directory_list[data->pos++];
 }
 
-static void dirsort_seekdir(vfs_handle_struct *handle, DIR *dirp,
-                           long offset)
-{
-       struct timespec current_mtime;
-       struct dirsort_privates *data = NULL;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates, return);
-
-       /* Find the entry holding dirp. */
-       while(data && (data->source_directory != dirp)) {
-               data = data->next;
-       }
-       if (data == NULL) {
-               return;
-       }
-       if (offset >= data->number_of_entries) {
-               return;
-       }
-       data->pos = offset;
-
-       if (get_sorted_dir_mtime(handle, data, &current_mtime) == false) {
-               return;
-       }
-
-       if (timespec_compare(&current_mtime, &data->mtime)) {
-               /* Directory changed. We must re-read the
-                  cache and search for the name that was
-                  previously stored at the offset being
-                  requested, otherwise after the re-sort
-                  we will point to the wrong entry. The
-                  OS/2 incremental delete code relies on
-                  this. */
-               unsigned int i;
-               char *wanted_name = talloc_strdup(handle->conn,
-                                       data->directory_list[offset].d_name);
-               if (wanted_name == NULL) {
-                       return;
-               }
-               SMB_VFS_NEXT_REWINDDIR(handle, data->source_directory);
-               open_and_sort_dir(handle, data);
-               /* Now search for where we were. */
-               data->pos = 0;
-               for (i = 0; i < data->number_of_entries; i++) {
-                       if(strcmp(wanted_name, data->directory_list[i].d_name) == 0) {
-                               data->pos = i;
-                               break;
-                       }
-               }
-               TALLOC_FREE(wanted_name);
-       }
-}
-
-static long dirsort_telldir(vfs_handle_struct *handle, DIR *dirp)
-{
-       struct dirsort_privates *data = NULL;
-       SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,
-                               return -1);
-
-       /* Find the entry holding dirp. */
-       while(data && (data->source_directory != dirp)) {
-               data = data->next;
-       }
-       if (data == NULL) {
-               return -1;
-       }
-       return data->pos;
-}
-
 static void dirsort_rewinddir(vfs_handle_struct *handle, DIR *dirp)
 {
        struct dirsort_privates *data = NULL;
@@ -380,11 +253,8 @@ static int dirsort_closedir(vfs_handle_struct *handle, DIR *dirp)
 }
 
 static struct vfs_fn_pointers vfs_dirsort_fns = {
-       .opendir_fn = dirsort_opendir,
        .fdopendir_fn = dirsort_fdopendir,
        .readdir_fn = dirsort_readdir,
-       .seekdir_fn = dirsort_seekdir,
-       .telldir_fn = dirsort_telldir,
        .rewind_dir_fn = dirsort_rewinddir,
        .closedir_fn = dirsort_closedir,
 };