diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-12-13 21:29:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-12-13 21:29:18 +0000 |
| commit | 13d91a6eec2114fdfe8fac60323347335a1e0697 (patch) | |
| tree | 91fa5e482290015f73ab4e8c24f88466b344333d | |
| parent | 410828e47a70317c39ef4ac1192d467a1cd0d48f (diff) | |
| download | glibc-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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | posix/confstr.c | 26 | ||||
| -rw-r--r-- | posix/getconf.c | 8 |
3 files changed, 24 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index 1a02630d7d..0a499e456d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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. + 2004-12-12 Ulrich Drepper <drepper@redhat.com> * elf/dl-load.c (_dl_map_object_from_fd): Fix computation of diff --git a/posix/confstr.c b/posix/confstr.c index 185b02fd8a..26b0fa875b 100644 --- a/posix/confstr.c +++ b/posix/confstr.c @@ -55,7 +55,7 @@ confstr (name, buf, len) Currently this means all environment which the system allows. */ { - char restenvs[4 * sizeof "_POSIX_V6_LPBIG_OFFBIG"]; + char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"]; string_len = 0; #ifndef _POSIX_V6_ILP32_OFF32 @@ -63,9 +63,9 @@ confstr (name, buf, len) #endif #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0 { - memcpy (restenvs + string_len, "_POSIX_V6_ILP32_OFF32", - sizeof "_POSIX_V6_ILP32_OFF32" - 1); - string_len += sizeof "_POSIX_V6_ILP32_OFF32" - 1; + memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", + sizeof "POSIX_V6_ILP32_OFF32" - 1); + string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; } #endif #ifndef _POSIX_V6_ILP32_OFFBIG @@ -75,9 +75,9 @@ confstr (name, buf, len) { if (string_len) restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "_POSIX_V6_ILP32_OFFBIG", - sizeof "_POSIX_V6_ILP32_OFFBIG" - 1); - string_len += sizeof "_POSIX_V6_ILP32_OFFBIG" - 1; + memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", + sizeof "POSIX_V6_ILP32_OFFBIG" - 1); + string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; } #endif #ifndef _POSIX_V6_LP64_OFF64 @@ -87,9 +87,9 @@ confstr (name, buf, len) { if (string_len) restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "_POSIX_V6_LP64_OFF64", - sizeof "_POSIX_V6_LP64_OFF64" - 1); - string_len += sizeof "_POSIX_V6_LP64_OFF64" - 1; + memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", + sizeof "POSIX_V6_LP64_OFF64" - 1); + string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; } #endif #ifndef _POSIX_V6_LPBIG_OFFBIG @@ -99,9 +99,9 @@ confstr (name, buf, len) { if (string_len) restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "_POSIX_V6_LPBIG_OFFBIG", - sizeof "_POSIX_V6_LPBIG_OFFBIG" - 1); - string_len += sizeof "_POSIX_V6_LPBIG_OFFBIG" - 1; + memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", + sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); + string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; } #endif restenvs[string_len++] = '\0'; 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; |