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

[gnunet]

Author: grothoff
Date: 2011-03-25 08:35:15 +0100 (Fri, 25 Mar 2011)
New Revision: 14712

Modified:
   gnunet/src/fs/fs_uri.c
   gnunet/src/fs/gnunet-download.c
   gnunet/src/fs/gnunet-service-fs_new.c
Log:
ems

Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c      2011-03-25 07:07:07 UTC (rev 14711)
+++ gnunet/src/fs/fs_uri.c      2011-03-25 07:35:15 UTC (rev 14712)
@@ -406,8 +406,9 @@
   char h1[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
   char h2[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
 
+  if (NULL == s)
+    return NULL;
   GNUNET_assert (s != NULL);
-
   slen = strlen (s);
   pos = strlen (GNUNET_FS_URI_CHK_PREFIX);
   if ( (slen < pos + 2 * sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||

Modified: gnunet/src/fs/gnunet-download.c
===================================================================
--- gnunet/src/fs/gnunet-download.c     2011-03-25 07:07:07 UTC (rev 14711)
+++ gnunet/src/fs/gnunet-download.c     2011-03-25 07:35:15 UTC (rev 14712)
@@ -173,6 +173,12 @@
   char *emsg;
   enum GNUNET_FS_DownloadOptions options;
 
+  if (NULL == args[0])
+    {
+      fprintf (stderr,
+              _("You need to specify a URI argument.\n"));
+      return;
+    }
   uri = GNUNET_FS_uri_parse (args[0],
                             &emsg);
   if (NULL == uri)

Modified: gnunet/src/fs/gnunet-service-fs_new.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_new.c       2011-03-25 07:07:07 UTC (rev 
14711)
+++ gnunet/src/fs/gnunet-service-fs_new.c       2011-03-25 07:35:15 UTC (rev 
14712)
@@ -418,6 +418,8 @@
     }
   GNUNET_LOAD_value_free (datastore_get_load);
   datastore_get_load = NULL;
+  GNUNET_LOAD_value_free (GSF_rt_entry_lifetime);
+  GSF_rt_entry_lifetime = NULL;
 }
 
 
@@ -576,6 +578,7 @@
       GNUNET_SCHEDULER_shutdown ();
       return;
     }
+  GSF_rt_entry_lifetime = GNUNET_LOAD_value_init 
(GNUNET_TIME_UNIT_FOREVER_REL);
   GSF_stats = GNUNET_STATISTICS_create ("fs", cfg);
   block_cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_set_value_string (block_cfg,