Changeset 58898d1d in mainline for uspace/srv/devman/match.c

Timestamp:

2017-03-24T20:31:54Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e9b2534

Parents:

c9e3692

Message:

Remove VFS_IN_SEEK from VFS

File:

• uspace/srv/devman/match.c (modified) (3 diffs)

uspace/srv/devman/match.c

@@ -201 +201 @@
         int fd;
         size_t len = 0;
+        struct stat st;
         
         fd = open(conf_path, O_RDONLY);
@@ -210 +211 @@
         opened = true;
         
-        len = lseek(fd, 0, SEEK_END);
-        lseek(fd, 0, SEEK_SET);
+        if (fstat(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 +230 @@
         }
         
-        ssize_t read_bytes = read(fd, buf, len);
+        ssize_t read_bytes = 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,