Changes in uspace/app/tester/vfs/vfs1.c [a6fc88a:6afc9d7] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/tester/vfs/vfs1.c
ra6fc88a r6afc9d7 33 33 #include <vfs/vfs.h> 34 34 #include <unistd.h> 35 #include <fcntl.h> 35 36 #include <dirent.h> 36 37 #include <loc.h> 37 38 #include <sys/types.h> 39 #include <sys/stat.h> 38 40 #include "../tester.h" 39 41 … … 68 70 const char *test_vfs1(void) 69 71 { 70 aoff64_t pos = 0; 71 int rc; 72 73 rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY, NULL); 74 if (rc != EOK) { 75 TPRINTF("rc=%d\n", rc); 76 return "vfs_link_path() failed"; 72 if (mkdir(TEST_DIRECTORY, 0) != 0) { 73 TPRINTF("rc=%d\n", errno); 74 return "mkdir() failed"; 77 75 } 78 76 TPRINTF("Created directory %s\n", TEST_DIRECTORY); 79 77 80 int fd0 = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE, 81 MODE_READ | MODE_WRITE); 78 int fd0 = open(TEST_FILE, O_CREAT); 82 79 if (fd0 < 0) 83 return " vfs_lookup_open() failed";80 return "open() failed"; 84 81 TPRINTF("Created file %s (fd=%d)\n", TEST_FILE, fd0); 85 82 86 83 size_t size = sizeof(text); 87 ssize_t cnt = vfs_write(fd0, &pos, text, size);84 ssize_t cnt = write(fd0, text, size); 88 85 if (cnt < 0) 89 86 return "write() failed"; 90 87 TPRINTF("Written %zd bytes\n", cnt); 91 92 pos = 0; 88 89 if (lseek(fd0, 0, SEEK_SET) != 0) 90 return "lseek() failed"; 91 TPRINTF("Sought to position 0\n"); 93 92 94 93 char buf[BUF_SIZE]; 95 94 TPRINTF("read..\n"); 96 while ((cnt = vfs_read(fd0, &pos, buf, BUF_SIZE))) {95 while ((cnt = read(fd0, buf, BUF_SIZE))) { 97 96 TPRINTF("read returns %zd\n", cnt); 98 97 if (cnt < 0) … … 108 107 } 109 108 110 vfs_put(fd0);109 close(fd0); 111 110 112 111 const char *rv = read_root(); … … 114 113 return rv; 115 114 116 if ( vfs_rename_path(TEST_FILE, TEST_FILE2) != EOK)117 return " vfs_rename_path() failed";115 if (rename(TEST_FILE, TEST_FILE2) != 0) 116 return "rename() failed"; 118 117 TPRINTF("Renamed %s to %s\n", TEST_FILE, TEST_FILE2); 119 118 120 if ( vfs_unlink_path(TEST_FILE2) != EOK)121 return " vfs_unlink_path() failed";119 if (unlink(TEST_FILE2) != 0) 120 return "unlink() failed"; 122 121 TPRINTF("Unlinked %s\n", TEST_FILE2); 123 122 124 if ( vfs_unlink_path(TEST_DIRECTORY) != EOK)125 return " vfs_unlink_path() failed";123 if (rmdir(TEST_DIRECTORY) != 0) 124 return "rmdir() failed"; 126 125 TPRINTF("Removed directory %s\n", TEST_DIRECTORY); 127 126
Note:
See TracChangeset
for help on using the changeset viewer.