1 files changed, 77 insertions, 18 deletions

diff --git a/src/fuse/gnunet-fuse.h b/src/fuse/gnunet-fuse.h
index d8f567b..99137d8 100644
--- a/src/fuse/gnunet-fuse.h
+++ b/src/fuse/gnunet-fuse.h
@@ -52,8 +52,36 @@ extern const struct GNUNET_CONFIGURATION_Handle *cfg;
  */
 struct GNUNET_FUSE_PathInfo
 {
+
+  /**
+   * All files in a directory are kept in a DLL.
+   */
+  struct GNUNET_FUSE_PathInfo *next;
+
+  /**
+   * All files in a directory are kept in a DLL.
+   */
+  struct GNUNET_FUSE_PathInfo *prev;
+
+  /**
+   * Parent directory, NULL for the root.
+   */
+  struct GNUNET_FUSE_PathInfo *parent;
+
   /**
-   * uri to corresponding path 
+   * Head of linked list of entries in this directory
+   * (NULL if this is a file).
+   */
+  struct GNUNET_FUSE_PathInfo *child_head;
+
+  /**
+   * Head of linked list of entries in this directory
+   * (NULL if this is a file).
+   */
+  struct GNUNET_FUSE_PathInfo *child_tail;
+
+  /**
+   * URI of the file or directory.
    */
   struct GNUNET_FS_Uri *uri;
 
@@ -63,14 +91,15 @@ struct GNUNET_FUSE_PathInfo
   struct GNUNET_CONTAINER_MetaData *meta;
 
   /**
-   * pathname 
+   * Name of the file for this path (i.e. "home").  '/' for the root (all other
+   * filenames must not contain '/')
    */
-  char* path;
+  char *filename;
 
   /**
-   * name of temporary file 
+   * Name of temporary file, NULL if we never accessed this file or directory.
    */
-  char* tmpfile;
+  char *tmpfile;
   
   /**
    * file attributes
@@ -78,12 +107,25 @@ struct GNUNET_FUSE_PathInfo
   struct stat stbuf;
   
   /**
-   * Lock for exclusive access to this struct.
+   * Lock for exclusive access to this struct (i.e. for downloading blocks).
+   * Lock order: always lock parents before children.
    */ 
   struct GNUNET_Mutex *lock;
 
   /**
-   * Reference counter.
+   * Beginning of a contiguous range of blocks of the file what we
+   * have downloaded already to 'tmpfile'.
+   */
+  uint64_t download_start;
+
+  /**
+   * End of a contiguous range of blocks of the file what we
+   * have downloaded already to 'tmpfile'.
+   */
+  uint64_t download_end;
+
+  /**
+   * Reference counter (used if the file is deleted while being opened, etc.)
    */
   unsigned int rc;
 
@@ -97,7 +139,8 @@ struct GNUNET_FUSE_PathInfo
 /**
  * Create a new path info entry in the global map.
  *
- * @param path path the entry represents
+ * @param parent parent directory (can be NULL)
+ * @param filename name of the file to create
  * @param uri URI to use for the path
  * @param is_directory GNUNET_YES if this entry is for a directory
  * @return existing path entry if one already exists, otherwise
@@ -105,7 +148,8 @@ struct GNUNET_FUSE_PathInfo
  *         the reference counter has been incremented by 1
  */
 struct GNUNET_FUSE_PathInfo *
-GNUNET_FUSE_path_info_create (const char *path,
+GNUNET_FUSE_path_info_create (struct GNUNET_FUSE_PathInfo *parent,
+                              const char *filename,
                               const struct GNUNET_FS_Uri *uri,
                               int is_directory);
 
@@ -114,11 +158,13 @@ GNUNET_FUSE_path_info_create (const char *path,
  * Obtain an existing path info entry from the global map.
  *
  * @param path path the entry represents
+ * @param eno where to store 'errno' on errors
  * @return NULL if no such path entry exists, otherwise
  *  an entry with incremented reference counter (!)
  */
 struct GNUNET_FUSE_PathInfo *
-GNUNET_FUSE_path_info_get (const char *path);
+GNUNET_FUSE_path_info_get (const char *path,
+                           int *eno);
 
 
 /**
@@ -141,9 +187,30 @@ int
 GNUNET_FUSE_path_info_delete (struct GNUNET_FUSE_PathInfo *pi);
 
 
+/**
+ * Load and parse a directory.
+ *
+ * @param pi path to the directory
+ * @param eno where to store 'errno' on errors
+ * @return GNUNET_OK on success
+ */
+int
+GNUNET_FUSE_load_directory (struct GNUNET_FUSE_PathInfo *pi,
+                            int * eno);
+
+
 /* FUSE function files */
 int gn_getattr(const char *path, struct stat *stbuf);
 
+int gn_open(const char *path, struct fuse_file_info *fi);
+
+int gn_read(const char *path, char *buf, size_t size, off_t offset,
+        struct fuse_file_info *fi);
+
+int gn_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+        off_t offset, struct fuse_file_info *fi);
+
+
 int gn_mknod(const char *path, mode_t mode, dev_t rdev);
 
 int gn_mkdir(const char *path, mode_t mode);
@@ -156,19 +223,11 @@ int gn_rename(const char *from, const char *to);
 
 int gn_truncate(const char *path, off_t size);
 
-int gn_open(const char *path, struct fuse_file_info *fi);
-
-int gn_read(const char *path, char *buf, size_t size, off_t offset,
-        struct fuse_file_info *fi);
-
 int gn_write(const char *path, const char *buf, size_t size, off_t offset,
         struct fuse_file_info *fi);
 
 int gn_release(const char *path, struct fuse_file_info *fi);
 
-int gn_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
-        off_t offset, struct fuse_file_info *fi);
-
 int gn_utimens(const char *path, const struct timespec ts[2]);