clean up and refactor program initialization

[musl] / src / env / __init_security.c

diff --git a/src/env/__init_security.c b/src/env/__init_security.c
index 8270f1f..91b9b10 100644 (file)
--- a/src/env/__init_security.c
+++ b/src/env/__init_security.c
@@ -6,30 +6,26 @@
 #include "libc.h"
 #include "atomic.h"
 
-#define AUX_CNT 24
-
-void dummy(size_t *auxv)
+static void dummy(void *ent)
 {
 }
 weak_alias(dummy, __init_ssp);
 
-void __init_security(size_t *auxv)
+void __init_security(size_t *aux)
 {
-       size_t i, aux[AUX_CNT] = { 0 };
        struct pollfd pfd[3] = { {.fd=0}, {.fd=1}, {.fd=2} };
+       int i;
 
 #ifndef SHARED
-       __init_ssp(auxv);
+       __init_ssp((void *)aux[AT_RANDOM]);
 #endif
 
-       for (; auxv[0]; auxv+=2) if (auxv[0]<AUX_CNT) aux[auxv[0]] = auxv[1];
        if (aux[AT_UID]==aux[AT_EUID] && aux[AT_GID]==aux[AT_EGID]
                && !aux[AT_SECURE]) return;
 
        __syscall(SYS_poll, pfd, 3, 0);
-       for (i=0; i<3; i++)
-               if (pfd[i].revents&POLLNVAL)
-                       if (__syscall(SYS_open, "/dev/null", O_RDWR)<0)
-                               a_crash();
+       for (i=0; i<3; i++) if (pfd[i].revents&POLLNVAL)
+               if (__syscall(SYS_open, "/dev/null", O_RDWR|O_LARGEFILE)<0)
+                       a_crash();
        libc.secure = 1;
 }