diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bits/confname.h | 26 | ||||
| -rw-r--r-- | conform/conformtest.pl | 8 | ||||
| -rw-r--r-- | sysdeps/generic/bits/confname.h | 26 | ||||
| -rw-r--r-- | sysdeps/posix/sysconf.c | 23 |
5 files changed, 55 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index 02ea29b836..abfa3aea89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-01-25 Ulrich Drepper <drepper@redhat.com> + * sysdeps/generic/bits/confname.h: Correct names of _SC_PBS + constants and add _SC_STREAMS. + * sysdeps/posix/sysconf.c (__sysconf): Likewise. + * sysdeps/unix/sysv/linux/statvfs64.c: Rename to __statvfs64 and make old name weak alias. * sysdeps/generic/statvfs64.c: Likewise. diff --git a/bits/confname.h b/bits/confname.h index 6c3bd7fc2a..7565e495da 100644 --- a/bits/confname.h +++ b/bits/confname.h @@ -420,18 +420,22 @@ enum #define _SC_USER_GROUPS _SC_USER_GROUPS _SC_USER_GROUPS_R, #define _SC_USER_GROUPS_R _SC_USER_GROUPS_R - _SC_PBS, -#define _SC_PBS _SC_PBS - _SC_PBS_ACCOUNTING, -#define _SC_PBS_ACCOUNTING _SC_PBS_ACCOUNTING - _SC_PBS_LOCATE, -#define _SC_PBS_LOCATE _SC_PBS_LOCATE - _SC_PBS_MESSAGE, -#define _SC_PBS_MESSAGE _SC_PBS_MESSAGE - _SC_PBS_TRACK, -#define _SC_PBS_TRACK _SC_PBS_TRACK - _SC_SYMLOOP + _SC_2_PBS, +#define _SC_2_PBS _SC_2_PBS + _SC_2_PBS_ACCOUNTING, +#define _SC_2_PBS_ACCOUNTING _SC_2_PBS_ACCOUNTING + _SC_2_PBS_LOCATE, +#define _SC_2_PBS_LOCATE _SC_2_PBS_LOCATE + _SC_2_PBS_MESSAGE, +#define _SC_2_PBS_MESSAGE _SC_2_PBS_MESSAGE + _SC_2_PBS_TRACK, +#define _SC_2_PBS_TRACK _SC_2_PBS_TRACK + _SC_SYMLOOP, #define _SC_SYMLOOP _SC_SYMLOOP + _SC_STREAMS, +#define _SC_STREAMS _SC_STREAMS + _SC_2_PBS_CHECKPOINT +#define _SC_2_PBS_CHECKPOINT _SC_2_PBS_CHECKPOINT }; #if (defined __USE_POSIX2 || defined __USE_UNIX98 \ diff --git a/conform/conformtest.pl b/conform/conformtest.pl index 0f8cbd286f..4353ffcdbd 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -22,8 +22,6 @@ $CFLAGS = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=600"; "dlfcn.h", "dirent.h", "ctype.h", "cpio.h", "assert.h", "arpa/inet.h", "aio.h"); -@headers = ('unistd.h'); - # These are the ISO C99 keywords. @keywords = ('auto', 'break', 'case', 'char', 'const', 'continue', 'default', 'do', 'double', 'else', 'enum', 'extern', 'float', 'for', 'goto', @@ -744,7 +742,7 @@ printf (" Total number of tests : %4d\n", $total); printf (" Number of known failures: %4d (", $known); $percent = ($known * 100) / $total; -if ($percent < 1.0) { +if ($known > 0 && $percent < 1.0) { printf (" <1%%)\n"); } else { printf ("%3d%%)\n", $percent); @@ -752,7 +750,7 @@ if ($percent < 1.0) { printf (" Number of failed tests : %4d (", $errors); $percent = ($errors * 100) / $total; -if ($percent < 1.0) { +if ($errors > 0 && $percent < 1.0) { printf (" <1%%)\n"); } else { printf ("%3d%%)\n", $percent); @@ -760,7 +758,7 @@ if ($percent < 1.0) { printf (" Number of skipped tests : %4d (", $skipped); $percent = ($skipped * 100) / $total; -if ($percent < 1.0) { +if ($skipped > 0 && $percent < 1.0) { printf (" <1%%)\n"); } else { printf ("%3d%%)\n", $percent); diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h index 6c3bd7fc2a..7565e495da 100644 --- a/sysdeps/generic/bits/confname.h +++ b/sysdeps/generic/bits/confname.h @@ -420,18 +420,22 @@ enum #define _SC_USER_GROUPS _SC_USER_GROUPS _SC_USER_GROUPS_R, #define _SC_USER_GROUPS_R _SC_USER_GROUPS_R - _SC_PBS, -#define _SC_PBS _SC_PBS - _SC_PBS_ACCOUNTING, -#define _SC_PBS_ACCOUNTING _SC_PBS_ACCOUNTING - _SC_PBS_LOCATE, -#define _SC_PBS_LOCATE _SC_PBS_LOCATE - _SC_PBS_MESSAGE, -#define _SC_PBS_MESSAGE _SC_PBS_MESSAGE - _SC_PBS_TRACK, -#define _SC_PBS_TRACK _SC_PBS_TRACK - _SC_SYMLOOP + _SC_2_PBS, +#define _SC_2_PBS _SC_2_PBS + _SC_2_PBS_ACCOUNTING, +#define _SC_2_PBS_ACCOUNTING _SC_2_PBS_ACCOUNTING + _SC_2_PBS_LOCATE, +#define _SC_2_PBS_LOCATE _SC_2_PBS_LOCATE + _SC_2_PBS_MESSAGE, +#define _SC_2_PBS_MESSAGE _SC_2_PBS_MESSAGE + _SC_2_PBS_TRACK, +#define _SC_2_PBS_TRACK _SC_2_PBS_TRACK + _SC_SYMLOOP, #define _SC_SYMLOOP _SC_SYMLOOP + _SC_STREAMS, +#define _SC_STREAMS _SC_STREAMS + _SC_2_PBS_CHECKPOINT +#define _SC_2_PBS_CHECKPOINT _SC_2_PBS_CHECKPOINT }; #if (defined __USE_POSIX2 || defined __USE_UNIX98 \ diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index 616c950898..7faaa51f94 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 93, 95, 96, 97, 99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,93,95,96,97,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -1053,25 +1053,31 @@ __sysconf (name) return -1; #endif - case _SC_PBS: + case _SC_2_PBS: #ifdef _POSIX2_PBS return _POSIX2_PBS; #else return -1; #endif - case _SC_PBS_ACCOUNTING: + case _SC_2_PBS_ACCOUNTING: #ifdef _POSIX2_PBS_ACCOUNTING return _POSIX2_PBS_ACCOUNTING; #else return -1; #endif - case _SC_PBS_LOCATE: + case _SC_2_PBS_CHECKPOINT: +#ifdef _POSIX2_PBS_CHECKPOINT + return _POSIX2_PBS_CHECKPOINT; +#else + return -1; +#endif + case _SC_2_PBS_LOCATE: #ifdef _POSIX2_PBS_LOCATE return _POSIX2_PBS_LOCATE; #else return -1; #endif - case _SC_PBS_TRACK: + case _SC_2_PBS_TRACK: #ifdef _POSIX2_PBS_TRACK return _POSIX2_PBS_TRACK; #else @@ -1084,6 +1090,13 @@ __sysconf (name) #else return -1; #endif + + case _SC_STREAMS: +#ifdef _XOPEN_STREAMS + return _XOPEN_STREAMS; +#else + return -1; +#endif } } |