Changeset 368ee04 in mainline for uspace/srv/devman/match.c

Timestamp:

2017-04-05T18:10:39Z (7 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/srv/devman/match.c (modified) (5 diffs)

uspace/srv/devman/match.c

@@ -32 +32 @@
 
 #include <errno.h>
-#include <fcntl.h>
 #include <io/log.h>
 #include <str.h>
 #include <str_error.h>
 #include <sys/types.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 
 #include "devman.h"
@@ -201 +200 @@
         int fd;
         size_t len = 0;
-        
-        fd = open(conf_path, O_RDONLY);
+        struct stat st;
+        
+        fd = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ);
         if (fd < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
@@ -210 +210 @@
         opened = true;
         
-        len = lseek(fd, 0, SEEK_END);
-        lseek(fd, 0, SEEK_SET);
+        if (vfs_stat(fd, &st) != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to fstat %d: %s.", fd,
+                    str_error(errno));
+                goto cleanup;
+        }
+        len = st.size;
         if (len == 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Configuration file '%s' is empty.",
@@ -225 +229 @@
         }
         
-        ssize_t read_bytes = read(fd, buf, len);
+        ssize_t read_bytes = vfs_read(fd, (aoff64_t []) {0}, buf, len);
         if (read_bytes <= 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%d).", conf_path,
@@ -239 +243 @@
         
         if (opened)
-                close(fd);
+                vfs_put(fd);
         
         return suc;