Changeset 132ab5d1 in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (10 diffs)

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

@@ -69 +69 @@
         "incompatible image",
         "unsupported image type",
-        "irrecoverable error"
+        "irrecoverable error",
+        "file io error"
 };
 
@@ -90 +91 @@
  *                  extracted from the binary.
  *
- * @return EOK on success or negative error code.
+ * @return EE_OK on success or EE_xx error code.
  *
  */
@@ -97 +98 @@
         elf_ld_t elf;
 
-        int ofile = vfs_clone(file, -1, true);
-        int rc = vfs_open(ofile, MODE_READ);
+        int ofile;
+        int rc = vfs_clone(file, -1, true, &ofile);
+        if (rc == EOK) {
+                rc = vfs_open(ofile, MODE_READ);
+        }
         if (rc != EOK) {
-                return rc;
+                return EE_IO;
         }
 
@@ -107 +111 @@
         elf.flags = flags;
 
-        rc = elf_load_module(&elf, so_bias);
+        int ret = elf_load_module(&elf, so_bias);
 
         vfs_put(ofile);
-        return rc;
+        return ret;
 }
 
@@ -116 +120 @@
     elf_finfo_t *info)
 {
-        int file = vfs_lookup(path, 0);
-        int rc = elf_load_file(file, so_bias, flags, info);
-        vfs_put(file);
-        return rc;
+        int file;
+        int rc = vfs_lookup(path, 0, &file);
+        if (rc == EOK) {
+                int ret = elf_load_file(file, so_bias, flags, info);
+                vfs_put(file);
+                return ret;
+        } else {
+                return EE_IO;
+        }
 }
 
@@ -137 +146 @@
         elf_header_t *header = &header_buf;
         aoff64_t pos = 0;
-        int i, rc;
-
-        rc = vfs_read(elf->fd, &pos, header, sizeof(elf_header_t));
-        if (rc != sizeof(elf_header_t)) {
+        size_t nr;
+        int i, ret;
+        int rc;
+
+        rc = vfs_read(elf->fd, &pos, header, sizeof(elf_header_t), &nr);
+        if (rc != EOK || nr != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
-                return EE_INVALID;
+                return EE_IO;
         }
 
@@ -199 +210 @@
                 pos = header->e_phoff + i * sizeof(elf_segment_header_t);
                 rc = vfs_read(elf->fd, &pos, &segment_hdr,
-                    sizeof(elf_segment_header_t));
-                if (rc != sizeof(elf_segment_header_t)) {
+                    sizeof(elf_segment_header_t), &nr);
+                if (rc != EOK || nr != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
-                        return EE_INVALID;
+                        return EE_IO;
                 }
 
-                rc = segment_header(elf, &segment_hdr);
-                if (rc != EE_OK)
-                        return rc;
+                ret = segment_header(elf, &segment_hdr);
+                if (ret != EE_OK)
+                        return ret;
         }
 
@@ -218 +229 @@
                 pos = header->e_shoff + i * sizeof(elf_section_header_t);
                 rc = vfs_read(elf->fd, &pos, &section_hdr,
-                    sizeof(elf_section_header_t));
-                if (rc != sizeof(elf_section_header_t)) {
+                    sizeof(elf_section_header_t), &nr);
+                if (rc != EOK || nr != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
-                        return EE_INVALID;
+                        return EE_IO;
                 }
 
-                rc = section_header(elf, &section_hdr);
-                if (rc != EE_OK)
-                        return rc;
+                ret = section_header(elf, &section_hdr);
+                if (ret != EE_OK)
+                        return ret;
         }
 
@@ -330 +341 @@
         size_t mem_sz;
         aoff64_t pos;
-        ssize_t rc;
+        int rc;
+        size_t nr;
 
         bias = elf->bias;
@@ -388 +400 @@
          */
         pos = entry->p_offset;
-        rc = vfs_read(elf->fd, &pos, seg_ptr, entry->p_filesz);
-        if (rc < 0) {
+        rc = vfs_read(elf->fd, &pos, seg_ptr, entry->p_filesz, &nr);
+        if (rc != EOK || nr != entry->p_filesz) {
                 DPRINTF("read error\n");
-                return EE_INVALID;
+                return EE_IO;
         }