aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-11-06 03:53:40 +0000
committerUlrich Drepper <drepper@redhat.com>2001-11-06 03:53:40 +0000
commit3e2040c85154c21828805196619344a88cbd9c25 (patch)
tree813bcf7cc285386b333be392beeeedd8ac621252 /elf
parentc95f3fd42ed8d7660e817cf74b0883d7563d8102 (diff)
downloadglibc-3e2040c85154c21828805196619344a88cbd9c25.zip
glibc-3e2040c85154c21828805196619344a88cbd9c25.tar.gz
glibc-3e2040c85154c21828805196619344a88cbd9c25.tar.bz2
Update.
* elf/rtld.c (process_dl_debug): Rewritten. Optimized for size not speed. (process_envvars): More some optimizations.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c184
1 files changed, 72 insertions, 112 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index e7d1e83..2d2befc 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1169,7 +1169,38 @@ static int any_debug;
static void
process_dl_debug (const char *dl_debug)
{
+ /* When adding new entries make sure that the maximal length of a name
+ is correctly handled in the LD_DEBUG_HELP code below. */
+ static const struct
+ {
+ const char name[11];
+ const char helptext[41];
+ unsigned short int mask;
+ } debopts[] =
+ {
+ { "libs", "display library search paths",
+ DL_DEBUG_LIBS | DL_DEBUG_IMPCALLS },
+ { "reloc", "display relocation processing",
+ DL_DEBUG_RELOC | DL_DEBUG_IMPCALLS },
+ { "files", "display progress for input file",
+ DL_DEBUG_FILES | DL_DEBUG_IMPCALLS },
+ { "symbols", "display symbol table processing",
+ DL_DEBUG_SYMBOLS | DL_DEBUG_IMPCALLS },
+ { "bindings", "display information about symbol binding",
+ DL_DEBUG_BINDINGS | DL_DEBUG_IMPCALLS },
+ { "versions", "display version dependencies",
+ DL_DEBUG_VERSIONS | DL_DEBUG_IMPCALLS },
+ { "all", "all previous options combined",
+ DL_DEBUG_LIBS | DL_DEBUG_RELOC | DL_DEBUG_FILES | DL_DEBUG_SYMBOLS
+ | DL_DEBUG_BINDINGS | DL_DEBUG_VERSIONS | DL_DEBUG_IMPCALLS },
+ { "statistics", "display relocation statistics",
+ DL_DEBUG_STATISTICS },
+ { "help", "display this help message and exit",
+ DL_DEBUG_HELP },
+ };
+#define ndebopts (sizeof (debopts) / sizeof (debopts[0]))
size_t len;
+
#define separators " ,:"
do
{
@@ -1178,115 +1209,48 @@ process_dl_debug (const char *dl_debug)
dl_debug += strspn (dl_debug, separators);
if (*dl_debug != '\0')
{
- len = strcspn (dl_debug, separators);
-
- switch (len)
- {
- case 3:
- /* This option is not documented since it is not generally
- useful. */
- if (memcmp (dl_debug, "all", 3) == 0)
- {
- _dl_debug_mask = (DL_DEBUG_LIBS | DL_DEBUG_IMPCALLS
- | DL_DEBUG_RELOC | DL_DEBUG_FILES
- | DL_DEBUG_SYMBOLS | DL_DEBUG_BINDINGS
- | DL_DEBUG_VERSIONS);
- any_debug = 1;
- continue;
- }
- break;
-
- case 4:
- if (memcmp (dl_debug, "help", 4) == 0)
- {
- _dl_printf ("\
-Valid options for the LD_DEBUG environment variable are:\n\
-\n\
- bindings display information about symbol binding\n\
- files display processing of files and libraries\n\
- help display this help message and exit\n\
- libs display library search paths\n\
- reloc display relocation processing\n\
- statistics display relocation statistics\n\
- symbols display symbol table processing\n\
- versions display version dependencies\n\
-\n\
-To direct the debugging output into a file instead of standard output\n\
-a filename can be specified using the LD_DEBUG_OUTPUT environment variable.\n");
- _exit (0);
- }
+ size_t cnt;
- if (memcmp (dl_debug, "libs", 4) == 0)
- {
- _dl_debug_mask |= DL_DEBUG_LIBS | DL_DEBUG_IMPCALLS;
- any_debug = 1;
- continue;
- }
- break;
-
- case 5:
- if (memcmp (dl_debug, "reloc", 5) == 0)
- {
- _dl_debug_mask |= DL_DEBUG_RELOC | DL_DEBUG_IMPCALLS;
- any_debug = 1;
- continue;
- }
+ len = strcspn (dl_debug, separators);
- if (memcmp (dl_debug, "files", 5) == 0)
- {
- _dl_debug_mask |= DL_DEBUG_FILES | DL_DEBUG_IMPCALLS;
- any_debug = 1;
- continue;
- }
- break;
+ for (cnt = 0; cnt < ndebopts; ++cnt)
+ if (strncmp (dl_debug, debopts[cnt].name, len) == 0
+ && debopts[cnt].name[len] == '\0')
+ {
+ _dl_debug_mask |= debopts[cnt].mask;
+ break;
+ }
- case 7:
- if (memcmp (dl_debug, "symbols", 7) == 0)
- {
- _dl_debug_mask |= DL_DEBUG_SYMBOLS | DL_DEBUG_IMPCALLS;
- any_debug = 1;
- continue;
- }
+ if (cnt == ndebopts)
+ {
+ /* Display a warning and skip everything until next
+ separator. */
+ char *copy = strndupa (dl_debug, len);
+ _dl_error_printf ("\
+warning: debug option `%s' unknown; try LD_DEBUG=help\n", copy);
break;
+ }
+ }
+ }
+ while (*(dl_debug += len) != '\0');
- case 8:
- if (memcmp (dl_debug, "bindings", 8) == 0)
- {
- _dl_debug_mask |= DL_DEBUG_BINDINGS | DL_DEBUG_IMPCALLS;
- any_debug = 1;
- continue;
- }
-
- if (memcmp (dl_debug, "versions", 8) == 0)
- {
- _dl_debug_mask |= DL_DEBUG_VERSIONS | DL_DEBUG_IMPCALLS;
- any_debug = 1;
- continue;
- }
- break;
+ if (_dl_debug_mask & DL_DEBUG_HELP)
+ {
+ size_t cnt;
- case 10:
- if (memcmp (dl_debug, "statistics", 10) == 0)
- {
- _dl_debug_mask |= DL_DEBUG_STATISTICS;
- continue;
- }
- break;
+ _dl_printf ("\
+Valid options for the LD_DEBUG environment variable are:\n\n");
- default:
- break;
- }
+ for (cnt = 0; cnt < ndebopts; ++cnt)
+ _dl_printf (" %s%s %s\n", debopts[cnt].name,
+ " " + strlen (debopts[cnt].name) - 3,
+ debopts[cnt].helptext);
- {
- /* Display a warning and skip everything until next separator. */
- char *startp = strndupa (dl_debug, len);
- _dl_error_printf ("\
-warning: debug option `%s' unknown; try LD_DEBUG=help\n", startp);
- break;
- }
- }
+ _dl_printf ("\n\
+To direct the debugging output into a file instead of standard output\n\
+a filename can be specified using the LD_DEBUG_OUTPUT environment variable.\n");
+ _exit (0);
}
- while (*(dl_debug += len) != '\0');
}
/* Process all environments variables the dynamic linker must recognize.
@@ -1303,7 +1267,7 @@ process_envvars (enum mode *modep)
char *debug_output = NULL;
/* This is the default place for profiling data file. */
- _dl_profile_output = __libc_enable_secure ? "/var/profile" : "/var/tmp";
+ _dl_profile_output = &"/var/tmp\0/var/profile"[__libc_enable_secure ? 9 : 0];
while ((envline = _dl_next_ld_env_entry (&runp)) != NULL)
{
@@ -1402,12 +1366,9 @@ process_envvars (enum mode *modep)
case 14:
/* Where to place the profiling data file. */
if (!__libc_enable_secure
- && memcmp (envline, "PROFILE_OUTPUT", 14) == 0)
- {
- _dl_profile_output = &envline[15];
- if (*_dl_profile_output == '\0')
- _dl_profile_output = "/var/tmp";
- }
+ && memcmp (envline, "PROFILE_OUTPUT", 14) == 0
+ && envline[15] != '\0')
+ _dl_profile_output = &envline[15];
break;
case 20:
@@ -1426,6 +1387,9 @@ process_envvars (enum mode *modep)
}
}
+ /* The caller wants this information. */
+ *modep = mode;
+
/* Extra security for SUID binaries. Remove all dangerous environment
variables. */
if (__builtin_expect (__libc_enable_secure, 0))
@@ -1448,14 +1412,10 @@ process_envvars (enum mode *modep)
if (__access ("/etc/suid-debug", F_OK) != 0)
unsetenv ("MALLOC_CHECK_");
}
-
- /* The caller wants this information. */
- *modep = mode;
-
/* If we have to run the dynamic linker in debugging mode and the
LD_DEBUG_OUTPUT environment variable is given, we write the debug
messages to this file. */
- if (any_debug && debug_output != NULL && !__libc_enable_secure)
+ else if (any_debug && debug_output != NULL)
{
#ifdef O_NOFOLLOW
const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW;