diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-12-13 23:32:37 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-12-13 23:32:37 +0000 |
| commit | f9626feb2d8a692e27d1c020beba198ec52a705a (patch) | |
| tree | 80e2799fe980f5c79a6bce099548081def04da41 /posix | |
| parent | e797f2e35cbf7edf2c7de7f79442bda550917f07 (diff) | |
Updated to fedora-glibc-20041213T2323cvs/fedora-glibc-2_3_3-91
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/confstr.c | 26 | ||||
| -rw-r--r-- | posix/getconf.c | 6 | ||||
| -rw-r--r-- | posix/getconf.speclist.h | 8 |
3 files changed, 19 insertions, 21 deletions
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 bf551bdbb6..4ce4f8e413 100644 --- a/posix/getconf.c +++ b/posix/getconf.c @@ -1003,8 +1003,6 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ { buf[len] = '\0'; spec = buf; - if (spec[0] == '_') - spec++; } } @@ -1036,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); + "/", 1), spec, spec_len + 1); args[0] = argv0; args[1] = "-v"; args[2] = spec; diff --git a/posix/getconf.speclist.h b/posix/getconf.speclist.h index 943c0de606..c3e67f7ccb 100644 --- a/posix/getconf.speclist.h +++ b/posix/getconf.speclist.h @@ -1,15 +1,15 @@ #include <unistd.h> const char *START_OF_STRINGS = #if _POSIX_V6_ILP32_OFF32 == 1 -"_POSIX_V6_ILP32_OFF32" +"POSIX_V6_ILP32_OFF32" #endif #if _POSIX_V6_ILP32_OFFBIG == 1 -"_POSIX_V6_ILP32_OFFBIG" +"POSIX_V6_ILP32_OFFBIG" #endif #if _POSIX_V6_LP64_OFF64 == 1 -"_POSIX_V6_LP64_OFF64" +"POSIX_V6_LP64_OFF64" #endif #if _POSIX_V6_LPBIG_OFFBIG == 1 -"_POSIX_V6_LPBIG_OFFBIG" +"POSIX_V6_LPBIG_OFFBIG" #endif ""; |