Implemented sub-second W32 filesystem interface by new: CaptiveFileInfoObject

[captive.git] / src / client / fuse / op_readdir.c

diff --git a/src/client/fuse/op_readdir.c b/src/client/fuse/op_readdir.c
index 5bec35f..6aceb66 100644 (file)
--- a/src/client/fuse/op_readdir.c
+++ b/src/client/fuse/op_readdir.c
@@ -28,7 +28,7 @@
 #include "op_readdir.h"        /* self */
 #include "main.h"
 #include "gnomevfsresult.h"
-#include "gnomevfsfileinfo.h"
+#include "capfuse_captive_file_info_object.h"
 
 
 /* int (*fuse_fill_dir_t)(void *buf,const char *name,const struct stat *stbuf,off_t off); */
@@ -37,7 +37,7 @@ int op_readdir(const char *path,void *buf,fuse_fill_dir_t fill_dir,off_t off,str
 {
 CaptiveDirectoryObject *captive_directory_object;
 GnomeVFSResult errvfsresult;
-GnomeVFSFileInfo file_info;
+CaptiveFileInfoObject *captive_file_info_object;
 
        g_return_val_if_fail(path!=NULL,-EINVAL);
        g_return_val_if_fail(fill_dir!=NULL,-EINVAL);
@@ -46,23 +46,21 @@ GnomeVFSFileInfo file_info;
        captive_directory_object=(gpointer)fi->fh;
        g_return_val_if_fail(CAPTIVE_DIRECTORY_IS_OBJECT(captive_directory_object),-EINVAL);
 
-       /* Pre-clear to take care of any fields not touched by libcaptive there. */
-       CAPTIVE_MEMZERO(&file_info);
-       gnome_vfs_file_info_clear(&file_info);
        while (GNOME_VFS_OK==(errvfsresult=captive_directory_read(
                        captive_directory_object,       /* captive_directory_object */
-                       &file_info))) { /* file_info */
+                       &captive_file_info_object))) {  /* captive_file_info_object */
 struct stat stat;
 int errint;
 
-               if ((errint=gnomevfsfileinfo_to_stat(&stat,&file_info)))
+               errint=capfuse_captive_file_info_object_to_stat(&stat,captive_file_info_object);
+               g_object_unref(captive_file_info_object);
+               if (errint)
                        return errint;
                errint=(*fill_dir)(
                                buf,    /* buf; opaque */
-                               file_info.name, /* name */
+                               captive_file_info_object->p.name,       /* name */
                                &stat,  /* stbuf */
                                0);     /* off; operation mode 1 - <fuse.h>/(*readdir) */
-               gnome_vfs_file_info_clear(&file_info);
                if (errint) {
                        /* FIXME: Is it right? Examples do so. */
                        break;