diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/getconf.c | 69 | ||||
| -rw-r--r-- | posix/posix2_lim.h | 18 | ||||
| -rw-r--r-- | posix/unistd.h | 21 |
3 files changed, 62 insertions, 46 deletions
diff --git a/posix/getconf.c b/posix/getconf.c index 699cf67bfe..6d78205a88 100644 --- a/posix/getconf.c +++ b/posix/getconf.c @@ -16,18 +16,19 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> #include <unistd.h> #include <errno.h> +#include <error.h> +#include <libintl.h> #include <string.h> #include <stdlib.h> #include <stdio.h> struct conf { - CONST char *name; - CONST int call_name; - CONST enum { SYSCONF, CONFSTR, PATHCONF } call; + const char *name; + const int call_name; + const enum { SYSCONF, CONFSTR, PATHCONF } call; }; static struct conf vars[] = @@ -82,31 +83,43 @@ static struct conf vars[] = { "_POSIX_PII_OSI_CLTS", _SC_PII_OSI_CLTS, SYSCONF }, { "_POSIX_PII_OSI_M", _SC_PII_OSI_M, SYSCONF }, { "_T_IOV_MAX", _SC_T_IOV_MAX, SYSCONF }, + /* POSIX.2 */ + { "BC_BASE_MAX", _SC_BC_BASE_MAX, SYSCONF }, + { "BC_DIM_MAX", _SC_BC_DIM_MAX, SYSCONF }, + { "BC_SCALE_MAX", _SC_BC_SCALE_MAX, SYSCONF }, + { "BC_STRING_MAX", _SC_BC_STRING_MAX, SYSCONF }, + { "COLL_WEIGHTS_MAX", _SC_COLL_WEIGHTS_MAX, SYSCONF }, + { "EQUIV_CLASS_MAX", _SC_EQUIV_CLASS_MAX, SYSCONF }, + { "EXPR_NEST_MAX", _SC_EXPR_NEST_MAX, SYSCONF }, + { "LINE_MAX", _SC_LINE_MAX, SYSCONF }, + { "RE_DUP_MAX", _SC_RE_DUP_MAX, SYSCONF }, + { "CHARCLASS_NAME_MAX", _SC_CHARCLASS_NAME_MAX }, + { "POSIX2_C_BIND", _SC_2_C_BIND, SYSCONF }, + { "POSIX2_C_DEV", _SC_2_C_DEV, SYSCONF }, + { "POSIX2_FORT_DEV", _SC_2_FORT_DEV, SYSCONF }, + { "POSIX2_FORT_RUN", _SC_2_FORT_RUN, SYSCONF }, + { "POSIX2_LOCALEDEF", _SC_2_LOCALEDEF, SYSCONF }, + { "POSIX2_SW_DEV", _SC_2_SW_DEV, SYSCONF }, { "PATH", _CS_PATH, CONFSTR }, { NULL, 0, SYSCONF } }; -static CONST char *program; +extern const char *__progname; + static void -DEFUN_VOID(usage) +usage (void) { - fprintf (stderr, _("Usage: %s variable_name [pathname]\n"), program); + fprintf (stderr, _("Usage: %s variable_name [pathname]\n"), __progname); exit (2); } int -DEFUN(main, (argc, argv), int argc AND char **argv) +main (int argc, char *argv[]) { - register CONST struct conf *c; - - program = strrchr (argv[0], '/'); - if (program == NULL) - program = argv[0]; - else - ++program; + register const struct conf *c; if (argc < 2 || argc > 3) usage (); @@ -124,11 +137,8 @@ DEFUN(main, (argc, argv), int argc AND char **argv) usage (); value = pathconf (argv[2], c->call_name); if (value == -1) - { - fprintf (stderr, "%s: pathconf: %s: %s\n", - program, argv[2], strerror (errno)); - exit (3); - } + error (3, errno, "pathconf: %s", argv[2]); + printf ("%ld\n", value); exit (0); @@ -145,22 +155,17 @@ DEFUN(main, (argc, argv), int argc AND char **argv) clen = confstr (c->call_name, (char *) NULL, 0); cvalue = (char *) malloc (clen); if (cvalue == NULL) - { - fprintf (stderr, "%s: malloc: %s\n", - program, strerror (errno)); - exit (3); - } + error (3, 0, _("memory exhausted")); + if (confstr (c->call_name, cvalue, clen) != clen) - { - fprintf (stderr, "%s: confstr: %s\n", - program, strerror (errno)); - exit (3); - } + error (3, errno, "confstr"); + printf ("%.*s\n", (int) clen, cvalue); exit (0); } } - fprintf (stderr, _("%s: Unrecognized variable `%s'\n"), program, argv[1]); - exit (2); + error (2, 0, _("Unrecognized variable `%s'"), argv[1]); + /* NOTREACHED */ + return 2; } diff --git a/posix/posix2_lim.h b/posix/posix2_lim.h index 8dda66dad4..b81dfd0694 100644 --- a/posix/posix2_lim.h +++ b/posix/posix2_lim.h @@ -34,8 +34,14 @@ Cambridge, MA 02139, USA. */ #define _POSIX2_BC_STRING_MAX 1000 /* The maximum number of weights that can be assigned to an entry of - the LC_COLLATE category `order' keyword in a locale definition. */ -#define _POSIX2_EQUIV_CLASS_MAX 2 + the LC_COLLATE `order' keyword in the locale definition file. + We have no fixed limit, 255 is very high. */ +#define _POSIX2_COLL_WEIGHTS_MAX 255 + +/* The maximum number of weights that can be assigned to an entry of + the LC_COLLATE category `order' keyword in a locale definition. + We have no fixed limit, 255 is a high number. */ +#define _POSIX2_EQUIV_CLASS_MAX 255 /* The maximum number of expressions that can be nested within parentheses by the `expr' utility. */ @@ -48,8 +54,9 @@ Cambridge, MA 02139, USA. */ permitted when using the interval notation `\{M,N\}'. */ #define _POSIX2_RE_DUP_MAX 255 -/* The manimum number of bytes in a character class name. */ -#define _POSIX2_CHARCLASS_NAME_MAX 14 +/* The maximum number of bytes in a character class name. We have no + fixed limit, 2048 is a high number. */ +#define _POSIX2_CHARCLASS_NAME_MAX 2048 /* These values are implementation-specific, @@ -68,6 +75,9 @@ Cambridge, MA 02139, USA. */ #ifndef BC_STRING_MAX #define BC_STRING_MAX _POSIX2_BC_STRING_MAX #endif +#ifndef COLL_WEIGHTS_MAX +#define COLL_WEIGHTS_MAX _POSIX2_COLL_WEIGHTS_MAX +#endif #ifndef EQUIV_CLASS_MAX #define EQUIV_CLASS_MAX _POSIX2_EQUIV_CLASS_MAX #endif diff --git a/posix/unistd.h b/posix/unistd.h index 0c4ddccb20..1247728121 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -216,7 +216,7 @@ extern unsigned int sleep __P ((unsigned int __seconds)); #ifdef __USE_BSD /* Sleep USECONDS microseconds, or until a signal arrives that is not blocked or ignored. Return value is not necessarily useful. */ -extern unsigned int usleep __P ((unsigned __useconds)); +extern unsigned int usleep __P ((unsigned int __useconds)); #endif @@ -270,7 +270,7 @@ extern char *get_current_dir_name __P ((void)); NULL, an array is allocated with `malloc'; the array is SIZE bytes long, unless SIZE <= 0, in which case it is as big as necessary. */ -char *__canonicalize_directory_name_internal __P ((const char *__thisdir, +char *__canonicalize_directory_name_internal __P ((__const char *__thisdir, char *__buf, size_t __size)); #endif @@ -307,7 +307,7 @@ extern int execve __P ((__const char *__path, char *__const __argv[], /* Execute the file FD refers to, overlaying the running program image. ARGV and ENVP are passed to the new program, as for `execve'. */ extern int fexecve __P ((int __fd, - char *const __argv[], char *const __envp[])); + char *__const __argv[], char *__const __envp[])); #endif @@ -317,11 +317,11 @@ extern int execv __P ((__const char *__path, char *__const __argv[])); /* Execute PATH with all arguments after PATH until a NULL pointer, and the argument after that for environment. */ -extern int execle __P ((__const char *__path, __const char *__arg,...)); +extern int execle __P ((__const char *__path, __const char *__arg, ...)); /* Execute PATH with all arguments after PATH until a NULL pointer and environment from `environ'. */ -extern int execl __P ((__const char *__path, __const char *__arg,...)); +extern int execl __P ((__const char *__path, __const char *__arg, ...)); /* Execute FILE, searching in the `PATH' environment variable if it contains no slashes, with arguments ARGV and environment from `environ'. */ @@ -415,7 +415,7 @@ extern __pid_t setsid __P ((void)); #ifdef __USE_GNU /* Return the session ID of the given process. */ -extern __pid_t getsid __P ((__pid_t)); +extern __pid_t getsid __P ((__pid_t __pid)); #endif /* Get the real user ID of the calling process. */ @@ -659,7 +659,7 @@ extern int sync __P ((void)); extern int vhangup __P ((void)); /* Revoke the access of all descriptors currently open on FILE. */ -extern int revoke __P ((const char *__file)); +extern int revoke __P ((__const char *__file)); /* Enable statistical profiling, writing samples of the PC into at most @@ -689,7 +689,7 @@ extern void setusershell __P ((void)); /* Rewind and re-read the file. */ /* Prompt with PROMPT and read a string from the terminal without echoing. Uses /dev/tty if possible; otherwise stderr and stdin. */ -extern char *getpass __P ((const char *__prompt)); +extern char *getpass __P ((__const char *__prompt)); /* Put the program in the background, and dissociate from the controlling terminal. If NOCHDIR is zero, do `chdir ("/")'. If NOCLOSE is zero, @@ -770,10 +770,11 @@ extern int lockf __P ((int __fd, int __cmd, __off_t __len)); set to EINTR. */ #define TEMP_FAILURE_RETRY(expression) \ - ({ long int __result; \ + (__extension__ \ + ({ long int __result; \ do __result = (long int) (expression); \ while (__result == -1L && errno == EINTR); \ - __result; }) + __result; })) \ #endif |