Changeset bb9ec2d in mainline for uspace/lib/c/include/loader

Timestamp:

2017-03-07T20:47:35Z (8 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/include/loader

Files:

• loader.h (modified) (1 diff)
• pcb.h (modified) (2 diffs)

uspace/lib/c/include/loader/loader.h

@@ -47 +47 @@
 extern int loader_get_task_id(loader_t *, task_id_t *);
 extern int loader_set_cwd(loader_t *);
-extern int loader_set_pathname(loader_t *, const char *);
+extern int loader_set_program(loader_t *, const char *, int);
+extern int loader_set_program_path(loader_t *, const char *);
 extern int loader_set_args(loader_t *, const char *const[]);
-extern int loader_set_files(loader_t *, int *const[]);
+extern int loader_add_inbox(loader_t *, const char *, int);
 extern int loader_load_program(loader_t *);
 extern int loader_run(loader_t *);

uspace/lib/c/include/loader/pcb.h

@@ -41 +41 @@
 typedef void (*entry_point_t)(void);
 
+struct pcb_inbox_entry {
+        char *name;
+        int file;
+};
+
 /** Program Control Block.
  *
@@ -60 +65 @@
         char **argv;
         
-        /** Number of preset files. */
-        unsigned int filc;
+        /** List of inbox files. */
+        struct pcb_inbox_entry *inbox;
+        int inbox_entries;
         
         /*