1 files changed, 12 insertions, 136 deletions

diff --git a/src/fuse/readdir.c b/src/fuse/readdir.c
index 9cb914b..32bd10d 100644
--- a/src/fuse/readdir.c
+++ b/src/fuse/readdir.c
@@ -53,153 +53,29 @@
 #include "gnunet-fuse.h"
 #include "gfs_download.h"
 
-/**
- * Closure for 'process_directory_entry'.
- */
-struct DepContext
-{
-  /**
-   * Function to call on each entry.
-   */
-  fuse_fill_dir_t filler;
-
-  /**
-   * 'buf' argument to give to filler.
-   */
-  void *buf;
-
-  /**
-   * Basepath to add for the entries.
-   */
-  const char *path;
-};
-
-
-/**
- * Function used to process entries in a directory.
- *
- * @param cls closure
- * @param filename name of the file in the directory
- * @param uri URI of the file
- * @param metadata metadata for the file; metadata for
- *        the directory if everything else is NULL/zero
- * @param length length of the available data for the file
- *           (of type size_t since data must certainly fit
- *            into memory; if files are larger than size_t
- *            permits, then they will certainly not be
- *            embedded with the directory itself).
- * @param data data available for the file (length bytes)
- */
-static void 
-process_directory_entry (void *cls,
-                         const char *filename,
-                         const struct GNUNET_FS_Uri *
-                         uri,
-                         const struct
-                         GNUNET_CONTAINER_MetaData *
-                         meta, size_t length,
-                         const void *data)
-{
-  struct DepContext *dc = cls;
-  struct GNUNET_FUSE_PathInfo *pi;
-  char *path;
-  int is_directory;
-
-  if (NULL == filename)
-    return; /* info about the directory itself */
-  GNUNET_asprintf (&path,
-                   "%s%s",
-                   dc->path,
-                   filename);
-  is_directory = GNUNET_FS_meta_data_test_for_directory (meta);
-  if (GNUNET_SYSERR == is_directory)
-    is_directory = GNUNET_NO; /* if in doubt, say no */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Listing filename `%s' in directory `%s' (%s)\n", 
-              filename,
-              dc->path,
-              path);
-  pi = GNUNET_FUSE_path_info_create (path, uri, is_directory);
-  dc->filler (dc->buf,
-              filename, 
-              &pi->stbuf,
-              0);
-  GNUNET_FUSE_path_info_done (pi);
-}
-
 
 int
 gn_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
             off_t offset, struct fuse_file_info *fi)
 {
   struct GNUNET_FUSE_PathInfo *path_info;
-  struct DepContext dc;
-  size_t size;
-  int ret;
-  void *data;
-  struct GNUNET_DISK_MapHandle *mh;
-  struct GNUNET_DISK_FileHandle *fh;
+  struct GNUNET_FUSE_PathInfo *pos;
+  int eno;
 
-  path_info = GNUNET_FUSE_path_info_get (path);
+  path_info = GNUNET_FUSE_path_info_get (path, &eno);
   if (NULL == path_info)
-    {
-      /* FIXME: we might need to check which of the ancestors
-         exist and possibly download ancestral directories,
-         instead of directly giving up here... */
-      return - ENOENT;
-    }
-  
-  if (NULL == path_info->tmpfile)
-    {
-      /* store to temporary file */
-      path_info->tmpfile = GNUNET_DISK_mktemp ("gnunet-fuse-tempfile");
-      if (GNUNET_OK != GNUNET_FUSE_download_file (path_info, 
-                                                  0,
-                                                  GNUNET_FS_uri_chk_get_file_size (path_info->uri)))
-      {
-        UNLINK (path_info->tmpfile);
-        GNUNET_free (path_info->tmpfile);
-        path_info->tmpfile = NULL;
-        GNUNET_FUSE_path_info_done (path_info);
-        return - EIO; /* low level IO error */
-      }
-    } 
-
-  dc.filler = filler;
-  dc.path = path;
-  dc.buf = buf;
-  size = (size_t) GNUNET_FS_uri_chk_get_file_size (path_info->uri);
-  fh = GNUNET_DISK_file_open (path_info->tmpfile,
-                              GNUNET_DISK_OPEN_READ,
-                              GNUNET_DISK_PERM_NONE);                         
-  if (NULL == fh)
-  {
-    GNUNET_FUSE_path_info_done (path_info);
-    return -EBADF;
-  }
-  data = GNUNET_DISK_file_map (fh, 
-                               &mh,
-                               GNUNET_DISK_MAP_TYPE_READ,
-                               size);
-  if (NULL == data)
-  {
-    GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
-    GNUNET_FUSE_path_info_done (path_info);
-    return -EBADF;
-  }
+    return - eno;
+  if ( (NULL == path_info->tmpfile) &&
+       (GNUNET_OK != GNUNET_FUSE_load_directory (path_info, &eno)) )
+    return - eno;
   filler (buf, ".", NULL, 0);
   filler (buf, "..", NULL, 0);
-  ret = 0;
-  if (GNUNET_OK !=
-      GNUNET_FS_directory_list_contents (size,
-                                         data, 0LL,
-                                         &process_directory_entry,
-                                         &dc))
-    ret = - EIO;
-  GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_unmap (mh));
-  GNUNET_DISK_file_close (fh);
+  for (pos = path_info->child_head; NULL != pos; pos = pos->next)
+    filler (buf, pos->filename, 
+            &pos->stbuf,
+            0);
   GNUNET_FUSE_path_info_done (path_info);
-  return ret;    
+  return 0;
 }
 
 /* end of readdir.c */