aboutsummaryrefslogtreecommitdiffstats
path: root/packages/glibc/glibc-2.3.2/ldconfig.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-06-30 08:19:37 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-06-30 08:19:37 +0000
commitc8e5702127e507e82e6f68a4b8c546803accea9d (patch)
tree00583491f40ecc640f2b28452af995e3a63a09d7 /packages/glibc/glibc-2.3.2/ldconfig.patch
parent87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff)
downloadopenembedded-c8e5702127e507e82e6f68a4b8c546803accea9d.tar.gz
openembedded-c8e5702127e507e82e6f68a4b8c546803accea9d.tar.bz2
openembedded-c8e5702127e507e82e6f68a4b8c546803accea9d.zip
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/glibc/glibc-2.3.2/ldconfig.patch')
-rw-r--r--packages/glibc/glibc-2.3.2/ldconfig.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/packages/glibc/glibc-2.3.2/ldconfig.patch b/packages/glibc/glibc-2.3.2/ldconfig.patch
index e69de29bb2..c60b9b1432 100644
--- a/packages/glibc/glibc-2.3.2/ldconfig.patch
+++ b/packages/glibc/glibc-2.3.2/ldconfig.patch
@@ -0,0 +1,37 @@
+--- elf/ldconfig.c 2003-07-08 23:26:27.000000000 +0900
++++ elf/ldconfig.c.debian 2003-07-08 23:29:43.000000000 +0900
+@@ -920,26 +920,24 @@
+ {
+ FILE *file = NULL;
+ char *line = NULL;
+- const char *canon;
++ const char *canon = filename;
+ size_t len = 0;
++ int file_fd;
+
+ if (opt_chroot)
+ {
+ canon = chroot_canon (opt_chroot, filename);
+- if (canon)
+- file = fopen (canon, "r");
+- else
++ if (!canon)
+ canon = filename;
+ }
+- else
+- {
+- canon = filename;
+- file = fopen (filename, "r");
+- }
++
++ if ((file_fd = open(canon, O_RDONLY | O_EXCL, 0022)) != -1)
++ file = fdopen (file_fd, "r");
+
+ if (file == NULL)
+ {
+- error (0, errno, _("Can't open configuration file %s"), canon);
++ if (opt_verbose)
++ error (0, errno, _("Can't open configuration file %s"), canon);
+ if (canon != filename)
+ free ((char *) canon);
+ return;