Changes in uspace/app/taskdump/symtab.c [ce04ea44:6afc9d7] in mainline

File:

• uspace/app/taskdump/symtab.c (modified) (8 diffs)

uspace/app/taskdump/symtab.c

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