Changeset 48178b56 in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2017-03-07T17:41:37Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e796dc8

Parents:

eca9fd0

Message:

Load segment using a long read

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (1 diff)

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

@@ -390 +390 @@
         }
 
-/*      rc = read(fd, (void *)(entry->p_vaddr + bias), entry->p_filesz);
-        if (rc < 0) { printf("read error\n"); return EE_INVALID; }*/
-
-        /* Long reads are not possible yet. Load segment piecewise. */
-
-        unsigned left, now;
-        uint8_t *dp;
-
-        left = entry->p_filesz;
-        dp = seg_ptr;
-
-        while (left > 0) {
-                now = 16384;
-                if (now > left) now = left;
-
-                rc = read(elf->fd, dp, now);
-
-                if (rc != (ssize_t) now) { 
-                        DPRINTF("Read error.\n");
-                        return EE_INVALID;
-                }
-
-                left -= now;
-                dp += now;
+        rc = read(elf->fd, seg_ptr, entry->p_filesz);
+        if (rc < 0) {
+                DPRINTF("read error\n");
+                return EE_INVALID;
         }