Changeset 874a0e8 in mainline

Timestamp:

2008-08-14T20:09:11Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cebab351

Parents:

6808614

Message:

Make sure that the loader keeps on read()ing until it read()s all it wanted to
read().

File:

• uspace/srv/loader/elf_load.c (modified) (6 diffs)

uspace/srv/loader/elf_load.c

@@ -72 +72 @@
 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, char *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.
  *
@@ -157 +170 @@
         int i, rc;
 
-        rc = read(elf->fd, header, sizeof(elf_header_t));
+        rc = my_read(elf->fd, header, sizeof(elf_header_t));
         if (rc < 0) {
                 printf("read error\n"); 
@@ -224 +237 @@
                         + i * sizeof(elf_segment_header_t), SEEK_SET);
 
-                rc = read(elf->fd, &segment_hdr, sizeof(elf_segment_header_t));
+                rc = my_read(elf->fd, &segment_hdr,
+                    sizeof(elf_segment_header_t));
                 if (rc < 0) {
                         printf("read error\n");
@@ -245 +259 @@
                     + i * sizeof(elf_section_header_t), SEEK_SET);
 
-                rc = read(elf->fd, &section_hdr, sizeof(elf_section_header_t));
+                rc = my_read(elf->fd, &section_hdr,
+                    sizeof(elf_section_header_t));
                 if (rc < 0) {
                         printf("read error\n");
@@ -362 +377 @@
          * and writeable.
          */
-        a = as_area_create((uint8_t *)base + bias,
-                mem_sz, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+        a = as_area_create((uint8_t *)base + bias, mem_sz,
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         if (a == (void *)(-1)) {
                 printf("memory mapping failed\n");
@@ -399 +414 @@
 
 //              printf("read %d...", now);
-                rc = read(elf->fd, dp, now);
+                rc = my_read(elf->fd, dp, now);
 //              printf("->%d\n", rc);