summaryrefslogtreecommitdiff
path: root/usr/src/head
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/head')
-rw-r--r--usr/src/head/ifaddrs.h13
-rw-r--r--usr/src/head/link.h9
-rw-r--r--usr/src/head/poll.h41
-rw-r--r--usr/src/head/secdb.h4
-rw-r--r--usr/src/head/stdio.h41
-rw-r--r--usr/src/head/stdlib.h11
-rw-r--r--usr/src/head/string.h115
-rw-r--r--usr/src/head/synch.h10
-rw-r--r--usr/src/head/unistd.h64
-rw-r--r--usr/src/head/user_attr.h6
-rw-r--r--usr/src/head/wchar.h29
11 files changed, 257 insertions, 86 deletions
diff --git a/usr/src/head/ifaddrs.h b/usr/src/head/ifaddrs.h
index f29aee16e9..4202b60998 100644
--- a/usr/src/head/ifaddrs.h
+++ b/usr/src/head/ifaddrs.h
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _IFADDRS_H
#define _IFADDRS_H
@@ -40,10 +39,8 @@ struct ifaddrs {
struct ifaddrs *ifa_next; /* Pointer to the next structure. */
char *ifa_name; /* Name of this network interface. */
uint64_t ifa_flags; /* Flags as from SIOCGLIFFLAGS ioctl. */
- struct sockaddr_storage *ifa_addr;
- /* Network address of this interface. */
- struct sockaddr_storage *ifa_netmask;
- /* Netmask of this interface. */
+ struct sockaddr *ifa_addr; /* Network address of this interface. */
+ struct sockaddr *ifa_netmask; /* Netmask of this interface. */
union {
/*
* At most one of the following two is valid. If the
@@ -52,8 +49,8 @@ struct ifaddrs {
* set, then `ifa_dstaddr' is valid. It is never the case that
* both these bits are set at once.
*/
- struct sockaddr_storage *ifu_broadaddr;
- struct sockaddr_storage *ifu_dstaddr;
+ struct sockaddr *ifu_broadaddr;
+ struct sockaddr *ifu_dstaddr;
} ifa_ifu;
void *ifa_data; /* Address-specific data (may be unused). */
/*
diff --git a/usr/src/head/link.h b/usr/src/head/link.h
index f40cb0cdb9..e92bb9e459 100644
--- a/usr/src/head/link.h
+++ b/usr/src/head/link.h
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _LINK_H
@@ -126,8 +125,9 @@ extern void ld_section64();
#define LAV_VERSION2 2
#define LAV_VERSION3 3
#define LAV_VERSION4 4
-#define LAV_CURRENT LAV_VERSION4
-#define LAV_NUM 5
+#define LAV_VERSION5 5
+#define LAV_CURRENT LAV_VERSION5
+#define LAV_NUM 6
/*
* Flags that can be or'd into the la_objopen() return code
@@ -165,6 +165,7 @@ extern void ld_section64();
#define LA_ACT_CONSISTENT 0x00 /* add/deletion of objects complete */
#define LA_ACT_ADD 0x01 /* objects being added */
#define LA_ACT_DELETE 0x02 /* objects being deleted */
+#define LA_ACT_MAX 3
#ifndef _KERNEL
diff --git a/usr/src/head/poll.h b/usr/src/head/poll.h
index cc3094be98..900bca5368 100644
--- a/usr/src/head/poll.h
+++ b/usr/src/head/poll.h
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,19 +18,49 @@
*
* CDDL HEADER END
*/
+
+/*
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
-
#ifndef _POLL_H
#define _POLL_H
-#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */
-
/*
* Poll system call interface definitions.
*/
+#include <sys/feature_tests.h>
#include <sys/poll.h>
+#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX)
+#include <time.h>
+#include <signal.h>
+#endif /* defined(__EXTENSIONS__) ... */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX)
+
+#if defined(__STDC__)
+
+extern int ppoll(struct pollfd *_RESTRICT_KYWD, nfds_t,
+ const struct timespec *_RESTRICT_KYWD, const sigset_t *_RESTRICT_KYWD);
+
+#else /* __STDC__ */
+
+extern int ppoll();
+
+#endif /* __STDC__ */
+
+#endif /* defined(__EXTENSIONS__) ... */
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _POLL_H */
diff --git a/usr/src/head/secdb.h b/usr/src/head/secdb.h
index 54eca363ef..f5fed8e945 100644
--- a/usr/src/head/secdb.h
+++ b/usr/src/head/secdb.h
@@ -43,7 +43,7 @@ extern "C" {
#define KV_EMPTY ""
#define KV_ESCAPE '\\'
#define KV_ADD_KEYS 16 /* number of key value pairs to realloc */
-#define KV_SPECIAL "=;:\\";
+#define KV_SPECIAL "=;:\\"
#define KV_TOKEN_DELIMIT ":"
#define KV_WILDCARD "*"
#define KV_WILDCHAR '*'
@@ -52,6 +52,7 @@ extern "C" {
#define KV_SEPSTR ","
#define KV_OBJECTCHAR '/'
#define KV_OBJECT "/"
+#define KV_AUDIT_DELIMIT ":"
#define KV_FLAG_NONE 0x0000
#define KV_FLAG_REQUIRED 0x0001
@@ -85,6 +86,7 @@ extern int _insert2kva(kva_t *, char *, char *);
extern int _kva2str(kva_t *, char *, int, char *, char *);
extern kva_t *_kva_dup(kva_t *);
extern void _kva_free(kva_t *);
+extern void _kva_free_value(kva_t *, char *);
extern kva_t *_new_kva(int size);
extern kva_t *_str2kva(char *, char *, char *);
extern int _enum_auths(const char *, int (*)(const char *, void *, void *),
diff --git a/usr/src/head/stdio.h b/usr/src/head/stdio.h
index 25c9fc3a43..d4178a4c0e 100644
--- a/usr/src/head/stdio.h
+++ b/usr/src/head/stdio.h
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 1988 AT&T */
@@ -261,6 +260,15 @@ extern FILE *_lastbuf;
#endif /* !__PRAGMA_REDEFINE_EXTNAME */
#endif /* _LP64 && _LARGEFILE64_SOURCE */
+#ifndef _SSIZE_T
+#define _SSIZE_T
+#if defined(_LP64) || defined(_I32LPx)
+typedef long ssize_t; /* size of something in bytes or -1 */
+#else
+typedef int ssize_t; /* (historical version) */
+#endif
+#endif /* !_SSIZE_T */
+
#if defined(__STDC__)
#if defined(__EXTENSIONS__) || \
@@ -271,6 +279,7 @@ extern char *tmpnam_r(char *);
#if defined(__EXTENSIONS__) || \
(!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+extern int fcloseall(void);
extern void setbuffer(FILE *, char *, size_t);
extern int setlinebuf(FILE *);
/* PRINTFLIKE2 */
@@ -279,6 +288,15 @@ extern int asprintf(char **, const char *, ...);
extern int vasprintf(char **, const char *, __va_list);
#endif
+#if defined(__EXTENSIONS__) || \
+ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+ /* || defined(_XPG7) */
+extern ssize_t getdelim(char **_RESTRICT_KYWD, size_t *_RESTRICT_KYWD,
+ int, FILE *_RESTRICT_KYWD);
+extern ssize_t getline(char **_RESTRICT_KYWD, size_t *_RESTRICT_KYWD,
+ FILE *_RESTRICT_KYWD);
+#endif /* __EXTENSIONS__ ... */
+
/*
* The following are known to POSIX and XOPEN, but not to ANSI-C.
*/
@@ -333,7 +351,7 @@ extern int putw(int, FILE *);
/*
* The following are defined as part of the Large File Summit interfaces.
*/
-#if defined(_LARGEFILE_SOURCE) || defined(_XPG5)
+#if defined(_LARGEFILE_SOURCE) || defined(_XPG5)
extern int fseeko(FILE *, off_t, int);
extern off_t ftello(FILE *);
#endif
@@ -342,7 +360,7 @@ extern off_t ftello(FILE *);
* The following are defined as part of the transitional Large File Summit
* interfaces.
*/
-#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
+#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
!defined(__PRAGMA_REDEFINE_EXTNAME))
extern FILE *fopen64(const char *, const char *);
extern FILE *freopen64(const char *, const char *, FILE *);
@@ -367,19 +385,26 @@ extern char *tmpnam_r();
#endif
#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX)
+extern int fcloseall();
extern void setbuffer();
extern int setlinebuf();
extern int asprintf();
extern int vasprintf();
#endif
+#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX)
+ /* || defined(_XPG7) */
+extern ssize_t getdelim();
+extern ssize_t getline();
+#endif /* __EXTENSIONS__ ... */
+
#if defined(__EXTENSIONS__) || defined(__XOPEN_OR_POSIX)
extern FILE *fdopen();
extern char *ctermid();
extern int fileno();
#endif /* defined(__EXTENSIONS__) || defined(__XOPEN_OR_POSIX) */
-#if defined(__EXTENSIONS__) || defined(_REENTRANT) || \
+#if defined(__EXTENSIONS__) || defined(_REENTRANT) || \
(_POSIX_C_SOURCE - 0 >= 199506L)
extern void flockfile();
extern int ftrylockfile();
@@ -410,12 +435,12 @@ extern int putw();
#endif /* defined(__EXTENSIONS__) || defined(_XOPEN_SOURCE) */
-#if defined(_LARGEFILE_SOURCE) || defined(_XPG5)
+#if defined(_LARGEFILE_SOURCE) || defined(_XPG5)
extern int fseeko();
extern off_t ftello();
#endif
-#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
+#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
!defined(__PRAGMA_REDEFINE_EXTNAME))
extern FILE *fopen64();
extern FILE *freopen64();
@@ -430,7 +455,7 @@ extern off64_t ftello64();
#if !defined(__lint)
-#if defined(__EXTENSIONS__) || defined(_REENTRANT) || \
+#if defined(__EXTENSIONS__) || defined(_REENTRANT) || \
(_POSIX_C_SOURCE - 0 >= 199506L)
#ifndef _LP64
#ifdef __STDC__
diff --git a/usr/src/head/stdlib.h b/usr/src/head/stdlib.h
index ba1343433d..66a4bb444a 100644
--- a/usr/src/head/stdlib.h
+++ b/usr/src/head/stdlib.h
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 1988 AT&T */
@@ -212,6 +211,8 @@ extern int unsetenv(const char *);
#if defined(__EXTENSIONS__) || \
(!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+extern char *canonicalize_file_name(const char *);
+extern int clearenv(void);
extern void closefrom(int);
extern int daemon(int, int);
extern int dup2(int, int);
@@ -232,6 +233,8 @@ extern int isatty(int);
extern void *memalign(size_t, size_t);
extern char *ttyname(int);
extern char *mkdtemp(char *);
+extern const char *getprogname(void);
+extern void setprogname(const char *);
#if !defined(_STRICT_STDC) && defined(_LONGLONG_TYPE)
extern char *lltostr(long long, char *);
@@ -315,6 +318,8 @@ extern int unsetenv();
#endif
#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX)
+extern char *canonicalize_file_name();
+extern int clearenv();
extern void closefrom();
extern int daemon();
extern int dup2();
@@ -335,6 +340,8 @@ extern int isatty();
extern void *memalign();
extern char *ttyname();
extern char *mkdtemp();
+extern char *getprogname();
+extern void setprogname();
#if defined(_LONGLONG_TYPE)
extern char *lltostr();
diff --git a/usr/src/head/string.h b/usr/src/head/string.h
index a0f380c32d..f786eb72d8 100644
--- a/usr/src/head/string.h
+++ b/usr/src/head/string.h
@@ -18,15 +18,14 @@
*
* CDDL HEADER END
*/
-/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
-
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
*/
+/* Copyright (c) 1988 AT&T */
+/* All Rights Reserved */
+
#ifndef _STRING_H
#define _STRING_H
@@ -89,16 +88,33 @@ extern void *memccpy(void *_RESTRICT_KYWD, const void *_RESTRICT_KYWD,
#if defined(__EXTENSIONS__) || \
(!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+ /* || defined(_XPG7) */
+extern int strcasecmp(const char *, const char *);
+extern int strncasecmp(const char *, const char *, size_t);
+extern char *stpcpy(char *_RESTRICT_KYWD, const char *_RESTRICT_KYWD);
+extern char *stpncpy(char *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, size_t);
+extern char *strndup(const char *, size_t);
+extern size_t strnlen(const char *, size_t);
+extern char *strsignal(int);
+#endif
+
+#if defined(__EXTENSIONS__) || \
+ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
extern int uucopy(const void *_RESTRICT_KYWD, void *_RESTRICT_KYWD, size_t);
extern int uucopystr(const void *_RESTRICT_KYWD, void *_RESTRICT_KYWD, size_t);
-extern char *strsignal(int);
-extern size_t strnlen(const char *, size_t);
extern int ffs(int);
-extern int strcasecmp(const char *, const char *);
-extern int strncasecmp(const char *, const char *, size_t);
+extern int ffsl(long);
+extern int ffsll(long long);
+extern int fls(int);
+extern int flsl(long);
+extern int flsll(long long);
+extern void *memmem(const void *, size_t, const void *, size_t);
+extern char *strcasestr(const char *, const char *);
+extern char *strnstr(const char *, const char *, size_t);
extern size_t strlcpy(char *, const char *, size_t);
extern size_t strlcat(char *, const char *, size_t);
extern char *strsep(char **stringp, const char *delim);
+extern char *strchrnul(const char *, int);
#endif /* defined(__EXTENSIONS__)... */
#if defined(__EXTENSIONS__) || \
@@ -107,6 +123,60 @@ extern char *strsep(char **stringp, const char *delim);
extern char *strdup(const char *);
#endif
+#if defined(__EXTENSIONS__) || \
+ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+#if defined(__GNUC__)
+
+/*
+ * gcc provides this inlining facility but Studio C does not.
+ * We should use it exclusively once Studio C also provides it.
+ */
+extern void *__builtin_alloca(size_t);
+
+#define strdupa(s) \
+ (__extension__( \
+ { \
+ char *__str = (char *)(s); \
+ strcpy((char *)__builtin_alloca(strlen(__str) + 1), __str); \
+ }))
+
+#define strndupa(s, n) \
+ (__extension__( \
+ { \
+ char *__str = (char *)(s); \
+ size_t __len = strnlen(__str, (n)); \
+ (__str = strncpy((char *)__builtin_alloca(__len + 1), \
+ __str, __len), \
+ __str[__len] = '\0', __str); \
+ }))
+
+#else /* __GNUC__ */
+
+#if defined(unix) /* excludes c99 */
+/*
+ * Studio C currently can't do the gcc-style inlining,
+ * so we use thread-local storage instead.
+ */
+extern void *__builtin_alloca(size_t);
+extern __thread char *__strdupa_str;
+extern __thread size_t __strdupa_len;
+
+#define strdupa(s) \
+ (__strdupa_str = (char *)(s), \
+ strcpy((char *)__builtin_alloca(strlen(__strdupa_str) + 1), \
+ __strdupa_str))
+
+#define strndupa(s, n) \
+ (__strdupa_str = (char *)(s), \
+ __strdupa_len = strnlen(__strdupa_str, (n)), \
+ __strdupa_str = strncpy((char *)__builtin_alloca(__strdupa_len + 1), \
+ __strdupa_str, __strdupa_len), \
+ __strdupa_str[__strdupa_len] = '\0', __strdupa_str)
+#endif /* unix */
+
+#endif /* __GNUC__ */
+#endif /* __EXTENSIONS__ ... */
+
#else /* __STDC__ */
#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || \
@@ -124,17 +194,34 @@ extern char *strtok_r();
extern void *memccpy();
#endif
-#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX)
+#if defined(__EXTENSIONS__) || \
+ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+ /* || defined(_XPG7) */
+extern int strcasecmp();
+extern int strncasecmp();
+extern char *stpcpy();
+extern char *stpncpy();
+extern char *strndup();
+extern size_t strnlen();
+extern char *strsignal();
+#endif
+
+#if defined(__EXTENSIONS__) || \
+ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
extern int uucopy();
extern int uucopystr();
-extern char *strsignal();
-extern size_t strnlen();
extern int ffs();
-extern int strcasecmp();
-extern int strncasecmp();
+extern int ffsl();
+extern int ffsll();
+extern int fls();
+extern int flsl();
+extern int flsll();
+extern char *strcasestr();
+extern char *strnstr();
extern size_t strlcpy();
extern size_t strlcat();
extern char *strsep();
+extern char *strchrnul();
#endif /* defined(__EXTENSIONS__) ... */
#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)
diff --git a/usr/src/head/synch.h b/usr/src/head/synch.h
index bf73cb33cf..89efe9c687 100644
--- a/usr/src/head/synch.h
+++ b/usr/src/head/synch.h
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _SYNCH_H
@@ -262,6 +261,13 @@ int _mutex_held();
#endif /* __STDC__ */
+/* Pause API */
+#ifdef __STDC__
+void smt_pause(void);
+#else /* __STDC__ */
+void smt_pause();
+#endif /* __STDC__ */
+
#endif /* _ASM */
#ifdef __cplusplus
diff --git a/usr/src/head/unistd.h b/usr/src/head/unistd.h
index 458848701f..2ea8c42c15 100644
--- a/usr/src/head/unistd.h
+++ b/usr/src/head/unistd.h
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 1988 AT&T */
@@ -163,11 +162,11 @@ extern "C" {
* which need mutexes to support priority inheritance/ceiling.
*/
#if defined(_XPG6)
-#define _POSIX_THREAD_PRIO_INHERIT 200112L
-#define _POSIX_THREAD_PRIO_PROTECT 200112L
+#define _POSIX_THREAD_PRIO_INHERIT 200112L
+#define _POSIX_THREAD_PRIO_PROTECT 200112L
#else
-#define _POSIX_THREAD_PRIO_INHERIT 1
-#define _POSIX_THREAD_PRIO_PROTECT 1
+#define _POSIX_THREAD_PRIO_INHERIT 1
+#define _POSIX_THREAD_PRIO_PROTECT 1
#endif
#ifndef _POSIX_VDISABLE
@@ -300,10 +299,6 @@ extern int fattach(int, const char *);
#if !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) || defined(__EXTENSIONS__)
extern int fchdir(int);
extern int fchown(int, uid_t, gid_t);
-#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
- defined(__EXTENSIONS__)
-extern int fchownat(int, const char *, uid_t, gid_t, int);
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
extern int fchroot(int);
@@ -464,10 +459,6 @@ extern ssize_t readlink(const char *_RESTRICT_KYWD, char *_RESTRICT_KYWD,
defined(__EXTENSIONS__)
extern int rename(const char *, const char *);
#endif /* (!defined(__XOPEN_OR_POSIX) || (defined(_XPG3)... */
-#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
- defined(__EXTENSIONS__)
-extern int renameat(int, const char *, int, const char *);
-#endif /* !defined(__XOPEN_OR_POSIX || defined(_ATFILE_SOURCE)... */
#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
extern int resolvepath(const char *, char *, size_t);
/* per RFC 3542; This is also defined in netdb.h */
@@ -541,10 +532,6 @@ extern char *ttyname(int);
extern useconds_t ualarm(useconds_t, useconds_t);
#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
extern int unlink(const char *);
-#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
- defined(__EXTENSIONS__)
-extern int unlinkat(int, const char *, int);
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
#if !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) || defined(__EXTENSIONS__)
extern int usleep(useconds_t);
#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
@@ -558,10 +545,23 @@ extern ssize_t write(int, const void *, size_t);
#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
extern void yield(void);
#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */
+
#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
defined(__EXTENSIONS__)
+ /* || defined(_XPG7) */
extern int faccessat(int, const char *, int, int);
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
+extern int fchownat(int, const char *, uid_t, gid_t, int);
+extern int linkat(int, const char *, int, const char *, int);
+extern ssize_t readlinkat(int, const char *_RESTRICT_KYWD,
+ char *_RESTRICT_KYWD, size_t);
+extern int renameat(int, const char *, int, const char *);
+extern int symlinkat(const char *, int, const char *);
+extern int unlinkat(int, const char *, int);
+#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
+#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
+extern int get_nprocs(void);
+extern int get_nprocs_conf(void);
+#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */
/* transitional large file interface versions */
#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
@@ -627,10 +627,6 @@ extern int fattach();
#if !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) || defined(__EXTENSIONS__)
extern int fchdir();
extern int fchown();
-#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
- defined(__EXTENSIONS__)
-extern int fchownat();
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
extern int fchroot();
@@ -765,10 +761,6 @@ extern ssize_t readlink();
#if (!defined(__XOPEN_OR_POSIX) || (defined(_XPG3) && !defined(_XPG4))) || \
defined(__EXTENSIONS__)
extern int rename();
-#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
- defined(__EXTENSIONS__)
-extern int renameat();
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
#endif /* (!defined(__XOPEN_OR_POSIX) || (defined(_XPG3)... */
#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
extern int resolvepath();
@@ -842,10 +834,6 @@ extern char *ttyname();
extern useconds_t ualarm();
#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
extern int unlink();
-#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
- defined(__EXTENSIONS__)
-extern int unlinkat();
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
#if !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) || defined(__EXTENSIONS__)
extern int usleep();
#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
@@ -859,10 +847,22 @@ extern ssize_t write();
#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
extern void yield();
#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */
+
#if !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE) || \
defined(__EXTENSIONS__)
+ /* || defined(_XPG7) */
extern int faccessat();
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
+extern int fchownat();
+extern int linkat();
+extern ssize_t readlinkat();
+extern int renameat();
+extern int symlinkat();
+extern int unlinkat();
+#endif /* !defined(__XOPEN_OR_POSIX) || defined(_ATFILE_SOURCE)... */
+#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
+extern int get_nprocs();
+extern int get_nprocs_conf();
+#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */
/* transitional large file interface versions */
#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
diff --git a/usr/src/head/user_attr.h b/usr/src/head/user_attr.h
index e5e6c9329c..42fbea0a03 100644
--- a/usr/src/head/user_attr.h
+++ b/usr/src/head/user_attr.h
@@ -19,15 +19,12 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _USER_ATTR_H
#define _USER_ATTR_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -107,6 +104,7 @@ struct __FILE; /* structure tag for type FILE defined in stdio.h */
#define USERATTR_PASSWD_AUTOMATIC "automatic"
#define USERATTR_PASSWD_MANUAL "manual"
#define USERATTR_TYPE_ROLE USERATTR_TYPE_NONADMIN_KW
+#define USERATTR_AUDIT_FLAGS_KW "audit_flags"
/*
diff --git a/usr/src/head/wchar.h b/usr/src/head/wchar.h
index 41a36de3ac..781b57afb8 100644
--- a/usr/src/head/wchar.h
+++ b/usr/src/head/wchar.h
@@ -20,17 +20,13 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _WCHAR_H
#define _WCHAR_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/feature_tests.h>
-
#include <iso/wchar_iso.h>
#include <iso/wchar_c99.h>
@@ -146,6 +142,18 @@ extern int wcwidth(wchar_t);
extern wctype_t wctype(const char *);
#endif /* !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE)... */
+#if defined(__EXTENSIONS__) || \
+ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+ /* || defined(_XPG7) */
+extern wchar_t *wcsdup(const wchar_t *);
+extern size_t wcsnlen(const wchar_t *, size_t);
+extern wchar_t *wcpcpy(wchar_t *_RESTRICT_KYWD, const wchar_t *_RESTRICT_KYWD);
+extern wchar_t *wcpncpy(wchar_t *_RESTRICT_KYWD, const wchar_t *_RESTRICT_KYWD,
+ size_t);
+extern int wcscasecmp(const wchar_t *, const wchar_t *);
+extern int wcsncasecmp(const wchar_t *, const wchar_t *, size_t);
+#endif
+
#else /* __STDC__ */
#if !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__)
@@ -169,6 +177,17 @@ extern int wcwidth();
extern wctype_t wctype();
#endif /* !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE)... */
+#if defined(__EXTENSIONS__) || \
+ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+ /* || defined(_XPG7) */
+extern wchar_t *wcsdup();
+extern size_t wcsnlen();
+extern wchar_t *wcpcpy();
+extern wchar_t *wcpncpy();
+extern int wcscasecmp();
+extern int wcsncasecmp();
+#endif
+
#endif /* __STDC__ */
#ifdef __cplusplus