Changeset 368ee04 in mainline for uspace/app/taskdump/symtab.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/taskdump/symtab.c (modified) (8 diffs)

uspace/app/taskdump/symtab.c

@@ -41 +41 @@
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <vfs/vfs.h>
 
 #include "include/symtab.h"
@@ -68 +67 @@
         char *shstrt, *sec_name;
         void *data;
+        aoff64_t pos = 0;
 
         int fd;
@@ -81 +81 @@
                 return ENOMEM;
 
-        fd = open(file_name, O_RDONLY);
+        fd = vfs_lookup_open(file_name, WALK_REGULAR, MODE_READ);
         if (fd < 0) {
                 printf("failed opening file\n");
@@ -88 +88 @@
         }
 
-        rc = read(fd, &elf_hdr, sizeof(elf_header_t));
+        rc = vfs_read(fd, &pos, &elf_hdr, sizeof(elf_header_t));
         if (rc != sizeof(elf_header_t)) {
                 printf("failed reading elf header\n");
@@ -165 +165 @@
 
         free(shstrt);
-        close(fd);
+        vfs_put(fd);
 
         if (stab->sym == NULL || stab->strtab == NULL) {
@@ -304 +304 @@
 {
         int rc;
-
-        rc = lseek(fd, elf_hdr->e_shoff + idx * sizeof(elf_section_header_t),
-            SEEK_SET);
-        if (rc == (off64_t) -1)
-                return EIO;
-
-        rc = read(fd, sec_hdr, sizeof(elf_section_header_t));
+        aoff64_t pos = elf_hdr->e_shoff + idx * sizeof(elf_section_header_t);
+
+        rc = vfs_read(fd, &pos, sec_hdr, sizeof(elf_section_header_t));
         if (rc != sizeof(elf_section_header_t))
                 return EIO;
@@ -331 +327 @@
 {
         ssize_t rc;
-        off64_t offs;
-
-        offs = lseek(fd, start, SEEK_SET);
-        if (offs == (off64_t) -1) {
-                printf("failed seeking chunk\n");
-                *ptr = NULL;
-                return EIO;
-        }
+        aoff64_t pos = start;
 
         *ptr = malloc(size);
@@ -346 +335 @@
         }
 
-        rc = read(fd, *ptr, size);
+        rc = vfs_read(fd, &pos, *ptr, size);
         if (rc != (ssize_t) size) {
                 printf("failed reading chunk\n");