WebSVN – Kolibri OS – Diff – /programs/develop/libraries/newlib/pe/loader.c

     char *path;
     int   path_len;
 }dll_path_t;
-module_t* load_module(const char *name);
+module_t* load_library(const char *name);
 LIST_HEAD(path_list);
     PIMAGE_DOS_HEADER        dos;
     PIMAGE_NT_HEADERS32      nt;
     PIMAGE_EXPORT_DIRECTORY  exp;
-    struct app_hdr          *header;
-    dll_path_t              *path;
-#if 0
+    struct app_hdr  *header = NULL;
-    dll_path_t *path;
+    dll_path_t      *path;
-    int len;
+    int             len;
+    char            *p;
-    char *p;
+#if 0
     if(__appenv_size)
+    {
         char *env;
                 else break;
             };
         };
     };
 #endif
-    header = (struct app_hdr*)NULL;
     len = strrchr(header->path, '/') - header->path+1;
     p = (char*)malloc(len+1);
     memcpy(p, header->path, len);
     p[len]=0;
     path->path_len = len;
     DBG("add libraries path %s\n", path->path);
     list_add_tail(&path->list, &path_list);
-#endif
     path = (dll_path_t*)malloc(sizeof(dll_path_t));
     INIT_LIST_HEAD(&path->list);
     path->path = "/kolibrios/lib/";
                         nt->OptionalHeader.DataDirectory[0].VirtualAddress);
 };
-const module_t* find_module(const char *name)
-{
-    module_t* mod = &libc_dll;
-    do
-    {
-        if( !strncmp(name, mod->img_name, 16))
-            return mod;
-        mod = (module_t*)mod->list.next;
-    }while(mod != &libc_dll);
-    return load_module(name);
-};
 static inline void sec_copy(void *dst, void *src, size_t len)
+{
     __asm__ __volatile__ (
     "shrl $2, %%ecx         \n\t"
         libname=MakePtr(char*,imp->Name, img_base);
         DBG("import from %s\n",libname);
-        api = find_module(libname);
+        api = load_library(libname);
         if(unlikely(api == NULL))
+        {
             printf("library %s not found\n", libname);
     return function;
 };
-module_t* load_module(const char *name)
-{
-    dll_path_t *dllpath;
-    char        *path;
-    int         len;
-    len = strlen(name);
-    list_for_each_entry(dllpath, &path_list, list)
+static void *load_lib_internal(const char *path)
+{
-        PIMAGE_DOS_HEADER        dos;
+    PIMAGE_DOS_HEADER        dos;
-        PIMAGE_NT_HEADERS32      nt;
+    PIMAGE_NT_HEADERS32      nt;
-        PIMAGE_EXPORT_DIRECTORY  exp;
     PIMAGE_EXPORT_DIRECTORY  exp;
         module_t *module;
-        ufile_t   uf;
+    ufile_t   uf;
-        void     *raw_img;
+    void     *raw_img;
-        size_t    raw_size;
-        void     *img_base;
-        path = alloca(len+dllpath->path_len+1);
-        memcpy(path, dllpath->path, dllpath->path_len);
-        memcpy(path+dllpath->path_len, name, len);
-        path[len+dllpath->path_len]=0;
     size_t    raw_size;
-//        printf("%s %s\n", path);
+    void     *img_base = NULL;
-        uf = load_file(path);
+    uf = load_file(path);
-        raw_img  = uf.data;
+    raw_img  = uf.data;
-        raw_size = uf.size;
     raw_size = uf.size;
         if(raw_img == NULL)
-            continue;
+    if(raw_img == NULL)
         return NULL;
-        if( validate_pe(raw_img, raw_size, 0) == 0)
+    if( validate_pe(raw_img, raw_size, 0) == 0)
+    {
-            printf("invalide module %s\n", path);
+        printf("invalide module %s\n", path);
-            user_free(raw_img);
+        user_free(raw_img);
-            continue;
-        };
+        return NULL;
+    };
+    img_base = create_image(raw_img);
+    user_free(raw_img);
+    if( unlikely(img_base == NULL) )
+        printf("cannot create image %s\n",path);
+    return img_base;
+}
+module_t* load_library(const char *name)
+{
+    PIMAGE_DOS_HEADER        dos;
+    PIMAGE_NT_HEADERS32      nt;
+    PIMAGE_EXPORT_DIRECTORY  exp;
+    module_t    *module, *mod = &libc_dll;
+    dll_path_t  *dllpath;
+    char        *path;
+    int          len;
+    char        *libname, *tmp;
+    void        *img_base;
+/*  check for already loaded libraries  */
+    tmp = strrchr(name, '/');
+    libname = path = tmp != NULL ? tmp+1 : (char*)name;
+//    printf("path %s\n", path);
+    do
+    {
+        if( !strncmp(path, mod->img_name, 16))
+            return mod;
+        mod = (module_t*)mod->list.next;
+    }while(mod != &libc_dll);
+    if(name[0] == '/')
+    {
+        path = (char*)name;
+        img_base = load_lib_internal(path);
+    }
+    else
+    {
+        len = strlen(libname);
+        list_for_each_entry(dllpath, &path_list, list)
+        {
+            path = alloca(len+dllpath->path_len+1);
+            memcpy(path, dllpath->path, dllpath->path_len);
+            memcpy(path+dllpath->path_len, libname, len);
             path[len+dllpath->path_len]=0;
         img_base = create_image(raw_img);
+            printf("%s\n", path);
+            img_base = load_lib_internal(path);
+            if( unlikely(img_base == NULL) )
+                continue;
+        };
         user_free(raw_img);
-        if( unlikely(img_base == NULL) )
+    if( unlikely(img_base == NULL) )
+    {
-            printf("cannot create image %s\n",path);
-            continue;
+        printf("unable to load %s\n", name);
-        };
+        return NULL;
     };
-        module = (module_t*)malloc(sizeof(module_t));
     module = (module_t*)malloc(sizeof(module_t));
         if(unlikely(module == NULL))
     if(unlikely(module == NULL))
             printf("%s epic fail: no enough memory\n",__FUNCTION__);
-            imp = MakePtr(PIMAGE_IMPORT_DESCRIPTOR, img_base,
+        imp = MakePtr(PIMAGE_IMPORT_DESCRIPTOR, img_base,
-                        nt->OptionalHeader.DataDirectory[1].VirtualAddress);
+                    nt->OptionalHeader.DataDirectory[1].VirtualAddress);
-            if(link_image(img_base, imp) == 0)
+        if(link_image(img_base, imp) == 0)
-                return NULL;
+            goto err2;
+        dll_startup = get_proc_address(module, "DllStartup");
-            dll_startup = get_proc_address(module, "DllStartup");
+        if( dll_startup )
-            if( dll_startup )
+        {
+            if( 0 == dll_startup(module, 1))
-                if( 0 == dll_startup(module, 1))
+                goto err2;
+        }
-                    return NULL;
+    };
+    return module;
+err2:
+    list_del(&module->list);
+    free(module->img_name);
-        };
+    free(module->img_path);
+    free(module);
-        return module;
+err1:
+    user_free(img_base);
-    };
+    return NULL;

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/newlib/pe/loader.c – Rev 3809 → 3900