oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Revert "roken: refactor rk_getauxval"; broke build

Browse Source 
This reverts commit cb1ab5b5fc.
This commit is contained in:
Nicolas Williams
2017-05-16 12:03:43 -05:00
parent e65db603bf
commit 28934a3bc8
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/roken/getauxval.c
View File

@@ -157,12 +157,12 @@ rk_getprocauxval(unsigned long type)
ROKEN_LIB_FUNCTION unsigned long ROKEN_LIB_CALL ROKEN_LIB_FUNCTION unsigned long ROKEN_LIB_CALL
rk_getauxval(unsigned long type) rk_getauxval(unsigned long type)
{ {
#if defined(HAVE_GETAUXVAL) && defined(GETAUXVAL_SETS_ERRNO) #ifdef HAVE_GETAUXVAL
#ifdef GETAUXVAL_SETS_ERRNO
if (rk_injected_auxv) if (rk_injected_auxv)
return rk_getprocauxval(type); return rk_getprocauxval(type);
return getauxval(type); return getauxval(type);
#else #else
const auxv_t *a;
unsigned long ret; unsigned long ret;
unsigned long ret2; unsigned long ret2;
static int getauxval_sets_errno = -1; static int getauxval_sets_errno = -1;
@@ -181,8 +181,17 @@ rk_getauxval(unsigned long type)
return ret; return ret;
} }
if (getauxval_sets_errno == 0) if (getauxval_sets_errno == 0) {
goto out; const auxv_t *a;
errno = save_errno;
a = rk_getauxv(type);
if (a == NULL) {
errno = ENOENT;
return 0;
}
return a->a_un.a_val;
}
/* /*
* We've called getauxval() and it returned 0, but we don't know if * We've called getauxval() and it returned 0, but we don't know if
@@ -191,6 +200,7 @@ rk_getauxval(unsigned long type)
* Attempt to detect whether getauxval() sets errno = ENOENT by * Attempt to detect whether getauxval() sets errno = ENOENT by
* calling it with what should be a bogus type. * calling it with what should be a bogus type.
*/ */
errno = 0; errno = 0;
ret2 = getauxval(~type); ret2 = getauxval(~type);
if (ret2 == 0 && errno == ENOENT) { if (ret2 == 0 && errno == ENOENT) {
@@ -198,14 +208,16 @@ rk_getauxval(unsigned long type)
errno = save_errno; errno = save_errno;
return ret; return ret;
} }
getauxval_sets_errno = 0;
out: getauxval_sets_errno = 0;
errno = save_errno; errno = save_errno;
a = rk_getauxv(type); #endif
if (a == NULL) { #else
errno = ENOENT; const auxv_t *a;
return 0;
if ((a = rk_getauxv(type)) == NULL) {
errno = ENOENT;
return 0;
} }
return a->a_un.a_val; return a->a_un.a_val;
#endif #endif