Changeset 966 for trunk/client/src/smbwrp.c

Timestamp:

Aug 19, 2016, 2:24:06 PM (9 years ago)

Author:

Yuri Dario

Message:

Samba code changes for using new dircache API. ticket#274.

File:

• trunk/client/src/smbwrp.c (modified) (5 diffs)

trunk/client/src/smbwrp.c

@@ -26 +26 @@
 #include "libsmb/clirap.h"
 #include "trans2.h"
+
+#include "dircache.h"
 #include "smbwrp.h"
 
@@ -806 +808 @@
 
         // Try to get the listing from cache.
-        if (dircache_list_files(fn, state, &num_finfo))
+        if (dircache_list_files(pRes->pdc, fn, state->plist,
+                                state->mask, (char*) state->fullpath, &num_finfo))
            return(num_finfo); // Got from cache
 
@@ -838 +841 @@
            goto fail;
 
-        dircachectx = dircache_write_begin(state, num_finfo);
+        dircachectx = dircache_write_begin(pRes->pdc, state->mask,
+                                           (char*) state->fullpath, num_finfo);
 
         debuglocal(pRes, 4,"list_files: got %d files\n", num_finfo);
@@ -854 +858 @@
            fn(cli->dfs_mountpoint, &wrpfinfo, mask, state);
            // Also add the entry to the cache.
-           dircache_write_entry(pRes, dircachectx, &wrpfinfo);
-        }
-
-        dircache_write_end(pRes, dircachectx);
+           dircache_write_entry(pRes->pdc, dircachectx, &wrpfinfo);
+        }
+
+        dircache_write_end(pRes->pdc, dircachectx);
+
  fail:
         TALLOC_FREE(frame);
@@ -988 +993 @@
 }
 
-
-#pragma pack(1)
-typedef struct _FEA
-{
-        unsigned char fEA;      // flags
-        unsigned char cbName;   // name length not including NULL
-        unsigned short cbValue; // value length
-} FEA;
-
-typedef struct _FEALIST
-{
-        unsigned long cbList;   // total bytes of structure including full list
-        FEA list[1];            // variable length FEA structures
-} FEALIST;
-#pragma pack()
 
 static int unilistea(Resource *pRes, cli_state * cli, char *fname, void * buffer, unsigned long size)