[GNUnet-SVN] r8594 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2009-06-16 16:57:50 -0600 (Tue, 16 Jun 2009)
New Revision: 8594

Modified:
   gnunet/src/util/container_bloomfilter.c
   gnunet/src/util/crypto_hash.c
   gnunet/src/util/disk.c
   gnunet/src/util/test_pseudonym.c
Log:
fixing testcases with new disk API

Modified: gnunet/src/util/container_bloomfilter.c
===================================================================
--- gnunet/src/util/container_bloomfilter.c     2009-06-16 22:25:18 UTC (rev 
8593)
+++ gnunet/src/util/container_bloomfilter.c     2009-06-16 22:57:50 UTC (rev 
8594)
@@ -406,10 +406,10 @@
   /* Try to open a bloomfilter file */
   if (filename != NULL)
     {
-      bf->fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_WRITE
-          | GNUNET_DISK_OPEN_READ | GNUNET_DISK_OPEN_CREATE,
+      bf->fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READWRITE
+                                     | GNUNET_DISK_OPEN_CREATE,
           GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-      if (!bf->fh)
+      if (NULL == bf->fh)
         {
           GNUNET_free (bf);
           return NULL;
@@ -437,6 +437,12 @@
           int res;
 
           res = GNUNET_DISK_file_read (bf->fh, rbuff, BUFFSIZE);
+         if (res == -1)
+           {
+             GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                       "read",
+                                       bf->filename);
+           }
           if (res == 0)
             break;              /* is ok! we just did not use that many bits 
yet */
           for (i = 0; i < res; i++)

Modified: gnunet/src/util/crypto_hash.c
===================================================================
--- gnunet/src/util/crypto_hash.c       2009-06-16 22:25:18 UTC (rev 8593)
+++ gnunet/src/util/crypto_hash.c       2009-06-16 22:57:50 UTC (rev 8594)
@@ -444,7 +444,7 @@
   fhc->callback (fhc->callback_cls, res);
   GNUNET_free (fhc->filename);
   if (!GNUNET_DISK_handle_invalid (fhc->fh))
-    GNUNET_break (0 == GNUNET_DISK_file_close (&fhc->fh));
+    GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (&fhc->fh));
   GNUNET_free (fhc);            /* also frees fhc->buffer */
 }
 

Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c      2009-06-16 22:25:18 UTC (rev 8593)
+++ gnunet/src/util/disk.c      2009-06-16 22:57:50 UTC (rev 8594)
@@ -533,8 +533,10 @@
   struct GNUNET_IO_Handle *fh;
   int ret;
 
-  fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_WRITE
-      | GNUNET_DISK_OPEN_CREATE, mode);
+  fh = GNUNET_DISK_file_open (fn, 
+                             GNUNET_DISK_OPEN_WRITE 
+                             | GNUNET_DISK_OPEN_TRUNCATE
+                             | GNUNET_DISK_OPEN_CREATE, mode);
   if (!fh)
     return GNUNET_SYSERR;
   ret = (n == GNUNET_DISK_file_write (fh, buffer, n)) ? GNUNET_OK : 
GNUNET_SYSERR;
@@ -844,9 +846,9 @@
   if (!in)
     return GNUNET_SYSERR;
   out = GNUNET_DISK_file_open (dst, GNUNET_DISK_OPEN_WRITE
-      | GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_FAILIFEXISTS,
-      GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
-          | GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_GROUP_WRITE);
+                              | GNUNET_DISK_OPEN_CREATE | 
GNUNET_DISK_OPEN_FAILIFEXISTS,
+                              GNUNET_DISK_PERM_USER_READ | 
GNUNET_DISK_PERM_USER_WRITE
+                              | GNUNET_DISK_PERM_GROUP_READ | 
GNUNET_DISK_PERM_GROUP_WRITE);
   if (!out)
     {
       GNUNET_DISK_file_close (&in);
@@ -990,14 +992,23 @@
 
 #ifndef MINGW
   oflags = 0;
-  if (flags & GNUNET_DISK_OPEN_READ)
+  if (GNUNET_DISK_OPEN_READWRITE == (flags & GNUNET_DISK_OPEN_READWRITE))
+    oflags = O_RDWR; /* note: O_RDWR is NOT always O_RDONLY | O_WRONLY */
+  else if (flags & GNUNET_DISK_OPEN_READ)
     oflags = O_RDONLY;
-  if (flags & GNUNET_DISK_OPEN_WRITE)
-    oflags |= O_WRONLY;
+  else if (flags & GNUNET_DISK_OPEN_WRITE)
+    oflags = O_WRONLY;
+  else
+    {
+      GNUNET_break (0);
+      return NULL;
+    }
   if (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)
     oflags |= (O_CREAT & O_EXCL);
   if (flags & GNUNET_DISK_OPEN_TRUNCATE)
     oflags |= O_TRUNC;
+  if (flags & GNUNET_DISK_OPEN_APPEND)
+    oflags |= O_APPEND;
   if (flags & GNUNET_DISK_OPEN_CREATE)
     {
       int perm;
@@ -1011,26 +1022,24 @@
 
       mode = 0;
       if (perm & GNUNET_DISK_PERM_USER_READ)
-        mode = S_IRUSR;
+        mode |= S_IRUSR;
       if (perm & GNUNET_DISK_PERM_USER_WRITE)
         mode |= S_IWUSR;
       if (perm & GNUNET_DISK_PERM_USER_EXEC)
         mode |= S_IXUSR;
       if (perm & GNUNET_DISK_PERM_GROUP_READ)
-        mode = S_IRGRP;
+        mode |= S_IRGRP;
       if (perm & GNUNET_DISK_PERM_GROUP_WRITE)
         mode |= S_IWGRP;
       if (perm & GNUNET_DISK_PERM_GROUP_EXEC)
         mode |= S_IXGRP;
       if (perm & GNUNET_DISK_PERM_OTHER_READ)
-        mode = S_IROTH;
+        mode |= S_IROTH;
       if (perm & GNUNET_DISK_PERM_OTHER_WRITE)
         mode |= S_IWOTH;
       if (perm & GNUNET_DISK_PERM_OTHER_EXEC)
         mode |= S_IXOTH;
     }
-  if (flags & GNUNET_DISK_OPEN_APPEND)
-    oflags = O_APPEND;
 
   fd = open (expfn, oflags | O_LARGEFILE, mode);
   if (fd == -1)
@@ -1074,7 +1083,7 @@
     }
 #endif
 
-  ret = (struct GNUNET_IO_Handle *) GNUNET_malloc(sizeof(struct 
GNUNET_IO_Handle));
+  ret = GNUNET_malloc(sizeof(struct GNUNET_IO_Handle));
 #ifdef MINGW
   ret->h = h;
 #else

Modified: gnunet/src/util/test_pseudonym.c
===================================================================
--- gnunet/src/util/test_pseudonym.c    2009-06-16 22:25:18 UTC (rev 8593)
+++ gnunet/src/util/test_pseudonym.c    2009-06-16 22:57:50 UTC (rev 8594)
@@ -81,7 +81,7 @@
   char *name2;
   int notiCount;
 
-  GNUNET_log_setup ("test-psuedonym", "WARNING", NULL);
+  GNUNET_log_setup ("test-pseudonym", "WARNING", NULL);
   ok = GNUNET_YES;
   GNUNET_CRYPTO_random_disable_entropy_gathering ();
   GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test");