Changeset 368ee04 in mainline for uspace/app/viewer/viewer.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/app/viewer/viewer.c (modified) (3 diffs)

uspace/app/viewer/viewer.c

@@ -34 +34 @@
 
 #include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
+#include <stdlib.h>
+#include <vfs/vfs.h>
 #include <errno.h>
 #include <malloc.h>
@@ -110 +109 @@
 static bool img_load(const char *fname, surface_t **p_local_surface)
 {
-        int fd = open(fname, O_RDONLY);
+        int fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
         if (fd < 0)
                 return false;
         
         struct stat stat;
-        int rc = fstat(fd, &stat);
-        if (rc != 0) {
-                close(fd);
+        int rc = vfs_stat(fd, &stat);
+        if (rc != EOK) {
+                vfs_put(fd);
                 return false;
         }
@@ -123 +122 @@
         void *tga = malloc(stat.size);
         if (tga == NULL) {
-                close(fd);
-                return false;
-        }
-        
-        ssize_t rd = read(fd, tga, stat.size);
+                vfs_put(fd);
+                return false;
+        }
+
+        ssize_t rd = vfs_read(fd, (aoff64_t []) {0}, tga, stat.size);
         if ((rd < 0) || (rd != (ssize_t) stat.size)) {
                 free(tga);
-                close(fd);
-                return false;
-        }
-        
-        close(fd);
+                vfs_put(fd);
+                return false;
+        }
+        
+        vfs_put(fd);
         
         *p_local_surface = decode_tga(tga, stat.size, 0);