diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
| commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
| tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/pwd.h | |
| parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
| parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
| download | illumos-joyent-release-20140821.tar.gz | |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/pwd.h')
| -rw-r--r-- | usr/src/head/pwd.h | 84 |
1 files changed, 2 insertions, 82 deletions
diff --git a/usr/src/head/pwd.h b/usr/src/head/pwd.h index 47dc2f136b..409c658f27 100644 --- a/usr/src/head/pwd.h +++ b/usr/src/head/pwd.h @@ -24,6 +24,8 @@ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,8 +33,6 @@ #ifndef _PWD_H #define _PWD_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3.1.9 */ - #include <sys/feature_tests.h> #include <sys/types.h> @@ -66,8 +66,6 @@ struct comment { }; #endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */ -#if defined(__STDC__) - extern struct passwd *getpwuid(uid_t); /* MT-unsafe */ extern struct passwd *getpwnam(const char *); /* MT-unsafe */ @@ -85,28 +83,6 @@ extern struct passwd *getpwent(void); /* MT-unsafe */ extern void setpwent(void); #endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) ... */ -#else /* (__STDC__) */ - -extern struct passwd *getpwuid(); /* MT-unsafe */ -extern struct passwd *getpwnam(); /* MT-unsafe */ - -#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) -extern struct passwd *getpwent_r(); -extern struct passwd *fgetpwent_r(); - -extern struct passwd *fgetpwent(); /* MT-unsafe */ -extern int putpwent(); -#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */ - -#if !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) || \ - defined(__EXTENSIONS__) -extern void endpwent(); -extern struct passwd *getpwent(); /* MT-unsafe */ -extern void setpwent(); -#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) ... */ - -#endif /* (__STDC__) */ - /* * getpwuid_r() & getpwnam_r() prototypes are defined here. */ @@ -146,8 +122,6 @@ extern void setpwent(); #if !defined(__XOPEN_OR_POSIX) || (_POSIX_C_SOURCE - 0 >= 199506L) || \ defined(_POSIX_PTHREAD_SEMANTICS) || defined(__EXTENSIONS__) -#if defined(__STDC__) - #if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS) #ifdef __PRAGMA_REDEFINE_EXTNAME @@ -193,60 +167,6 @@ extern struct passwd *getpwnam_r(const char *, struct passwd *, char *, int); #endif /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */ -#else /* __STDC__ */ - -#if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS) - -#ifdef __PRAGMA_REDEFINE_EXTNAME -#pragma redefine_extname getpwuid_r __posix_getpwuid_r -#pragma redefine_extname getpwnam_r __posix_getpwnam_r -extern int getpwuid_r(); -extern int getpwnam_r(); -#else /* __PRAGMA_REDEFINE_EXTNAME */ - -extern int __posix_getpwuid_r(); -extern int __posix_getpwnam_r(); - -#ifdef __lint - -#define getpwuid_r __posix_getpwuid_r -#define getpwnam_r __posix_getpwnam_r - -#else /* !__lint */ - -static int -getpwuid_r(__uid, __pwd, __buf, __len, __res) - uid_t __uid; - struct passwd *__pwd; - char *__buf; - int __len; - struct passwd **__res; -{ - return (__posix_getpwuid_r(__uid, __pwd, __buf, __len, __res)); -} -static int -getpwnam_r(__cb, __pwd, __buf, __len, __res) - char *__cb; - struct passwd *__pwd; - char *__buf; - int __len; - struct passwd **__res; -{ - return (__posix_getpwnam_r(__cb, __pwd, __buf, __len, __res)); -} - -#endif /* !__lint */ -#endif /* __PRAGMA_REDEFINE_EXTNAME */ - -#else /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */ - -extern struct passwd *getpwuid_r(); -extern struct passwd *getpwnam_r(); - -#endif /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */ - -#endif /* __STDC__ */ - #endif /* !defined(__XOPEN_OR_POSIX) || (_POSIX_C_SOURCE - 0 >= 199506L)... */ #ifdef __cplusplus |