1 files changed, 52 insertions, 7 deletions

diff --git a/src/fuse/read.c b/src/fuse/read.c
index d6774e0..de950a8 100644
--- a/src/fuse/read.c
+++ b/src/fuse/read.c
@@ -52,15 +52,22 @@ gn_read (const char *path, char *buf, size_t size, off_t offset,
   struct GNUNET_FUSE_PathInfo *path_info;
   uint64_t fsize;
   struct GNUNET_DISK_FileHandle *fh;
+  int eno;
 
-  path_info = GNUNET_FUSE_path_info_get (path);
+  path_info = GNUNET_FUSE_path_info_get (path, &eno);
   if (NULL == path_info)
+    return - eno;
+  fsize = GNUNET_FS_uri_chk_get_file_size (path_info->uri);
+  if (offset > fsize)
   {
-    /* FIXME: we might need to check which of the ancestors
-       exist and possibly download ancestral directories,
-       instead of directly giving up here... */
-    return - ENOENT;
-  }  
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                "No data available at offset %llu of file `%s'\n",
+                (unsigned long long) offset,
+                path);
+    return 0; 
+  }
+  if (offset + size > fsize)
+    size = fsize - offset;
   if (NULL == path_info->tmpfile)
   {
     /* store to temporary file */
@@ -76,8 +83,46 @@ gn_read (const char *path, char *buf, size_t size, off_t offset,
       return - EIO; /* low level IO error */
     }
   } 
+  else
+  {
+    if ( (offset < path_info->download_start) ||
+         (size + offset > path_info->download_end) )
+    {
+      /* need to download some more... */
+      if (GNUNET_OK != GNUNET_FUSE_download_file (path_info, 
+                                                  offset,
+                                                  size))
+      {
+        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 */
+      }
+    }
+  }
+  /* combine ranges */
+  if (path_info->download_start == path_info->download_end)
+  {
+    /* first range */
+    path_info->download_start = offset;
+    path_info->download_end = offset + size;
+  }
+  else
+  {
+    /* only combine ranges if the resulting range would
+       be contiguous... */
+    if ( (offset >= path_info->download_start) &&
+         (offset <= path_info->download_end) &&
+         (offset + size > path_info->download_end) )
+      path_info->download_end = offset + size;
+    if ( (offset + size >= path_info->download_start) &&
+         (offset + size <= path_info->download_end) &&
+         (offset < path_info->download_start) )
+      path_info->download_start = offset;
+  }
+
 
-  fsize = 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);