From 7a9cac25484d310cfe9da4a0c6c1887871538366 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 29 Jan 2012 22:04:45 +0000
Subject: [PATCH] -fix

---
 src/fs/fs_dirmetascan.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index 5ffa69229..9ee69c860 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -231,8 +231,12 @@ process_helper_msgs (void *cls,
     ds->progress_callback (ds->progress_callback_cls, 
 			   filename, GNUNET_NO,
 			   GNUNET_FS_DIRSCANNER_FILE_START);
-    expand_tree (ds->pos,
-		 filename, GNUNET_NO);
+    if (NULL == ds->toplevel)
+      ds->toplevel = expand_tree (ds->pos,
+				  filename, GNUNET_NO);
+    else
+      (void) expand_tree (ds->pos,
+			  filename, GNUNET_NO);
     return;
   case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_DIRECTORY:
     if (filename[left-1] != '\0')
@@ -273,6 +277,11 @@ process_helper_msgs (void *cls,
       GNUNET_break (0);
       break;
     }
+    if (NULL == ds->toplevel)
+    {
+      GNUNET_break (0);
+      break;
+    }
     ds->progress_callback (ds->progress_callback_cls, 
 			   NULL, GNUNET_SYSERR,
 			   GNUNET_FS_DIRSCANNER_ALL_COUNTED);
@@ -336,6 +345,11 @@ process_helper_msgs (void *cls,
       break;
     }
     if (0 != left)
+    {
+      GNUNET_break (0);
+      break;
+    }   
+    if (NULL == ds->toplevel)
     {
       GNUNET_break (0);
       break;
-- 
2.25.1