Changeset f7017572 in mainline for uspace/app/tester/vfs/vfs1.c

Timestamp:

2008-01-27T18:54:16Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

acfdcb0

Parents:

15b9970

Message:

VFS_WRITE and tmpfs_write fixes.

File:

• uspace/app/tester/vfs/vfs1.c (modified) (4 diffs)

uspace/app/tester/vfs/vfs1.c

@@ -39 +39 @@
 #include "../tester.h"
 
+char text[] = "O xein', angellein Lakedaimoniois hoti teide "
+        "keimetha tois keinon rhemasi peithomenoi.";
+
 char *test_vfs1(bool quiet)
 {
@@ -46 +49 @@
         if (mkdir("/mydir", 0) != 0)
                 return "mkdir() failed.\n";
+        if (!quiet)
+                printf("Created directory /mydir\n");
+        
+        int fd0 = open("/mydir/myfile", O_CREAT);
+        if (fd0 < 0)
+                return "open() failed.\n";
+        if (!quiet)
+                printf("Created /mydir/myfile, handle=%d\n", fd0);
+
+        ssize_t cnt;
+        size_t size = sizeof(text);
+        cnt = write(fd0, text, size);
+        if (cnt < 0)
+                return "write() failed.\n";
+        if (!quiet)
+                printf("Written %d btyes to handle %d.\n", cnt, fd0);
+        if (lseek(fd0, 0, SEEK_SET) != 0)
+                return "lseek() failed.\n";
 
         DIR *dirp;
@@ -57 +78 @@
         closedir(dirp);
 
-        int fd1 = open("/dir1/file1", 0);
-        int fd2 = open("/dir2/file2", 0);
+        int fd1 = open("/dir1/file1", O_RDONLY);
+        int fd2 = open("/dir2/file2", O_RDONLY);
 
         if (fd1 < 0)
@@ -70 +91 @@
         char buf[10];
 
-        ssize_t cnt = read(fd1, buf, sizeof(buf));
+        cnt = read(fd0, buf, sizeof(buf));
         if (cnt < 0)
                 return "read() failed.\n";
 
         if (!quiet)
-                printf("Read %d bytes: %.*s\n", cnt, cnt, buf);
+                printf("Read %d bytes from handle %d: %.*s\n", cnt, fd0, cnt,
+                    buf);
+
+        cnt = read(fd1, buf, sizeof(buf));
+        if (cnt < 0)
+                return "read() failed.\n";
+
+        if (!quiet)
+                printf("Read %d bytes from handle %d: %.*s\n", cnt, fd1, cnt,
+                    buf);
 
         return NULL;