about summary refs log tree commit diff
path: root/posix/getconf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-13 21:29:18 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-13 21:29:18 +0000
commit13d91a6eec2114fdfe8fac60323347335a1e0697 (patch)
tree91fa5e482290015f73ab4e8c24f88466b344333d /posix/getconf.c
parent410828e47a70317c39ef4ac1192d467a1cd0d48f (diff)
downloadglibc-13d91a6eec2114fdfe8fac60323347335a1e0697.tar.gz
glibc-13d91a6eec2114fdfe8fac60323347335a1e0697.tar.xz
glibc-13d91a6eec2114fdfe8fac60323347335a1e0697.zip
Update.
2004-12-13  Jakub Jelinek  <jakub@redhat.com>

	* posix/getconf.c (main): Prepend just $GETCONF_DIR/ instead of
	$GETCONF_DIR/_ to spec.
	* posix/confstr.c (confstr): Remove leading underscores for
	_CS_POSIX_V6_WIDTH_RESTRICTED_ENVS.
Diffstat (limited to 'posix/getconf.c')
-rw-r--r--posix/getconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/posix/getconf.c b/posix/getconf.c
index 5aac25e4ca..4ce4f8e413 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -997,7 +997,7 @@ 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)
 	{
@@ -1034,10 +1034,10 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 	    {
 	      const char *args[argc + 3];
 	      size_t spec_len = strlen (spec);
-	      char getconf_name[getconf_dirlen + 2 + spec_len + 1];
+	      char getconf_name[getconf_dirlen + 1 + spec_len + 1];
 	      memcpy (mempcpy (mempcpy (getconf_name, getconf_dir,
-	                                getconf_dirlen),
-                               "/_", 2), spec, spec_len + 1);
+					getconf_dirlen),
+			       "/", 1), spec, spec_len + 1);
 	      args[0] = argv0;
 	      args[1] = "-v";
 	      args[2] = spec;