Changeset 58898d1d in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2017-03-24T20:31:54Z (7 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/lib/c/generic/elf/elf_mod.c (modified) (5 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -135 +135 @@
         elf_header_t header_buf;
         elf_header_t *header = &header_buf;
+        aoff64_t pos = 0;
         int i, rc;
 
-        rc = read(elf->fd, header, sizeof(elf_header_t));
+        rc = read(elf->fd, &pos, header, sizeof(elf_header_t));
         if (rc != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
@@ -195 +196 @@
                 elf_segment_header_t segment_hdr;
 
-                /* Seek to start of segment header */
-                lseek(elf->fd, header->e_phoff
-                        + i * sizeof(elf_segment_header_t), SEEK_SET);
-
-                rc = read(elf->fd, &segment_hdr,
+                pos = header->e_phoff + i * sizeof(elf_segment_header_t);
+                rc = read(elf->fd, &pos, &segment_hdr,
                     sizeof(elf_segment_header_t));
                 if (rc != sizeof(elf_segment_header_t)) {
@@ -217 +215 @@
                 elf_section_header_t section_hdr;
 
-                /* Seek to start of section header */
-                lseek(elf->fd, header->e_shoff
-                    + i * sizeof(elf_section_header_t), SEEK_SET);
-
-                rc = read(elf->fd, &section_hdr,
+                pos = header->e_shoff + i * sizeof(elf_section_header_t);
+                rc = read(elf->fd, &pos, &section_hdr,
                     sizeof(elf_section_header_t));
                 if (rc != sizeof(elf_section_header_t)) {
@@ -333 +328 @@
         uintptr_t seg_addr;
         size_t mem_sz;
+        aoff64_t pos;
         ssize_t rc;
 
@@ -390 +386 @@
          * Load segment data
          */
-        rc = lseek(elf->fd, entry->p_offset, SEEK_SET);
-        if (rc < 0) {
-                printf("seek error\n");
-                return EE_INVALID;
-        }
-
-        rc = read(elf->fd, seg_ptr, entry->p_filesz);
+        pos = entry->p_offset;
+        rc = read(elf->fd, &pos, seg_ptr, entry->p_filesz);
         if (rc < 0) {
                 DPRINTF("read error\n");