3 files changed, 14 insertions, 5 deletions

diff --git a/TODO b/TODO
index 7d591bd42..49e647671 100644
--- a/TODO
+++ b/TODO
@@ -21,19 +21,18 @@ away), in order in which they will likely be done:
     Also, core does not seem to actually decrement the number of active
     sessions even if no connections exist for a while! (likely related...)
   - transport reports bw quota violations on slow systems (core or
-    transport issue?)
+    transport issue? tracking issue or actual violation?)
 * DATASTORE: [CG]
   - utilization can (easily, restart?) go out of control (very large), causing
     content expiration job to go crazy and delete everything!
 * FS: [CG]
-  - gnunet-publish uses 'NULL' for the file name when
-    publishing a directory (!)
+  - EASY BUGS:
+    + gnunet-download does not terminate when done (stop missing!)
   - on some systems, keyword search does not find locally published content
     (need testcase of command-line tools! - also good to cover getopt API!)
     [could be related to datastore issue above!]
   - 2-peer download is still too slow (why?)
   - advanced FS API parts
-    + pick correct filenames for recursive downloads (mkdir, .gnd)
     + support recursive download even if filename is NULL and we hence
       do not generate files on disk (use temp_filename)
     + bound parallelism (# fs downloads)
diff --git a/doc/man/gnunet-download.1 b/doc/man/gnunet-download.1
index 0db45aeb0..8fcfaf2b5 100644
--- a/doc/man/gnunet-download.1
+++ b/doc/man/gnunet-download.1
@@ -34,7 +34,7 @@ write the file to FILENAME.  Hint: when recursively downloading a directory, app
 set the maximum number of parallel downloads that is allowed.  More parallel downloads can, to some extent, improve the overall time to download content.  However, parallel downloads also take more memory.  The specified number is the number of files that are downloaded in parallel, not the number of blocks that are concurrently requested.  As a result, the number only matters for recursive downloads.  The default value is 32.
 .TP
 \fB\-R\fR, \fB\-\-recursive\fR
-download directories recursively (and in parallel); note that the URI must belong to a GNUnet directory and that the filename given must end with a '/' \-\- otherwise, only the file corresponding to the URI will be downloaded.
+download directories recursively (and in parallel); note that the URI must belong to a GNUnet directory and that the filename given must end with a '/' \-\- otherwise, only the file corresponding to the URI will be downloaded.  Note that in addition to using '-R', you must also specify a filename ending in '.gnd' so that the code realizes that the top-level file is a directory (since we have no meta data).
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 961dab4e2..6da6ce43e 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -2376,6 +2376,16 @@ GNUNET_FS_meta_data_make_directory (struct GNUNET_CONTAINER_MetaData *md);
 
 
 /**
+ * Suggest a filename based on given metadata.
+ * 
+ * @param md given meta data
+ * @return NULL if meta data is useless for suggesting a filename
+ */
+char *
+GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md);
+
+
+/**
  * Function used to process entries in a directory.
  *
  * @param cls closure