diff options
| author | Daniel Sabogal <dsabogalcc@gmail.com> | 2016-09-04 10:42:47 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-10-20 16:55:05 -0400 |
| commit | 104e8a0e3b30f6dda6ce9c1b901a6bb8ee046616 (patch) | |
| tree | 0fc875898b45dc82167bd97a80aca275aa695146 | |
| parent | e314258e2fe75b7443db84d2927315dea0f337c8 (diff) | |
| download | musl-104e8a0e3b30f6dda6ce9c1b901a6bb8ee046616.tar.gz musl-104e8a0e3b30f6dda6ce9c1b901a6bb8ee046616.tar.bz2 musl-104e8a0e3b30f6dda6ce9c1b901a6bb8ee046616.tar.xz musl-104e8a0e3b30f6dda6ce9c1b901a6bb8ee046616.zip | |
add missing confstr constants
the _CS_V6_ENV and _CS_V7_ENV constants are required to be available for use
with confstr. glibc defines these constants with values 1148 and 1149,
respectively.
the only missing (and required) confstr constants are
_CS_POSIX_V7_THREADS_CFLAGS and _CS_POSIX_V7_THREADS_LDFLAGS which remain
unavailable in glibc.
| -rw-r--r-- | include/unistd.h | 2 | ||||
| -rw-r--r-- | src/conf/confstr.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/unistd.h b/include/unistd.h index 760a1652..2c355880 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -457,6 +457,8 @@ int eaccess(const char *, int); #define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS 1145 #define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS 1146 #define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147 +#define _CS_V6_ENV 1148 +#define _CS_V7_ENV 1149 #ifdef __cplusplus } diff --git a/src/conf/confstr.c b/src/conf/confstr.c index 6e9c23a0..02cb1aa2 100644 --- a/src/conf/confstr.c +++ b/src/conf/confstr.c @@ -7,7 +7,7 @@ size_t confstr(int name, char *buf, size_t len) const char *s = ""; if (!name) { s = "/bin:/usr/bin"; - } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>31U) { + } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>33U) { errno = EINVAL; return 0; } |