more complete DISK API

1 files changed, 18 insertions, 17 deletions

diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index 0d385afa7..e305889d8 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -36,13 +36,12 @@ testReadWrite ()
   char tmp[100 + 1];
   int ret;
 
-  if (GNUNET_OK !=
-      GNUNET_DISK_file_write (".testfile", TESTSTRING, strlen (TESTSTRING),
-                              "644"))
+  if (GNUNET_OK != GNUNET_DISK_fn_write (".testfile", TESTSTRING, strlen (
+      TESTSTRING), GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE))
     return 1;
   if (GNUNET_OK != GNUNET_DISK_file_test (".testfile"))
     return 1;
-  ret = GNUNET_DISK_file_read (".testfile", sizeof (tmp) - 1, tmp);
+  ret = GNUNET_DISK_fn_read (".testfile", tmp, sizeof (tmp) - 1);
   if (ret < 0)
     {
       fprintf (stderr,
@@ -59,7 +58,7 @@ testReadWrite ()
     }
   GNUNET_DISK_file_copy (".testfile", ".testfile2");
   memset (tmp, 0, sizeof (tmp));
-  ret = GNUNET_DISK_file_read (".testfile2", sizeof (tmp) - 1, tmp);
+  ret = GNUNET_DISK_fn_read (".testfile2", tmp, sizeof (tmp) - 1);
   if (ret < 0)
     {
       fprintf (stderr,
@@ -86,15 +85,16 @@ testReadWrite ()
 static int
 testOpenClose ()
 {
-  int fd;
+  struct GNUNET_IO_Handle *fh;
   unsigned long long size;
   long avail;
 
-  fd = GNUNET_DISK_file_open (".testfile",
-                              O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
-  GNUNET_assert (-1 != fd);
-  GNUNET_break (5 == WRITE (fd, "Hello", 5));
-  GNUNET_DISK_file_close (".testfile", fd);
+  fh = GNUNET_DISK_file_open (".testfile", GNUNET_DISK_OPEN_READWRITE
+      | GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_READ
+      | GNUNET_DISK_PERM_USER_WRITE);
+  GNUNET_assert (GNUNET_NO == GNUNET_IO_handle_invalid (fh));
+  GNUNET_break (5 == GNUNET_DISK_file_write (fh, "Hello", 5));
+  GNUNET_DISK_file_close (&fh);
   GNUNET_break (GNUNET_OK ==
                 GNUNET_DISK_file_size (".testfile", &size, GNUNET_NO));
   if (size != 5)
@@ -105,18 +105,19 @@ testOpenClose ()
   GNUNET_log_skip (1);
   avail = GNUNET_DISK_get_blocks_available (".testfile");
   GNUNET_log_skip (0);
-  fd = GNUNET_DISK_file_open (".testfile",
-                              O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
-  GNUNET_assert (-1 != fd);
+  fh = GNUNET_DISK_file_open (".testfile", GNUNET_DISK_OPEN_READWRITE
+      | GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_WRITE
+      | GNUNET_DISK_PERM_USER_READ);
+  GNUNET_assert (GNUNET_NO == GNUNET_IO_handle_invalid (fh));
   while ((avail == GNUNET_DISK_get_blocks_available (".testfile")) &&
          (avail != -1))
-    if (16 != WRITE (fd, "HelloWorld123456", 16))
+    if (16 != GNUNET_DISK_file_write (fh, "HelloWorld123456", 16))
       {
-        GNUNET_DISK_file_close (".testfile", fd);
+        GNUNET_DISK_file_close (&fh);
         GNUNET_break (0 == UNLINK (".testfile"));
         return 1;
       }
-  GNUNET_DISK_file_close (".testfile", fd);
+  GNUNET_DISK_file_close (&fh);
   GNUNET_break (0 == UNLINK (".testfile"));
 
   return 0;