[GNUnet-SVN] r19518 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-01-29 23:04:45 +0100 (Sun, 29 Jan 2012)
New Revision: 19518

Modified:
   gnunet/src/fs/fs_dirmetascan.c
Log:
-fix

Modified: gnunet/src/fs/fs_dirmetascan.c
===================================================================
--- gnunet/src/fs/fs_dirmetascan.c      2012-01-29 21:41:24 UTC (rev 19517)
+++ gnunet/src/fs/fs_dirmetascan.c      2012-01-29 22:04:45 UTC (rev 19518)
@@ -231,8 +231,12 @@
     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 @@
       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);
@@ -339,6 +348,11 @@
     {
       GNUNET_break (0);
       break;
+    }   
+    if (NULL == ds->toplevel)
+    {
+      GNUNET_break (0);
+      break;
     }
     GNUNET_HELPER_stop (ds->helper);
     ds->helper = NULL;