summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-11-20 10:27:48 +0000
committerJakub Jelinek <jakub@redhat.com>2006-11-20 10:27:48 +0000
commit9a40233fa0d4c587880f5d3d3f42813ec6e6ae32 (patch)
tree241b0205b13dd2914bab182e4d3598c3a0569c3e /elf
parent53a451c64a34f4602b9479aaa8effe149e150a54 (diff)
downloadglibc-9a40233fa0d4c587880f5d3d3f42813ec6e6ae32.tar.gz
glibc-9a40233fa0d4c587880f5d3d3f42813ec6e6ae32.tar.xz
glibc-9a40233fa0d4c587880f5d3d3f42813ec6e6ae32.zip
Updated to fedora-glibc-20061120T1000 cvs/fedora-glibc-2_5_90-7
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-deps.c2
-rw-r--r--elf/ldconfig.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index c35cc977fa..4ec984e15b 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -123,7 +123,7 @@ DST not allowed in SUID/SGID programs"));				      \
 	       processed.  */						      \
 	    if (fatal)							      \
 	      _dl_signal_error (0, __str, NULL, N_("\
-empty dynamics string token substitution"));				      \
+empty dynamic string token substitution"));				      \
 	    else							      \
 	      {								      \
 		/* This is for DT_AUXILIARY.  */			      \
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 3f6aabbc26..45a622288e 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <libintl.h>
+#include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
@@ -1175,11 +1176,16 @@ set_hwcap (void)
 int
 main (int argc, char **argv)
 {
-  int remaining;
+  /* Set locale via LC_ALL.  */
+  setlocale (LC_ALL, "");
+
+  /* Set the text message domain.  */
+  textdomain (_libc_intl_domainname);
 
   arch_startup (argc, argv);
 
   /* Parse and process arguments.  */
+  int remaining;
   argp_parse (&argp, argc, argv, 0, &remaining, NULL);
 
   /* Remaining arguments are additional directories if opt_manual_link