* posix/getconf.c (main): Skip over initial underscore in

	$libexecdir/getconf/default symlink target.

diff --git a/ChangeLog b/ChangeLog
index 4b5c3dca03ba411e0f2cf213c53038459ea9b3ce..e9535c47e1cb9aee8f99304c926ef0fd641463f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-10  Jakub Jelinek  <jakub@redhat.com>
+
+       * posix/getconf.c (main): Skip over initial underscore in
+       $libexecdir/getconf/default symlink target.
+
 2004-11-29  Jakub Jelinek  <jakub@redhat.com>
 
        * stdlib/strtod_l.c (INTERNAL (__STRTOF)): If densize > 2

diff --git a/posix/getconf.c b/posix/getconf.c
index 5aac25e4ca4898fb2d95caffcaa32fe849ff9d24..bf551bdbb661052185a0b9c78137e298569b878f 100644 (file)
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -997,12 +997,14 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
     {
       char default_name[getconf_dirlen + sizeof "/default"];
       memcpy (mempcpy (default_name, getconf_dir, getconf_dirlen),
-              "/default", sizeof "/default");
+             "/default", sizeof "/default");
       int len = readlink (default_name, buf, sizeof buf - 1);
       if (len > 0)
        {
          buf[len] = '\0';
          spec = buf;
+         if (spec[0] == '_')
+           spec++;
        }
     }
 
@@ -1036,8 +1038,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
              size_t spec_len = strlen (spec);
              char getconf_name[getconf_dirlen + 2 + spec_len + 1];
              memcpy (mempcpy (mempcpy (getconf_name, getconf_dir,
-                                       getconf_dirlen),
-                               "/_", 2), spec, spec_len + 1);
+                                       getconf_dirlen),
+                              "/_", 2), spec, spec_len + 1);
              args[0] = argv0;
              args[1] = "-v";
              args[2] = spec;