Changeset e796dc8 in mainline

Timestamp:

2017-03-07T18:01:55Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bb9ec2d

Parents:

48178b56

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 18:01:55)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 18:01:55)

Message:

Cherry-pick changes from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1940

Original commit message:

1940: Jiri Zarevucky 2013-08-06 Make elf loader more generic.

File:

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

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

@@ -44 +44 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
+#include <vfs/vfs.h>
 #include <sys/types.h>
 #include <align.h>
@@ -50 +52 @@
 #include <as.h>
 #include <elf/elf.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <smc.h>
 #include <loader/pcb.h>
 #include <entry_point.h>
+#include <str_error.h>
+#include <stdlib.h>
 
 #include <elf/elf_load.h>
@@ -82 +84 @@
  * pointed to by @a info.
  *
- * @param file_name Path to the ELF file.
+ * @param file      ELF file.
  * @param so_bias   Bias to use if the file is a shared object.
  * @param info      Pointer to a structure for storing information
@@ -90 +92 @@
  *
  */
-int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
-    elf_finfo_t *info)
+static int elf_load_file2(int file, size_t so_bias, eld_flags_t flags, elf_finfo_t *info)
 {
         elf_ld_t elf;
 
-        int fd;
-        int rc;
-
-        fd = open(file_name, O_RDONLY);
-        if (fd < 0) {
-                DPRINTF("failed opening file\n");
-                return -1;
-        }
-
-        elf.fd = fd;
+        int ofile = vfs_clone(file, true);
+        int rc = _vfs_open(ofile, MODE_READ);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        elf.fd = ofile;
         elf.info = info;
         elf.flags = flags;
@@ -110 +108 @@
         rc = elf_load_module(&elf, so_bias);
 
-        close(fd);
-
+        close(ofile);
+        return rc;
+}
+
+int elf_load_file(const char *path, size_t so_bias, eld_flags_t flags, elf_finfo_t *info)
+{
+        int file = vfs_lookup(path);
+        int rc = elf_load_file2(file, so_bias, flags, info);
+        close(file);
         return rc;
 }