[GNUnet-SVN] r13999 - in gnunet/src: peerinfo util

[gnunet]

Author: grothoff
Date: 2010-12-21 17:12:30 +0100 (Tue, 21 Dec 2010)
New Revision: 13999

Modified:
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
   gnunet/src/util/configuration.c
Log:
fixes

Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2010-12-21 16:08:24 UTC 
(rev 13998)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2010-12-21 16:12:30 UTC 
(rev 13999)
@@ -304,7 +304,12 @@
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   count = 0;
-  GNUNET_DISK_directory_create (networkIdDirectory);
+  if (GNUNET_SYSERR == GNUNET_DISK_directory_create (networkIdDirectory))
+    {
+      GNUNET_SCHEDULER_add_delayed (DATA_HOST_FREQ,
+                                   &cron_scan_directory_data_hosts, NULL);
+      return;
+    }
   GNUNET_DISK_directory_scan (networkIdDirectory,
                               &hosts_directory_scan_callback, &count);
   if ((0 == count) && (0 == (++retries & 31)))
@@ -355,12 +360,19 @@
       host->hello = mrg;
     }
   fn = get_host_filename (peer);
-  GNUNET_DISK_directory_create_for_file (fn);
-  GNUNET_DISK_fn_write (fn, 
-                       host->hello, 
-                       GNUNET_HELLO_size (host->hello),
-                       GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
-                       | GNUNET_DISK_PERM_GROUP_READ | 
GNUNET_DISK_PERM_OTHER_READ);
+  if (GNUNET_OK == GNUNET_DISK_directory_create_for_file (fn))
+    {
+      if (GNUNET_OK != 
+         GNUNET_DISK_fn_write (fn, 
+                               host->hello, 
+                               GNUNET_HELLO_size (host->hello),
+                               GNUNET_DISK_PERM_USER_READ | 
GNUNET_DISK_PERM_USER_WRITE
+                               | GNUNET_DISK_PERM_GROUP_READ | 
GNUNET_DISK_PERM_OTHER_READ))
+       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                 "write",
+                                 fn);
+       
+    }
   GNUNET_free (fn);
   notify_all (host);
 }

Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c     2010-12-21 16:08:24 UTC (rev 13998)
+++ gnunet/src/util/configuration.c     2010-12-21 16:12:30 UTC (rev 13999)
@@ -306,7 +306,11 @@
   fn = GNUNET_STRINGS_filename_expand (filename);
   if (fn == NULL)
     return GNUNET_SYSERR;
-  GNUNET_DISK_directory_create_for_file (fn);
+  if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn))
+    {
+      GNUNET_free (fn);
+      return GNUNET_SYSERR;
+    }
   if (NULL == (fp = FOPEN (fn, "w")))
     {
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "fopen", fn);