Changes in uspace/lib/c/generic/rtld/module.c [09ab0a9a:a0e2f9c] in mainline

File:

• uspace/lib/c/generic/rtld/module.c (modified) (10 diffs)

uspace/lib/c/generic/rtld/module.c

@@ -50 +50 @@
 #include <rtld/rtld_arch.h>
 #include <rtld/module.h>
+#include <libarch/rtld/module.h>
 
 #include "../private/libc.h"
@@ -64 +65 @@
 
         module = calloc(1, sizeof(module_t));
-        if (module == NULL)
+        if (module == NULL) {
+                DPRINTF("malloc failed\n");
                 return ENOMEM;
+        }
 
         module->id = rtld_get_next_id(rtld);
@@ -181 +184 @@
         char name_buf[NAME_BUF_SIZE];
         module_t *m;
-        int rc;
+        errno_t rc;
 
         m = calloc(1, sizeof(module_t));
         if (m == NULL) {
-                printf("malloc failed\n");
-                exit(1);
+                DPRINTF("malloc failed\n");
+                goto error;
         }
 
@@ -196 +199 @@
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
-                printf("soname too long. increase NAME_BUF_SIZE\n");
-                exit(1);
+                DPRINTF("soname too long. increase NAME_BUF_SIZE\n");
+                goto error;
         }
 
@@ -206 +209 @@
         DPRINTF("filename:'%s'\n", name_buf);
 
-        rc = elf_load_file_name(name_buf, ELDF_RW, &info);
-        if (rc != EE_OK) {
-                printf("Failed to load '%s'\n", name_buf);
-                exit(1);
+        rc = elf_load_file_name(name_buf, RTLD_MODULE_LDF, &info);
+        if (rc != EOK) {
+                DPRINTF("Failed to load '%s'\n", name_buf);
+                goto error;
         }
 
@@ -217 +220 @@
 
         if (info.dynamic == NULL) {
-                printf("Error: '%s' is not a dynamically-linked object.\n",
+                DPRINTF("Error: '%s' is not a dynamically-linked object.\n",
                     name_buf);
-                exit(1);
+                goto error;
         }
 
@@ -242 +245 @@
 
         return m;
+
+error:
+        if (m)
+                free(m);
+
+        return NULL;
 }
 
 /** Load all modules on which m (transitively) depends.
  */
-void module_load_deps(module_t *m, mlflags_t flags)
+errno_t module_load_deps(module_t *m, mlflags_t flags)
 {
         elf_dyn_t *dp;
@@ -273 +282 @@
                 /* There are no dependencies, so we are done. */
                 m->deps = NULL;
-                return;
+                return EOK;
         }
 
         m->deps = malloc(n * sizeof(module_t *));
         if (!m->deps) {
-                printf("malloc failed\n");
-                exit(1);
+                DPRINTF("malloc failed\n");
+                return ENOMEM;
         }
 
@@ -293 +302 @@
                         if (!dm) {
                                 dm = module_load(m->rtld, dep_name, flags);
-                                module_load_deps(dm, flags);
+                                if (!dm) {
+                                        return EINVAL;
+                                }
+
+                                errno_t rc = module_load_deps(dm, flags);
+                                if (rc != EOK) {
+                                        return rc;
+                                }
                         }
 
@@ -301 +317 @@
                 ++dp;
         }
+
+        return EOK;
 }