-allow NULL for emsg

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index d8d05eb8d66c5b8edbc489e6debff10e15c513e5..cf6cab8490c74e7b31312718fef80d8573fe4b64 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -226,6 +226,11 @@ check_SCRIPTS = \
  test_gnunet_fs_ns.py 
 endif
 
+if ENABLE_MONKEY
+ TESTS_ENVIRONMENT = @MONKEYPREFIX@
+ AM_LDFLAGS = -no-install
+endif
+
 
 if ENABLE_TEST_RUN
 TESTS = \

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index d91c9e824462d049ce9611eec0075b6bcf032c35..8ae4a29fb51f8249cddf71db66bf08a8af7ac03a 100644 (file)
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -1773,16 +1773,19 @@ fh_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg)
   struct GNUNET_DISK_FileHandle *fh = dc->rfh;
   ssize_t ret;
 
-  *emsg = NULL;
+  if (NULL != emsg)
+    *emsg = NULL;
   if (offset != GNUNET_DISK_file_seek (fh, offset, GNUNET_DISK_SEEK_SET))
   {
-    *emsg = GNUNET_strdup (strerror (errno));
+    if (NULL != emsg)
+      *emsg = GNUNET_strdup (strerror (errno));
     return 0;
   }
   ret = GNUNET_DISK_file_read (fh, buf, max);
   if (ret < 0)
   {
-    *emsg = GNUNET_strdup (strerror (errno));
+    if (NULL != emsg)
+      *emsg = GNUNET_strdup (strerror (errno));
     return 0;
   }
   return ret;