Changeset bb9ec2d in mainline for uspace/lib/c/generic/elf

Timestamp:

2017-03-07T20:47:35Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a737667e

Parents:

e796dc8

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 20:47:35)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 20:47:35)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1941-1944

Original commit messages:

1944: Jiri Zarevucky 2013-08-06 Replace legacy file descriptor presetting with inbox.
1943: Jiri Zarevucky 2013-08-06 Do not preserve open state when passing file descriptor to another task. Allow receiver to specify, whether the descriptor is low or high.
1942: Jiri Zarevucky 2013-08-06 C style.
1941: Jiri Zarevucky 2013-08-06 Make loader accept file reference instead of a pathname.

Modifications:

• Keep version of elf_load_file() that accepts file name
• Changes required for loading dynamically linked executables
• Update to newer list_foreach

Location:

uspace/lib/c/generic/elf

Files:

• elf_load.c (modified) (3 diffs)
• elf_mod.c (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <vfs/vfs.h>
 
 #ifdef CONFIG_RTLD
@@ -50 +51 @@
 /** Load ELF program.
  *
- * @param file_name File name
+ * @param file File handle 
  * @param info Place to store ELF program information
  * @return EOK on success or non-zero error code
  */
-int elf_load(const char *file_name, elf_info_t *info)
+int elf_load(int file, elf_info_t *info)
 {
 #ifdef CONFIG_RTLD
@@ -61 +62 @@
         int rc;
 
-        rc = elf_load_file(file_name, 0, 0, &info->finfo);
+        rc = elf_load_file(file, 0, 0, &info->finfo);
         if (rc != EE_OK) {
                 DPRINTF("Failed to load executable '%s'.\n", file_name);

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

@@ -92 +92 @@
  *
  */
-static int elf_load_file2(int file, size_t so_bias, eld_flags_t flags, elf_finfo_t *info)
+int elf_load_file(int file, size_t so_bias, eld_flags_t flags, elf_finfo_t *info)
 {
         elf_ld_t elf;
@@ -112 +112 @@
 }
 
-int elf_load_file(const char *path, size_t so_bias, eld_flags_t flags, elf_finfo_t *info)
+int elf_load_file_name(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);
+        int rc = elf_load_file(file, so_bias, flags, info);
         close(file);
         return rc;