Changeset 00c2de63 in mainline for uspace/lib/c/generic/elf/elf_load.c

Timestamp:

2011-07-29T14:50:22Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

b6759f4

Parents:

6c69d19 (diff), 7ae249d (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 libposix.

File:

• uspace/lib/c/generic/elf/elf_load.c (moved) (moved from uspace/srv/loader/elf_load.c ) (9 diffs)

uspace/lib/c/generic/elf/elf_load.c

@@ -29 +29 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -49 +49 @@
 #include <assert.h>
 #include <as.h>
+#include <elf/elf.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -55 +56 @@
 #include <entry_point.h>
 
-#include "elf.h"
-#include "elf_load.h"
+#include <elf/elf_load.h>
 
 #define DPRINTF(...)
@@ -74 +74 @@
 static int load_segment(elf_ld_t *elf, elf_segment_header_t *entry);
 
-/** Read until the buffer is read in its entirety. */
-static int my_read(int fd, void *buf, size_t len)
-{
-        int cnt = 0;
-        do {
-                buf += cnt;
-                len -= cnt;
-                cnt = read(fd, buf, len);
-        } while ((cnt > 0) && ((len - cnt) > 0));
-
-        return cnt;
-}
-
 /** Load ELF binary from a file.
  *
@@ -160 +147 @@
         int i, rc;
 
-        rc = my_read(elf->fd, header, sizeof(elf_header_t));
-        if (rc < 0) {
+        rc = read_all(elf->fd, header, sizeof(elf_header_t));
+        if (rc != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
                 return EE_INVALID;
@@ -222 +209 @@
                         + i * sizeof(elf_segment_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &segment_hdr,
+                rc = read_all(elf->fd, &segment_hdr,
                     sizeof(elf_segment_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -244 +231 @@
                     + i * sizeof(elf_section_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &section_hdr,
+                rc = read_all(elf->fd, &section_hdr,
                     sizeof(elf_section_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -334 +321 @@
         uintptr_t seg_addr;
         size_t mem_sz;
-        int rc;
+        ssize_t rc;
 
         bias = elf->bias;
@@ -412 +399 @@
                 if (now > left) now = left;
 
-                rc = my_read(elf->fd, dp, now);
-
-                if (rc < 0) { 
+                rc = read_all(elf->fd, dp, now);
+
+                if (rc != (ssize_t) now) { 
                         DPRINTF("Read error.\n");
                         return EE_INVALID;