mkostemp: fix implementation

[uclinux-h8/uClibc.git] / utils / ldd.c

diff --git a/utils/ldd.c b/utils/ldd.c
index 7411c32..a12acd2 100644 (file)
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -20,6 +20,11 @@
 #define ELFCLASSM      ELFCLASS64
 #endif
 
+#if defined(__arc__)
+#define MATCH_MACHINE(x) (x == EM_ARCOMPACT)
+#define ELFCLASSM      ELFCLASS32
+#endif
+
 #if defined(__arm__) || defined(__thumb__)
 #define MATCH_MACHINE(x) (x == EM_ARM)
 #define ELFCLASSM      ELFCLASS32
@@ -63,6 +68,11 @@
 #define ELFCLASSM      ELFCLASS32
 #endif
 
+#if defined(__metag__)
+#define MATCH_MACHINE(x) (x == EM_METAG)
+#define ELFCLASSM      ELFCLASS32
+#endif
+
 #if defined(__mips__)
 #define MATCH_MACHINE(x) (x == EM_MIPS || x == EM_MIPS_RS3_LE)
 #define ELFCLASSM      ELFCLASS32
@@ -101,6 +111,16 @@
 #define ELFCLASSM      ELFCLASS64
 #endif
 
+#if defined(__microblaze__)
+#define MATCH_MACHINE(x) (x == EM_MICROBLAZE_OLD)
+#define ELFCLASSM      ELFCLASS32
+#endif
+
+#if defined(__xtensa__)
+#define MATCH_MACHINE(x) (x == EM_XTENSA)
+#define ELFCLASSM      ELFCLASS32
+#endif
+
 #ifndef MATCH_MACHINE
 # ifdef __linux__
 #  include <asm/elf.h>
@@ -122,6 +142,8 @@
 #define ELFDATAM       ELFDATA2MSB
 #endif
 
+#define TRUSTED_LDSO   UCLIBC_RUNTIME_PREFIX "lib/" UCLIBC_LDSO
+
 struct library {
        char *name;
        int resolved;
@@ -137,7 +159,7 @@ static int interpreter_already_found = 0;
 
 static __inline__ uint32_t byteswap32_to_host(uint32_t value)
 {
-       if (byteswap == 1) {
+       if (byteswap) {
                return (bswap_32(value));
        } else {
                return (value);
@@ -145,7 +167,7 @@ static __inline__ uint32_t byteswap32_to_host(uint32_t value)
 }
 static __inline__ uint64_t byteswap64_to_host(uint64_t value)
 {
-       if (byteswap == 1) {
+       if (byteswap) {
                return (bswap_64(value));
        } else {
                return (value);
@@ -224,14 +246,7 @@ static int check_elf_header(ElfW(Ehdr) *const ehdr)
        }
 
        /* Check if the target endianness matches the host's endianness */
-       byteswap = 0;
-       if (UCLIBC_ENDIAN_HOST == UCLIBC_ENDIAN_LITTLE) {
-               if (ehdr->e_ident[5] == ELFDATA2MSB)
-                       byteswap = 1;
-       } else if (UCLIBC_ENDIAN_HOST == UCLIBC_ENDIAN_BIG) {
-               if (ehdr->e_ident[5] == ELFDATA2LSB)
-                       byteswap = 1;
-       }
+       byteswap = !(ehdr->e_ident[5] == ELFDATAM);
 
        /* Be very lazy, and only byteswap the stuff we use */
        if (byteswap) {
@@ -538,6 +553,7 @@ static void find_needed_libraries(ElfW(Ehdr) *ehdr, ElfW(Dyn) *dynamic, int is_s
        }
 }
 
+#ifdef __LDSO_LDD_SUPPORT__
 static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr)
 {
        ElfW(Phdr) *phdr;
@@ -553,7 +569,7 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr)
                interp_name = strdup(s);
                interp_dir = strdup(s);
                tmp = strrchr(interp_dir, '/');
-               if (*tmp)
+               if (tmp)
                        *tmp = '\0';
                else {
                        free(interp_dir);
@@ -576,7 +592,7 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr)
                                }
                                newlib->name = NULL;
                                newlib->path = NULL;
-                               return NULL;
+                               break;
                        }
                }
                if (newlib == NULL)
@@ -603,6 +619,7 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr)
        }
        return NULL;
 }
+#endif /* __LDSO_LDD_SUPPORT__ */
 
 /* map the .so, and locate interesting pieces */
 /*
@@ -612,11 +629,13 @@ static int find_dependencies(char *filename)
 {
        int is_suid = 0;
        FILE *thefile;
-       struct library *interp;
        struct stat statbuf;
        ElfW(Ehdr) *ehdr = NULL;
        ElfW(Shdr) *dynsec = NULL;
        ElfW(Dyn) *dynamic = NULL;
+#ifdef __LDSO_LDD_SUPPORT__
+       struct library *interp;
+#endif
 
        if (filename == not_found)
                return 0;
@@ -673,9 +692,9 @@ foo:
        }
 
        interpreter_already_found = 0;
+#ifdef __LDSO_LDD_SUPPORT__
        interp = find_elf_interpreter(ehdr);
 
-#ifdef __LDSO_LDD_SUPPORT__
        if (interp
            && (ehdr->e_type == ET_EXEC || ehdr->e_type == ET_DYN)
            && ehdr->e_ident[EI_CLASS] == ELFCLASSM
@@ -693,16 +712,59 @@ foo:
                                "LD_TRACE_LOADED_OBJECTS=1",
                                NULL
                        };
-
+# ifdef __LDSO_STANDALONE_SUPPORT__
+                       char * lib_path = getenv("LD_LIBRARY_PATH");
+
+                       /* The 'extended' environment inclusing the LD_LIBRARY_PATH */
+                       static char *ext_environment[ARRAY_SIZE(environment) + 1];
+                       char **envp = (char **) environment;
+
+                       if (lib_path) {
+                               /*
+                                * If the LD_LIBRARY_PATH is set, it needs to include it
+                                * into the environment for the new process to be spawned
+                                */
+                               char ** eenvp = (char **) ext_environment;
+
+                               /* Copy the N-1 environment's entries */
+                               while (*envp)
+                                       *eenvp++=*envp++;
+
+                               /* Make room for LD_LIBRARY_PATH */
+                               *eenvp = (char *) malloc(sizeof("LD_LIBRARY_PATH=")
+                                                                         + strlen(lib_path));
+                               strcpy(*eenvp, "LD_LIBRARY_PATH=");
+                               strcat(*eenvp, lib_path);
+                               lib_path = *eenvp;
+                               /* ext_environment[size] is already NULL */
+
+                               /* Use the extended environment */
+                               envp = ext_environment;
+                       }
+                       if ((pid = vfork()) == 0) {
+                               /*
+                                * Force to use the standard dynamic linker in stand-alone mode.
+                                * It will fails at runtime if support is not actually available
+                                */
+                               execle(TRUSTED_LDSO, TRUSTED_LDSO, filename, NULL, envp);
+                               _exit(0xdead);
+                       }
+# else
                        if ((pid = vfork()) == 0) {
                                /* Cool, it looks like we should be able to actually
                                 * run this puppy.  Do so now... */
                                execle(filename, filename, NULL, environment);
                                _exit(0xdead);
                        }
-
+# endif
                        /* Wait till it returns */
                        waitpid(pid, &status, 0);
+
+# ifdef __LDSO_STANDALONE_SUPPORT__
+                       /* Do not leak */
+                       free(lib_path);
+# endif
+
                        if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
                                return 1;
                        }