aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
Diffstat (limited to 'posix')
-rw-r--r--posix/fnmatch.h36
-rw-r--r--posix/getconf.c52
-rw-r--r--posix/glob.h14
-rw-r--r--posix/regex.h4
-rw-r--r--posix/sys/types.h28
-rw-r--r--posix/sys/wait.h5
-rw-r--r--posix/unistd.h11
-rw-r--r--posix/wordexp.h5
8 files changed, 132 insertions, 23 deletions
diff --git a/posix/fnmatch.h b/posix/fnmatch.h
index 38b7255f4d..4d1eb3e2d3 100644
--- a/posix/fnmatch.h
+++ b/posix/fnmatch.h
@@ -23,18 +23,24 @@
extern "C" {
#endif
-#if (defined (__cplusplus) || (defined (__STDC__) && __STDC__) \
- || defined (WINDOWS32))
-#undef __P
-#define __P(protos) protos
+#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
+# undef __P
+# define __P(protos) protos
#else /* Not C++ or ANSI C. */
-#undef __P
-#define __P(protos) ()
+# undef __P
+# define __P(protos) ()
/* We can get away without defining `const' here only because in this file
it is used only inside the prototype for `fnmatch', which is elided in
non-ANSI C where `const' is problematical. */
#endif /* C++ or ANSI C. */
+#ifndef const
+# if (defined __STDC__ && __STDC__) || defined __cplusplus
+# define __const const
+# else
+# define __const
+# endif
+#endif
/* We #undef these before defining them because some losing systems
(HP-UX A.08.07 for example) define these in <unistd.h>. */
@@ -47,18 +53,26 @@ extern "C" {
#define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
#define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */
-#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE)
-#define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */
-#define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */
-#define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */
+#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
+# define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */
+# define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */
+# define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */
#endif
/* Value returned by `fnmatch' if STRING does not match PATTERN. */
#define FNM_NOMATCH 1
+/* This value is returned if the implementation does not support
+ `fnmatch'. Since this is not the case here it will never be
+ returned but the conformance test suites still require the symbol
+ to be defined. */
+#if (_XOPEN_SOURCE - 0) == 500
+# define FNM_NOSYS (-1)
+#endif
+
/* Match STRING against the filename pattern PATTERN,
returning zero if it matches, FNM_NOMATCH if not. */
-extern int fnmatch __P ((const char *__pattern, const char *__string,
+extern int fnmatch __P ((__const char *__pattern, __const char *__string,
int __flags));
#ifdef __cplusplus
diff --git a/posix/getconf.c b/posix/getconf.c
index c6371cb60b..8aaa75ba67 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -20,10 +20,14 @@
#include <errno.h>
#include <error.h>
#include <libintl.h>
+#include <locale.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include "../version.h"
+#define PACKAGE _libc_intl_domainname
+
struct conf
{
const char *name;
@@ -148,6 +152,9 @@ static const struct conf vars[] =
{ "_T_IOV_MAX", _SC_T_IOV_MAX, SYSCONF },
{ "_XOPEN_CRYPT", _SC_XOPEN_CRYPT, SYSCONF },
{ "_XOPEN_ENH_I18N", _SC_XOPEN_ENH_I18N, SYSCONF },
+ { "_XOPEN_LEGACY", _SC_XOPEN_LEGACY, SYSCONF },
+ { "_XOPEN_REALTIME", _SC_XOPEN_REALTIME, SYSCONF },
+ { "_XOPEN_REALTIME_THREADS", _SC_XOPEN_REALTIME_THREADS, SYSCONF },
{ "_XOPEN_SHM", _SC_XOPEN_SHM, SYSCONF },
{ "_XOPEN_UNIX", _SC_XOPEN_UNIX, SYSCONF },
{ "_XOPEN_VERSION", _SC_XOPEN_VERSION, SYSCONF },
@@ -198,6 +205,31 @@ static const struct conf vars[] =
{ "LFS64_LIBS", _CS_LFS64_LIBS, CONFSTR },
{ "LFS64_LINTFLAGS", _CS_LFS64_LINTFLAGS, CONFSTR },
+ /* Programming environments. */
+ { "XBS5_ILP32_OFF32", _SC_XBS5_ILP32_OFF32, SYSCONF },
+ { "XBS5_ILP32_OFF32_CFLAGS", _CS_XBS5_ILP32_OFF32_CFLAGS, CONFSTR },
+ { "XBS5_ILP32_OFF32_LDFLAGS", _CS_XBS5_ILP32_OFF32_LDFLAGS, CONFSTR },
+ { "XBS5_ILP32_OFF32_LIBS", _CS_XBS5_ILP32_OFF32_LIBS, CONFSTR },
+ { "XBS5_ILP32_OFF32_LINTFLAGS", _CS_XBS5_ILP32_OFF32_LINTFLAGS, CONFSTR },
+
+ { "XBS5_ILP32_OFFBIG", _SC_XBS5_ILP32_OFFBIG, SYSCONF },
+ { "XBS5_ILP32_OFFBIG_CFLAGS", _CS_XBS5_ILP32_OFFBIG_CFLAGS, CONFSTR },
+ { "XBS5_ILP32_OFFBIG_LDFLAGS", _CS_XBS5_ILP32_OFFBIG_LDFLAGS, CONFSTR },
+ { "XBS5_ILP32_OFFBIG_LIBS", _CS_XBS5_ILP32_OFFBIG_LIBS, CONFSTR },
+ { "XBS5_ILP32_OFFBIG_LINTFLAGS", _CS_XBS5_ILP32_OFFBIG_LINTFLAGS, CONFSTR },
+
+ { "XBS5_LP64_OFF64", _SC_XBS5_LP64_OFF64, SYSCONF },
+ { "XBS5_LP64_OFF64_CFLAGS", _CS_XBS5_LP64_OFF64_CFLAGS, CONFSTR },
+ { "XBS5_LP64_OFF64_LDFLAGS", _CS_XBS5_LP64_OFF64_LDFLAGS, CONFSTR },
+ { "XBS5_LP64_OFF64_LIBS", _CS_XBS5_LP64_OFF64_LIBS, CONFSTR },
+ { "XBS5_LP64_OFF64_LINTFLAGS", _CS_XBS5_LP64_OFF64_LINTFLAGS, CONFSTR },
+
+ { "XBS5_LPBIG_OFFBIG", _SC_XBS5_LPBIG_OFFBIG, SYSCONF },
+ { "XBS5_LPBIG_OFFBIG_CFLAGS", _CS_XBS5_LPBIG_OFFBIG_CFLAGS, CONFSTR },
+ { "XBS5_LPBIG_OFFBIG_LDFLAGS", _CS_XBS5_LPBIG_OFFBIG_LDFLAGS, CONFSTR },
+ { "XBS5_LPBIG_OFFBIG_LIBS", _CS_XBS5_LPBIG_OFFBIG_LIBS, CONFSTR },
+ { "XBS5_LPBIG_OFFBIG_LINTFLAGS", _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS, CONFSTR },
+
{ NULL, 0, SYSCONF }
};
@@ -216,6 +248,26 @@ main (int argc, char *argv[])
{
register const struct conf *c;
+ /* Set locale. Do not set LC_ALL because the other categories must
+ not be affected (according to POSIX.2). */
+ setlocale (LC_CTYPE, "");
+ setlocale (LC_MESSAGES, "");
+
+ /* Initialize the message catalog. */
+ textdomain (PACKAGE);
+
+ if (argc > 1 && strcmp (argv[1], "--version") == 0)
+ {
+ fprintf (stderr, "getconf (GNU %s) %s\n", PACKAGE, VERSION);
+ fprintf (stderr, gettext ("\
+Copyright (C) %s Free Software Foundation, Inc.\n\
+This is free software; see the source for copying conditions. There is NO\n\
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
+"), "1991, 1992, 1995, 1996, 1997");
+ fprintf (stderr, gettext ("Written by %s.\n"), "Roland McGrath");
+ return 0;
+ }
+
if (argc < 2 || argc > 3)
usage ();
diff --git a/posix/glob.h b/posix/glob.h
index a15d8ef92f..a546c865f2 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -19,13 +19,11 @@
#define _GLOB_H 1
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
#undef __ptr_t
-#if (defined __cplusplus || (defined __STDC__ && __STDC__) \
- || defined WINDOWS32)
+#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
# undef __P
# define __P(protos) protos
# define __ptr_t void *
@@ -80,6 +78,14 @@ extern "C"
# define GLOB_ABEND GLOB_ABORTED
#endif
+/* This value is returned if the implementation does not support
+ `glob'. Since this is not the case here it will never be
+ returned but the conformance test suites still require the symbol
+ to be defined. */
+#if (_XOPEN_SOURCE - 0) == 500
+# define GLOB_NOSYS (-1)
+#endif
+
/* Structure describing a globbing run. */
#if !defined _AMIGA && !defined VMS /* Buggy compiler. */
struct stat;
diff --git a/posix/regex.h b/posix/regex.h
index 22d316b0f1..44f6b557b6 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -282,6 +282,10 @@ extern reg_syntax_t re_syntax_options;
`re_error_msg' table in regex.c. */
typedef enum
{
+#if (_XOPEN_SOURCE - 0) == 500
+ REG_NOSYS = -1, /* This will never happen for this implementation. */
+#endif
+
REG_NOERROR = 0, /* Success. */
REG_NOMATCH, /* Didn't find a match (for regexec). */
diff --git a/posix/sys/types.h b/posix/sys/types.h
index d48e0d23eb..113dd1415d 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -39,25 +39,40 @@ typedef __u_quad_t u_quad_t;
typedef __fsid_t fsid_t;
#endif
-typedef __dev_t dev_t;
-typedef __mode_t mode_t;
-typedef __nlink_t nlink_t;
typedef __loff_t loff_t;
-#ifndef __USE_FILE_OFFSET64
+#ifndef ino_t
+# ifndef __USE_FILE_OFFSET64
typedef __ino_t ino_t;
-#else
+# else
typedef __ino64_t ino_t;
+# endif
+# define ino_t ino_t
#endif
#ifdef __USE_LARGEFILE64
typedef __ino64_t ino64_t;
#endif
+#ifndef dev_t
+typedef __dev_t dev_t;
+# define dev_t dev_t
+#endif
+
#ifndef gid_t
typedef __gid_t gid_t;
# define gid_t gid_t
#endif
+#ifndef mode_t
+typedef __mode_t mode_t;
+# define mode_t mode_t
+#endif
+
+#ifndef nlink_t
+typedef __nlink_t nlink_t;
+# define nlink_t nlink_t
+#endif
+
#ifndef uid_t
typedef __uid_t uid_t;
# define uid_t uid_t
@@ -99,6 +114,9 @@ typedef __caddr_t caddr_t;
typedef __key_t key_t;
#endif
+#ifdef __USE_XOPEN
+# define __need_clock_t
+#endif
#define __need_time_t
#include <time.h>
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index e663f41e05..ed904d909b 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -29,6 +29,11 @@ __BEGIN_DECLS
#include <bits/types.h>
+#if defined __USE_UNIX98 && !defined pid_t
+typedef __pid_t pid_t;
+# define pid_t pid_t
+#endif
+
/* This will define the `W*' macros for the flag
bits to `waitpid', `wait3', and `wait4'. */
#include <bits/waitflags.h>
diff --git a/posix/unistd.h b/posix/unistd.h
index 2fbdae5652..0147594f53 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -40,6 +40,9 @@ __BEGIN_DECLS
/* POSIX Standard approved as ISO/IEC 9945-2 as of December, 1993. */
#define _POSIX2_C_VERSION 199209L
+/* The utilities on GNU systems also correspond to this version. */
+#define _POSIX2_VERSION 199209L
+
/* If defined, the implementation supports the
C Language Bindings Option. */
#define _POSIX2_C_BIND 1
@@ -56,8 +59,12 @@ __BEGIN_DECLS
creation of locales with the localedef utility. */
#define _POSIX2_LOCALEDEF 1
-/* Library conforms to X/Open version 4. */
-#define _XOPEN_VERSION 4
+/* X/Open version number to which the library conforms. It is selectable. */
+#ifdef __USE_UNIX98
+# define _XOPEN_VERSION 500
+#else
+# define _XOPEN_VERSION 4
+#endif
/* Commands and utilities from XPG4 are available. */
#define _XOPEN_XCU_VERSION 4
diff --git a/posix/wordexp.h b/posix/wordexp.h
index 6fa02b78c4..cd5fba9b41 100644
--- a/posix/wordexp.h
+++ b/posix/wordexp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996, 1997 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
@@ -47,6 +47,9 @@ typedef struct
/* Possible nonzero return values from `wordexp'. */
enum
{
+#ifdef __USE_UNIX98
+ WRDE_NOSYS = -1, /* Never used since we support `wordexp'. */
+#endif
WRDE_NOSPACE = 1, /* Ran out of memory. */
WRDE_BADCHAR, /* A metachar appears in the wrong place. */
WRDE_BADVAL, /* Undefined var reference with WRDE_UNDEF. */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 10:42:34 +0000