diff options
| author | raf <none@none> | 2006-01-06 13:09:21 -0800 |
|---|---|---|
| committer | raf <none@none> | 2006-01-06 13:09:21 -0800 |
| commit | e8031f0a8ed0e45c6d8847c5e09424e66fd34a4b (patch) | |
| tree | 8ded5f3bcfc9f92ca50e6639f7063ea0afd17fa7 | |
| parent | a7aa4df776b2ef44358da774101a0a3039d69100 (diff) | |
| download | illumos-joyent-e8031f0a8ed0e45c6d8847c5e09424e66fd34a4b.tar.gz | |
6362982 namespace pollution/protection in libc
6369040 there should be but one synonyms.h file outside of libc
--HG--
rename : usr/src/lib/common/inc/mtlib.h => deleted_files/usr/src/lib/common/inc/mtlib.h
rename : usr/src/lib/libc/sparcv9/gen/llabs.s => deleted_files/usr/src/lib/libc/sparcv9/gen/llabs.s
rename : usr/src/lib/libcurses/screen/synonyms.h => deleted_files/usr/src/lib/libcurses/screen/synonyms.h
rename : usr/src/lib/libmail/inc/synonyms.h => deleted_files/usr/src/lib/libmail/inc/synonyms.h
rename : usr/src/lib/libresolv/synonyms.h => deleted_files/usr/src/lib/libresolv/synonyms.h
rename : usr/src/lib/libresolv2/include/synonyms.h => deleted_files/usr/src/lib/libresolv2/include/synonyms.h
rename : usr/src/lib/librsm/inc/synonyms.h => deleted_files/usr/src/lib/librsm/inc/synonyms.h
rename : usr/src/ucblib/libucb/port/gen/synonyms.h => deleted_files/usr/src/ucblib/libucb/port/gen/synonyms.h
rename : usr/src/lib/common/inc/synonyms.h => usr/src/lib/common/inc/c_synonyms.h
rename : usr/src/lib/libcrypt/inc/synonyms.h => usr/src/lib/libcrypt/inc/des_synonyms.h
rename : usr/src/lib/libgen/inc/synonyms.h => usr/src/lib/libgen/inc/gen_synonyms.h
301 files changed, 3363 insertions, 3338 deletions
diff --git a/usr/src/lib/common/inc/mtlib.h b/deleted_files/usr/src/lib/common/inc/mtlib.h index 461c61f44a..461c61f44a 100644 --- a/usr/src/lib/common/inc/mtlib.h +++ b/deleted_files/usr/src/lib/common/inc/mtlib.h diff --git a/usr/src/lib/libc/sparcv9/gen/llabs.s b/deleted_files/usr/src/lib/libc/sparcv9/gen/llabs.s index fdc1f04c4f..fdc1f04c4f 100644 --- a/usr/src/lib/libc/sparcv9/gen/llabs.s +++ b/deleted_files/usr/src/lib/libc/sparcv9/gen/llabs.s diff --git a/usr/src/lib/libcurses/screen/synonyms.h b/deleted_files/usr/src/lib/libcurses/screen/synonyms.h index c3d1229c31..c3d1229c31 100644 --- a/usr/src/lib/libcurses/screen/synonyms.h +++ b/deleted_files/usr/src/lib/libcurses/screen/synonyms.h diff --git a/usr/src/lib/libmail/inc/synonyms.h b/deleted_files/usr/src/lib/libmail/inc/synonyms.h index 099190faf5..099190faf5 100644 --- a/usr/src/lib/libmail/inc/synonyms.h +++ b/deleted_files/usr/src/lib/libmail/inc/synonyms.h diff --git a/usr/src/lib/libresolv/synonyms.h b/deleted_files/usr/src/lib/libresolv/synonyms.h index e1063aec22..e1063aec22 100644 --- a/usr/src/lib/libresolv/synonyms.h +++ b/deleted_files/usr/src/lib/libresolv/synonyms.h diff --git a/usr/src/lib/libresolv2/include/synonyms.h b/deleted_files/usr/src/lib/libresolv2/include/synonyms.h index a1a17fb7d4..a1a17fb7d4 100644 --- a/usr/src/lib/libresolv2/include/synonyms.h +++ b/deleted_files/usr/src/lib/libresolv2/include/synonyms.h diff --git a/usr/src/lib/librsm/inc/synonyms.h b/deleted_files/usr/src/lib/librsm/inc/synonyms.h index d80219f279..d80219f279 100644 --- a/usr/src/lib/librsm/inc/synonyms.h +++ b/deleted_files/usr/src/lib/librsm/inc/synonyms.h diff --git a/usr/src/ucblib/libucb/port/gen/synonyms.h b/deleted_files/usr/src/ucblib/libucb/port/gen/synonyms.h index 7ac3fbaf71..7ac3fbaf71 100644 --- a/usr/src/ucblib/libucb/port/gen/synonyms.h +++ b/deleted_files/usr/src/ucblib/libucb/port/gen/synonyms.h diff --git a/usr/src/cmd/mdb/common/kmdb/kmdb_dl.c b/usr/src/cmd/mdb/common/kmdb/kmdb_dl.c index 2b96ae1405..adc26d6e95 100644 --- a/usr/src/cmd/mdb/common/kmdb/kmdb_dl.c +++ b/usr/src/cmd/mdb/common/kmdb/kmdb_dl.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -140,9 +141,10 @@ dlsym(void *dlp, const char *name) return (addr); } +#pragma weak dladdr1 = _dladdr1 /*ARGSUSED*/ int -dladdr1(void *address, Dl_info *dlip, void **info, int flags) +_dladdr1(void *address, Dl_info *dlip, void **info, int flags) { /* * umem uses this for debugging information. We'll pretend to fail. diff --git a/usr/src/common/util/qsort.c b/usr/src/common/util/qsort.c index b61ca20b7c..203c0c16d3 100644 --- a/usr/src/common/util/qsort.c +++ b/usr/src/common/util/qsort.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -35,7 +36,6 @@ #if !defined(_KERNEL) && !defined(_KMDB) #include <stdlib.h> -#include <mtlib.h> #include <synch.h> #endif /* !_KERNEL && !_KMDB */ diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index 682a526d00..8218c4924b 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -43,6 +43,8 @@ NX_MAP_sparc= NX_MAP= $(NX_MAP_$(MACH)) +C_SYNONYMS_H= $(SRC)/lib/common/inc/c_synonyms.h + # # If HDRDIR is left unset, then it's possible for the $(ROOTHDRDIR)/% # install rule in lib/Makefile.targ to generate false matches if there diff --git a/usr/src/lib/Makefile.targ b/usr/src/lib/Makefile.targ index f13eaed78c..2ea6b7cb95 100644 --- a/usr/src/lib/Makefile.targ +++ b/usr/src/lib/Makefile.targ @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -95,6 +95,9 @@ $(DYNLIBCCC): pics .WAIT $$(PICS) $$(ALTPICS) $(BUILDCCC.SO) $(POST_PROCESS_SO) +fnamecheck: $(DYNLIB) + check_fnames -s $(C_SYNONYMS_H) -l $(DYNLIB) $(PICS) $(ALTPICS) + $(LINTLIB): $$(SRCS) $(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 diff --git a/usr/src/lib/common/inc/c_synonyms.h b/usr/src/lib/common/inc/c_synonyms.h new file mode 100644 index 0000000000..b863f40d39 --- /dev/null +++ b/usr/src/lib/common/inc/c_synonyms.h @@ -0,0 +1,1020 @@ +/* + * 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. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +/* + * This file is included in library source files (other than libc) when it + * is desired to call libc functions by their restricted names rather than + * by their public names, to avoid a namespace collision with applications. + */ + +#ifndef _COMMON_INC_SYNONYMS_H +#define _COMMON_INC_SYNONYMS_H + +#pragma ident "%Z%%M% %I% %E% SMI" + +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(__lint) + +/* external data */ +#define altzone _altzone +#define _ctype __ctype +#define daylight _daylight +#define lone _lone +#define lten _lten +#define lzero _lzero +#define timezone _timezone +#define tzname _tzname + +/* functions */ +#define a64l _a64l +#define access _access +#define acct _acct +#define acctctl _acctctl +#define acl _acl +#define addseverity _addseverity +#define adjtime _adjtime +#define alarm _alarm +#define alphasort64 _alphasort64 +#define alphasort _alphasort +#define ascftime _ascftime +#define asctime_r _asctime_r +#define _assert __assert +#define _assert_c99 __assert_c99 +#define atoll _atoll +#define atomic_add_16 _atomic_add_16 +#define atomic_add_16_nv _atomic_add_16_nv +#define atomic_add_32 _atomic_add_32 +#define atomic_add_32_nv _atomic_add_32_nv +#define atomic_add_64 _atomic_add_64 +#define atomic_add_64_nv _atomic_add_64_nv +#define atomic_add_8 _atomic_add_8 +#define atomic_add_8_nv _atomic_add_8_nv +#define atomic_add_char _atomic_add_char +#define atomic_add_char_nv _atomic_add_char_nv +#define atomic_add_int _atomic_add_int +#define atomic_add_int_nv _atomic_add_int_nv +#define atomic_add_long _atomic_add_long +#define atomic_add_long_nv _atomic_add_long_nv +#define atomic_add_ptr _atomic_add_ptr +#define atomic_add_ptr_nv _atomic_add_ptr_nv +#define atomic_add_short _atomic_add_short +#define atomic_add_short_nv _atomic_add_short_nv +#define atomic_and_16 _atomic_and_16 +#define atomic_and_16_nv _atomic_and_16_nv +#define atomic_and_32 _atomic_and_32 +#define atomic_and_32_nv _atomic_and_32_nv +#define atomic_and_64 _atomic_and_64 +#define atomic_and_64_nv _atomic_and_64_nv +#define atomic_and_8 _atomic_and_8 +#define atomic_and_8_nv _atomic_and_8_nv +#define atomic_and_uchar _atomic_and_uchar +#define atomic_and_uchar_nv _atomic_and_uchar_nv +#define atomic_and_uint _atomic_and_uint +#define atomic_and_uint_nv _atomic_and_uint_nv +#define atomic_and_ulong _atomic_and_ulong +#define atomic_and_ulong_nv _atomic_and_ulong_nv +#define atomic_and_ushort _atomic_and_ushort +#define atomic_and_ushort_nv _atomic_and_ushort_nv +#define atomic_cas_16 _atomic_cas_16 +#define atomic_cas_32 _atomic_cas_32 +#define atomic_cas_64 _atomic_cas_64 +#define atomic_cas_8 _atomic_cas_8 +#define atomic_cas_ptr _atomic_cas_ptr +#define atomic_cas_uchar _atomic_cas_uchar +#define atomic_cas_uint _atomic_cas_uint +#define atomic_cas_ulong _atomic_cas_ulong +#define atomic_cas_ushort _atomic_cas_ushort +#define atomic_clear_long_excl _atomic_clear_long_excl +#define atomic_dec_16 _atomic_dec_16 +#define atomic_dec_16_nv _atomic_dec_16_nv +#define atomic_dec_32 _atomic_dec_32 +#define atomic_dec_32_nv _atomic_dec_32_nv +#define atomic_dec_64 _atomic_dec_64 +#define atomic_dec_64_nv _atomic_dec_64_nv +#define atomic_dec_8 _atomic_dec_8 +#define atomic_dec_8_nv _atomic_dec_8_nv +#define atomic_dec_uchar _atomic_dec_uchar +#define atomic_dec_uchar_nv _atomic_dec_uchar_nv +#define atomic_dec_uint _atomic_dec_uint +#define atomic_dec_uint_nv _atomic_dec_uint_nv +#define atomic_dec_ulong _atomic_dec_ulong +#define atomic_dec_ulong_nv _atomic_dec_ulong_nv +#define atomic_dec_ushort _atomic_dec_ushort +#define atomic_dec_ushort_nv _atomic_dec_ushort_nv +#define atomic_inc_16 _atomic_inc_16 +#define atomic_inc_16_nv _atomic_inc_16_nv +#define atomic_inc_32 _atomic_inc_32 +#define atomic_inc_32_nv _atomic_inc_32_nv +#define atomic_inc_64 _atomic_inc_64 +#define atomic_inc_64_nv _atomic_inc_64_nv +#define atomic_inc_8 _atomic_inc_8 +#define atomic_inc_8_nv _atomic_inc_8_nv +#define atomic_inc_uchar _atomic_inc_uchar +#define atomic_inc_uchar_nv _atomic_inc_uchar_nv +#define atomic_inc_uint _atomic_inc_uint +#define atomic_inc_uint_nv _atomic_inc_uint_nv +#define atomic_inc_ulong _atomic_inc_ulong +#define atomic_inc_ulong_nv _atomic_inc_ulong_nv +#define atomic_inc_ushort _atomic_inc_ushort +#define atomic_inc_ushort_nv _atomic_inc_ushort_nv +#define atomic_or_16 _atomic_or_16 +#define atomic_or_16_nv _atomic_or_16_nv +#define atomic_or_32 _atomic_or_32 +#define atomic_or_32_nv _atomic_or_32_nv +#define atomic_or_64 _atomic_or_64 +#define atomic_or_64_nv _atomic_or_64_nv +#define atomic_or_8 _atomic_or_8 +#define atomic_or_8_nv _atomic_or_8_nv +#define atomic_or_uchar _atomic_or_uchar +#define atomic_or_uchar_nv _atomic_or_uchar_nv +#define atomic_or_uint _atomic_or_uint +#define atomic_or_uint_nv _atomic_or_uint_nv +#define atomic_or_ulong _atomic_or_ulong +#define atomic_or_ulong_nv _atomic_or_ulong_nv +#define atomic_or_ushort _atomic_or_ushort +#define atomic_or_ushort_nv _atomic_or_ushort_nv +#define atomic_set_long_excl _atomic_set_long_excl +#define atomic_swap_16 _atomic_swap_16 +#define atomic_swap_32 _atomic_swap_32 +#define atomic_swap_64 _atomic_swap_64 +#define atomic_swap_8 _atomic_swap_8 +#define atomic_swap_ptr _atomic_swap_ptr +#define atomic_swap_uchar _atomic_swap_uchar +#define atomic_swap_uint _atomic_swap_uint +#define atomic_swap_ulong _atomic_swap_ulong +#define atomic_swap_ushort _atomic_swap_ushort +#define attropen _attropen +#define brk _brk +#define catclose _catclose +#define catgets _catgets +#define catopen _catopen +#define cfgetispeed _cfgetispeed +#define cfgetospeed _cfgetospeed +#define cfree _cfree +#define cfsetispeed _cfsetispeed +#define cfsetospeed _cfsetospeed +#define cftime _cftime +#define chdir _chdir +#define chmod _chmod +#define chown _chown +#define chroot _chroot +#define _cladm __cladm +#define close _close +#define closedir _closedir +#define closefrom _closefrom +#define closelog _closelog +#define cond_broadcast _cond_broadcast +#define cond_destroy _cond_destroy +#define cond_init _cond_init +#define cond_reltimedwait _cond_reltimedwait +#define cond_signal _cond_signal +#define cond_timedwait _cond_timedwait +#define cond_wait _cond_wait +#define core_get_default_content _core_get_default_content +#define core_get_default_path _core_get_default_path +#define core_get_global_content _core_get_global_content +#define core_get_global_path _core_get_global_path +#define core_get_options _core_get_options +#define core_get_process_content _core_get_process_content +#define core_get_process_path _core_get_process_path +#define core_set_default_content _core_set_default_content +#define core_set_default_path _core_set_default_path +#define core_set_global_content _core_set_global_content +#define core_set_global_path _core_set_global_path +#define core_set_options _core_set_options +#define core_set_process_content _core_set_process_content +#define core_set_process_path _core_set_process_path +#define creat _creat +#define crypt _crypt +#define ctermid _ctermid +#define ctermid_r _ctermid_r +#define ctime_r _ctime_r +#define cuserid _cuserid +#define decimal_to_double _decimal_to_double +#define decimal_to_extended _decimal_to_extended +#define decimal_to_quadruple _decimal_to_quadruple +#define decimal_to_single _decimal_to_single +#define dgettext _dgettext +#define dladdr1 _dladdr1 +#define dladdr _dladdr +#define dlamd64getunwind _dlamd64getunwind +#define dlclose _dlclose +#define dldump _dldump +#define dlerror _dlerror +#define dlinfo _dlinfo +#define dlmopen _dlmopen +#define dlopen _dlopen +#define dlsym _dlsym +#define door_bind _door_bind +#define door_call _door_call +#define door_create _door_create +#define door_cred _door_cred +#define door_getparam _door_getparam +#define door_info _door_info +#define door_return _door_return +#define door_revoke _door_revoke +#define door_server_create _door_server_create +#define door_setparam _door_setparam +#define door_ucred _door_ucred +#define door_unbind _door_unbind +#define double_to_decimal _double_to_decimal +#define drand48 _drand48 +#define dup2 _dup2 +#define dup _dup +#define econvert _econvert +#define ecvt _ecvt +#define encrypt _encrypt +#define endgrent _endgrent +#define endpwent _endpwent +#define endspent _endspent +#define endutent _endutent +#define endutxent _endutxent +#define environ _environ +#define erand48 _erand48 +#define execle _execle +#define execl _execl +#define execlp _execlp +#define execve _execve +#define execv _execv +#define execvp _execvp +#define exportfs _exportfs +#define extended_to_decimal _extended_to_decimal +#define facl _facl +#define fattach _fattach +#define fchdir _fchdir +#define fchmod _fchmod +#define fchownat _fchownat +#define fchown _fchown +#define fchroot _fchroot +#define fcntl _fcntl +#define fconvert _fconvert +#define fcvt _fcvt +#define fdetach _fdetach +#define fdopendir _fdopendir +#define fdopen _fdopen +#define fdwalk _fdwalk +#define ffs _ffs +#define fgetgrent _fgetgrent +#define fgetgrent_r _fgetgrent_r +#define fgetpwent _fgetpwent +#define fgetpwent_r _fgetpwent_r +#define fgetspent _fgetspent +#define fgetspent_r _fgetspent_r +#define fileno _fileno +#define file_to_decimal _file_to_decimal +#define finite _finite +#define flockfile _flockfile +#define fmtmsg _fmtmsg +#define fork1 _fork1 +#define forkall _forkall +#define fork _fork +#define fpathconf _fpathconf +#define fpclass _fpclass +#define fpgetmask _fpgetmask +#define fpgetround _fpgetround +#define fpgetsticky _fpgetsticky +#define fprintf _fprintf +#define fpsetmask _fpsetmask +#define fpsetround _fpsetround +#define fpsetsticky _fpsetsticky +#define fstatat _fstatat +#define fstatfs _fstatfs +#define fstatvfs _fstatvfs +#define fsync _fsync +#define ftok _ftok +#define ftruncate _ftruncate +#define ftrylockfile _ftrylockfile +#define ftw _ftw +#define func_to_decimal _func_to_decimal +#define funlockfile _funlockfile +#define futimesat _futimesat +#define gconvert _gconvert +#define gcvt _gcvt +#define getacct _getacct +#define getcontext _getcontext +#define getcpuid _getcpuid +#define getcwd _getcwd +#define getdate _getdate +#define getdents _getdents +#define getegid _getegid +#define geteuid _geteuid +#define getexecname _getexecname +#define getgid _getgid +#define getgrent _getgrent +#define getgrent_r _getgrent_r +#define getgrgid _getgrgid +#define getgrgid_r _getgrgid_r +#define getgrnam _getgrnam +#define getgrnam_r _getgrnam_r +#define getgroups _getgroups +#define gethomelgroup _gethomelgroup +#define getisax _getisax +#define getitimer _getitimer +#define getlogin _getlogin +#define getlogin_r _getlogin_r +#define getmntany _getmntany +#define getmntent _getmntent +#define getmsg _getmsg +#define getopt_clip _getopt_clip +#define getopt _getopt +#define getopt_long _getopt_long +#define getopt_long_only _getopt_long_only +#define getpass _getpass +#define getpeerucred _getpeerucred +#define getpflags _getpflags +#define getpgid _getpgid +#define getpgrp _getpgrp +#define getpid _getpid +#define getpmsg _getpmsg +#define getppid _getppid +#define getppriv _getppriv +#define getprivimplinfo _getprivimplinfo +#define getprojid _getprojid +#define getpwent _getpwent +#define getpwent_r _getpwent_r +#define getpw _getpw +#define getpwnam _getpwnam +#define getpwnam_r _getpwnam_r +#define getpwuid _getpwuid +#define getpwuid_r _getpwuid_r +#define getrctl _getrctl +#define getrlimit _getrlimit +#define getsid _getsid +#define getspent _getspent +#define getspent_r _getspent_r +#define getspnam _getspnam +#define getspnam_r _getspnam_r +#define getsubopt _getsubopt +#define gettaskid _gettaskid +#define gettimeofday _gettimeofday +#define gettxt _gettxt +#define getuid _getuid +#define getustack _getustack +#define getutent _getutent +#define getutid _getutid +#define getutline _getutline +#define getutmp _getutmp +#define getutmpx _getutmpx +#define getutxent _getutxent +#define getutxid _getutxid +#define getutxline _getutxline +#define getvfsany _getvfsany +#define getvfsent _getvfsent +#define getvfsfile _getvfsfile +#define getvfsspec _getvfsspec +#define getw _getw +#define getzoneidbyname _getzoneidbyname +#define getzoneid _getzoneid +#define getzonenamebyid _getzonenamebyid +#define gmtime_r _gmtime_r +#define grantpt _grantpt +#define gsignal _gsignal +#define gtty _gtty +#define hasmntopt _hasmntopt +#define hcreate _hcreate +#define hdestroy _hdestroy +#define hsearch _hsearch +#define iconv_close _iconv_close +#define iconv _iconv +#define iconv_open _iconv_open +#define initgroups _initgroups +#define insque _insque +#define install_utrap _install_utrap +#define inst_sync _inst_sync +#define _iob __iob +#define ioctl _ioctl +#define isastream _isastream +#define isatty _isatty +#define issetugid _issetugid +#define jrand48 _jrand48 +#define kaio _kaio +#define kill _kill +#define l64a _l64a +#define ladd _ladd +#define lchown _lchown +#define lckpwdf _lckpwdf +#define lcong48 _lcong48 +#define ldivide _ldivide +#define lexp10 _lexp10 +#define lfind _lfind +#define link _link +#define llabs _llabs +#define lldiv _lldiv +#define llog10 _llog10 +#define llseek _llseek +#define lltostr _lltostr +#define lmul _lmul +#define localtime_r _localtime_r +#define lockf _lockf +#define longjmp _longjmp +#define lrand48 _lrand48 +#define lsearch _lsearch +#define lseek _lseek +#define lshiftl _lshiftl +#define lsub _lsub +#define _lwp_cond_broadcast __lwp_cond_broadcast +#define _lwp_cond_reltimedwait __lwp_cond_reltimedwait +#define _lwp_cond_signal __lwp_cond_signal +#define _lwp_cond_timedwait __lwp_cond_timedwait +#define _lwp_cond_wait __lwp_cond_wait +#define _lwp_continue __lwp_continue +#define _lwp_info __lwp_info +#define _lwp_kill __lwp_kill +#define _lwp_mutex_lock __lwp_mutex_lock +#define _lwp_mutex_trylock __lwp_mutex_trylock +#define _lwp_mutex_unlock __lwp_mutex_unlock +#define _lwp_self __lwp_self +#define _lwp_sema_init __lwp_sema_init +#define _lwp_sema_post __lwp_sema_post +#define _lwp_sema_trywait __lwp_sema_trywait +#define _lwp_sema_wait __lwp_sema_wait +#define _lwp_suspend __lwp_suspend +#define madvise _madvise +#define makecontext _makecontext +#define makeut _makeut +#define makeutx _makeutx +#define memalign _memalign +#define membar_consumer _membar_consumer +#define membar_enter _membar_enter +#define membar_exit _membar_exit +#define membar_producer _membar_producer +#define memccpy _memccpy +#define memcmp _memcmp +#define memcntl _memcntl +#define memcpy _memcpy +#define meminfo _meminfo +#define memmove _memmove +#define memset _memset +#define mincore _mincore +#define mkdir _mkdir +#define mkfifo _mkfifo +#define mkstemp _mkstemp +#define mktemp _mktemp +#define mlockall _mlockall +#define mlock _mlock +#define mmap _mmap +#define modutx _modutx +#define monitor _monitor +#define mount _mount +#define mprotect _mprotect +#define mrand48 _mrand48 +#define msgctl64 _msgctl64 +#define msgctl _msgctl +#define msgget _msgget +#define msgids _msgids +#define msgrcv _msgrcv +#define msgsnap _msgsnap +#define msgsnd _msgsnd +#define msync _msync +#define munlockall _munlockall +#define munlock _munlock +#define munmap _munmap +#define _mutex_destroy __mutex_destroy +#define mutex_destroy __mutex_destroy +#define _mutex_held __mutex_held +#define mutex_held __mutex_held +#define _mutex_init __mutex_init +#define mutex_init __mutex_init +#define _mutex_lock __mutex_lock +#define mutex_lock __mutex_lock +#define _mutex_trylock __mutex_trylock +#define mutex_trylock __mutex_trylock +#define _mutex_unlock __mutex_unlock +#define mutex_unlock __mutex_unlock +#define nfs_getfh _nfs_getfh +#define nfssvc _nfssvc +#define nftw _nftw +#define nice _nice +#define nl_langinfo _nl_langinfo +#define nrand48 _nrand48 +#define nss_default_finders _nss_default_finders +#define nss_delete _nss_delete +#define nss_endent _nss_endent +#define nss_getent _nss_getent +#define nss_search _nss_search +#define nss_setent _nss_setent +#define ntp_adjtime _ntp_adjtime +#define ntp_gettime _ntp_gettime +#define openat _openat +#define opendir _opendir +#define openlog _openlog +#define open _open +#define pathconf _pathconf +#define pause _pause +#define pclose _pclose +#define pipe _pipe +#define plock _plock +#define poll _poll +#define popen _popen +#define port_alert _port_alert +#define port_associate _port_associate +#define port_create _port_create +#define port_dispatch _port_dispatch +#define port_dissociate _port_dissociate +#define port_getn _port_getn +#define port_get _port_get +#define port_sendn _port_sendn +#define port_send _port_send +#define posix_openpt _posix_openpt +#define posix_spawnattr_destroy _posix_spawnattr_destroy +#define posix_spawnattr_getflags _posix_spawnattr_getflags +#define posix_spawnattr_getpgroup _posix_spawnattr_getpgroup +#define posix_spawnattr_getschedparam _posix_spawnattr_getschedparam +#define posix_spawnattr_getschedpolicy _posix_spawnattr_getschedpolicy +#define posix_spawnattr_getsigdefault _posix_spawnattr_getsigdefault +#define posix_spawnattr_getsigmask _posix_spawnattr_getsigmask +#define posix_spawnattr_init _posix_spawnattr_init +#define posix_spawnattr_setflags _posix_spawnattr_setflags +#define posix_spawnattr_setpgroup _posix_spawnattr_setpgroup +#define posix_spawnattr_setschedparam _posix_spawnattr_setschedparam +#define posix_spawnattr_setschedpolicy _posix_spawnattr_setschedpolicy +#define posix_spawnattr_setsigdefault _posix_spawnattr_setsigdefault +#define posix_spawnattr_setsigmask _posix_spawnattr_setsigmask +#define posix_spawn_file_actions_addclose _posix_spawn_file_actions_addclose +#define posix_spawn_file_actions_adddup2 _posix_spawn_file_actions_adddup2 +#define posix_spawn_file_actions_addopen _posix_spawn_file_actions_addopen +#define posix_spawn_file_actions_destroy _posix_spawn_file_actions_destroy +#define posix_spawn_file_actions_init _posix_spawn_file_actions_init +#define posix_spawn _posix_spawn +#define posix_spawnp _posix_spawnp +#define pread _pread +#define printstack _printstack +#define priv_addset _priv_addset +#define priv_allocset _priv_allocset +#define priv_copyset _priv_copyset +#define priv_delset _priv_delset +#define priv_emptyset _priv_emptyset +#define priv_fillset _priv_fillset +#define priv_freeset _priv_freeset +#define priv_getbyname _priv_getbyname +#define priv_getbynum _priv_getbynum +#define priv_getsetbyname _priv_getsetbyname +#define priv_getsetbynum _priv_getsetbynum +#define priv_gettext _priv_gettext +#define priv_ineffect _priv_ineffect +#define priv_intersect _priv_intersect +#define priv_inverse _priv_inverse +#define priv_isemptyset _priv_isemptyset +#define priv_isequalset _priv_isequalset +#define priv_isfullset _priv_isfullset +#define priv_ismember _priv_ismember +#define priv_issubset _priv_issubset +#define priv_set _priv_set +#define priv_set_to_str _priv_set_to_str +#define priv_str_to_set _priv_str_to_set +#define priv_union _priv_union +#define profil _profil +#define pselect _pselect +#define psiginfo _psiginfo +#define psignal _psignal +#define pthread_atfork _pthread_atfork +#define pthread_attr_destroy _pthread_attr_destroy +#define pthread_attr_getdetachstate _pthread_attr_getdetachstate +#define pthread_attr_getguardsize _pthread_attr_getguardsize +#define pthread_attr_getinheritsched _pthread_attr_getinheritsched +#define pthread_attr_getschedparam _pthread_attr_getschedparam +#define pthread_attr_getschedpolicy _pthread_attr_getschedpolicy +#define pthread_attr_getscope _pthread_attr_getscope +#define pthread_attr_getstackaddr _pthread_attr_getstackaddr +#define pthread_attr_getstack _pthread_attr_getstack +#define pthread_attr_getstacksize _pthread_attr_getstacksize +#define pthread_attr_init _pthread_attr_init +#define pthread_attr_setdetachstate _pthread_attr_setdetachstate +#define pthread_attr_setguardsize _pthread_attr_setguardsize +#define pthread_attr_setinheritsched _pthread_attr_setinheritsched +#define pthread_attr_setschedparam _pthread_attr_setschedparam +#define pthread_attr_setschedpolicy _pthread_attr_setschedpolicy +#define pthread_attr_setscope _pthread_attr_setscope +#define pthread_attr_setstackaddr _pthread_attr_setstackaddr +#define pthread_attr_setstack _pthread_attr_setstack +#define pthread_attr_setstacksize _pthread_attr_setstacksize +#define pthread_barrierattr_destroy _pthread_barrierattr_destroy +#define pthread_barrierattr_getpshared _pthread_barrierattr_getpshared +#define pthread_barrierattr_init _pthread_barrierattr_init +#define pthread_barrierattr_setpshared _pthread_barrierattr_setpshared +#define pthread_barrier_destroy _pthread_barrier_destroy +#define pthread_barrier_init _pthread_barrier_init +#define pthread_barrier_wait _pthread_barrier_wait +#define pthread_cancel _pthread_cancel +#define pthread_condattr_destroy _pthread_condattr_destroy +#define pthread_condattr_getclock _pthread_condattr_getclock +#define pthread_condattr_getpshared _pthread_condattr_getpshared +#define pthread_condattr_init _pthread_condattr_init +#define pthread_condattr_setclock _pthread_condattr_setclock +#define pthread_condattr_setpshared _pthread_condattr_setpshared +#define pthread_cond_broadcast _pthread_cond_broadcast +#define pthread_cond_destroy _pthread_cond_destroy +#define pthread_cond_init _pthread_cond_init +#define pthread_cond_reltimedwait_np _pthread_cond_reltimedwait_np +#define pthread_cond_signal _pthread_cond_signal +#define pthread_cond_timedwait _pthread_cond_timedwait +#define pthread_cond_wait _pthread_cond_wait +#define pthread_create _pthread_create +#define pthread_detach _pthread_detach +#define pthread_equal _pthread_equal +#define pthread_exit _pthread_exit +#define pthread_getconcurrency _pthread_getconcurrency +#define pthread_getschedparam _pthread_getschedparam +#define pthread_getspecific _pthread_getspecific +#define pthread_join _pthread_join +#define pthread_key_create _pthread_key_create +#define pthread_key_delete _pthread_key_delete +#define pthread_kill _pthread_kill +#define pthread_mutexattr_destroy _pthread_mutexattr_destroy +#define pthread_mutexattr_getprioceiling _pthread_mutexattr_getprioceiling +#define pthread_mutexattr_getprotocol _pthread_mutexattr_getprotocol +#define pthread_mutexattr_getpshared _pthread_mutexattr_getpshared +#define pthread_mutexattr_getrobust_np _pthread_mutexattr_getrobust_np +#define pthread_mutexattr_gettype _pthread_mutexattr_gettype +#define pthread_mutexattr_init _pthread_mutexattr_init +#define pthread_mutexattr_setprioceiling _pthread_mutexattr_setprioceiling +#define pthread_mutexattr_setprotocol _pthread_mutexattr_setprotocol +#define pthread_mutexattr_setpshared _pthread_mutexattr_setpshared +#define pthread_mutexattr_setrobust_np _pthread_mutexattr_setrobust_np +#define pthread_mutexattr_settype _pthread_mutexattr_settype +#define pthread_mutex_consistent_np _pthread_mutex_consistent_np +#define pthread_mutex_destroy _pthread_mutex_destroy +#define pthread_mutex_getprioceiling _pthread_mutex_getprioceiling +#define pthread_mutex_init _pthread_mutex_init +#define pthread_mutex_lock _pthread_mutex_lock +#define pthread_mutex_reltimedlock_np _pthread_mutex_reltimedlock_np +#define pthread_mutex_setprioceiling _pthread_mutex_setprioceiling +#define pthread_mutex_timedlock _pthread_mutex_timedlock +#define pthread_mutex_trylock _pthread_mutex_trylock +#define pthread_mutex_unlock _pthread_mutex_unlock +#define pthread_once _pthread_once +#define pthread_rwlockattr_destroy _pthread_rwlockattr_destroy +#define pthread_rwlockattr_getpshared _pthread_rwlockattr_getpshared +#define pthread_rwlockattr_init _pthread_rwlockattr_init +#define pthread_rwlockattr_setpshared _pthread_rwlockattr_setpshared +#define pthread_rwlock_destroy _pthread_rwlock_destroy +#define pthread_rwlock_init _pthread_rwlock_init +#define pthread_rwlock_rdlock _pthread_rwlock_rdlock +#define pthread_rwlock_reltimedrdlock_np _pthread_rwlock_reltimedrdlock_np +#define pthread_rwlock_reltimedwrlock_np _pthread_rwlock_reltimedwrlock_np +#define pthread_rwlock_timedrdlock _pthread_rwlock_timedrdlock +#define pthread_rwlock_timedwrlock _pthread_rwlock_timedwrlock +#define pthread_rwlock_tryrdlock _pthread_rwlock_tryrdlock +#define pthread_rwlock_trywrlock _pthread_rwlock_trywrlock +#define pthread_rwlock_unlock _pthread_rwlock_unlock +#define pthread_rwlock_wrlock _pthread_rwlock_wrlock +#define pthread_self _pthread_self +#define pthread_setcancelstate _pthread_setcancelstate +#define pthread_setcanceltype _pthread_setcanceltype +#define pthread_setconcurrency _pthread_setconcurrency +#define pthread_setschedparam _pthread_setschedparam +#define pthread_setschedprio _pthread_setschedprio +#define pthread_setspecific _pthread_setspecific +#define pthread_sigmask _pthread_sigmask +#define pthread_spin_destroy _pthread_spin_destroy +#define pthread_spin_init _pthread_spin_init +#define pthread_spin_lock _pthread_spin_lock +#define pthread_spin_trylock _pthread_spin_trylock +#define pthread_spin_unlock _pthread_spin_unlock +#define pthread_testcancel _pthread_testcancel +#define ptsname _ptsname +#define putacct _putacct +#define putenv _putenv +#define putmsg _putmsg +#define putpmsg _putpmsg +#define putpwent _putpwent +#define putspent _putspent +#define pututline _pututline +#define pututxline _pututxline +#define putw _putw +#define pwrite _pwrite +#define qeconvert _qeconvert +#define qecvt _qecvt +#define qfconvert _qfconvert +#define qfcvt _qfcvt +#define qgconvert _qgconvert +#define qgcvt _qgcvt +#define quadruple_to_decimal _quadruple_to_decimal +#define rand_r _rand_r +#define rctlctl _rctlctl +#define rctllist _rctllist +#define readdir _readdir +#define readdir_r _readdir_r +#define readlink _readlink +#define read _read +#define readv _readv +#define realpath _realpath +#define remque _remque +#define resolvepath _resolvepath +#define rmdir _rmdir +#define rwlock_destroy _rwlock_destroy +#define rwlock_init _rwlock_init +#define rw_rdlock _rw_rdlock +#define rw_read_held _rw_read_held +#define rw_tryrdlock _rw_tryrdlock +#define rw_trywrlock _rw_trywrlock +#define rw_unlock _rw_unlock +#define rw_write_held _rw_write_held +#define rw_wrlock _rw_wrlock +#define sbrk _sbrk +#define scandir64 _scandir64 +#define scandir _scandir +#define schedctl_exit _schedctl_exit +#define schedctl_init _schedctl_init +#define schedctl_lookup _schedctl_lookup +#define seconvert _seconvert +#define seed48 _seed48 +#define seekdir _seekdir +#define select _select +#define sema_destroy _sema_destroy +#define sema_held _sema_held +#define sema_init _sema_init +#define sema_post _sema_post +#define sema_reltimedwait _sema_reltimedwait +#define sema_timedwait _sema_timedwait +#define sema_trywait _sema_trywait +#define sema_wait _sema_wait +#define semctl64 _semctl64 +#define semctl _semctl +#define semget _semget +#define semids _semids +#define semop _semop +#define semtimedop _semtimedop +#define setcontext _setcontext +#define setegid _setegid +#define setenv _setenv +#define seteuid _seteuid +#define setgid _setgid +#define setgrent _setgrent +#define setgroups _setgroups +#define setitimer _setitimer +#define setjmp _setjmp +#define setkey _setkey +#define setlogmask _setlogmask +#define setpflags _setpflags +#define setpgid _setpgid +#define setpgrp _setpgrp +#define setppriv _setppriv +#define setpwent _setpwent +#define setrctl _setrctl +#define setregid _setregid +#define setreuid _setreuid +#define setrlimit _setrlimit +#define setsid _setsid +#define setspent _setspent +#define settaskid _settaskid +#define settimeofday _settimeofday +#define setuid _setuid +#define setustack _setustack +#define setutent _setutent +#define setutxent _setutxent +#define s_fcntl _s_fcntl +#define sfconvert _sfconvert +#define sgconvert _sgconvert +#define shmat _shmat +#define shmctl64 _shmctl64 +#define shmctl _shmctl +#define shmdt _shmdt +#define shmget _shmget +#define shmids _shmids +#define sig2str _sig2str +#define sigaction _sigaction +#define sigaddset _sigaddset +#define sigaltstack _sigaltstack +#define sigdelset _sigdelset +#define sigemptyset _sigemptyset +#define sigfillset _sigfillset +#define sigflag _sigflag +#define sigfpe _sigfpe +#define sighold _sighold +#define sigignore _sigignore +#define siginterrupt _siginterrupt +#define sigismember _sigismember +#define siglongjmp _siglongjmp +#define signal _signal +#define sigpause _sigpause +#define sigpending _sigpending +#define sigprocmask _sigprocmask +#define sigrelse _sigrelse +#define sigsendset _sigsendset +#define sigsend _sigsend +#define sigsetjmp _sigsetjmp +#define sigset _sigset +#define sigsuspend _sigsuspend +#define sigwait _sigwait +#define single_to_decimal _single_to_decimal +#define sleep _sleep +#define srand48 _srand48 +#define ssignal _ssignal +#define stack_getbounds _stack_getbounds +#define stack_inbounds _stack_inbounds +#define stack_setbounds _stack_setbounds +#define stack_violation _stack_violation +#define statfs _statfs +#define statvfs _statvfs +#define stime _stime +#define str2sig _str2sig +#define strdup _strdup +#define strerror_r _strerror_r +#define strerror _strerror +#define string_to_decimal _string_to_decimal +#define strsignal _strsignal +#define strtok_r _strtok_r +#define strtoll _strtoll +#define strtoull _strtoull +#define stty _stty +#define swab _swab +#define swapcontext _swapcontext +#define swapctl _swapctl +#define symlink _symlink +#define sync _sync +#define syscall _syscall +#define sysconf _sysconf +#define sysfs _sysfs +#define sysinfo _sysinfo +#define syslog _syslog +#define tcdrain _tcdrain +#define tcflow _tcflow +#define tcflush _tcflush +#define tcgetattr _tcgetattr +#define tcgetpgrp _tcgetpgrp +#define tcgetsid _tcgetsid +#define tcsendbreak _tcsendbreak +#define tcsetattr _tcsetattr +#define tcsetpgrp _tcsetpgrp +#define tdelete _tdelete +#define telldir _telldir +#define tell _tell +#define tempnam _tempnam +#define tfind _tfind +#define thr_continue_allmutators _thr_continue_allmutators +#define thr_continue_mutator _thr_continue_mutator +#define thr_continue _thr_continue +#define thr_create _thr_create +#define thr_exit _thr_exit +#define thr_getconcurrency _thr_getconcurrency +#define thr_getprio _thr_getprio +#define thr_getspecific _thr_getspecific +#define thr_getstate _thr_getstate +#define thr_join _thr_join +#define thr_keycreate _thr_keycreate +#define thr_kill _thr_kill +#define thr_main _thr_main +#define thr_min_stack _thr_min_stack +#define thr_mutators_barrier _thr_mutators_barrier +#define thr_self _thr_self +#define thr_setconcurrency _thr_setconcurrency +#define thr_setmutator _thr_setmutator +#define thr_setprio _thr_setprio +#define thr_setspecific _thr_setspecific +#define thr_setstate _thr_setstate +#define thr_sighndlrinfo _thr_sighndlrinfo +#define thr_sigsetmask _thr_sigsetmask +#define thr_stksegment _thr_stksegment +#define thr_suspend_allmutators _thr_suspend_allmutators +#define thr_suspend_mutator _thr_suspend_mutator +#define thr_suspend _thr_suspend +#define thr_wait_mutator _thr_wait_mutator +#define thr_yield _thr_yield +#define times _times +#define time _time +#define tmpnam_r _tmpnam_r +#define tmpnam _tmpnam +#define truncate _truncate +#define tsearch _tsearch +#define ttyname_r _ttyname_r +#define ttyname _ttyname +#define ttyslot _ttyslot +#define twalk _twalk +#define tzset _tzset +#define uadmin _uadmin +#define ucred_free _ucred_free +#define ucred_getamask _ucred_getamask +#define ucred_getasid _ucred_getasid +#define ucred_getatid _ucred_getatid +#define ucred_getauid _ucred_getauid +#define ucred_getegid _ucred_getegid +#define ucred_geteuid _ucred_geteuid +#define ucred_getgroups _ucred_getgroups +#define ucred_getpflags _ucred_getpflags +#define ucred_getpid _ucred_getpid +#define ucred_getprivset _ucred_getprivset +#define ucred_getprojid _ucred_getprojid +#define ucred_getrgid _ucred_getrgid +#define ucred_getruid _ucred_getruid +#define ucred_getsgid _ucred_getsgid +#define ucred_getsuid _ucred_getsuid +#define ucred_get _ucred_get +#define ucred_getzoneid _ucred_getzoneid +#define ucred_size _ucred_size +#define ulckpwdf _ulckpwdf +#define ulimit _ulimit +#define ulltostr _ulltostr +#define umask _umask +#define umount2 _umount2 +#define umount _umount +#define unlinkat _unlinkat +#define unlink _unlink +#define unlockpt _unlockpt +#define unordered _unordered +#define unsetenv _unsetenv +#define updwtmp _updwtmp +#define updwtmpx _updwtmpx +#define usleep _usleep +#define ustat _ustat +#define utimes _utimes +#define utime _utime +#define utmpname _utmpname +#define utmpxname _utmpxname +#define utssys _utssys +#define valloc _valloc +#define vfork _vfork +#define vfscanf _vfscanf +#define vhangup _vhangup +#define vscanf _vscanf +#define vsscanf _vsscanf +#define vsyslog _vsyslog +#define wait3 _wait3 +#define waitid _waitid +#define waitpid _waitpid +#define wait _wait +#define walkcontext _walkcontext +#define wctomb _wctomb +#define wracct _wracct +#define writev _writev +#define write _write +#define yield _yield + +/* accommodation for _*xstat() and _nuname() interfaces */ +#if !defined(__i386) || _FILE_OFFSET_BITS == 64 || defined(_LP64) +#define fstat _fstat +#define lstat _lstat +#define mknod _mknod +#define stat _stat +#endif +#if !defined(__i386) +#define uname _uname +#endif + +/* transitional large file and other 32-bit only interfaces */ +#if !defined(_LP64) +#define attropen64 _attropen64 +#define creat64 _creat64 +#define fstat64 _fstat64 +#define fstatat64 _fstatat64 +#define fstatvfs64 _fstatvfs64 +#define ftruncate64 _ftruncate64 +#define ftw64 _ftw64 +#define getdents64 _getdents64 +#define getrlimit64 _getrlimit64 +#define lockf64 _lockf64 +#define lseek64 _lseek64 +#define lstat64 _lstat64 +#define mkstemp64 _mkstemp64 +#define mmap64 _mmap64 +#define nftw64 _nftw64 +#define open64 _open64 +#define openat64 _openat64 +#define pread64 _pread64 +#define pwrite64 _pwrite64 +#define readdir64 _readdir64 +#define readdir64_r _readdir64_r +#define setrlimit64 _setrlimit64 +#define stat64 _stat64 +#define statvfs64 _statvfs64 +#define tell64 _tell64 +#define truncate64 _truncate64 +#define ptrace _ptrace +#define sys_errlist _sys_errlist +#define sys_nerr _sys_nerr +#endif /* !_LP64 */ + +#endif /* !defined(__lint) */ + +#ifdef __cplusplus +} +#endif + +#endif /* _COMMON_INC_SYNONYMS_H */ diff --git a/usr/src/lib/common/inc/synonyms.h b/usr/src/lib/common/inc/synonyms.h deleted file mode 100644 index ca02e099c7..0000000000 --- a/usr/src/lib/common/inc/synonyms.h +++ /dev/null @@ -1,647 +0,0 @@ -/* - * 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. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * This file is included in library source files (other than libc) when it - * is desired to call libc functions by their restricted names rather than - * by their public names, to avoid a namespace collision with applications. - */ - -#ifndef _COMMON_INC_SYNONYMS_H -#define _COMMON_INC_SYNONYMS_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <mtlib.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#if !defined(__lint) - -/* external data */ -#define altzone _altzone -#define daylight _daylight -#define lone _lone -#define lten _lten -#define lzero _lzero -#define timezone _timezone -#define tzname _tzname - -/* functions */ -#define a64l _a64l -#define access _access -#define acct _acct -#define acctctl _acctctl -#define acl _acl -#define addseverity _addseverity -#define adjtime _adjtime -#define alarm _alarm -#define ascftime _ascftime -#define asctime_r _asctime_r -#define attropen _attropen -#define brk _brk -#define catclose _catclose -#define catgets _catgets -#define catopen _catopen -#define cfgetispeed _cfgetispeed -#define cfgetospeed _cfgetospeed -#define cfree _cfree -#define cfsetispeed _cfsetispeed -#define cfsetospeed _cfsetospeed -#define cftime _cftime -#define ctime_r _ctime_r -#define chdir _chdir -#define chmod _chmod -#define chown _chown -#define chroot _chroot -#define close _close -#define closedir _closedir -#define closefrom _closefrom -#define closelog _closelog -#define core_set_options _core_set_options -#define core_get_options _core_get_options -#define core_set_global_path _core_set_global_path -#define core_get_global_path _core_get_global_path -#define core_set_process_path _core_set_process_path -#define core_get_process_path _core_get_process_path -#define creat _creat -#define crypt _crypt -#define ctermid _ctermid -#define ctermid_r _ctermid_r -#define cuserid _cuserid -#define dgettext _dgettext -#define dlclose _dlclose -#define dlopen _dlopen -#define dlsym _dlsym -#define dlerror _dlerror -#define door_bind _door_bind -#define door_call _door_call -#define door_create _door_create -#define door_cred _door_cred -#define door_getparam _door_getparam -#define door_info _door_info -#define door_return _door_return -#define door_revoke _door_revoke -#define door_setparam _door_setparam -#define door_server_create _door_server_create -#define door_ucred _door_ucred -#define door_unbind _door_unbind -#define drand48 _drand48 -#define dup _dup -#define dup2 _dup2 -#define ecvt _ecvt -#define encrypt _encrypt -#define endgrent _endgrent -#define endpwent _endpwent -#define endspent _endspent -#define endutent _endutent -#define endutxent _endutxent -#define environ _environ -#define erand48 _erand48 -#define execl _execl -#define execle _execle -#define execlp _execlp -#define execv _execv -#define execve _execve -#define execvp _execvp -#define exportfs _exportfs -#define facl _facl -#define fattach _fattach -#define fchdir _fchdir -#define fchmod _fchmod -#define fchown _fchown -#define fchownat _fchownat -#define fchroot _fchroot -#define fcntl _fcntl -#define fcvt _fcvt -#define fdetach _fdetach -#define fdopen _fdopen -#define fdwalk _fdwalk -#define ffs _ffs -#define fgetgrent _fgetgrent -#define fgetgrent_r _fgetgrent_r -#define fgetpwent _fgetpwent -#define fgetpwent_r _fgetpwent_r -#define fgetspent _fgetspent -#define fgetspent_r _fgetspent_r -#define finite _finite -#define flockfile _flockfile -#define ftrylockfile _ftrylockfile -#define funlockfile _funlockfile -#define fmtmsg _fmtmsg -#define fork _fork -#define fork1 _fork1 -#define forkall _forkall -#define fpathconf _fpathconf -#define fpclass _fpclass -#define fpgetmask _fpgetmask -#define fpgetround _fpgetround -#define fpgetsticky _fpgetsticky -#define fprintf _fprintf -#define fpsetmask _fpsetmask -#define fpsetround _fpsetround -#define fpsetsticky _fpsetsticky -#define fstat _fstat -#define fstatat _fstatat -#define fstatfs _fstatfs -#define fstatvfs _fstatvfs -#define fsync _fsync -#define ftok _ftok -#define ftruncate _ftruncate -#define ftw _ftw -#define futimesat _futimesat -#define gcvt _gcvt -#define getacct _getacct -#define getcontext _getcontext -#define getcpuid _getcpuid -#define getcwd _getcwd -#define getdate _getdate -#define getdents _getdents -#define getegid _getegid -#define geteuid _geteuid -#define getexecname _getexecname -#define getgid _getgid -#define getgrent _getgrent -#define getgrent_r _getgrent_r -#define getgrgid _getgrgid -#define getgrgid_r _getgrgid_r -#define getgrnam _getgrnam -#define getgrnam_r _getgrnam_r -#define getgroups _getgroups -#define gethomelgroup _gethomelgroup -#define getisax _getisax -#define getitimer _getitimer -#define gettaskid _gettaskid -#define getlogin _getlogin -#define getlogin_r _getlogin_r -#define getmntany _getmntany -#define getmntent _getmntent -#define getmsg _getmsg -#define getopt _getopt -#define getpass _getpass -#define getpgid _getpgid -#define getpgrp _getpgrp -#define getpid _getpid -#define getpmsg _getpmsg -#define getppid _getppid -#define getprojid _getprojid -#define getpw _getpw -#define getpwent _getpwent -#define getpwent_r _getpwent_r -#define getpwnam _getpwnam -#define getpwnam_r _getpwnam_r -#define getpwuid _getpwuid -#define getpwuid_r _getpwuid_r -#define getrctl _getrctl -#define getrlimit _getrlimit -#define getsid _getsid -#define getspent _getspent -#define getspent_r _getspent_r -#define getspnam _getspnam -#define getspnam_r _getspnam_r -#define getsubopt _getsubopt -#define gettimeofday _gettimeofday -#define gettxt _gettxt -#define getuid _getuid -#define getustack _getustack -#define getutent _getutent -#define getutid _getutid -#define getutline _getutline -#define getutmp _getutmp -#define getutmpx _getutmpx -#define getutxent _getutxent -#define getutxid _getutxid -#define getutxline _getutxline -#define getvfsany _getvfsany -#define getvfsent _getvfsent -#define getvfsfile _getvfsfile -#define getvfsspec _getvfsspec -#define getw _getw -#define gmtime_r _gmtime_r -#define grantpt _grantpt -#define gsignal _gsignal -#define gtty _gtty -#define hasmntopt _hasmntopt -#define hcreate _hcreate -#define hdestroy _hdestroy -#define hsearch _hsearch -#define iconv _iconv -#define iconv_close _iconv_close -#define iconv_open _iconv_open -#define initgroups _initgroups -#define insque _insque -#define install_utrap _install_utrap -#define inst_sync _inst_sync -#define ioctl _ioctl -#define isastream _isastream -#define isatty _isatty -#define issetugid _issetugid -#define jrand48 _jrand48 -#define kaio _kaio -#define kill _kill -#define l64a _l64a -#define ladd _ladd -#define lchown _lchown -#define lckpwdf _lckpwdf -#define lcong48 _lcong48 -#define ldivide _ldivide -#define lexp10 _lexp10 -#define lfind _lfind -#define link _link -#define llog10 _llog10 -#define llseek _llseek -#define lmul _lmul -#define lockf _lockf -#define localtime_r _localtime_r -#define longjmp _longjmp -#define lrand48 _lrand48 -#define lsearch _lsearch -#define lseek _lseek -#define lshiftl _lshiftl -#define lstat _lstat -#define lsub _lsub -#define madvise _madvise -#define makecontext _makecontext -#define makeut _makeut -#define makeutx _makeutx -#define memalign _memalign -#define memccpy _memccpy -#define memcntl _memcntl -#define memcmp _memcmp -#define memcpy _memcpy -#define meminfo _meminfo -#define memmove _memmove -#define memset _memset -#define mincore _mincore -#define mkdir _mkdir -#define mkfifo _mkfifo -#define mknod _mknod -#define mktemp _mktemp -#define mkstemp _mkstemp -#define mlock _mlock -#define mlockall _mlockall -#define mmap _mmap -#define modutx _modutx -#define monitor _monitor -#define mount _mount -#define mprotect _mprotect -#define mrand48 _mrand48 -#define msgctl _msgctl -#define msgctl64 _msgctl64 -#define msgget _msgget -#define msgids _msgids -#define msgsnap _msgsnap -#define msgrcv _msgrcv -#define msgsnd _msgsnd -#define msync _msync -#define munlock _munlock -#define munlockall _munlockall -#define munmap _munmap -#define nfs_getfh _nfs_getfh -#define nfssvc _nfssvc -#define nftw _nftw -#define nice _nice -#define nl_langinfo _nl_langinfo -#define nrand48 _nrand48 -#define nss_delete _nss_delete -#define nss_endent _nss_endent -#define nss_getent _nss_getent -#define nss_search _nss_search -#define nss_setent _nss_setent -#define nss_default_finders _nss_default_finders -#define ntp_gettime _ntp_gettime -#define ntp_adjtime _ntp_adjtime -#define open _open -#define openat _openat -#define opendir _opendir -#define fdopendir _fdopendir -#define openlog _openlog -#define pathconf _pathconf -#define pause _pause -#define pclose _pclose -#define pipe _pipe -#define plock _plock -#define poll _poll -#define popen _popen -#define pread _pread -#define printstack _printstack -#define profil _profil -#define pselect _pselect -#define psiginfo _psiginfo -#define psignal _psignal -#define ptsname _ptsname -#define putacct _putacct -#define pwrite _pwrite -#define putenv _putenv -#define putmsg _putmsg -#define putpmsg _putpmsg -#define putpwent _putpwent -#define putspent _putspent -#define pututline _pututline -#define pututxline _pututxline -#define putw _putw -#define rand_r _rand_r -#define rctlctl _rctlctl -#define rctllist _rctllist -#define read _read -#define readdir _readdir -#define readdir_r _readdir_r -#define readlink _readlink -#define readv _readv -#define realpath _realpath -#define remque _remque -#define resolvepath _resolvepath -#define rmdir _rmdir -#define sbrk _sbrk -#define schedctl_init _schedctl_init -#define schedctl_lookup _schedctl_lookup -#define schedctl_exit _schedctl_exit -#define seed48 _seed48 -#define seekdir _seekdir -#define select _select -#define semctl _semctl -#define semctl64 _semctl64 -#define semget _semget -#define semids _semids -#define semop _semop -#define semtimedop _semtimedop -#define setcontext _setcontext -#define setegid _setegid -#define seteuid _seteuid -#define setgid _setgid -#define setgrent _setgrent -#define setgroups _setgroups -#define setitimer _setitimer -#define settaskid _settaskid -#define setjmp _setjmp -#define setkey _setkey -#define setlogmask _setlogmask -#define setpgid _setpgid -#define setpgrp _setpgrp -#define setpwent _setpwent -#define setrctl _setrctl -#define setregid _setregid -#define setreuid _setreuid -#define setrlimit _setrlimit -#define setsid _setsid -#define setspent _setspent -#define settimeofday _settimeofday -#define setuid _setuid -#define setustack _setustack -#define setutent _setutent -#define setutxent _setutxent -#define shmat _shmat -#define shmctl _shmctl -#define shmctl64 _shmctl64 -#define shmdt _shmdt -#define shmget _shmget -#define shmids _shmids -#define sig2str _sig2str -#define sigaction _sigaction -#define sigaddset _sigaddset -#define sigaltstack _sigaltstack -#define sigdelset _sigdelset -#define sigemptyset _sigemptyset -#define sigfillset _sigfillset -#define sigflag _sigflag -#define sigfpe _sigfpe -#define sighold _sighold -#define sigignore _sigignore -#define sigismember _sigismember -#define siglongjmp _siglongjmp -#define sigpause _sigpause -#define sigpending _sigpending -#define sigprocmask _sigprocmask -#define sigrelse _sigrelse -#define sigsend _sigsend -#define sigsendset _sigsendset -#define sigset _sigset -#define signal _signal -#define sigsetjmp _sigsetjmp -#define sigsuspend _sigsuspend -#define sigwait _sigwait -#define sleep _sleep -#define srand48 _srand48 -#define ssignal _ssignal -#define stack_getbounds _stack_getbounds -#define stack_setbounds _stack_setbounds -#define stack_inbounds _stack_inbounds -#define stack_violation _stack_violation -#define stat _stat -#define statfs _statfs -#define statvfs _statvfs -#define stime _stime -#define str2sig _str2sig -#define strdup _strdup -#define strerror _strerror -#define strsignal _strsignal -#define strtok_r _strtok_r -#define stty _stty -#define swab _swab -#define swapcontext _swapcontext -#define swapctl _swapctl -#define symlink _symlink -#define sync _sync -#define syscall _syscall -#define sysconf _sysconf -#define sysfs _sysfs -#define sysinfo _sysinfo -#define syslog _syslog -#define tcdrain _tcdrain -#define tcflow _tcflow -#define tcflush _tcflush -#define tcgetattr _tcgetattr -#define tcgetpgrp _tcgetpgrp -#define tcgetsid _tcgetsid -#define tcsendbreak _tcsendbreak -#define tcsetattr _tcsetattr -#define tcsetpgrp _tcsetpgrp -#define tdelete _tdelete -#define tell _tell -#define telldir _telldir -#define tempnam _tempnam -#define tfind _tfind -#define time _time -#define times _times -#define tmpnam _tmpnam -#define tmpnam_r _tmpnam_r -#define truncate _truncate -#define tsearch _tsearch -#define ttyname _ttyname -#define ttyname_r _ttyname_r -#define ttyslot _ttyslot -#define twalk _twalk -#define tzset _tzset -#define uadmin _uadmin -#define ulckpwdf _ulckpwdf -#define ulimit _ulimit -#define umask _umask -#define umount _umount -#define umount2 _umount2 -#define uname _uname -#define unlink _unlink -#define unlinkat _unlinkat -#define unlockpt _unlockpt -#define unordered _unordered -#define updwtmp _updwtmp -#define updwtmpx _updwtmpx -#define ustat _ustat -#define utime _utime -#define utimes _utimes -#define utmpname _utmpname -#define utmpxname _utmpxname -#define utssys _utssys -#define valloc _valloc -#define vfork _vfork -#define vfscanf _vfscanf -#define vhangup _vhangup -#define vscanf _vscanf -#define vsscanf _vsscanf -#define vsyslog _vsyslog -#define wait _wait -#define waitid _waitid -#define waitpid _waitpid -#define walkcontext _walkcontext -#define wctomb _wctomb -#define wracct _wracct -#define write _write -#define writev _writev -#define yield _yield -#define usleep _usleep -#define wait3 _wait3 -#define _assert __assert -#define _assert_c99 __assert_c99 -#define _cladm __cladm -#define _ctype __ctype -#define _filbuf __filbuf -#define _flsbuf __flsbuf -#define _iob __iob - -/* fp and ll functions */ -#define decimal_to_double _decimal_to_double -#define decimal_to_extended _decimal_to_extended -#define decimal_to_quadruple _decimal_to_quadruple -#define decimal_to_single _decimal_to_single -#define double_to_decimal _double_to_decimal -#define econvert _econvert -#define extended_to_decimal _extended_to_decimal -#define fconvert _fconvert -#define file_to_decimal _file_to_decimal -#define func_to_decimal _func_to_decimal -#define gconvert _gconvert -#define qeconvert _qeconvert -#define qecvt _qecvt -#define qfconvert _qfconvert -#define qfcvt _qfcvt -#define qgconvert _qgconvert -#define qgcvt _qgcvt -#define quadruple_to_decimal _quadruple_to_decimal -#define seconvert _seconvert -#define sfconvert _sfconvert -#define sgconvert _sgconvert -#define single_to_decimal _single_to_decimal -#define string_to_decimal _string_to_decimal -#define atoll _atoll -#define llabs _llabs -#define lldiv _lldiv -#define lltostr _lltostr -#define strtoll _strtoll -#define strtoull _strtoull -#define ulltostr _ulltostr - -/* new POSIX SUSV3 stuff */ -#define posix_spawn _posix_spawn -#define posix_spawnp _posix_spawnp -#define posix_spawn_file_actions_init _posix_spawn_file_actions_init -#define posix_spawn_file_actions_destroy \ - _posix_spawn_file_actions_destroy -#define posix_spawn_file_actions_addopen \ - _posix_spawn_file_actions_addopen -#define posix_spawn_file_actions_addclose \ - _posix_spawn_file_actions_addclose -#define posix_spawn_file_actions_adddup2 \ - _posix_spawn_file_actions_adddup2 -#define posix_spawnattr_init _posix_spawnattr_init -#define posix_spawnattr_destroy _posix_spawnattr_destroy -#define posix_spawnattr_setflags _posix_spawnattr_setflags -#define posix_spawnattr_getflags _posix_spawnattr_getflags -#define posix_spawnattr_setpgroup _posix_spawnattr_setpgroup -#define posix_spawnattr_getpgroup _posix_spawnattr_getpgroup -#define posix_spawnattr_setschedparam _posix_spawnattr_setschedparam -#define posix_spawnattr_getschedparam _posix_spawnattr_getschedparam -#define posix_spawnattr_setschedpolicy _posix_spawnattr_setschedpolicy -#define posix_spawnattr_getschedpolicy _posix_spawnattr_getschedpolicy -#define posix_spawnattr_setsigdefault _posix_spawnattr_setsigdefault -#define posix_spawnattr_getsigdefault _posix_spawnattr_getsigdefault -#define posix_spawnattr_setsigmask _posix_spawnattr_setsigmask -#define posix_spawnattr_getsigmask _posix_spawnattr_getsigmask - -#if !defined(_LP64) - -/* transitional large file and other 32-bit only interfaces */ - -#define attropen64 _attropen64 -#define creat64 _creat64 -#define fstat64 _fstat64 -#define fstatat64 _fstatat64 -#define fstatvfs64 _fstatvfs64 -#define ftruncate64 _ftruncate64 -#define ftw64 _ftw64 -#define getdents64 _getdents64 -#define getrlimit64 _getrlimit64 -#define lockf64 _lockf64 -#define lseek64 _lseek64 -#define lstat64 _lstat64 -#define mkstemp64 _mkstemp64 -#define mmap64 _mmap64 -#define nftw64 _nftw64 -#define open64 _open64 -#define openat64 _openat64 -#define pread64 _pread64 -#define pwrite64 _pwrite64 -#define readdir64 _readdir64 -#define readdir64_r _readdir64_r -#define setrlimit64 _setrlimit64 -#define stat64 _stat64 -#define statvfs64 _statvfs64 -#define tell64 _tell64 -#define truncate64 _truncate64 - -#define ptrace _ptrace -#define sys_errlist _sys_errlist -#define sys_nerr _sys_nerr - -#endif /* !_LP64 */ - -#endif /* !defined(__lint) */ - -#ifdef __cplusplus -} -#endif - -#endif /* _COMMON_INC_SYNONYMS_H */ diff --git a/usr/src/lib/libavl/Makefile.com b/usr/src/lib/libavl/Makefile.com index 7a33befcdd..b3f017f6b3 100644 --- a/usr/src/lib/libavl/Makefile.com +++ b/usr/src/lib/libavl/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -51,7 +51,7 @@ CFLAGS += $(CCVERBOSE) .KEEP_STATE: -all : $(LIBS) +all : $(LIBS) fnamecheck lint : lintcheck diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 961d80a379..4bf2ad6379 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -103,7 +103,7 @@ $(ROOTVARIANTDIR)/$(VAR2_DYNLIB) := FILEMODE= 755 all: check_i18n .WAIT spec .WAIT lib32 $(BUILD64) .WAIT lib64 .WAIT etc check_i18n: - @if [ ! -f $(ROOTFS_LIBDIR)/libc_i18n.a -a \ + @if [ ! -f $(ROOTFS_LIBDIR)/libc_i18n.a -o \ ! -f $(ROOTFS_LIBDIR64)/libc_i18n.a ]; then \ if [ "$$CLOSED_IS_PRESENT" = no ]; then \ $(ECHO) "Warning: closed binaries not" \ @@ -120,11 +120,20 @@ check_i18n: etc: $($(MACH)_ETC) lib32: $(MACHLIBS) $(MACH)/$(LIB_PIC) $(VARIANTLIBS) + mkdir -p $(MACH)/i18n_pics + cd $(MACH)/i18n_pics ; $(AR) -x $(ROOTFS_LIBDIR)/libc_i18n.a + check_fnames -s $(C_SYNONYMS_H) -l $(MACH)/$(DYNLIB) \ + $(MACH)/pics/*.o $(MACH)/i18n_pics/*.o lib64: $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS) + mkdir -p $(MACH64)/i18n_pics + cd $(MACH64)/i18n_pics ; $(AR) -x $(ROOTFS_LIBDIR64)/libc_i18n.a + check_fnames -s $(C_SYNONYMS_H) -l $(MACH64)/$(DYNLIB) \ + $(MACH64)/pics/*.o $(MACH64)/i18n_pics/*.o $(VARIANTLIBS): FRC @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F) + check_fnames -s $(C_SYNONYMS_H) -l $(@D)/$(@F) $(@D)/pics/*.o $($(MACH)_ETC): FRC @cd $(@); pwd; $(MAKE) $(TARGET) @@ -194,6 +203,8 @@ spec $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) clean clobber: spec .WAIT $(SUBDIRS) + $(RM) -r $(MACH)/i18n_pics + $(BUILD64)$(RM) -r $(MACH64)/i18n_pics lint: $(SUBDIRS) diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 4b71748be4..6b4d219b8d 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -448,7 +448,6 @@ PORTGEN= \ lfind.o \ lfmt.o \ lfmt_log.o \ - llabs.o \ lldiv.o \ lltostr.o \ lmath.o \ diff --git a/usr/src/lib/libc/amd64/gen/abs.s b/usr/src/lib/libc/amd64/gen/abs.s index bee5942677..fe559eb08f 100644 --- a/usr/src/lib/libc/amd64/gen/abs.s +++ b/usr/src/lib/libc/amd64/gen/abs.s @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,6 +39,10 @@ * } */ +#include <sys/asm_linkage.h> + + ANSI_PRAGMA_WEAK(llabs,function) + #include "SYS.h" ENTRY(abs) @@ -49,7 +54,6 @@ ret SET_SIZE(abs) - ENTRY(labs) movq %rdi, %rax testq %rax, %rax /* arg < 0? */ @@ -58,3 +62,12 @@ 1: ret SET_SIZE(labs) + + ENTRY(llabs) + movq %rdi, %rax + testq %rax, %rax /* arg < 0? */ + jns 1f + negq %rax /* yes, return -arg */ +1: + ret + SET_SIZE(llabs) diff --git a/usr/src/lib/libc/i386/gen/abs.s b/usr/src/lib/libc/i386/gen/abs.s index 776d69154b..dd92cc4546 100644 --- a/usr/src/lib/libc/i386/gen/abs.s +++ b/usr/src/lib/libc/i386/gen/abs.s @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,12 +40,19 @@ #include "SYS.h" ENTRY(abs) - ENTRY(labs) movl 4(%esp),%eax / arg < 0? testl %eax,%eax - jns .posit + jns 1f negl %eax / yes, return -arg -.posit: +1: ret SET_SIZE(abs) + + ENTRY(labs) + movl 4(%esp),%eax / arg < 0? + testl %eax,%eax + jns 1f + negl %eax / yes, return -arg +1: + ret SET_SIZE(labs) diff --git a/usr/src/lib/libc/inc/libc.h b/usr/src/lib/libc/inc/libc.h index cf5173cc1b..d09aae7ce0 100644 --- a/usr/src/lib/libc/inc/libc.h +++ b/usr/src/lib/libc/inc/libc.h @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -333,7 +333,8 @@ extern wint_t _towlower(wint_t); extern int _doscan(FILE *, const char *, va_list); extern int _wcscoll(const wchar_t *, const wchar_t *); extern size_t _wcsxfrm(wchar_t *, const wchar_t *, size_t); -extern wint_t _fputwc(wint_t, FILE *); +extern wint_t _fputwc(wint_t, FILE *); +extern pid_t waitpid_cancel(pid_t, int *, int); #ifdef __cplusplus } #endif diff --git a/usr/src/lib/libc/inc/synonyms.h b/usr/src/lib/libc/inc/synonyms.h index 6687e63931..5024e57757 100644 --- a/usr/src/lib/libc/inc/synonyms.h +++ b/usr/src/lib/libc/inc/synonyms.h @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,83 +34,247 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/feature_tests.h> + #ifdef __cplusplus extern "C" { #endif #if !defined(__lint) +#if !defined(_LP64) +/* transitional large file interfaces */ +#define alphasort64 _alphasort64 +#define attropen64 _attropen64 +#define creat64 _creat64 +#define ftello64 _ftello64 +#define fseeko64 _fseeko64 +#define fstat64 _fstat64 +#define fstatvfs64 _fstatvfs64 +#define ftruncate64 _ftruncate64 +#define getdents64 _getdents64 +#define getrlimit64 _getrlimit64 +#define lockf64 _lockf64 +#define lseek64 _lseek64 +#define lstat64 _lstat64 +#define mkstemp64 _mkstemp64 +#define mmap64 _mmap64 +#define openat64 _openat64 +#define open64 _open64 +#define pread64 _pread64 +#define pwrite64 _pwrite64 +#define readdir64 _readdir64 +#define readdir64_r _readdir64_r +#define scandir64 _scandir64 +#define seekdir64 _seekdir64 +#define tell64 _tell64 +#define telldir64 _telldir64 +#define setrlimit64 _setrlimit64 +#define stat64 _stat64 +#define fstatat64 _fstatat64 +#define statvfs64 _statvfs64 +#define truncate64 _truncate64 +#endif /* !_LP64 */ + /* external data */ -#define altzone _altzone -#define daylight _daylight -#define lone _lone -#define lten _lten -#define lzero _lzero -#define timezone _timezone -#define tzname _tzname +#define altzone _altzone +#define daylight _daylight +#define lone _lone +#define lten _lten +#define lzero _lzero +#define timezone _timezone +#define tzname _tzname /* functions */ -#define Msgdb _Msgdb -#define a64l _a64l -#define access _access -#define acct _acct -#define acctctl _acctctl -#define acl _acl -#define addseverity _addseverity -#define adjtime _adjtime -#define alarm _alarm -#define alphasort _alphasort -#define ascftime _ascftime -#define asctime_r _asctime_r -#define attropen _attropen -#define basename _basename -#define brk _brk -#define brkbase _brkbase -#define bsd_signal _bsd_signal -#define catclose _catclose -#define catgets _catgets -#define catopen _catopen -#define cfgetispeed _cfgetispeed -#define cfgetospeed _cfgetospeed -#define cfree _cfree -#define cfsetispeed _cfsetispeed -#define cfsetospeed _cfsetospeed -#define cftime _cftime -#define ctime_r _ctime_r -#define chdir _chdir -#define chmod _chmod -#define chown _chown -#define chroot _chroot -#define close _close -#define closedir _closedir -#define closefrom _closefrom -#define closelog _closelog -#define core_set_options _core_set_options -#define core_get_options _core_get_options -#define core_set_global_content _core_set_global_content +#define a64l _a64l +#define access _access +#define acct _acct +#define acctctl _acctctl +#define acl _acl +#define addseverity _addseverity +#define adjtime _adjtime +#define alarm _alarm +#define alphasort _alphasort +#define ascftime _ascftime +#define asctime_r _asctime_r +#define _assert __assert +#define _assert_c99 __assert_c99 +#define atexit _atexit +#define atoll _atoll +#define atomic_add_16 _atomic_add_16 +#define atomic_add_16_nv _atomic_add_16_nv +#define atomic_add_32 _atomic_add_32 +#define atomic_add_32_nv _atomic_add_32_nv +#define atomic_add_64 _atomic_add_64 +#define atomic_add_64_nv _atomic_add_64_nv +#define atomic_add_8 _atomic_add_8 +#define atomic_add_8_nv _atomic_add_8_nv +#define atomic_add_char _atomic_add_char +#define atomic_add_char_nv _atomic_add_char_nv +#define atomic_add_int _atomic_add_int +#define atomic_add_int_nv _atomic_add_int_nv +#define atomic_add_long _atomic_add_long +#define atomic_add_long_nv _atomic_add_long_nv +#define atomic_add_ptr _atomic_add_ptr +#define atomic_add_ptr_nv _atomic_add_ptr_nv +#define atomic_add_short _atomic_add_short +#define atomic_add_short_nv _atomic_add_short_nv +#define atomic_and_16 _atomic_and_16 +#define atomic_and_16_nv _atomic_and_16_nv +#define atomic_and_32 _atomic_and_32 +#define atomic_and_32_nv _atomic_and_32_nv +#define atomic_and_64 _atomic_and_64 +#define atomic_and_64_nv _atomic_and_64_nv +#define atomic_and_8 _atomic_and_8 +#define atomic_and_8_nv _atomic_and_8_nv +#define atomic_and_uchar _atomic_and_uchar +#define atomic_and_uchar_nv _atomic_and_uchar_nv +#define atomic_and_uint _atomic_and_uint +#define atomic_and_uint_nv _atomic_and_uint_nv +#define atomic_and_ulong _atomic_and_ulong +#define atomic_and_ulong_nv _atomic_and_ulong_nv +#define atomic_and_ushort _atomic_and_ushort +#define atomic_and_ushort_nv _atomic_and_ushort_nv +#define atomic_cas_16 _atomic_cas_16 +#define atomic_cas_32 _atomic_cas_32 +#define atomic_cas_64 _atomic_cas_64 +#define atomic_cas_8 _atomic_cas_8 +#define atomic_cas_ptr _atomic_cas_ptr +#define atomic_cas_uchar _atomic_cas_uchar +#define atomic_cas_uint _atomic_cas_uint +#define atomic_cas_ulong _atomic_cas_ulong +#define atomic_cas_ushort _atomic_cas_ushort +#define atomic_clear_long_excl _atomic_clear_long_excl +#define atomic_dec_16 _atomic_dec_16 +#define atomic_dec_16_nv _atomic_dec_16_nv +#define atomic_dec_32 _atomic_dec_32 +#define atomic_dec_32_nv _atomic_dec_32_nv +#define atomic_dec_64 _atomic_dec_64 +#define atomic_dec_64_nv _atomic_dec_64_nv +#define atomic_dec_8 _atomic_dec_8 +#define atomic_dec_8_nv _atomic_dec_8_nv +#define atomic_dec_uchar _atomic_dec_uchar +#define atomic_dec_uchar_nv _atomic_dec_uchar_nv +#define atomic_dec_uint _atomic_dec_uint +#define atomic_dec_uint_nv _atomic_dec_uint_nv +#define atomic_dec_ulong _atomic_dec_ulong +#define atomic_dec_ulong_nv _atomic_dec_ulong_nv +#define atomic_dec_ushort _atomic_dec_ushort +#define atomic_dec_ushort_nv _atomic_dec_ushort_nv +#define atomic_inc_16 _atomic_inc_16 +#define atomic_inc_16_nv _atomic_inc_16_nv +#define atomic_inc_32 _atomic_inc_32 +#define atomic_inc_32_nv _atomic_inc_32_nv +#define atomic_inc_64 _atomic_inc_64 +#define atomic_inc_64_nv _atomic_inc_64_nv +#define atomic_inc_8 _atomic_inc_8 +#define atomic_inc_8_nv _atomic_inc_8_nv +#define atomic_inc_uchar _atomic_inc_uchar +#define atomic_inc_uchar_nv _atomic_inc_uchar_nv +#define atomic_inc_uint _atomic_inc_uint +#define atomic_inc_uint_nv _atomic_inc_uint_nv +#define atomic_inc_ulong _atomic_inc_ulong +#define atomic_inc_ulong_nv _atomic_inc_ulong_nv +#define atomic_inc_ushort _atomic_inc_ushort +#define atomic_inc_ushort_nv _atomic_inc_ushort_nv +#define atomic_or_16 _atomic_or_16 +#define atomic_or_16_nv _atomic_or_16_nv +#define atomic_or_32 _atomic_or_32 +#define atomic_or_32_nv _atomic_or_32_nv +#define atomic_or_64 _atomic_or_64 +#define atomic_or_64_nv _atomic_or_64_nv +#define atomic_or_8 _atomic_or_8 +#define atomic_or_8_nv _atomic_or_8_nv +#define atomic_or_uchar _atomic_or_uchar +#define atomic_or_uchar_nv _atomic_or_uchar_nv +#define atomic_or_uint _atomic_or_uint +#define atomic_or_uint_nv _atomic_or_uint_nv +#define atomic_or_ulong _atomic_or_ulong +#define atomic_or_ulong_nv _atomic_or_ulong_nv +#define atomic_or_ushort _atomic_or_ushort +#define atomic_or_ushort_nv _atomic_or_ushort_nv +#define atomic_set_long_excl _atomic_set_long_excl +#define atomic_swap_16 _atomic_swap_16 +#define atomic_swap_32 _atomic_swap_32 +#define atomic_swap_64 _atomic_swap_64 +#define atomic_swap_8 _atomic_swap_8 +#define atomic_swap_ptr _atomic_swap_ptr +#define atomic_swap_uchar _atomic_swap_uchar +#define atomic_swap_uint _atomic_swap_uint +#define atomic_swap_ulong _atomic_swap_ulong +#define atomic_swap_ushort _atomic_swap_ushort +#define attropen _attropen +#define basename _basename +#define bindtextdomain _bindtextdomain +#define bind_textdomain_codeset _bind_textdomain_codeset +#define brk _brk +#define bsd_signal _bsd_signal +#define catclose _catclose +#define catgets _catgets +#define catopen _catopen +#define cfgetispeed _cfgetispeed +#define cfgetospeed _cfgetospeed +#define cfree _cfree +#define cfsetispeed _cfsetispeed +#define cfsetospeed _cfsetospeed +#define cftime _cftime +#define chdir _chdir +#define chmod _chmod +#define chown _chown +#define chroot _chroot +#define _cladm __cladm +#define close _close +#define closedir _closedir +#define closefrom _closefrom +#define closelog _closelog +#define cond_broadcast _cond_broadcast +#define cond_destroy _cond_destroy +#define cond_init _cond_init +#define cond_reltimedwait _cond_reltimedwait +#define cond_signal _cond_signal +#define cond_timedwait _cond_timedwait +#define cond_wait _cond_wait +#define core_get_default_content _core_get_default_content +#define core_get_default_path _core_get_default_path #define core_get_global_content _core_get_global_content -#define core_set_global_path _core_set_global_path #define core_get_global_path _core_get_global_path +#define core_get_options _core_get_options +#define core_get_process_content _core_get_process_content +#define core_get_process_path _core_get_process_path #define core_set_default_content _core_set_default_content -#define core_get_default_content _core_get_default_content #define core_set_default_path _core_set_default_path -#define core_get_default_path _core_get_default_path +#define core_set_global_content _core_set_global_content +#define core_set_global_path _core_set_global_path +#define core_set_options _core_set_options #define core_set_process_content _core_set_process_content -#define core_get_process_content _core_get_process_content #define core_set_process_path _core_set_process_path -#define core_get_process_path _core_get_process_path -#define countbase _countbase -#define creat _creat -#define crypt _crypt -#define ctermid _ctermid -#define ctermid_r _ctermid_r -#define cuserid _cuserid -#define dial _dial -#define dirname _dirname -#define dlclose _dlclose -#define dlopen _dlopen -#define dlsym _dlsym -#define dlerror _dlerror +#define countbase _countbase +#define creat _creat +#define crypt _crypt +#define ctermid _ctermid +#define ctermid_r _ctermid_r +#define ctime_r _ctime_r +#define _ctype __ctype +#define cuserid _cuserid +#define dcgettext _dcgettext +#define dcngettext _dcngettext +#define decimal_to_double _decimal_to_double +#define decimal_to_extended _decimal_to_extended +#define decimal_to_quadruple _decimal_to_quadruple +#define decimal_to_single _decimal_to_single +#define dgettext _dgettext +#define dirname _dirname +#define dladdr _dladdr +#define dladdr1 _dladdr1 +#define dlamd64getunwind _dlamd64getunwind +#define dlclose _dlclose +#define dldump _dldump +#define dlerror _dlerror +#define dlinfo _dlinfo +#define dlmopen _dlmopen +#define dlopen _dlopen +#define dlsym _dlsym +#define dngettext _dngettext #define door_bind _door_bind #define door_call _door_call #define door_create _door_create @@ -118,796 +283,854 @@ extern "C" { #define door_info _door_info #define door_return _door_return #define door_revoke _door_revoke -#define door_setparam _door_setparam #define door_server_create _door_server_create +#define door_setparam _door_setparam #define door_ucred _door_ucred #define door_unbind _door_unbind -#define drand48 _drand48 -#define dup _dup -#define dup2 _dup2 -#define ecvt _ecvt -#define edata _edata -#define encrypt _encrypt -#define end _end -#define endgrent _endgrent -#define endpwent _endpwent -#define endspent _endspent -#define endutent _endutent -#define endutxent _endutxent -#define environ _environ -#define erand48 _erand48 -#define etext _etext -#define execl _execl -#define execle _execle -#define execlp _execlp -#define execv _execv -#define execve _execve -#define execvp _execvp -#define exportfs _exportfs -#define facl _facl -#define fattach _fattach -#define fchdir _fchdir -#define fchmod _fchmod -#define fchown _fchown -#define fchownat _fchownat -#define fchroot _fchroot -#define fcntl _fcntl -#define fcvt _fcvt -#define fdetach _fdetach -#define fdopen _fdopen -#define fdwalk _fdwalk -#define ffs _ffs -#define fgetgrent _fgetgrent -#define fgetgrent_r _fgetgrent_r -#define fgetpwent _fgetpwent -#define fgetpwent_r _fgetpwent_r -#define fgetspent _fgetspent -#define fgetspent_r _fgetspent_r -#define finite _finite -#define flockfile _flockfile -#define ftrylockfile _ftrylockfile -#define funlockfile _funlockfile -#define fmtmsg _fmtmsg -#define fork _fork -#define fork1 _fork1 -#define forkall _forkall -#define fpathconf _fpathconf -#define fpclass _fpclass -#define fpgetmask _fpgetmask -#define fpgetround _fpgetround -#define fpgetsticky _fpgetsticky -#define fprintf _fprintf -#define fpsetmask _fpsetmask -#define fpsetround _fpsetround -#define fpsetsticky _fpsetsticky -#define fstat _fstat -#define fstatat _fstatat -#define fstatfs _fstatfs -#define fstatvfs _fstatvfs -#define fsync _fsync -#define ftell _ftell -#define ftello _ftello -#define fseek _fseek -#define fseeko _fseeko -#define ftok _ftok -#define ftruncate _ftruncate -#define unlinkat _unlinkat -#define futimesat _futimesat -#define gcvt _gcvt -#define getacct _getacct -#define getcontext _getcontext -#define getcpuid _getcpuid -#define getcwd _getcwd -#define getdate _getdate -#define getdents _getdents -#define getegid _getegid -#define geteuid _geteuid -#define getexecname _getexecname -#define getextmntent _getextmntent -#define getgid _getgid -#define getloadavg _getloadavg -#define getgrent _getgrent -#define getgrent_r _getgrent_r -#define getgrgid _getgrgid -#define getgrgid_r _getgrgid_r -#define getgrnam _getgrnam -#define getgrnam_r _getgrnam_r -#define getgroups _getgroups -#define gethomelgroup _gethomelgroup /* Being replaced by lgrp_home() */ -#define gethz _gethz -#define getisax _getisax -#define getitimer _getitimer -#define gettaskid _gettaskid -#define getlogin _getlogin -#define getmntany _getmntany -#define getmntent _getmntent -#define getmsg _getmsg -#define getopt _getopt -#define getopt_clip _getopt_clip -#define getopt_long _getopt_long -#define getopt_long_only _getopt_long_only -#define getpagesizes _getpagesizes -#define getpass _getpass -#define getpassphrase _getpassphrase -#define getpeerucred _getpeerucred -#define getpgid _getpgid -#define getpgrp _getpgrp -#define getpid _getpid -#define getpmsg _getpmsg -#define getppid _getppid -#define getppriv _getppriv -#define getprivimplinfo _getprivimplinfo -#define getpflags _getpflags -#define getprojid _getprojid -#define getpw _getpw -#define getpwent _getpwent -#define getpwent_r _getpwent_r -#define getpwnam _getpwnam -#define getpwnam_r _getpwnam_r -#define getpwuid _getpwuid -#define getpwuid_r _getpwuid_r -#define getrctl _getrctl -#define getrlimit _getrlimit -#define getsid _getsid -#define getspent _getspent -#define getspent_r _getspent_r -#define getspnam _getspnam -#define getspnam_r _getspnam_r -#define getsubopt _getsubopt -#define gettimeofday _gettimeofday -#define gettxt _gettxt -#define getuid _getuid -#define getustack _getustack -#define getutent _getutent -#define getutid _getutid -#define getutline _getutline -#define getutmp _getutmp -#define getutmpx _getutmpx -#define getutxent _getutxent -#define getutxid _getutxid -#define getutxline _getutxline -#define getvfsany _getvfsany -#define getvfsent _getvfsent -#define getvfsfile _getvfsfile -#define getvfsspec _getvfsspec -#define getw _getw -#define getzoneid _getzoneid -#define getzoneidbyname _getzoneidbyname -#define getzonenamebyid _getzonenamebyid -#define grantpt _grantpt -#define gsignal _gsignal -#define gtty _gtty -#define hasmntopt _hasmntopt -#define hcreate _hcreate -#define hdestroy _hdestroy -#define hsearch _hsearch -#define initgroups _initgroups -#define insque _insque -#define install_utrap _install_utrap -#define inst_sync _inst_sync -#define ioctl _ioctl -#define isaexec _isaexec -#define isastream _isastream -#define isatty _isatty -#define issetugid _issetugid -#define jrand48 _jrand48 -#define kaio _kaio -#define kill _kill -#define l64a _l64a -#define ladd _ladd -#define lchown _lchown -#define lckpwdf _lckpwdf -#define lcong48 _lcong48 -#define ldivide _ldivide -#define lexp10 _lexp10 -#define lfind _lfind -#define link _link -#define llog10 _llog10 -#define llseek _llseek -#define lmul _lmul -#define lockf _lockf -#define localtime_r _localtime_r -#define longjmp _longjmp -#define lrand48 _lrand48 -#define lsearch _lsearch -#define lseek _lseek -#define lshiftl _lshiftl -#define lsign _lsign -#define lstat _lstat -#define lsub _lsub -#define ltol3 _ltol3 -#define madvise _madvise -#define makecontext _makecontext -#define __makecontext_v2 ___makecontext_v2 -#define makeut _makeut -#define makeutx _makeutx -#define memalign _memalign -#define memccpy _memccpy -#define memcntl _memcntl -#define memcmp _memcmp -#define memcpy _memcpy -#define meminfo _meminfo -#define memmove _memmove -#define memset _memset -#define mincore _mincore -#define mkdir _mkdir -#define mkfifo _mkfifo -#define mknod _mknod -#define mktemp _mktemp -#define mkstemp _mkstemp -#define mlock _mlock -#define mlockall _mlockall -#define mmap _mmap -#define modut _modut -#define modutx _modutx -#define monitor _monitor -#define mount _mount -#define mprotect _mprotect -#define mrand48 _mrand48 -#define msgctl _msgctl -#define msgctl64 _msgctl64 -#define msgget _msgget -#define msgids _msgids -#define msgsnap _msgsnap -#define msgrcv _msgrcv -#define msgsnd _msgsnd -#define msync _msync -#define munlock _munlock -#define munlockall _munlockall -#define munmap _munmap -#define nfs_getfh _nfs_getfh -#define nfssvc _nfssvc -#define nftw _nftw -#define nice _nice -#define nrand48 _nrand48 -#define nss_delete _nss_delete -#define nss_endent _nss_endent -#define nss_getent _nss_getent -#define nss_search _nss_search -#define nss_setent _nss_setent -#define ntp_gettime _ntp_gettime -#define ntp_adjtime _ntp_adjtime -#define open _open -#define openat _openat -#define opendir _opendir -#define fdopendir _fdopendir -#define openlog _openlog -#define pathconf _pathconf -#define pause _pause -#define pclose _pclose -#define pcsample _pcsample -#define pipe _pipe -#define plock _plock -#define poll _poll -#define port_create _port_create -#define port_associate _port_associate -#define port_dissociate _port_dissociate -#define port_send _port_send -#define port_sendn _port_sendn -#define port_get _port_get -#define port_getn _port_getn -#define port_alert _port_alert -#define port_dispatch _port_dispatch -#define popen _popen -#define posix_openpt _posix_openpt -#define pread _pread -#define pselect _pselect -#define pset_assign _pset_assign -#define pset_bind _pset_bind -#define printstack _printstack -#define pset_create _pset_create -#define pset_destroy _pset_destroy -#define pset_getattr _pset_getattr -#define pset_getloadavg _pset_getloadavg -#define pset_info _pset_info -#define pset_list _pset_list -#define pset_setattr _pset_setattr -#define priv_addset _priv_addset -#define priv_allocset _priv_allocset -#define priv_copyset _priv_copyset -#define priv_delset _priv_delset -#define priv_emptyset _priv_emptyset -#define priv_fillset _priv_fillset -#define priv_freeset _priv_freeset -#define priv_getbyname _priv_getbyname -#define priv_getbynum _priv_getbynum -#define priv_getsetbyname _priv_getsetbyname -#define priv_getsetbynum _priv_getsetbynum -#define priv_gettext _priv_gettext -#define priv_ineffect _priv_ineffect -#define priv_intersect _priv_intersect -#define priv_inverse _priv_inverse -#define priv_isemptyset _priv_isemptyset -#define priv_isequalset _priv_isequalset -#define priv_isfullset _priv_isfullset -#define priv_ismember _priv_ismember -#define priv_issubset _priv_issubset -#define priv_set _priv_set -#define priv_set_to_str _priv_set_to_str -#define priv_str_to_set _priv_str_to_set -#define priv_union _priv_union -#define profil _profil -#define psiginfo _psiginfo -#define psignal _psignal -#define ptrace _ptrace -#define ptsname _ptsname -#define putacct _putacct -#define pwrite _pwrite -#define putenv _putenv -#define putmsg _putmsg -#define putpmsg _putpmsg -#define putpwent _putpwent -#define putspent _putspent -#define pututline _pututline -#define pututxline _pututxline -#define putw _putw -#define rand_r _rand_r -#define rctlctl _rctlctl -#define rctllist _rctllist -#define read _read -#define readdir _readdir -#define readdir_r _readdir_r -#define readlink _readlink -#define readv _readv -#define realpath _realpath -#define regcmp _regcmp -#define regcomp _regcomp -#define regerror _regerror -#define regex _regex -#define regexec _regexec -#define regfree _regfree -#define remque _remque -#define renameat _renameat -#define resetmnttab _resetmnttab -#define resolvepath _resolvepath -#define rmdir _rmdir -#define sbrk _sbrk -#define scandir _scandir -#define scrwidth _scrwidth -#define seed48 _seed48 -#define seekdir _seekdir -#define select _select -#define semctl _semctl -#define semctl64 _semctl64 -#define semget _semget -#define semids _semids -#define semop _semop -#define semtimedop _semtimedop -#define setcontext _setcontext -#define setegid _setegid -#define setenv _setenv -#define seteuid _seteuid -#define setgid _setgid -#define setgrent _setgrent -#define setgroups _setgroups -#define setitimer _setitimer -#define settaskid _settaskid -#define setjmp _setjmp -#define setkey _setkey -#define setlocale _setlocale -#define setlogmask _setlogmask -#define setpgid _setpgid -#define setpgrp _setpgrp -#define setppriv _setppriv -#define setpflags _setpflags -#define setpwent _setpwent -#define setrctl _setrctl -#define setregid _setregid -#define setreuid _setreuid -#define setrlimit _setrlimit -#define setsid _setsid -#define setspent _setspent -#define settimeofday _settimeofday -#define setuid _setuid -#define setustack _setustack -#define setutent _setutent -#define setutxent _setutxent -#define shmat _shmat -#define shmctl _shmctl -#define shmctl64 _shmctl64 -#define shmdt _shmdt -#define shmget _shmget -#define shmids _shmids -#define sig2str _sig2str -#define sigaction _sigaction -#define sigaddset _sigaddset -#define sigaltstack _sigaltstack -#define sigdelset _sigdelset -#define sigemptyset _sigemptyset -#define sigfillset _sigfillset -#define sigflag _sigflag -#define sigfpe _sigfpe -#define sighold _sighold -#define sigignore _sigignore -#define siginterrupt _siginterrupt -#define sigismember _sigismember -#define siglongjmp _siglongjmp -#define sigpause _sigpause -#define sigpending _sigpending -#define sigprocmask _sigprocmask -#define sigrelse _sigrelse -#define sigsend _sigsend -#define sigsendset _sigsendset -#define sigset _sigset -#define signal _signal -#define sigsetjmp _sigsetjmp -#define sigsuspend _sigsuspend -#define sigwait _sigwait -#define sleep _sleep -#define srand48 _srand48 -#define ssignal _ssignal -#define stack_getbounds _stack_getbounds -#define stack_setbounds _stack_setbounds -#define stack_inbounds _stack_inbounds -#define stack_violation _stack_violation -#define stat _stat -#define statfs _statfs -#define statvfs _statvfs -#define stime _stime -#define str2sig _str2sig -#define strdup _strdup -#define strtok_r _strtok_r -#define stty _stty -#define swab _swab -#define swapcontext _swapcontext -#define swapctl _swapctl -#define symlink _symlink -#define sync _sync -#define synchutmp _synchutmp -#define syssun _syssun -#define sys_errlist _sys_errlist -#define sys_nerr _sys_nerr -#define syscall _syscall6 -#define _syscall _syscall6 -#define sysconf _sysconf -#define sysfs _sysfs -#define sysinfo _sysinfo -#define syslog _syslog -#define tcdrain _tcdrain -#define tcflow _tcflow -#define tcflush _tcflush -#define tcgetattr _tcgetattr -#define tcgetpgrp _tcgetpgrp -#define tcgetsid _tcgetsid -#define tcsendbreak _tcsendbreak -#define tcsetattr _tcsetattr -#define tcsetpgrp _tcsetpgrp -#define tdelete _tdelete -#define tell _tell -#define telldir _telldir -#define tempnam _tempnam -#define tfind _tfind -#define time _time -#define times _times -#define tmpnam _tmpnam -#define tmpnam_r _tmpnam_r -#define truncate _truncate -#define tsearch _tsearch -#define ttyname _ttyname -#define ttyslot _ttyslot -#define twalk _twalk -#define tzname _tzname -#define tzset _tzset -#define uadmin _uadmin -#define ucred_free _ucred_free -#define ucred_get _ucred_get -#define ucred_getamask _ucred_getamask -#define ucred_getasid _ucred_getasid -#define ucred_getatid _ucred_getatid -#define ucred_getauid _ucred_getauid -#define ucred_getegid _ucred_getegid -#define ucred_geteuid _ucred_geteuid -#define ucred_getgroups _ucred_getgroups -#define ucred_getpflags _ucred_getpflags -#define ucred_getpid _ucred_getpid -#define ucred_getprojid _ucred_getprojid -#define ucred_getprivset _ucred_getprivset -#define ucred_getrgid _ucred_getrgid -#define ucred_getruid _ucred_getruid -#define ucred_getsuid _ucred_getsuid -#define ucred_getsgid _ucred_getsgid -#define ucred_getzoneid _ucred_getzoneid -#define ucred_size _ucred_size -#define ulckpwdf _ulckpwdf -#define ulimit _ulimit -#define umask _umask -#define umount _umount -#define umount2 _umount2 -#define uname _uname -#define undial _undial -#define unlink _unlink -#define unlockpt _unlockpt -#define unordered _unordered -#define unsetenv _unsetenv -#define updutfile _updutfile -#define updutxfile _updutxfile -#define updutmp _updutmp -#define updutmpx _updutmpx -#define updwtmp _updwtmp -#define updwtmpx _updwtmpx -#define ustat _ustat -#define utime _utime -#define utimes _utimes -#define utmpname _utmpname -#define utmpxname _utmpxname -#define utssys _utssys -#define valloc _valloc -#define vfork _vfork -#define vfscanf _vfscanf -#define vhangup _vhangup -#define vscanf _vscanf -#define vsscanf _vsscanf -#define vsyslog _vsyslog -#define wait _wait -#define waitid _waitid -#define waitpid _waitpid -#define walkcontext _walkcontext -#define wcwidth _wcwidth -#define wcswidth _wcswidth -#define wracct _wracct -#define write _write -#define writev _writev -#define yield _yield -#define usleep _usleep -#define wait3 _wait3 -#define _assert __assert -#define _assert_c99 __assert_c99 -#define _cladm __cladm -#define _ctype __ctype -#define _filbuf __filbuf -#define _flsbuf __flsbuf -#define _iob __iob -#define _lwp_info __lwp_info -#define _lwp_self __lwp_self -#define _lwp_kill __lwp_kill -#define _lwp_private __lwp_private -#define _lwp_suspend __lwp_suspend -#define _lwp_continue __lwp_continue -#define _lwp_mutex_lock __lwp_mutex_lock -#define _lwp_mutex_timedlock __lwp_mutex_timedlock -#define _lwp_mutex_reltimedlock __lwp_mutex_reltimedlock -#define _lwp_mutex_trylock __lwp_mutex_trylock -#define _lwp_mutex_unlock __lwp_mutex_unlock -#define _lwp_cond_wait __lwp_cond_wait -#define _lwp_cond_timedwait __lwp_cond_timedwait -#define _lwp_cond_reltimedwait __lwp_cond_reltimedwait -#define _lwp_cond_signal __lwp_cond_signal -#define _lwp_cond_broadcast __lwp_cond_broadcast -#define _lwp_sema_wait __lwp_sema_wait -#define _lwp_sema_trywait __lwp_sema_trywait -#define _lwp_sema_post __lwp_sema_post -#define _lwp_sema_init __lwp_sema_init -#define __systemcall __systemcall6 - -/* fp and ll functions */ -#define decimal_to_double _decimal_to_double -#define decimal_to_extended _decimal_to_extended -#define decimal_to_quadruple _decimal_to_quadruple -#define decimal_to_single _decimal_to_single #define double_to_decimal _double_to_decimal +#define drand48 _drand48 +#define dup2 _dup2 +#define dup _dup #define econvert _econvert +#define ecvt _ecvt +#define edata _edata +#define encrypt _encrypt +#define end _end +#define endgrent _endgrent +#define endpwent _endpwent +#define endspent _endspent +#define endutent _endutent +#define endutxent _endutxent +#define environ _environ +#define erand48 _erand48 +#define etext _etext +#define execle _execle +#define execl _execl +#define execlp _execlp +#define execve _execve +#define execv _execv +#define execvp _execvp +#define exportfs _exportfs #define extended_to_decimal _extended_to_decimal +#define facl _facl +#define fattach _fattach +#define fchdir _fchdir +#define fchmod _fchmod +#define fchownat _fchownat +#define fchown _fchown +#define fchroot _fchroot +#define fcntl _fcntl #define fconvert _fconvert +#define fcvt _fcvt +#define fdetach _fdetach +#define fdopendir _fdopendir +#define fdopen _fdopen +#define fdwalk _fdwalk +#define ffs _ffs +#define fgetgrent _fgetgrent +#define fgetgrent_r _fgetgrent_r +#define fgetpwent _fgetpwent +#define fgetpwent_r _fgetpwent_r +#define fgetspent _fgetspent +#define fgetspent_r _fgetspent_r +#define _filbuf __filbuf +#define fileno _fileno #define file_to_decimal _file_to_decimal +#define finite _finite +#define flockfile _flockfile +#define _flsbuf __flsbuf +#define fmtmsg _fmtmsg +#define fnmatch _fnmatch +#define fork1 _fork1 +#define forkall _forkall +#define fork _fork +#define fpathconf _fpathconf +#define fpclass _fpclass +#define fpgetmask _fpgetmask +#define fpgetround _fpgetround +#define fpgetsticky _fpgetsticky +#define fprintf _fprintf +#define fpsetmask _fpsetmask +#define fpsetround _fpsetround +#define fpsetsticky _fpsetsticky +#define fseek _fseek +#define fseeko _fseeko +#define fstatat _fstatat +#define fstatfs _fstatfs +#define fstat _fstat +#define fstatvfs _fstatvfs +#define fsync _fsync +#define ftell _ftell +#define ftello _ftello +#define ftok _ftok +#define ftruncate _ftruncate +#define ftrylockfile _ftrylockfile +#define ftw64 _ftw64 +#define ftw _ftw #define func_to_decimal _func_to_decimal +#define funlockfile _funlockfile +#define futimesat _futimesat #define gconvert _gconvert -#define qeconvert _qeconvert -#define qecvt _qecvt -#define qfconvert _qfconvert -#define qfcvt _qfcvt -#define qgconvert _qgconvert -#define qgcvt _qgcvt -#define quadruple_to_decimal _quadruple_to_decimal -#define seconvert _seconvert -#define sfconvert _sfconvert -#define sgconvert _sgconvert -#define single_to_decimal _single_to_decimal -#define string_to_decimal _string_to_decimal -#define atoll _atoll +#define gcvt _gcvt +#define getacct _getacct +#define getcontext _getcontext +#define getcpuid _getcpuid +#define getcwd _getcwd +#define getdate_err _getdate_err +#define getdate _getdate +#define getdents _getdents +#define getegid _getegid +#define geteuid _geteuid +#define getexecname _getexecname +#define getextmntent _getextmntent +#define getgid _getgid +#define getgrent _getgrent +#define getgrent_r _getgrent_r +#define getgrgid _getgrgid +#define getgrgid_r _getgrgid_r +#define getgrnam _getgrnam +#define getgrnam_r _getgrnam_r +#define getgroups _getgroups +#define gethomelgroup _gethomelgroup +#define gethz _gethz +#define getisax _getisax +#define getitimer _getitimer +#define getloadavg _getloadavg +#define getlogin _getlogin +#define getlogin_r _getlogin_r +#define getmntany _getmntany +#define getmntent _getmntent +#define getmsg _getmsg +#define getopt_clip _getopt_clip +#define getopt _getopt +#define getopt_long _getopt_long +#define getopt_long_only _getopt_long_only +#define getpagesizes _getpagesizes +#define getpass _getpass +#define getpassphrase _getpassphrase +#define getpeerucred _getpeerucred +#define getpflags _getpflags +#define getpgid _getpgid +#define getpgrp _getpgrp +#define getpid _getpid +#define getpmsg _getpmsg +#define getppid _getppid +#define getppriv _getppriv +#define getprivimplinfo _getprivimplinfo +#define getprojid _getprojid +#define getpwent _getpwent +#define getpwent_r _getpwent_r +#define getpw _getpw +#define getpwnam _getpwnam +#define getpwnam_r _getpwnam_r +#define getpwuid _getpwuid +#define getpwuid_r _getpwuid_r +#define getrctl _getrctl +#define getrlimit _getrlimit +#define getsid _getsid +#define getspent _getspent +#define getspent_r _getspent_r +#define getspnam _getspnam +#define getspnam_r _getspnam_r +#define getsubopt _getsubopt +#define gettaskid _gettaskid +#define gettext _gettext +#define gettimeofday _gettimeofday +#define gettxt _gettxt +#define getuid _getuid +#define getustack _getustack +#define getutent _getutent +#define getutid _getutid +#define getutline _getutline +#define getutmp _getutmp +#define getutmpx _getutmpx +#define getutxent _getutxent +#define getutxid _getutxid +#define getutxline _getutxline +#define getvfsany _getvfsany +#define getvfsent _getvfsent +#define getvfsfile _getvfsfile +#define getvfsspec _getvfsspec +#define getw _getw +#define getzoneidbyname _getzoneidbyname +#define getzoneid _getzoneid +#define getzonenamebyid _getzonenamebyid +#define gmtime_r _gmtime_r +#define grantpt _grantpt +#define gsignal _gsignal +#define gtty _gtty +#define hasmntopt _hasmntopt +#define hcreate _hcreate +#define hdestroy _hdestroy +#define hsearch _hsearch +#define iconv_close _iconv_close +#define iconv _iconv +#define iconv_open _iconv_open +#define initgroups _initgroups +#define insque _insque +#define install_utrap _install_utrap +#define inst_sync _inst_sync +#define _iob __iob +#define ioctl _ioctl +#define isaexec _isaexec +#define isastream _isastream +#define isatty _isatty +#define isenglish _isenglish +#define isideogram _isideogram +#define isnumber _isnumber +#define isphonogram _isphonogram +#define issetugid _issetugid +#define isspecial _isspecial +#define iswalnum _iswalnum +#define iswalpha _iswalpha +#define iswcntrl _iswcntrl +#define iswctype __iswctype +#define iswdigit _iswdigit +#define iswgraph _iswgraph +#define iswlower _iswlower +#define iswprint _iswprint +#define iswpunct _iswpunct +#define iswspace _iswspace +#define iswupper _iswupper +#define iswxdigit _iswxdigit +#define jrand48 _jrand48 +#define kaio _kaio +#define kill _kill +#define l64a _l64a +#define ladd _ladd +#define lchown _lchown +#define lckpwdf _lckpwdf +#define lcong48 _lcong48 +#define ldivide _ldivide +#define lexp10 _lexp10 +#define lfind _lfind +#define link _link #define llabs _llabs #define lldiv _lldiv +#define llog10 _llog10 +#define llseek _llseek #define lltostr _lltostr -#define strtoll _strtoll -#define strtoull _strtoull -#define ulltostr _ulltostr - -#if !defined(_LP64) -/* transitional large file interfaces */ -#define alphasort64 _alphasort64 -#define attropen64 _attropen64 -#define creat64 _creat64 -#define ftello64 _ftello64 -#define fseeko64 _fseeko64 -#define fstat64 _fstat64 -#define ftw64 _ftw64 -#define fstatvfs64 _fstatvfs64 -#define ftruncate64 _ftruncate64 -#define getdents64 _getdents64 -#define getrlimit64 _getrlimit64 -#define lockf64 _lockf64 -#define lseek64 _lseek64 -#define lstat64 _lstat64 -#define mkstemp64 _mkstemp64 -#define mmap64 _mmap64 -#define nftw64 _nftw64 -#define openat64 _openat64 -#define open64 _open64 -#define pread64 _pread64 -#define pwrite64 _pwrite64 -#define readdir64 _readdir64 -#define readdir64_r _readdir64_r -#define scandir64 _scandir64 -#define seekdir64 _seekdir64 -#define tell64 _tell64 -#define telldir64 _telldir64 -#define setrlimit64 _setrlimit64 -#define stat64 _stat64 -#define fstatat64 _fstatat64 -#define statvfs64 _statvfs64 -#define truncate64 _truncate64 -#endif /* !_LP64 */ - -/* lock primitives and other multithreading interfaces */ -#define atomic_inc_8 _atomic_inc_8 -#define atomic_inc_uchar _atomic_inc_uchar -#define atomic_inc_16 _atomic_inc_16 -#define atomic_inc_ushort _atomic_inc_ushort -#define atomic_inc_32 _atomic_inc_32 -#define atomic_inc_uint _atomic_inc_uint -#define atomic_inc_ulong _atomic_inc_ulong -#define atomic_inc_64 _atomic_inc_64 -#define atomic_dec_8 _atomic_dec_8 -#define atomic_dec_uchar _atomic_dec_uchar -#define atomic_dec_16 _atomic_dec_16 -#define atomic_dec_ushort _atomic_dec_ushort -#define atomic_dec_32 _atomic_dec_32 -#define atomic_dec_uint _atomic_dec_uint -#define atomic_dec_ulong _atomic_dec_ulong -#define atomic_dec_64 _atomic_dec_64 -#define atomic_add_8 _atomic_add_8 -#define atomic_add_char _atomic_add_char -#define atomic_add_16 _atomic_add_16 -#define atomic_add_short _atomic_add_short -#define atomic_add_32 _atomic_add_32 -#define atomic_add_int _atomic_add_int -#define atomic_add_64 _atomic_add_64 -#define atomic_add_ptr _atomic_add_ptr -#define atomic_add_long _atomic_add_long -#define atomic_or_8 _atomic_or_8 -#define atomic_or_uchar _atomic_or_uchar -#define atomic_or_16 _atomic_or_16 -#define atomic_or_ushort _atomic_or_ushort -#define atomic_or_32 _atomic_or_32 -#define atomic_or_uint _atomic_or_uint -#define atomic_or_64 _atomic_or_64 -#define atomic_or_ulong _atomic_or_ulong -#define atomic_and_8 _atomic_and_8 -#define atomic_and_uchar _atomic_and_uchar -#define atomic_and_16 _atomic_and_16 -#define atomic_and_ushort _atomic_and_ushort -#define atomic_and_32 _atomic_and_32 -#define atomic_and_uint _atomic_and_uint -#define atomic_and_64 _atomic_and_64 -#define atomic_and_ulong _atomic_and_ulong -#define atomic_inc_8_nv _atomic_inc_8_nv -#define atomic_inc_uchar_nv _atomic_inc_uchar_nv -#define atomic_inc_16_nv _atomic_inc_16_nv -#define atomic_inc_ushort_nv _atomic_inc_ushort_nv -#define atomic_inc_32_nv _atomic_inc_32_nv -#define atomic_inc_uint_nv _atomic_inc_uint_nv -#define atomic_inc_ulong_nv _atomic_inc_ulong_nv -#define atomic_inc_64_nv _atomic_inc_64_nv -#define atomic_dec_8_nv _atomic_dec_8_nv -#define atomic_dec_uchar_nv _atomic_dec_uchar_nv -#define atomic_dec_16_nv _atomic_dec_16_nv -#define atomic_dec_ushort_nv _atomic_dec_ushort_nv -#define atomic_dec_32_nv _atomic_dec_32_nv -#define atomic_dec_uint_nv _atomic_dec_uint_nv -#define atomic_dec_ulong_nv _atomic_dec_ulong_nv -#define atomic_dec_64_nv _atomic_dec_64_nv -#define atomic_add_8_nv _atomic_add_8_nv -#define atomic_add_char_nv _atomic_add_char_nv -#define atomic_add_16_nv _atomic_add_16_nv -#define atomic_add_short_nv _atomic_add_short_nv -#define atomic_add_32_nv _atomic_add_32_nv -#define atomic_add_int_nv _atomic_add_int_nv -#define atomic_add_64_nv _atomic_add_64_nv -#define atomic_add_ptr_nv _atomic_add_ptr_nv -#define atomic_add_long_nv _atomic_add_long_nv -#define atomic_or_8_nv _atomic_or_8_nv -#define atomic_or_uchar_nv _atomic_or_uchar_nv -#define atomic_or_16_nv _atomic_or_16_nv -#define atomic_or_ushort_nv _atomic_or_ushort_nv -#define atomic_or_32_nv _atomic_or_32_nv -#define atomic_or_uint_nv _atomic_or_uint_nv -#define atomic_or_64_nv _atomic_or_64_nv -#define atomic_or_ulong_nv _atomic_or_ulong_nv -#define atomic_and_8_nv _atomic_and_8_nv -#define atomic_and_uchar_nv _atomic_and_uchar_nv -#define atomic_and_16_nv _atomic_and_16_nv -#define atomic_and_ushort_nv _atomic_and_ushort_nv -#define atomic_and_32_nv _atomic_and_32_nv -#define atomic_and_uint_nv _atomic_and_uint_nv -#define atomic_and_64_nv _atomic_and_64_nv -#define atomic_and_ulong_nv _atomic_and_ulong_nv -#define atomic_cas_8 _atomic_cas_8 -#define atomic_cas_uchar _atomic_cas_uchar -#define atomic_cas_16 _atomic_cas_16 -#define atomic_cas_ushort _atomic_cas_ushort -#define atomic_cas_32 _atomic_cas_32 -#define atomic_cas_uint _atomic_cas_uint -#define atomic_cas_ptr _atomic_cas_ptr -#define atomic_cas_ulong _atomic_cas_ulong -#define atomic_cas_64 _atomic_cas_64 -#define atomic_swap_8 _atomic_swap_8 -#define atomic_swap_uchar _atomic_swap_uchar -#define atomic_swap_16 _atomic_swap_16 -#define atomic_swap_ushort _atomic_swap_ushort -#define atomic_swap_32 _atomic_swap_32 -#define atomic_swap_uint _atomic_swap_uint -#define atomic_swap_ptr _atomic_swap_ptr -#define atomic_swap_ulong _atomic_swap_ulong -#define atomic_swap_64 _atomic_swap_64 -#define atomic_set_long_excl _atomic_set_long_excl -#define atomic_clear_long_excl _atomic_clear_long_excl +#define lmul _lmul +#define localtime_r _localtime_r +#define lockf _lockf +#define longjmp _longjmp +#define lrand48 _lrand48 +#define lsearch _lsearch +#define lseek _lseek +#define lshiftl _lshiftl +#define lsign _lsign +#define lstat _lstat +#define lsub _lsub +#define _lwp_cond_broadcast __lwp_cond_broadcast +#define _lwp_cond_reltimedwait __lwp_cond_reltimedwait +#define _lwp_cond_signal __lwp_cond_signal +#define _lwp_cond_timedwait __lwp_cond_timedwait +#define _lwp_cond_wait __lwp_cond_wait +#define _lwp_continue __lwp_continue +#define _lwp_info __lwp_info +#define _lwp_kill __lwp_kill +#define _lwp_mutex_lock __lwp_mutex_lock +#define _lwp_mutex_reltimedlock __lwp_mutex_reltimedlock +#define _lwp_mutex_timedlock __lwp_mutex_timedlock +#define _lwp_mutex_trylock __lwp_mutex_trylock +#define _lwp_mutex_unlock __lwp_mutex_unlock +#define _lwp_private __lwp_private +#define _lwp_self __lwp_self +#define _lwp_sema_init __lwp_sema_init +#define _lwp_sema_post __lwp_sema_post +#define _lwp_sema_trywait __lwp_sema_trywait +#define _lwp_sema_wait __lwp_sema_wait +#define _lwp_suspend __lwp_suspend +#define madvise _madvise +#define makecontext _makecontext +#define __makecontext_v2 ___makecontext_v2 +#define makeut _makeut +#define makeutx _makeutx +#define mblen _mblen +#define mbstowcs _mbstowcs +#define mbtowc _mbtowc +#define memalign _memalign +#define membar_consumer _membar_consumer #define membar_enter _membar_enter #define membar_exit _membar_exit #define membar_producer _membar_producer -#define membar_consumer _membar_consumer -#define mutex_init _mutex_init +#define memccpy _memccpy +#define memcmp _memcmp +#define memcntl _memcntl +#define memcpy _memcpy +#define meminfo _meminfo +#define memmove _memmove +#define memset _memset +#define mincore _mincore +#define mkdir _mkdir +#define mkfifo _mkfifo +#define mknod _mknod +#define mkstemp _mkstemp +#define mktemp _mktemp +#define mlockall _mlockall +#define mlock _mlock +#define mmap _mmap +#define modut _modut +#define modutx _modutx +#define monitor _monitor +#define mount _mount +#define mprotect _mprotect +#define mrand48 _mrand48 +#define msgctl64 _msgctl64 +#define msgctl _msgctl +#define msgget _msgget +#define msgids _msgids +#define msgrcv _msgrcv +#define msgsnap _msgsnap +#define msgsnd _msgsnd +#define msync _msync +#define munlockall _munlockall +#define munlock _munlock +#define munmap _munmap #define mutex_destroy _mutex_destroy +#define mutex_held _mutex_held +#define mutex_init _mutex_init #define mutex_lock _mutex_lock #define mutex_trylock _mutex_trylock #define mutex_unlock _mutex_unlock -#define cond_init _cond_init -#define cond_destroy _cond_destroy -#define cond_wait _cond_wait -#define cond_timedwait _cond_timedwait -#define cond_reltimedwait _cond_reltimedwait -#define cond_signal _cond_signal -#define cond_broadcast _cond_broadcast -#define rwlock_init _rwlock_init +#define nfs_getfh _nfs_getfh +#define nfssvc _nfssvc +#define nftw64 _nftw64 +#define nftw _nftw +#define ngettext _ngettext +#define nice _nice +#define nl_langinfo _nl_langinfo +#define nrand48 _nrand48 +#define nss_default_finders _nss_default_finders +#define nss_delete _nss_delete +#define nss_endent _nss_endent +#define nss_getent _nss_getent +#define nss_search _nss_search +#define nss_setent _nss_setent +#define ntp_adjtime _ntp_adjtime +#define ntp_gettime _ntp_gettime +#define openat _openat +#define opendir _opendir +#define openlog _openlog +#define open _open +#define pathconf _pathconf +#define pause _pause +#define pclose _pclose +#define pcsample _pcsample +#define pipe _pipe +#define plock _plock +#define poll _poll +#define popen _popen +#define port_alert _port_alert +#define port_associate _port_associate +#define port_create _port_create +#define port_dispatch _port_dispatch +#define port_dissociate _port_dissociate +#define port_getn _port_getn +#define port_get _port_get +#define port_sendn _port_sendn +#define port_send _port_send +#define posix_openpt _posix_openpt +#define posix_spawnattr_destroy _posix_spawnattr_destroy +#define posix_spawnattr_getflags _posix_spawnattr_getflags +#define posix_spawnattr_getpgroup _posix_spawnattr_getpgroup +#define posix_spawnattr_getschedparam _posix_spawnattr_getschedparam +#define posix_spawnattr_getschedpolicy _posix_spawnattr_getschedpolicy +#define posix_spawnattr_getsigdefault _posix_spawnattr_getsigdefault +#define posix_spawnattr_getsigmask _posix_spawnattr_getsigmask +#define posix_spawnattr_init _posix_spawnattr_init +#define posix_spawnattr_setflags _posix_spawnattr_setflags +#define posix_spawnattr_setpgroup _posix_spawnattr_setpgroup +#define posix_spawnattr_setschedparam _posix_spawnattr_setschedparam +#define posix_spawnattr_setschedpolicy _posix_spawnattr_setschedpolicy +#define posix_spawnattr_setsigdefault _posix_spawnattr_setsigdefault +#define posix_spawnattr_setsigmask _posix_spawnattr_setsigmask +#define posix_spawn_file_actions_addclose _posix_spawn_file_actions_addclose +#define posix_spawn_file_actions_adddup2 _posix_spawn_file_actions_adddup2 +#define posix_spawn_file_actions_addopen _posix_spawn_file_actions_addopen +#define posix_spawn_file_actions_destroy _posix_spawn_file_actions_destroy +#define posix_spawn_file_actions_init _posix_spawn_file_actions_init +#define posix_spawn _posix_spawn +#define posix_spawnp _posix_spawnp +#define pread _pread +#define printstack _printstack +#define priv_addset _priv_addset +#define priv_allocset _priv_allocset +#define priv_copyset _priv_copyset +#define priv_delset _priv_delset +#define priv_emptyset _priv_emptyset +#define priv_fillset _priv_fillset +#define priv_freeset _priv_freeset +#define priv_getbyname _priv_getbyname +#define priv_getbynum _priv_getbynum +#define priv_getsetbyname _priv_getsetbyname +#define priv_getsetbynum _priv_getsetbynum +#define priv_gettext _priv_gettext +#define priv_ineffect _priv_ineffect +#define priv_intersect _priv_intersect +#define priv_inverse _priv_inverse +#define priv_isemptyset _priv_isemptyset +#define priv_isequalset _priv_isequalset +#define priv_isfullset _priv_isfullset +#define priv_ismember _priv_ismember +#define priv_issubset _priv_issubset +#define priv_set _priv_set +#define priv_set_to_str _priv_set_to_str +#define priv_str_to_set _priv_str_to_set +#define priv_union _priv_union +#define profil _profil +#define pselect _pselect +#define pset_assign _pset_assign +#define pset_bind _pset_bind +#define pset_create _pset_create +#define pset_destroy _pset_destroy +#define pset_getattr _pset_getattr +#define pset_getloadavg _pset_getloadavg +#define pset_info _pset_info +#define pset_list _pset_list +#define pset_setattr _pset_setattr +#define psiginfo _psiginfo +#define psignal _psignal +#define pthread_atfork _pthread_atfork +#define pthread_attr_destroy _pthread_attr_destroy +#define pthread_attr_getdetachstate _pthread_attr_getdetachstate +#define pthread_attr_getguardsize _pthread_attr_getguardsize +#define pthread_attr_getinheritsched _pthread_attr_getinheritsched +#define pthread_attr_getschedparam _pthread_attr_getschedparam +#define pthread_attr_getschedpolicy _pthread_attr_getschedpolicy +#define pthread_attr_getscope _pthread_attr_getscope +#define pthread_attr_getstackaddr _pthread_attr_getstackaddr +#define pthread_attr_getstack _pthread_attr_getstack +#define pthread_attr_getstacksize _pthread_attr_getstacksize +#define pthread_attr_init _pthread_attr_init +#define pthread_attr_setdetachstate _pthread_attr_setdetachstate +#define pthread_attr_setguardsize _pthread_attr_setguardsize +#define pthread_attr_setinheritsched _pthread_attr_setinheritsched +#define pthread_attr_setschedparam _pthread_attr_setschedparam +#define pthread_attr_setschedpolicy _pthread_attr_setschedpolicy +#define pthread_attr_setscope _pthread_attr_setscope +#define pthread_attr_setstackaddr _pthread_attr_setstackaddr +#define pthread_attr_setstack _pthread_attr_setstack +#define pthread_attr_setstacksize _pthread_attr_setstacksize +#define pthread_barrierattr_destroy _pthread_barrierattr_destroy +#define pthread_barrierattr_getpshared _pthread_barrierattr_getpshared +#define pthread_barrierattr_init _pthread_barrierattr_init +#define pthread_barrierattr_setpshared _pthread_barrierattr_setpshared +#define pthread_barrier_destroy _pthread_barrier_destroy +#define pthread_barrier_init _pthread_barrier_init +#define pthread_barrier_wait _pthread_barrier_wait +#define pthread_cancel _pthread_cancel +#define pthread_condattr_destroy _pthread_condattr_destroy +#define pthread_condattr_getclock _pthread_condattr_getclock +#define pthread_condattr_getpshared _pthread_condattr_getpshared +#define pthread_condattr_init _pthread_condattr_init +#define pthread_condattr_setclock _pthread_condattr_setclock +#define pthread_condattr_setpshared _pthread_condattr_setpshared +#define pthread_cond_broadcast _pthread_cond_broadcast +#define pthread_cond_destroy _pthread_cond_destroy +#define pthread_cond_init _pthread_cond_init +#define pthread_cond_reltimedwait_np _pthread_cond_reltimedwait_np +#define pthread_cond_signal _pthread_cond_signal +#define pthread_cond_timedwait _pthread_cond_timedwait +#define pthread_cond_wait _pthread_cond_wait +#define pthread_create _pthread_create +#define pthread_detach _pthread_detach +#define pthread_equal _pthread_equal +#define pthread_exit _pthread_exit +#define pthread_getconcurrency _pthread_getconcurrency +#define pthread_getschedparam _pthread_getschedparam +#define pthread_getspecific _pthread_getspecific +#define pthread_join _pthread_join +#define pthread_key_create _pthread_key_create +#define pthread_key_delete _pthread_key_delete +#define pthread_kill _pthread_kill +#define pthread_mutexattr_destroy _pthread_mutexattr_destroy +#define pthread_mutexattr_getprioceiling _pthread_mutexattr_getprioceiling +#define pthread_mutexattr_getprotocol _pthread_mutexattr_getprotocol +#define pthread_mutexattr_getpshared _pthread_mutexattr_getpshared +#define pthread_mutexattr_getrobust_np _pthread_mutexattr_getrobust_np +#define pthread_mutexattr_gettype _pthread_mutexattr_gettype +#define pthread_mutexattr_init _pthread_mutexattr_init +#define pthread_mutexattr_setprioceiling _pthread_mutexattr_setprioceiling +#define pthread_mutexattr_setprotocol _pthread_mutexattr_setprotocol +#define pthread_mutexattr_setpshared _pthread_mutexattr_setpshared +#define pthread_mutexattr_setrobust_np _pthread_mutexattr_setrobust_np +#define pthread_mutexattr_settype _pthread_mutexattr_settype +#define pthread_mutex_consistent_np _pthread_mutex_consistent_np +#define pthread_mutex_destroy _pthread_mutex_destroy +#define pthread_mutex_getprioceiling _pthread_mutex_getprioceiling +#define pthread_mutex_init _pthread_mutex_init +#define pthread_mutex_lock _pthread_mutex_lock +#define pthread_mutex_reltimedlock_np _pthread_mutex_reltimedlock_np +#define pthread_mutex_setprioceiling _pthread_mutex_setprioceiling +#define pthread_mutex_timedlock _pthread_mutex_timedlock +#define pthread_mutex_trylock _pthread_mutex_trylock +#define pthread_mutex_unlock _pthread_mutex_unlock +#define pthread_once _pthread_once +#define pthread_rwlockattr_destroy _pthread_rwlockattr_destroy +#define pthread_rwlockattr_getpshared _pthread_rwlockattr_getpshared +#define pthread_rwlockattr_init _pthread_rwlockattr_init +#define pthread_rwlockattr_setpshared _pthread_rwlockattr_setpshared +#define pthread_rwlock_destroy _pthread_rwlock_destroy +#define pthread_rwlock_init _pthread_rwlock_init +#define pthread_rwlock_rdlock _pthread_rwlock_rdlock +#define pthread_rwlock_reltimedrdlock_np _pthread_rwlock_reltimedrdlock_np +#define pthread_rwlock_reltimedwrlock_np _pthread_rwlock_reltimedwrlock_np +#define pthread_rwlock_timedrdlock _pthread_rwlock_timedrdlock +#define pthread_rwlock_timedwrlock _pthread_rwlock_timedwrlock +#define pthread_rwlock_tryrdlock _pthread_rwlock_tryrdlock +#define pthread_rwlock_trywrlock _pthread_rwlock_trywrlock +#define pthread_rwlock_unlock _pthread_rwlock_unlock +#define pthread_rwlock_wrlock _pthread_rwlock_wrlock +#define pthread_self _pthread_self +#define pthread_setcancelstate _pthread_setcancelstate +#define pthread_setcanceltype _pthread_setcanceltype +#define pthread_setconcurrency _pthread_setconcurrency +#define pthread_setschedparam _pthread_setschedparam +#define pthread_setschedprio _pthread_setschedprio +#define pthread_setspecific _pthread_setspecific +#define pthread_sigmask _pthread_sigmask +#define pthread_spin_destroy _pthread_spin_destroy +#define pthread_spin_init _pthread_spin_init +#define pthread_spin_lock _pthread_spin_lock +#define pthread_spin_trylock _pthread_spin_trylock +#define pthread_spin_unlock _pthread_spin_unlock +#define pthread_testcancel _pthread_testcancel +#define ptrace _ptrace +#define ptsname _ptsname +#define putacct _putacct +#define putenv _putenv +#define putmsg _putmsg +#define putpmsg _putpmsg +#define putpwent _putpwent +#define putspent _putspent +#define pututline _pututline +#define pututxline _pututxline +#define putw _putw +#define pwrite _pwrite +#define qeconvert _qeconvert +#define qecvt _qecvt +#define qfconvert _qfconvert +#define qfcvt _qfcvt +#define qgconvert _qgconvert +#define qgcvt _qgcvt +#define quadruple_to_decimal _quadruple_to_decimal +#define rand_r _rand_r +#define rctlctl _rctlctl +#define rctllist _rctllist +#define readdir _readdir +#define readdir_r _readdir_r +#define readlink _readlink +#define read _read +#define readv _readv +#define realpath _realpath +#define regcmp _regcmp +#define regcomp _regcomp +#define regerror _regerror +#define regexec _regexec +#define regex _regex +#define regfree _regfree +#define remque _remque +#define renameat _renameat +#define resetmnttab _resetmnttab +#define resolvepath _resolvepath +#define rmdir _rmdir #define rwlock_destroy _rwlock_destroy +#define rwlock_init _rwlock_init #define rw_rdlock _rw_rdlock -#define rw_wrlock _rw_wrlock +#define rw_read_held _rw_read_held #define rw_tryrdlock _rw_tryrdlock #define rw_trywrlock _rw_trywrlock #define rw_unlock _rw_unlock -#define thr_main _thr_main -#define thr_self _thr_self +#define rw_write_held _rw_write_held +#define rw_wrlock _rw_wrlock +#define sbrk _sbrk +#define scandir _scandir +#define schedctl_exit _schedctl_exit +#define schedctl_init _schedctl_init +#define schedctl_lookup _schedctl_lookup +#define scrwidth _scrwidth +#define seconvert _seconvert +#define seed48 _seed48 +#define seekdir _seekdir +#define select _select +#define sema_destroy _sema_destroy +#define sema_held _sema_held +#define sema_init _sema_init +#define sema_post _sema_post +#define sema_reltimedwait _sema_reltimedwait +#define sema_timedwait _sema_timedwait +#define sema_trywait _sema_trywait +#define sema_wait _sema_wait +#define semctl64 _semctl64 +#define semctl _semctl +#define semget _semget +#define semids _semids +#define semop _semop +#define semtimedop _semtimedop +#define setcontext _setcontext +#define setegid _setegid +#define setenv _setenv +#define seteuid _seteuid +#define setgid _setgid +#define setgrent _setgrent +#define setgroups _setgroups +#define setitimer _setitimer +#define setjmp _setjmp +#define setkey _setkey +#define setlocale _setlocale +#define setlogmask _setlogmask +#define setpflags _setpflags +#define setpgid _setpgid +#define setpgrp _setpgrp +#define setppriv _setppriv +#define setpwent _setpwent +#define setrctl _setrctl +#define setregid _setregid +#define setreuid _setreuid +#define setrlimit _setrlimit +#define setsid _setsid +#define setspent _setspent +#define settaskid _settaskid +#define settimeofday _settimeofday +#define setuid _setuid +#define setustack _setustack +#define setutent _setutent +#define setutxent _setutxent +#define s_fcntl _s_fcntl +#define sfconvert _sfconvert +#define sgconvert _sgconvert +#define shmat _shmat +#define shmctl64 _shmctl64 +#define shmctl _shmctl +#define shmdt _shmdt +#define shmget _shmget +#define shmids _shmids +#define sig2str _sig2str +#define sigaction _sigaction +#define sigaddset _sigaddset +#define sigaltstack _sigaltstack +#define sigdelset _sigdelset +#define sigemptyset _sigemptyset +#define sigfillset _sigfillset +#define sigflag _sigflag +#define sigfpe _sigfpe +#define sighold _sighold +#define sigignore _sigignore +#define siginterrupt _siginterrupt +#define sigismember _sigismember +#define siglongjmp _siglongjmp +#define signal _signal +#define sigpause _sigpause +#define sigpending _sigpending +#define sigprocmask _sigprocmask +#define sigrelse _sigrelse +#define sigsendset _sigsendset +#define sigsend _sigsend +#define sigsetjmp _sigsetjmp +#define sigset _sigset +#define sigsuspend _sigsuspend +#define sigwait _sigwait +#define single_to_decimal _single_to_decimal +#define s_ioctl _s_ioctl +#define sleep _sleep +#define srand48 _srand48 +#define ssignal _ssignal +#define stack_getbounds _stack_getbounds +#define stack_inbounds _stack_inbounds +#define stack_setbounds _stack_setbounds +#define stack_violation _stack_violation +#define statfs _statfs +#define stat _stat +#define statvfs _statvfs +#define stime _stime +#define str2sig _str2sig +#define strcoll _strcoll +#define strdup _strdup +#define strerror_r _strerror_r +#define strerror _strerror +#define string_to_decimal _string_to_decimal +#define strtok_r _strtok_r +#define strtoll _strtoll +#define strtoull _strtoull +#define strxfrm _strxfrm +#define stty _stty +#define swab _swab +#define swapcontext _swapcontext +#define swapctl _swapctl +#define symlink _symlink +#define synchutmp _synchutmp +#define sync _sync +#define _syscall _syscall6 +#define syscall _syscall6 +#define sysconf _sysconf +#define sys_errlist _sys_errlist +#define sysfs _sysfs +#define sysinfo _sysinfo +#define syslog _syslog +#define sys_nerr _sys_nerr +#define syssun _syssun +#define __systemcall __systemcall6 +#define tcdrain _tcdrain +#define tcflow _tcflow +#define tcflush _tcflush +#define tcgetattr _tcgetattr +#define tcgetpgrp _tcgetpgrp +#define tcgetsid _tcgetsid +#define tcsendbreak _tcsendbreak +#define tcsetattr _tcsetattr +#define tcsetpgrp _tcsetpgrp +#define tdelete _tdelete +#define telldir _telldir +#define tell _tell +#define tempnam _tempnam +#define textdomain _textdomain +#define tfind _tfind +#define thr_continue_allmutators _thr_continue_allmutators +#define thr_continue_mutator _thr_continue_mutator +#define thr_continue _thr_continue +#define thr_create _thr_create #define thr_exit _thr_exit -#define thr_min_stack _thr_min_stack -#define thr_kill _thr_kill +#define thr_getconcurrency _thr_getconcurrency +#define thr_getprio _thr_getprio +#define thr_getspecific _thr_getspecific +#define thr_getstate _thr_getstate +#define thr_join _thr_join #define thr_keycreate _thr_keycreate +#define thr_kill _thr_kill +#define thr_main _thr_main +#define thr_min_stack _thr_min_stack +#define thr_mutators_barrier _thr_mutators_barrier +#define thr_self _thr_self +#define thr_setconcurrency _thr_setconcurrency +#define thr_setmutator _thr_setmutator +#define thr_setprio _thr_setprio #define thr_setspecific _thr_setspecific -#define thr_getspecific _thr_getspecific - -/* new POSIX SUSV3 stuff */ -#define posix_spawn _posix_spawn -#define posix_spawnp _posix_spawnp -#define posix_spawn_file_actions_init _posix_spawn_file_actions_init -#define posix_spawn_file_actions_destroy \ - _posix_spawn_file_actions_destroy -#define posix_spawn_file_actions_addopen \ - _posix_spawn_file_actions_addopen -#define posix_spawn_file_actions_addclose \ - _posix_spawn_file_actions_addclose -#define posix_spawn_file_actions_adddup2 \ - _posix_spawn_file_actions_adddup2 -#define posix_spawnattr_init _posix_spawnattr_init -#define posix_spawnattr_destroy _posix_spawnattr_destroy -#define posix_spawnattr_setflags _posix_spawnattr_setflags -#define posix_spawnattr_getflags _posix_spawnattr_getflags -#define posix_spawnattr_setpgroup _posix_spawnattr_setpgroup -#define posix_spawnattr_getpgroup _posix_spawnattr_getpgroup -#define posix_spawnattr_setschedparam _posix_spawnattr_setschedparam -#define posix_spawnattr_getschedparam _posix_spawnattr_getschedparam -#define posix_spawnattr_setschedpolicy _posix_spawnattr_setschedpolicy -#define posix_spawnattr_getschedpolicy _posix_spawnattr_getschedpolicy -#define posix_spawnattr_setsigdefault _posix_spawnattr_setsigdefault -#define posix_spawnattr_getsigdefault _posix_spawnattr_getsigdefault -#define posix_spawnattr_setsigmask _posix_spawnattr_setsigmask -#define posix_spawnattr_getsigmask _posix_spawnattr_getsigmask +#define thr_setstate _thr_setstate +#define thr_sighndlrinfo _thr_sighndlrinfo +#define thr_sigsetmask _thr_sigsetmask +#define thr_stksegment _thr_stksegment +#define thr_suspend_allmutators _thr_suspend_allmutators +#define thr_suspend_mutator _thr_suspend_mutator +#define thr_suspend _thr_suspend +#define thr_wait_mutator _thr_wait_mutator +#define thr_yield _thr_yield +#define times _times +#define time _time +#define tmpnam_r _tmpnam_r +#define tmpnam _tmpnam +#define towlower _towlower +#define towupper _towupper +#define truncate _truncate +#define tsearch _tsearch +#define ttyname_r _ttyname_r +#define ttyname _ttyname +#define ttyslot _ttyslot +#define twalk _twalk +#define tzset _tzset +#define uadmin _uadmin +#define ucred_free _ucred_free +#define ucred_getamask _ucred_getamask +#define ucred_getasid _ucred_getasid +#define ucred_getatid _ucred_getatid +#define ucred_getauid _ucred_getauid +#define ucred_getegid _ucred_getegid +#define ucred_geteuid _ucred_geteuid +#define ucred_getgroups _ucred_getgroups +#define ucred_getpflags _ucred_getpflags +#define ucred_getpid _ucred_getpid +#define ucred_getprivset _ucred_getprivset +#define ucred_getprojid _ucred_getprojid +#define ucred_getrgid _ucred_getrgid +#define ucred_getruid _ucred_getruid +#define ucred_getsgid _ucred_getsgid +#define ucred_getsuid _ucred_getsuid +#define ucred_get _ucred_get +#define ucred_getzoneid _ucred_getzoneid +#define ucred_size _ucred_size +#define ulckpwdf _ulckpwdf +#define ulimit _ulimit +#define ulltostr _ulltostr +#define umask _umask +#define umount2 _umount2 +#define umount _umount +#define uname _uname +#define unlinkat _unlinkat +#define unlink _unlink +#define unlockpt _unlockpt +#define unordered _unordered +#define unsetenv _unsetenv +#define updutfile _updutfile +#define updutmp _updutmp +#define updutmpx _updutmpx +#define updutxfile _updutxfile +#define updwtmp _updwtmp +#define updwtmpx _updwtmpx +#define usleep _usleep +#define ustat _ustat +#define utimes _utimes +#define utime _utime +#define utmpname _utmpname +#define utmpxname _utmpxname +#define utssys _utssys +#define valloc _valloc +#define vfork _vfork +#define vfscanf _vfscanf +#define vhangup _vhangup +#define vscanf _vscanf +#define vsscanf _vsscanf +#define vsyslog _vsyslog +#define wait3 _wait3 +#define waitid _waitid +#define waitpid _waitpid +#define wait _wait +#define walkcontext _walkcontext +#define wcscat _wcscat +#define wcschr _wcschr +#define wcscmp _wcscmp +#define wcscoll _wcscoll +#define wcscpy _wcscpy +#define wcscspn _wcscspn +#define wcsftime _wcsftime +#define wcslen _wcslen +#define wcsncat _wcsncat +#define wcsncmp _wcsncmp +#define wcsncpy _wcsncpy +#define wcspbrk _wcspbrk +#define wcsrchr _wcsrchr +#define wcstod _wcstod +#define wcstol _wcstol +#define wcstombs _wcstombs +#define wcstoul _wcstoul +#define wcswcs _wcswcs +#define wcswidth _wcswidth +#define wcsxfrm _wcsxfrm +#define wctomb _wctomb +#define wctype __wctype +#define wcwidth _wcwidth +#define wracct _wracct +#define writev _writev +#define write _write +#define wscasecmp _wscasecmp +#define wscat _wscat +#define wschr _wschr +#define wscmp _wscmp +#define wscoll _wscoll +#define wscpy _wscpy +#define wscspn _wscspn +#define wslen _wslen +#define wsncasecmp _wsncasecmp +#define wsncat _wsncat +#define wsncmp _wsncmp +#define wsncpy _wsncpy +#define wspbrk _wspbrk +#define wsrchr _wsrchr +#define wstod _wstod +#define wstok _wstok +#define wstoll _wstoll +#define wstol _wstol +#define wsxfrm _wsxfrm +#define yield _yield /* unwind stuff (amd64 only) */ #if defined(__amd64) @@ -922,7 +1145,7 @@ extern "C" { #define _Unwind_Resume _SUNW_Unwind_Resume #define _Unwind_SetGR _SUNW_Unwind_SetGR #define _Unwind_SetIP _SUNW_Unwind_SetIP -#endif /* __amd64 */ +#endif /* __amd64 */ #endif /* !defined(__lint) */ diff --git a/usr/src/lib/libc/port/gen/atexit.c b/usr/src/lib/libc/port/gen/atexit.c index 8d1ebcef79..2104eefea3 100644 --- a/usr/src/lib/libc/port/gen/atexit.c +++ b/usr/src/lib/libc/port/gen/atexit.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -29,8 +30,9 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ +#pragma weak atexit = _atexit -#include "lint.h" +#include "synonyms.h" #include "thr_uberdata.h" #include "libc_int.h" #include "atexit.h" @@ -94,7 +96,6 @@ atexit_unlocks() * atexit() is called before the primordial thread is fully set up. * Be careful about dereferencing self->ul_uberdata->atexit_root. */ -#pragma weak atexit = _atexit int _atexit(void (*func)(void)) { diff --git a/usr/src/lib/libc/port/gen/directio.c b/usr/src/lib/libc/port/gen/directio.c index a682734f17..3a76c7bb9d 100644 --- a/usr/src/lib/libc/port/gen/directio.c +++ b/usr/src/lib/libc/port/gen/directio.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include <sys/types.h> #include <unistd.h> #include <sys/filio.h> diff --git a/usr/src/lib/libc/port/gen/getauxv.c b/usr/src/lib/libc/port/gen/getauxv.c index 4e7af946c6..c32fefdfb6 100644 --- a/usr/src/lib/libc/port/gen/getauxv.c +++ b/usr/src/lib/libc/port/gen/getauxv.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include <libc.h> #include <fcntl.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/gettxt.c b/usr/src/lib/libc/port/gen/gettxt.c index 398585fbe0..c9b1d386e3 100644 --- a/usr/src/lib/libc/port/gen/gettxt.c +++ b/usr/src/lib/libc/port/gen/gettxt.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +31,6 @@ /* All Rights Reserved */ -#pragma weak Msgdb = _Msgdb #pragma weak gettxt = _gettxt #include "synonyms.h" diff --git a/usr/src/lib/libc/port/gen/imaxabs.c b/usr/src/lib/libc/port/gen/imaxabs.c index 569b4a190f..6beaca4796 100644 --- a/usr/src/lib/libc/port/gen/imaxabs.c +++ b/usr/src/lib/libc/port/gen/imaxabs.c @@ -19,16 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include <sys/feature_tests.h> -#include "lint.h" -#include <inttypes.h> +#include "synonyms.h" #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/nftw.c b/usr/src/lib/libc/port/gen/nftw.c index 3b849c08f4..78fdc109a4 100644 --- a/usr/src/lib/libc/port/gen/nftw.c +++ b/usr/src/lib/libc/port/gen/nftw.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -111,6 +112,7 @@ #define getcwd _getcwd #define opendir _opendir #define seekdir _seekdir +#define strerror _strerror #define telldir _telldir #include "lint.h" diff --git a/usr/src/lib/libc/port/gen/rctlops.c b/usr/src/lib/libc/port/gen/rctlops.c index 59eba92212..f8d67e2f4b 100644 --- a/usr/src/lib/libc/port/gen/rctlops.c +++ b/usr/src/lib/libc/port/gen/rctlops.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include <sys/rctl_impl.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libc/port/gen/strtoimax.c b/usr/src/lib/libc/port/gen/strtoimax.c index a8ad96b6a5..35b9d48155 100644 --- a/usr/src/lib/libc/port/gen/strtoimax.c +++ b/usr/src/lib/libc/port/gen/strtoimax.c @@ -19,15 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include <sys/feature_tests.h> -#include "lint.h" +#include "synonyms.h" #include <inttypes.h> #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/strtoumax.c b/usr/src/lib/libc/port/gen/strtoumax.c index 95a42c7c95..2fb3f144e4 100644 --- a/usr/src/lib/libc/port/gen/strtoumax.c +++ b/usr/src/lib/libc/port/gen/strtoumax.c @@ -19,15 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include <sys/feature_tests.h> -#include "lint.h" +#include "synonyms.h" #include <inttypes.h> #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/i18n/__fputws_xpg5.c b/usr/src/lib/libc/port/i18n/__fputws_xpg5.c index e2a5a4bca9..8bea02334b 100644 --- a/usr/src/lib/libc/port/i18n/__fputws_xpg5.c +++ b/usr/src/lib/libc/port/i18n/__fputws_xpg5.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -44,7 +45,7 @@ * the string in a series of smaller buffers. */ -#include "lint.h" +#include "synonyms.h" #include "file64.h" #include "mse_int.h" #include <stdio.h> diff --git a/usr/src/lib/libc/port/i18n/gettext_real.c b/usr/src/lib/libc/port/i18n/gettext_real.c index c820d87167..c40f103be0 100644 --- a/usr/src/lib/libc/port/i18n/gettext_real.c +++ b/usr/src/lib/libc/port/i18n/gettext_real.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -74,8 +75,8 @@ _real_gettext_u(const char *domain, size_t cblen, cur_locale_len, cur_domain_len; unsigned int hash_locale; - struct msg_pack *mp, omp = { 0 }; - struct cache_pack *cp, ocp = { 0 }; + struct msg_pack *mp, omp; + struct cache_pack *cp, ocp; #ifdef GETTEXT_DEBUG (void) printf("*************** _real_gettext_u(%s, %s, " @@ -87,8 +88,8 @@ _real_gettext_u(const char *domain, if (msgid1 == NULL) return (NULL); - cp = &ocp; /* cache pack */ - mp = &omp; /* msg pack */ + cp = memset(&ocp, 0, sizeof (ocp)); /* cache pack */ + mp = memset(&omp, 0, sizeof (omp)); /* msg pack */ /* * category may be LC_MESSAGES or LC_TIME diff --git a/usr/src/lib/libc/port/i18n/strtows.c b/usr/src/lib/libc/port/i18n/strtows.c index c423c31e5d..add9ed0ed7 100644 --- a/usr/src/lib/libc/port/i18n/strtows.c +++ b/usr/src/lib/libc/port/i18n/strtows.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include <limits.h> #include <widec.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/i18n/wcstoimax.c b/usr/src/lib/libc/port/i18n/wcstoimax.c index c787d012ba..b9ab153303 100644 --- a/usr/src/lib/libc/port/i18n/wcstoimax.c +++ b/usr/src/lib/libc/port/i18n/wcstoimax.c @@ -19,15 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include <sys/feature_tests.h> -#include "lint.h" +#include "synonyms.h" #include <stddef.h> #include <inttypes.h> #include <wchar.h> diff --git a/usr/src/lib/libc/port/i18n/wcstol.c b/usr/src/lib/libc/port/i18n/wcstol.c index 307bcdc608..d370951353 100644 --- a/usr/src/lib/libc/port/i18n/wcstol.c +++ b/usr/src/lib/libc/port/i18n/wcstol.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,7 +35,7 @@ #pragma weak wcstol = _wcstol #endif -#include "lint.h" +#include "synonyms.h" #include <limits.h> #include <errno.h> #include <wchar.h> diff --git a/usr/src/lib/libc/port/i18n/wcstoul.c b/usr/src/lib/libc/port/i18n/wcstoul.c index 96b475d6ce..b67db3fd9a 100644 --- a/usr/src/lib/libc/port/i18n/wcstoul.c +++ b/usr/src/lib/libc/port/i18n/wcstoul.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,7 +35,7 @@ #pragma weak wcstoul = _wcstoul #endif -#include "lint.h" +#include "synonyms.h" #include <limits.h> #include <errno.h> #include <wchar.h> diff --git a/usr/src/lib/libc/port/i18n/wmemcpy.c b/usr/src/lib/libc/port/i18n/wmemcpy.c index 3bd296ba4f..1473b8cb8e 100644 --- a/usr/src/lib/libc/port/i18n/wmemcpy.c +++ b/usr/src/lib/libc/port/i18n/wmemcpy.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include <sys/types.h> #include <wchar.h> #include <limits.h> diff --git a/usr/src/lib/libc/port/i18n/wmemmove.c b/usr/src/lib/libc/port/i18n/wmemmove.c index 62407b88ac..86d016ceeb 100644 --- a/usr/src/lib/libc/port/i18n/wmemmove.c +++ b/usr/src/lib/libc/port/i18n/wmemmove.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include <sys/types.h> #include <wchar.h> #include <limits.h> diff --git a/usr/src/lib/libc/port/i18n/wsprintf.c b/usr/src/lib/libc/port/i18n/wsprintf.c index 9796242181..dd82d9a475 100644 --- a/usr/src/lib/libc/port/i18n/wsprintf.c +++ b/usr/src/lib/libc/port/i18n/wsprintf.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +31,7 @@ /* All Rights Reserved */ -#include "lint.h" +#include "synonyms.h" #include <stdio.h> #include <stdarg.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/i18n/wstok.c b/usr/src/lib/libc/port/i18n/wstok.c index 1bb4b22df9..d0f109aa7c 100644 --- a/usr/src/lib/libc/port/i18n/wstok.c +++ b/usr/src/lib/libc/port/i18n/wstok.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -41,7 +42,7 @@ #pragma weak wstok = _wstok -#include "lint.h" +#include "synonyms.h" #include "mtlib.h" #include "mse_int.h" #include <stdlib.h> diff --git a/usr/src/lib/libc/port/i18n/wstol.c b/usr/src/lib/libc/port/i18n/wstol.c index a106247433..78af1651c4 100644 --- a/usr/src/lib/libc/port/i18n/wstol.c +++ b/usr/src/lib/libc/port/i18n/wstol.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,7 +33,7 @@ #pragma weak wstol = _wstol -#include "lint.h" +#include "synonyms.h" #include <widec.h> #include <wchar.h> diff --git a/usr/src/lib/libc/port/regex/glob.c b/usr/src/lib/libc/port/regex/glob.c index d411840dea..936c1e78d8 100644 --- a/usr/src/lib/libc/port/regex/glob.c +++ b/usr/src/lib/libc/port/regex/glob.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,7 +46,7 @@ * Written by Eric Gisin. */ -#include "lint.h" +#include "synonyms.h" #include <stdio.h> #include <unistd.h> #include <limits.h> @@ -61,6 +62,7 @@ #define INITIAL 8 /* initial pathv allocation */ #define NULLCPP ((char **)0) /* Null char ** */ +#define NAME_MAX 1024 /* something large */ static int globit(size_t, const char *, glob_t *, int, int (*)(const char *, int), char **); @@ -164,12 +166,8 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, struct stat64 sb; DIR *dirp; struct dirent64 *d; - struct dirent64 *entry = NULL; - int namemax; int err; -#define FREE_ENTRY if (entry) free(entry) - for (;;) switch (*dp++ = *(unsigned char *)sp++) { case '\0': /* end of source path */ @@ -179,7 +177,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, if (!(flags & GLOB_NOCHECK) || flags & (GLOB__CHECK|GLOB_MARK)) if (stat64(*path, &sb) < 0) { - FREE_ENTRY; return (0); } if (flags & GLOB_MARK && S_ISDIR(sb.st_mode)) { @@ -187,7 +184,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, *--dp = '/'; } if (append(gp, *path) < 0) { - FREE_ENTRY; return (GLOB_NOSPACE); } return (0); @@ -211,25 +207,12 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, Expand: /* determine directory and open it */ (*path)[end] = '\0'; -#ifdef NAME_MAX - namemax = NAME_MAX; -#else - namemax = 1024; /* something large */ -#endif - if ((entry = (struct dirent64 *)malloc( - sizeof (struct dirent64) + namemax + 1)) - == NULL) { - return (GLOB_NOSPACE); - } - dirp = opendir(**path == '\0' ? "." : *path); - if (dirp == (DIR *)0 || namemax == -1) { + if (dirp == NULL) { if (errfn != 0 && errfn(*path, errno) != 0 || flags&GLOB_ERR) { - FREE_ENTRY; return (GLOB_ABORTED); } - FREE_ENTRY; return (0); } @@ -237,7 +220,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, n = sp - pat; if ((cp = malloc(n)) == NULL) { (void) closedir(dirp); - FREE_ENTRY; return (GLOB_NOSPACE); } pat = memcpy(cp, pat, n); @@ -248,20 +230,17 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, /* expand path to max. expansion */ n = dp - *path; *path = realloc(*path, - strlen(*path)+namemax+strlen(sp)+1); + strlen(*path) + NAME_MAX + strlen(sp) + 1); if (*path == NULL) { (void) closedir(dirp); free(pat); - FREE_ENTRY; return (GLOB_NOSPACE); } dp = (*path) + n; /* read directory and match entries */ err = 0; - while (readdir64_r(dirp, entry, &d) == 0) { - if (d == NULL) - break; + while ((d = readdir64(dirp)) != NULL) { cp = d->d_name; if ((flags&GLOB_NOESCAPE) ? fnmatch(pat, cp, FNM_PERIOD|FNM_NOESCAPE) @@ -279,7 +258,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, (void) closedir(dirp); free(pat); - FREE_ENTRY; return (err); } /* NOTREACHED */ diff --git a/usr/src/lib/libc/port/regex/regex.c b/usr/src/lib/libc/port/regex/regex.c index b763a915b0..369e2b813f 100644 --- a/usr/src/lib/libc/port/regex/regex.c +++ b/usr/src/lib/libc/port/regex/regex.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,7 +43,7 @@ /* CONSTANTS SHARED WITH regcmp() */ #include "regex.h" -#include "lint.h" +#include "synonyms.h" #include "mtlib.h" #include <limits.h> #include <stdarg.h> diff --git a/usr/src/lib/libc/port/stdio/fdopen.c b/usr/src/lib/libc/port/stdio/fdopen.c index 38ed3af860..c0908f5f89 100644 --- a/usr/src/lib/libc/port/stdio/fdopen.c +++ b/usr/src/lib/libc/port/stdio/fdopen.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -40,14 +41,7 @@ #pragma weak fdopen = _fdopen -#include <sys/feature_tests.h> - -#define fdopen _fdopen -#if !defined(_LP64) -#define lseek64 _lseek64 -#endif - -#include "lint.h" +#include "synonyms.h" #include <mtlib.h> #include "file64.h" #include <sys/types.h> diff --git a/usr/src/lib/libc/port/stdio/fopen.c b/usr/src/lib/libc/port/stdio/fopen.c index 24ad5f0966..4881cef27d 100644 --- a/usr/src/lib/libc/port/stdio/fopen.c +++ b/usr/src/lib/libc/port/stdio/fopen.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,7 +40,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include "file64.h" #include <sys/types.h> #include <stdio.h> diff --git a/usr/src/lib/libc/port/stdio/fpos.c b/usr/src/lib/libc/port/stdio/fpos.c index 44e92cac70..d2395fc801 100644 --- a/usr/src/lib/libc/port/stdio/fpos.c +++ b/usr/src/lib/libc/port/stdio/fpos.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +31,7 @@ /* All Rights Reserved */ -#include "lint.h" +#include "synonyms.h" #include <sys/types.h> #include <unistd.h> #include <stdio.h> diff --git a/usr/src/lib/libc/port/stdio/system.c b/usr/src/lib/libc/port/stdio/system.c index 45e11aeeac..b641e6592e 100644 --- a/usr/src/lib/libc/port/stdio/system.c +++ b/usr/src/lib/libc/port/stdio/system.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,14 +33,6 @@ #include "synonyms.h" #include "mtlib.h" - -/* - * system() is a cancellation point. - * Undefine waitpid so we call the real waitpid() rather than _waitpid(). - * This ensures that we actually perform the cancellation logic. - */ -#undef waitpid - #include <sys/types.h> #include <sys/wait.h> #include <signal.h> @@ -52,6 +45,7 @@ #include <errno.h> #include <synch.h> #include <spawn.h> +#include "libc.h" extern const char **environ; @@ -221,9 +215,14 @@ system(const char *cmd) errno = error; status = -1; } else { + /* + * system() is a cancellation point. + * Call waitpid_cancel() rather than _waitpid() to make + * sure that we actually perform the cancellation logic. + */ pthread_cleanup_push(cleanup, &savemask); do { - w = waitpid(pid, &status, 0); + w = waitpid_cancel(pid, &status, 0); } while (w == -1 && errno == EINTR); pthread_cleanup_pop(0); if (w == -1) diff --git a/usr/src/lib/libc/port/sys/sigstack.c b/usr/src/lib/libc/port/sys/sigstack.c index 9b147051b0..cf4335f2a2 100644 --- a/usr/src/lib/libc/port/sys/sigstack.c +++ b/usr/src/lib/libc/port/sys/sigstack.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -29,16 +30,14 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak sigstack = _sigstack - -#include "lint.h" +#include "synonyms.h" #include <sys/types.h> #include <sys/ucontext.h> #include <signal.h> #include <errno.h> int -_sigstack(struct sigstack *nss, struct sigstack *oss) +sigstack(struct sigstack *nss, struct sigstack *oss) { struct sigaltstack nalt; struct sigaltstack oalt; diff --git a/usr/src/lib/libc/port/threads/scalls.c b/usr/src/lib/libc/port/threads/scalls.c index 660c29f9b3..0e0b3c78e4 100644 --- a/usr/src/lib/libc/port/threads/scalls.c +++ b/usr/src/lib/libc/port/threads/scalls.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -891,6 +891,11 @@ waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options) PERFORM(_waitid(idtype, id, infop, options)) } +/* + * waitpid_cancel() is a libc-private symbol for internal use + * where cancellation semantics is desired (see system()). + */ +#pragma weak waitpid_cancel = waitpid pid_t waitpid(pid_t pid, int *stat_loc, int options) { diff --git a/usr/src/lib/libc/port/threads/synch.c b/usr/src/lib/libc/port/threads/synch.c index 21ecb0a2b7..296096dc22 100644 --- a/usr/src/lib/libc/port/threads/synch.c +++ b/usr/src/lib/libc/port/threads/synch.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -3145,6 +3146,9 @@ record_spin_locks(ulwp_t *ulwp) /* * atexit function: dump the queue statistics to stderr. */ +#if !defined(__lint) +#define fprintf _fprintf +#endif #include <stdio.h> void dump_queue_statistics(void) diff --git a/usr/src/lib/libc/port/unwind/unwind.c b/usr/src/lib/libc/port/unwind/unwind.c index e7151c0c40..9e31d656c1 100644 --- a/usr/src/lib/libc/port/unwind/unwind.c +++ b/usr/src/lib/libc/port/unwind/unwind.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "lint.h" +#include "synonyms.h" #include "thr_uberdata.h" #include <dlfcn.h> diff --git a/usr/src/lib/libc/req.flg b/usr/src/lib/libc/req.flg index 9fad6cfb0e..c35743d94a 100644 --- a/usr/src/lib/libc/req.flg +++ b/usr/src/lib/libc/req.flg @@ -21,10 +21,11 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" find_files "s.*" usr/src/common/atomic find_files "s.*" usr/src/common/util +find_files "s.*" usr/src/lib/common diff --git a/usr/src/lib/libc/sparc/gen/abs.s b/usr/src/lib/libc/sparc/gen/abs.s index 6a555d8dca..920daaab83 100644 --- a/usr/src/lib/libc/sparc/gen/abs.s +++ b/usr/src/lib/libc/sparc/gen/abs.s @@ -19,8 +19,10 @@ * * CDDL HEADER END */ + /* - * Copyright (c) 1987 Sun Microsystems, Inc. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ .ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */ @@ -31,15 +33,24 @@ /* * int abs(register int arg); - * long labs(register long int arg); */ - ENTRY2(abs,labs) + ENTRY(abs) tst %o0 bl,a 1f neg %o0 1: retl nop - SET_SIZE(abs) + +/* + * long labs(register long int arg); + */ + ENTRY(labs) + tst %o0 + bl,a 1f + neg %o0 +1: + retl + nop SET_SIZE(labs) diff --git a/usr/src/lib/libc/sparc/gen/siglongjmp.c b/usr/src/lib/libc/sparc/gen/siglongjmp.c index 3b90f52164..5efc2e28a2 100644 --- a/usr/src/lib/libc/sparc/gen/siglongjmp.c +++ b/usr/src/lib/libc/sparc/gen/siglongjmp.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,7 +33,7 @@ #pragma weak siglongjmp = _siglongjmp -#include "lint.h" +#include "synonyms.h" #include <sys/types.h> #include <sys/stack.h> #include <sys/frame.h> @@ -43,7 +44,7 @@ #include "libc.h" void -_siglongjmp(sigjmp_buf env, int val) +siglongjmp(sigjmp_buf env, int val) { extern void _fetch_globals(greg_t *); ucontext_t uc; diff --git a/usr/src/lib/libc/sparcv9/Makefile b/usr/src/lib/libc/sparcv9/Makefile index 13129556e5..6e051be401 100644 --- a/usr/src/lib/libc/sparcv9/Makefile +++ b/usr/src/lib/libc/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -128,7 +128,6 @@ GENOBJS= \ ecvt.o \ getctxt.o \ lexp10.o \ - llabs.o \ llog10.o \ lock.o \ makectxt.o \ diff --git a/usr/src/lib/libc/sparcv9/gen/abs.s b/usr/src/lib/libc/sparcv9/gen/abs.s index 1da656130f..9e483e2ca2 100644 --- a/usr/src/lib/libc/sparcv9/gen/abs.s +++ b/usr/src/lib/libc/sparcv9/gen/abs.s @@ -19,8 +19,10 @@ * * CDDL HEADER END */ + /* - * Copyright (c) 1997 Sun Microsystems, Inc. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ .ident "%Z%%M% %I% %E% SMI" @@ -29,15 +31,40 @@ #include <sys/asm_linkage.h> + ANSI_PRAGMA_WEAK(llabs,function) + +#include "synonyms.h" + /* - * int abs(register int arg); + * int abs(int arg); */ ENTRY(abs) cmp %o0, 0 - bneg,a %icc, .done + bneg,a %icc, 1f neg %o0 -.done: +1: retl nop - SET_SIZE(abs) + +/* + * long labs(long arg); + */ + ENTRY(labs) + brlz,a %o0, 1f + neg %o0 +1: + retl + nop + SET_SIZE(labs) + +/* + * long long llabs(long long arg); + */ + ENTRY(llabs) + brlz,a %o0, 1f + neg %o0 +1: + retl + nop + SET_SIZE(llabs) diff --git a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c index 3b90f52164..5efc2e28a2 100644 --- a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c +++ b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,7 +33,7 @@ #pragma weak siglongjmp = _siglongjmp -#include "lint.h" +#include "synonyms.h" #include <sys/types.h> #include <sys/stack.h> #include <sys/frame.h> @@ -43,7 +44,7 @@ #include "libc.h" void -_siglongjmp(sigjmp_buf env, int val) +siglongjmp(sigjmp_buf env, int val) { extern void _fetch_globals(greg_t *); ucontext_t uc; diff --git a/usr/src/lib/libcmd/Makefile.com b/usr/src/lib/libcmd/Makefile.com index 5f630cc3b2..b15605fc07 100644 --- a/usr/src/lib/libcmd/Makefile.com +++ b/usr/src/lib/libcmd/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -49,7 +49,7 @@ CPPFLAGS += -I../../common/inc -D_REENTRANT .KEEP_STATE: -all: +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libcmd/common/deflt.c b/usr/src/lib/libcmd/common/deflt.c index ca70312f6b..42f09bc532 100644 --- a/usr/src/lib/libcmd/common/deflt.c +++ b/usr/src/lib/libcmd/common/deflt.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,6 +35,7 @@ /* LINTLIBRARY */ +#include "c_synonyms.h" #include <stdio.h> #include <stdlib.h> #include <deflt.h> @@ -41,7 +43,6 @@ #include <string.h> #include <ctype.h> #include <limits.h> -#include "mtlib.h" #include <thread.h> #include <synch.h> #include <libintl.h> diff --git a/usr/src/lib/libcmdutils/Makefile.com b/usr/src/lib/libcmdutils/Makefile.com index 717952d7c3..9ddab62f5f 100644 --- a/usr/src/lib/libcmdutils/Makefile.com +++ b/usr/src/lib/libcmdutils/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -54,7 +54,7 @@ CPPFLAGS += -I.. -D_REENTRANT -D_FILE_OFFSET_BITS=64 .KEEP_STATE: -all: +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com index 3818bd2cc9..b9092b8121 100644 --- a/usr/src/lib/libcrypt/Makefile.com +++ b/usr/src/lib/libcrypt/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -54,7 +54,7 @@ LDLIBS += -lgen -lc .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libcrypt/common/cryptio.c b/usr/src/lib/libcrypt/common/cryptio.c index cc1758d967..09116fc321 100644 --- a/usr/src/lib/libcrypt/common/cryptio.c +++ b/usr/src/lib/libcrypt/common/cryptio.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,8 +37,7 @@ #pragma weak crypt_close = _crypt_close #pragma weak makekey = _makekey -#include "synonyms.h" -#include "mtlib.h" +#include "des_synonyms.h" #include <stdio.h> #include <signal.h> #include <fcntl.h> diff --git a/usr/src/lib/libcrypt/common/des.c b/usr/src/lib/libcrypt/common/des.c index 61fcd3c407..42eaf80a52 100644 --- a/usr/src/lib/libcrypt/common/des.c +++ b/usr/src/lib/libcrypt/common/des.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +40,8 @@ * DES encryption library routines */ +#include "des_synonyms.h" #include <sys/types.h> - #include <rpc/des_crypt.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/usr/src/lib/libcrypt/common/des_crypt.c b/usr/src/lib/libcrypt/common/des_crypt.c index b7fd085065..69a7f83152 100644 --- a/usr/src/lib/libcrypt/common/des_crypt.c +++ b/usr/src/lib/libcrypt/common/des_crypt.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -35,8 +35,7 @@ #pragma weak des_encrypt = _des_encrypt #pragma weak des_setkey = _des_setkey -#include "synonyms.h" -#include "mtlib.h" +#include "des_synonyms.h" #include <sys/types.h> #include <crypt.h> #include "des_soft.h" @@ -336,13 +335,13 @@ _get_iobuf(thread_key_t *key, unsigned size) char *iobuf = NULL; if (thr_getspecific(*key, (void **)&iobuf) != 0) { - if (_thr_keycreate(key, free) != 0) { + if (thr_keycreate(key, free) != 0) { return (NULL); } } if (!iobuf) { - if (_thr_setspecific(*key, (void *)(iobuf = malloc(size))) + if (thr_setspecific(*key, (void *)(iobuf = malloc(size))) != 0) { if (iobuf) (void) free(iobuf); diff --git a/usr/src/lib/libcrypt/common/des_encrypt.c b/usr/src/lib/libcrypt/common/des_encrypt.c index ff5b88cb3b..13a9310ee3 100644 --- a/usr/src/lib/libcrypt/common/des_encrypt.c +++ b/usr/src/lib/libcrypt/common/des_encrypt.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,11 +33,12 @@ #pragma weak des_encrypt1 = _des_encrypt1 -#include "synonyms.h" +#include "des_synonyms.h" #include <sys/types.h> void -des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E, char KS[][48], char S[][64], char *f, char *tempL, char *P, char *FP) +des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E, + char KS[][48], char S[][64], char *f, char *tempL, char *P, char *FP) { /* EXPORT DELETE START */ int i; diff --git a/usr/src/lib/libcrypt/common/des_soft.c b/usr/src/lib/libcrypt/common/des_soft.c index b560c2dd65..11a97d5420 100644 --- a/usr/src/lib/libcrypt/common/des_soft.c +++ b/usr/src/lib/libcrypt/common/des_soft.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -49,7 +50,7 @@ #define CRYPT /* cannot configure out of user-level code */ #endif -#include "synonyms.h" +#include "des_synonyms.h" #ifdef CRYPT #include <sys/types.h> #include <des/softdes.h> diff --git a/usr/src/lib/libcrypt/inc/des_synonyms.h b/usr/src/lib/libcrypt/inc/des_synonyms.h new file mode 100644 index 0000000000..9761ed275f --- /dev/null +++ b/usr/src/lib/libcrypt/inc/des_synonyms.h @@ -0,0 +1,60 @@ +/* + * 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. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef _DES_SYNONYMS_H +#define _DES_SYNONYMS_H + +#pragma ident "%Z%%M% %I% %E% SMI" + +#include "c_synonyms.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(__lint) + +#define crypt_close _crypt_close +#define des_crypt _des_crypt +#define des_decrypt1 _des_decrypt1 +#define des_encrypt _des_encrypt +#define des_encrypt1 _des_encrypt1 +#define des_setkey _des_setkey +#define makekey _makekey +#define run_crypt _run_crypt +#define run_setkey _run_setkey + +#endif /* !defined(__lint) */ + +#ifdef __cplusplus +} +#endif + +#endif /* _DES_SYNONYMS_H */ diff --git a/usr/src/lib/libcrypt/inc/synonyms.h b/usr/src/lib/libcrypt/inc/synonyms.h deleted file mode 100644 index 609c19e9f1..0000000000 --- a/usr/src/lib/libcrypt/inc/synonyms.h +++ /dev/null @@ -1,449 +0,0 @@ -/* - * 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. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - - -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ifndef _LIBCRYPT_SYNONYMS_H -#define _LIBCRYPT_SYNONYMS_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(__STDC__) - -/* external data */ -#define altzone _altzone -#define daylight _daylight -#define lone _lone -#define lten _lten -#define lzero _lzero -#define timezone _timezone -#define tzname _tzname - -/* functions */ -#define Msgdb _Msgdb -#define a64l _a64l -#define access _access -#define acct _acct -#define addseverity _addseverity -#define adjtime _adjtime -#define alarm _alarm -#define ascftime _ascftime -#define brk _brk -#define brkbase _brkbase -#define cat_init _cat_init -#define cat_malloc_init _cat_malloc_init -#define cat_name _cat_name -#define catclose _catclose -#define catgets _catgets -#define catopen _catopen -#define cfgetispeed _cfgetispeed -#define cfgetospeed _cfgetospeed -#define cfree _cfree -#define cfsetispeed _cfsetispeed -#define cfsetospeed _cfsetospeed -#define cftime _cftime -#define chdir _chdir -#define chmod _chmod -#define chown _chown -#define chroot _chroot -#define close _close -#define closedir _closedir -#define closelog _closelog -#define countbase _countbase -#define creat _creat -#define crypt _crypt -#define crypt_close _crypt_close -#define ctermid _ctermid -#define cuserid _cuserid -#define des_crypt _des_crypt -#define des_decrypt1 _des_decrypt1 -#define des_encrypt _des_encrypt -#define des_encrypt1 _des_encrypt1 -#define des_setkey _des_setkey -#define dial _dial -#define drand48 _drand48 -#define dup _dup -#define dup2 _dup2 -#define ecvt _ecvt -#define edata _edata -#define encrypt _encrypt -#define end _end -#define endgrent _endgrent -#define endpwent _endpwent -#define endspent _endspent -#define endutent _endutent -#define endutxent _endutxent -#define environ _environ -#define erand48 _erand48 -#define etext _etext -#define ev_traptousr _ev_traptousr -#define ev_usrtrapret _ev_usrtrapret -#define evsys _evsys -#define execl _execl -#define execle _execle -#define execlp _execlp -#define execv _execv -#define execve _execve -#define execvp _execvp -#define exportfs _exportfs -#define fattach _fattach -#define fchdir _fchdir -#define fchmod _fchmod -#define fchown _fchown -#define fcntl _fcntl -#define fcvt _fcvt -#define fdetach _fdetach -#define fdopen _fdopen -#define ffs _ffs -#define fgetgrent _fgetgrent -#define fgetpwent _fgetpwent -#define fgetspent _fgetspent -#define finite _finite -#define fmount _fmount -#define fmtmsg _fmtmsg -#define fork _fork -#define fpathconf _fpathconf -#define fpclass _fpclass -#define fpgetmask _fpgetmask -#define fpgetround _fpgetround -#define fpgetsticky _fpgetsticky -#define fpsetmask _fpsetmask -#define fpsetround _fpsetround -#define fpsetsticky _fpsetsticky -#define fptrap _fptrap -#define fstat _fstat -#define fstatvfs _fstatvfs -#define fsync _fsync -#define ftok _ftok -#define ftruncate _ftruncate -#define ftw _ftw -#define funmount _funmount -#define fxstat _fxstat -#define gcvt _gcvt -#define getcontext _getcontext -#define getcwd _getcwd -#define getdents _getdents -#define getegid _getegid -#define geteuid _geteuid -#define getgid _getgid -#define getgrent _getgrent -#define getgrgid _getgrgid -#define getgrnam _getgrnam -#define getgroups _getgroups -#define gethz _gethz -#define getitimer _getitimer -#define getlogin _getlogin -#define getmntany _getmntany -#define getmntent _getmntent -#define getmsg _getmsg -#define getopt _getopt -#define getpagesize _getpagesize -#define getpass _getpass -#define getpgid _getpgid -#define getpgrp _getpgrp -#define getpid _getpid -#define getpmsg _getpmsg -#define getppid _getppid -#define getpw _getpw -#define getpwent _getpwent -#define getpwnam _getpwnam -#define getpwuid _getpwuid -#define getrlimit _getrlimit -#define getsid _getsid -#define getspent _getspent -#define getspnam _getspnam -#define getsubopt _getsubopt -#define gettimeofday _gettimeofday -#define gettxt _gettxt -#define getuid _getuid -#define getutent _getutent -#define getutid _getutid -#define getutline _getutline -#define getutxent _getutxent -#define getutxid _getutxid -#define getutxline _getutxline -#define getvfsany _getvfsany -#define getvfsent _getvfsent -#define getvfsfile _getvfsfile -#define getvfsspec _getvfsspec -#define getw _getw -#define gsignal _gsignal -#define gtty _gtty -#define hcreate _hcreate -#define hdestroy _hdestroy -#define hrtalarm _hrtalarm -#define hrtascftime _hrtascftime -#define hrtasctime _hrtasctime -#define hrtcancel _hrtcancel -#define hrtcftime _hrtcftime -#define hrtcntl _hrtcntl -#define hrtctime _hrtctime -#define hrtnewres _hrtnewres -#define hrtsleep _hrtsleep -#define hrtstrftime _hrtstrftime -#define hsearch _hsearch -#define id2str _id2str -#define initgroups _initgroups -#define insque _insque -#define ioctl _ioctl -#define isastream _isastream -#define isatty _isatty -#define jrand48 _jrand48 -#define kill _kill -#define l3tol _l3tol -#define l64a _l64a -#define ladd _ladd -#define lchown _lchown -#define lckpwdf _lckpwdf -#define lcong48 _lcong48 -#define ldivide _ldivide -#define lexp10 _lexp10 -#define lfind _lfind -#define link _link -#define llog10 _llog10 -#define lmul _lmul -#define lockf _lockf -#define lrand48 _lrand48 -#define lsearch _lsearch -#define lseek _lseek -#define lshiftl _lshiftl -#define lsign _lsign -#define lstat _lstat -#define lsub _lsub -#define ltol3 _ltol3 -#define lxstat _lxstat -#define makecontext _makecontext -#define makekey _makekey -#define mctl _mctl -#define memalign _memalign -#define memccpy _memccpy -#define memcntl _memcntl -#define mincore _mincore -#define mkdir _mkdir -#define mkfifo _mkfifo -#define mknod _mknod -#define mktemp _mktemp -#define mlock _mlock -#define mlockall _mlockall -#define mmap _mmap -#define monitor _monitor -#define mount _mount -#define mprotect _mprotect -#define mrand48 _mrand48 -#define msgctl _msgctl -#define msgget _msgget -#define msgrcv _msgrcv -#define msgsnd _msgsnd -#define msync _msync -#define munlock _munlock -#define munlockall _munlockall -#define munmap _munmap -#define nfs_getfh _nfs_getfh -#define nfssvc _nfssvc -#define nftw _nftw -#define nice _nice -#define nrand48 _nrand48 -#define nuname _nuname -#define open _open -#define opendir _opendir -#define openlog _openlog -#define pathconf _pathconf -#define pause _pause -#define pclose _pclose -#define pipe _pipe -#define plock _plock -#define poll _poll -#define popen _popen -#define profil _profil -#define psiginfo _psiginfo -#define psignal _psignal -#define ptrace _ptrace -#define putenv _putenv -#define putmsg _putmsg -#define putpmsg _putpmsg -#define putpwent _putpwent -#define putspent _putspent -#define pututline _pututline -#define pututxline _pututxline -#define putw _putw -#define read _read -#define readdir _readdir -#define readlink _readlink -#define readv _readv -#define realpath _realpath -#define remque _remque -#define rmdir _rmdir -#define run_crypt _run_crypt -#define run_setkey _run_setkey -#define sbrk _sbrk -#define seed48 _seed48 -#define seekdir _seekdir -#define select _select -#define semctl _semctl -#define semget _semget -#define semop _semop -#define setcontext _setcontext -#define setegid _setegid -#define seteuid _seteuid -#define setgid _setgid -#define setgrent _setgrent -#define setgroups _setgroups -#define setitimer _setitimer -#define setkey _setkey -#define setlogmask _setlogmask -#define setpgid _setpgid -#define setpgrp _setpgrp -#define setpwent _setpwent -#define setrlimit _setrlimit -#define setsid _setsid -#define setspent _setspent -#define settimeofday _settimeofday -#define setuid _setuid -#define setutent _setutent -#define setutxent _setutxent -#define shmat _shmat -#define shmctl _shmctl -#define shmdt _shmdt -#define shmget _shmget -#define sig2str _sig2str -#define sigaction _sigaction -#define sigaddset _sigaddset -#define sigaltstack _sigaltstack -#define sigdelset _sigdelset -#define sigemptyset _sigemptyset -#define sigfillset _sigfillset -#define sigflag _sigflag -#define sighold _sighold -#define sigignore _sigignore -#define sigismember _sigismember -#define siglongjmp _siglongjmp -#define sigpause _sigpause -#define sigpending _sigpending -#define sigprocmask _sigprocmask -#define sigrelse _sigrelse -#define sigsend _sigsend -#define sigsendset _sigsendset -#define sigset _sigset -#define sigsetjmp _sigsetjmp -#define sigsuspend _sigsuspend -#define sleep _sleep -#define srand48 _srand48 -#define ssignal _ssignal -#define stat _stat -#define statfs _statfs -#define statvfs _statvfs -#define stime _stime -#define str2id _str2id -#define str2sig _str2sig -#define strdup _strdup -#define stty _stty -#define swab _swab -#define swapcontext _swapcontext -#define swapctl _swapctl -#define symlink _symlink -#define sync _sync -#define sys3b _sys3b -#define syscall _syscall -#define sysconf _sysconf -#define sysfs _sysfs -#define sysinfo _sysinfo -#define syslog _syslog -#define tcdrain _tcdrain -#define tcflow _tcflow -#define tcflush _tcflush -#define tcgetattr _tcgetattr -#define tcgetpgrp _tcgetpgrp -#define tcgetsid _tcgetsid -#define tcsendbreak _tcsendbreak -#define tcsetattr _tcsetattr -#define tcsetpgrp _tcsetpgrp -#define tdelete _tdelete -#define tell _tell -#define telldir _telldir -#define tempnam _tempnam -#define tfind _tfind -#define times _times -#define truncate _truncate -#define tsearch _tsearch -#define ttyname _ttyname -#define ttyslot _ttyslot -#define twalk _twalk -#define tzname _tzname -#define tzset _tzset -#define uadmin _uadmin -#define ulckpwdf _ulckpwdf -#define ulimit _ulimit -#define umask _umask -#define umount _umount -#define uname _uname -#define undial _undial -#define unlink _unlink -#define unordered _unordered -#define updutmp _updutmp -#define updwtmpx _updwtmpx -#define utime _utime -#define utmpname _utmpname -#define utmpxname _utmpxname -#define utssys _utssys -#define valloc _valloc -#define vfork _vfork -#define vsyslog _vsyslog -#define wait _wait -#define waitid _waitid -#define waitpid _waitpid -#define write _write -#define writev _writev -#define xmknod _xmknod -#define xstat _xstat -#define _assert __assert -#define _ctype __ctype -#define _filbuf __filbuf -#define _flsbuf __flsbuf -#define _iob __iob - - -#else /* not __STDC__ */ - -#define const - -#ifndef _SIZE_T -#define _SIZE_T -typedef unsigned int size_t; -#endif - -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* _LIBCRYPT_SYNONYMS_H */ diff --git a/usr/src/lib/libcurses/screen/curshdr.h b/usr/src/lib/libcurses/screen/curshdr.h index 712014acc0..46a23414f4 100644 --- a/usr/src/lib/libcurses/screen/curshdr.h +++ b/usr/src/lib/libcurses/screen/curshdr.h @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 1997 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -281,7 +282,7 @@ extern int _overlap(WINDOW *, WINDOW *, int); extern int _scr_all(char *, int); extern int _slk_update(void); extern int _tcsearch(char *, short [], char *[], int, int); -extern int _vsscanf(char *, char *, __va_list); +extern int _vsscanf(const char *, const char *, __va_list); extern int force_doupdate(void); extern int init_acs(void); extern int mbscrw(int); diff --git a/usr/src/lib/libcurses/screen/mbstowcs.c b/usr/src/lib/libcurses/screen/mbstowcs.c index c8cb391e6d..688e83a02e 100644 --- a/usr/src/lib/libcurses/screen/mbstowcs.c +++ b/usr/src/lib/libcurses/screen/mbstowcs.c @@ -19,22 +19,22 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ +#include "c_synonyms.h" #include <widec.h> #include <sys/types.h> -#include "synonyms.h" #include <stdlib.h> #include "curses_inc.h" diff --git a/usr/src/lib/libcurses/screen/mbtowc.c b/usr/src/lib/libcurses/screen/mbtowc.c index 836faf34c1..fd19039f83 100644 --- a/usr/src/lib/libcurses/screen/mbtowc.c +++ b/usr/src/lib/libcurses/screen/mbtowc.c @@ -19,21 +19,21 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ +#include "c_synonyms.h" #include <widec.h> -#include "synonyms.h" #include <ctype.h> #include <sys/types.h> #include "curses_wchar.h" @@ -88,5 +88,5 @@ lab2: if (wchar) *wchar = intcode | mask; /*LINTED*/ - return ((int) (s - olds)); + return ((int)(s - olds)); } diff --git a/usr/src/lib/libeti/menu/Makefile.com b/usr/src/lib/libeti/menu/Makefile.com index 8d2bebd46f..202b4b171c 100644 --- a/usr/src/lib/libeti/menu/Makefile.com +++ b/usr/src/lib/libeti/menu/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -83,7 +83,7 @@ LDLIBS += -lcurses -lc .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libeti/panel/Makefile.com b/usr/src/lib/libeti/panel/Makefile.com index 27c26b6924..ffdf998885 100644 --- a/usr/src/lib/libeti/panel/Makefile.com +++ b/usr/src/lib/libeti/panel/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -59,7 +59,7 @@ LDLIBS += -lcurses -lc .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libfruutils/Makefile.com b/usr/src/lib/libfruutils/Makefile.com index e11a851463..bc119e2373 100644 --- a/usr/src/lib/libfruutils/Makefile.com +++ b/usr/src/lib/libfruutils/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -56,7 +56,7 @@ $(LINTLIB) := LINTFLAGS64 = -nvx -Xarch=$(MACH64:sparcv9=v9) .KEEP_STATE: -all : $(LIBS) +all : $(LIBS) fnamecheck $(CHMOD) 755 $(DYNLIB) lint : diff --git a/usr/src/lib/libgen/Makefile.com b/usr/src/lib/libgen/Makefile.com index 93b0a0d506..8cb653da1a 100644 --- a/usr/src/lib/libgen/Makefile.com +++ b/usr/src/lib/libgen/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -50,7 +50,7 @@ CPPFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -I../inc -I../../common/inc .KEEP_STATE: -all: +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libgen/common/bgets.c b/usr/src/lib/libgen/common/bgets.c index baf259a58d..befc87c0db 100644 --- a/usr/src/lib/libgen/common/bgets.c +++ b/usr/src/lib/libgen/common/bgets.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +39,7 @@ #pragma weak bgets = _bgets -#include "synonyms.h" -#include "mtlib.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <stdio.h> diff --git a/usr/src/lib/libgen/common/bufsplit.c b/usr/src/lib/libgen/common/bufsplit.c index 3d68b9e650..ac5a043eac 100644 --- a/usr/src/lib/libgen/common/bufsplit.c +++ b/usr/src/lib/libgen/common/bufsplit.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,8 +43,7 @@ #pragma weak bufsplit = _bufsplit -#include "synonyms.h" -#include "mtlib.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libgen/common/copylist.c b/usr/src/lib/libgen/common/copylist.c index 45a291d3af..3f620f759f 100644 --- a/usr/src/lib/libgen/common/copylist.c +++ b/usr/src/lib/libgen/common/copylist.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1996, 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1.3.2 */ @@ -43,7 +43,7 @@ #endif #pragma weak copylist = _copylist -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <stdlib.h> diff --git a/usr/src/lib/libgen/common/eaccess.c b/usr/src/lib/libgen/common/eaccess.c index 70a26f6f14..d7afcc124e 100644 --- a/usr/src/lib/libgen/common/eaccess.c +++ b/usr/src/lib/libgen/common/eaccess.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -39,7 +39,7 @@ #pragma weak eaccess = _eaccess -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <unistd.h> diff --git a/usr/src/lib/libgen/common/gmatch.c b/usr/src/lib/libgen/common/gmatch.c index bec6b89e00..dc47f7ec3f 100644 --- a/usr/src/lib/libgen/common/gmatch.c +++ b/usr/src/lib/libgen/common/gmatch.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1.5.2 */ @@ -34,7 +34,7 @@ #pragma weak gmatch = _gmatch -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <stdlib.h> diff --git a/usr/src/lib/libgen/common/isencrypt.c b/usr/src/lib/libgen/common/isencrypt.c index 8627f69514..e056e37a96 100644 --- a/usr/src/lib/libgen/common/isencrypt.c +++ b/usr/src/lib/libgen/common/isencrypt.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -34,7 +34,7 @@ #pragma weak isencrypt = _isencrypt -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <locale.h> #include <string.h> diff --git a/usr/src/lib/libgen/common/mkdirp.c b/usr/src/lib/libgen/common/mkdirp.c index 81de12d2f4..2960131130 100644 --- a/usr/src/lib/libgen/common/mkdirp.c +++ b/usr/src/lib/libgen/common/mkdirp.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -41,7 +41,7 @@ * Does NOT simplify pathnames with . or .. in them. */ -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <stdlib.h> diff --git a/usr/src/lib/libgen/common/p2open.c b/usr/src/lib/libgen/common/p2open.c index 0760a154ea..2ea018385c 100644 --- a/usr/src/lib/libgen/common/p2open.c +++ b/usr/src/lib/libgen/common/p2open.c @@ -19,15 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ @@ -39,7 +39,7 @@ * Similar to popen(3S) but with pipe to cmd's stdin and from stdout. */ -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <stdio.h> diff --git a/usr/src/lib/libgen/common/pathfind.c b/usr/src/lib/libgen/common/pathfind.c index 207ceec438..cd45ebfde6 100644 --- a/usr/src/lib/libgen/common/pathfind.c +++ b/usr/src/lib/libgen/common/pathfind.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,9 +38,8 @@ * file isn't found, return NULL. */ -#include "synonyms.h" +#include "gen_synonyms.h" #ifdef _REENTRANT -#include "mtlib.h" #include <thread.h> #endif /* _REENTRANT */ #include <sys/types.h> diff --git a/usr/src/lib/libgen/common/reg_compile.c b/usr/src/lib/libgen/common/reg_compile.c index 6eae595e45..b2acb39bba 100644 --- a/usr/src/lib/libgen/common/reg_compile.c +++ b/usr/src/lib/libgen/common/reg_compile.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -35,8 +35,7 @@ #pragma weak reglength = _reglength #pragma weak compile = __compile -#include "synonyms.h" -#include "mtlib.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <ctype.h> #include <limits.h> diff --git a/usr/src/lib/libgen/common/reg_step.c b/usr/src/lib/libgen/common/reg_step.c index 01efd31302..ad46f7f1d2 100644 --- a/usr/src/lib/libgen/common/reg_step.c +++ b/usr/src/lib/libgen/common/reg_step.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,8 +38,7 @@ #pragma weak step = _step #pragma weak advance = _radvance -#include "synonyms.h" -#include "mtlib.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <ctype.h> #include <stdlib.h> diff --git a/usr/src/lib/libgen/common/rmdirp.c b/usr/src/lib/libgen/common/rmdirp.c index f09dba7d9d..d315cde4b6 100644 --- a/usr/src/lib/libgen/common/rmdirp.c +++ b/usr/src/lib/libgen/common/rmdirp.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1996, 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5.3.2 */ @@ -47,7 +47,7 @@ * returns -3 if removal stops because it's the current directory. */ -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <sys/stat.h> diff --git a/usr/src/lib/libgen/common/strccpy.c b/usr/src/lib/libgen/common/strccpy.c index ce70172529..3be9d62a57 100644 --- a/usr/src/lib/libgen/common/strccpy.c +++ b/usr/src/lib/libgen/common/strccpy.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2.5.2 */ @@ -35,7 +35,7 @@ #pragma weak strccpy = _strccpy #pragma weak strcadd = _strcadd -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> diff --git a/usr/src/lib/libgen/common/strecpy.c b/usr/src/lib/libgen/common/strecpy.c index 758af97e07..dd980d9c6a 100644 --- a/usr/src/lib/libgen/common/strecpy.c +++ b/usr/src/lib/libgen/common/strecpy.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2.5.2 */ @@ -35,7 +35,7 @@ #pragma weak strecpy = _strecpy #pragma weak streadd = _streadd -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <libgen.h> #include <ctype.h> diff --git a/usr/src/lib/libgen/common/strfind.c b/usr/src/lib/libgen/common/strfind.c index 16e57a4bb8..7b09616979 100644 --- a/usr/src/lib/libgen/common/strfind.c +++ b/usr/src/lib/libgen/common/strfind.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1.2.2 */ @@ -34,7 +34,7 @@ #pragma weak strfind = _strfind -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> /* diff --git a/usr/src/lib/libgen/common/strrspn.c b/usr/src/lib/libgen/common/strrspn.c index 93069c8840..25acddf2f0 100644 --- a/usr/src/lib/libgen/common/strrspn.c +++ b/usr/src/lib/libgen/common/strrspn.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1.2.2 */ @@ -34,7 +34,7 @@ #pragma weak strrspn = _strrspn -#include "synonyms.h" +#include "gen_synonyms.h" #include <sys/types.h> #include <string.h> diff --git a/usr/src/lib/libgen/common/strtrns.c b/usr/src/lib/libgen/common/strtrns.c index 735ba15348..6f22100bf6 100644 --- a/usr/src/lib/libgen/common/strtrns.c +++ b/usr/src/lib/libgen/common/strtrns.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1.2.2 */ @@ -34,7 +34,7 @@ #pragma weak strtrns = _strtrns -#include "synonyms.h" +#include "gen_synonyms.h" /* * Copy `str' to `result' replacing any character found diff --git a/usr/src/lib/libgen/inc/gen_synonyms.h b/usr/src/lib/libgen/inc/gen_synonyms.h new file mode 100644 index 0000000000..de9fa10913 --- /dev/null +++ b/usr/src/lib/libgen/inc/gen_synonyms.h @@ -0,0 +1,81 @@ +/* + * 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. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + +#ifndef _GEN_SYNONYMS_H +#define _GEN_SYNONYMS_H + +#pragma ident "%Z%%M% %I% %E% SMI" + +#include "c_synonyms.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(__lint) + +#define mkdirp _mkdirp +#define loc1 _loc1 +#define loc2 _loc2 +#define locs _locs +#define braelist _braelist +#define braslist _braslist +#define step _step +#define advance _radvance +#define eaccess _eaccess +#define bgets _bgets +#define bufsplit _bufsplit +#define copylist64 _copylist64 +#define copylist _copylist +#define gmatch _gmatch +#define p2open _p2open +#define p2close _p2close +#define isencrypt _isencrypt +#define pathfind _pathfind +#define strfind _strfind +#define nbra _nbra +#define regerrno _regerrno +#define reglength _reglength +#define compile __compile +#define strtrns _strtrns +#define rmdirp _rmdirp +#define strccpy _strccpy +#define strcadd _strcadd +#define strecpy _strecpy +#define streadd _streadd +#define strrspn _strrspn + +#endif /* !defined(__lint) */ + +#ifdef __cplusplus +} +#endif + +#endif /* _GEN_SYNONYMS_H */ diff --git a/usr/src/lib/libgen/inc/synonyms.h b/usr/src/lib/libgen/inc/synonyms.h deleted file mode 100644 index 1d2450f2f4..0000000000 --- a/usr/src/lib/libgen/inc/synonyms.h +++ /dev/null @@ -1,461 +0,0 @@ -/* - * 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. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - - -#ifndef _LIBGEN_SYNONYMS_H -#define _LIBGEN_SYNONYMS_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef __cplusplus -extern "C" { -#endif - -/* external data */ -#define altzone _altzone -#define braelist _braelist -#define braslist _braslist -#define daylight _daylight -#define getdate_err _getdate_err -#define lone _lone -#define lten _lten -#define lzero _lzero -#define loc1 _loc1 -#define loc2 _loc2 -#define locs _locs -#define nbra _nbra -#define regerrno _regerrno -#define reglength _reglength -#define timezone _timezone -#define tzname _tzname - -/* functions */ -#define Msgdb _Msgdb -#define a64l _a64l -#define access _access -#define acct _acct -#define addseverity _addseverity -#define adjtime _adjtime -#define advance _radvance -#define alarm _alarm -#define ascftime _ascftime -#define basename _basename -#define bgets _bgets -#define brk _brk -#define brkbase _brkbase -#define bufsplit _bufsplit -#define cat_init _cat_init -#define cat_malloc_init _cat_malloc_init -#define cat_name _cat_name -#define catclose _catclose -#define catgets _catgets -#define catopen _catopen -#define cfgetispeed _cfgetispeed -#define cfgetospeed _cfgetospeed -#define cfree _cfree -#define cfsetispeed _cfsetispeed -#define cfsetospeed _cfsetospeed -#define cftime _cftime -#define chdir _chdir -#define chmod _chmod -#define chown _chown -#define chroot _chroot -#define close _close -#define closedir _closedir -#define closelog _closelog -#define compile __compile -#define copylist _copylist -#define countbase _countbase -#define creat _creat -#define crypt _crypt -#define ctermid _ctermid -#define cuserid _cuserid -#define dial _dial -#define dirname _dirname -#define drand48 _drand48 -#define dup _dup -#define dup2 _dup2 -#define eaccess _eaccess -#define ecvt _ecvt -#define edata _edata -#define encrypt _encrypt -#define end _end -#define endgrent _endgrent -#define endpwent _endpwent -#define endspent _endspent -#define endutent _endutent -#define endutxent _endutxent -#define environ _environ -#define erand48 _erand48 -#define etext _etext -#define ev_traptousr _ev_traptousr -#define ev_usrtrapret _ev_usrtrapret -#define evsys _evsys -#define execl _execl -#define execle _execle -#define execlp _execlp -#define execv _execv -#define execve _execve -#define execvp _execvp -#define exportfs _exportfs -#define fattach _fattach -#define fchdir _fchdir -#define fchmod _fchmod -#define fchown _fchown -#define fcntl _fcntl -#define fcvt _fcvt -#define fdetach _fdetach -#define fdopen _fdopen -#define ffs _ffs -#define fgetgrent _fgetgrent -#define fgetpwent _fgetpwent -#define fgetspent _fgetspent -#define finite _finite -#define fmount _fmount -#define fmtmsg _fmtmsg -#define fork _fork -#define fpathconf _fpathconf -#define fpclass _fpclass -#define fpgetmask _fpgetmask -#define fpgetround _fpgetround -#define fpgetsticky _fpgetsticky -#define fpsetmask _fpsetmask -#define fpsetround _fpsetround -#define fpsetsticky _fpsetsticky -#define fptrap _fptrap -#define fstat _fstat -#define fstatvfs _fstatvfs -#define fsync _fsync -#define ftok _ftok -#define ftruncate _ftruncate -#define ftw _ftw -#define funmount _funmount -#define fxstat _fxstat -#define gcvt _gcvt -#define getcontext _getcontext -#define getcwd _getcwd -#define getdate _getdate -#define getdents _getdents -#define getegid _getegid -#define geteuid _geteuid -#define getgid _getgid -#define getgrent _getgrent -#define getgrgid _getgrgid -#define getgrnam _getgrnam -#define getgroups _getgroups -#define gethz _gethz -#define getitimer _getitimer -#define getlogin _getlogin -#define getmntany _getmntany -#define getmntent _getmntent -#define getmsg _getmsg -#define getopt _getopt -#define getpagesize _getpagesize -#define getpass _getpass -#define getpgid _getpgid -#define getpgrp _getpgrp -#define getpid _getpid -#define getpmsg _getpmsg -#define getppid _getppid -#define getpw _getpw -#define getpwent _getpwent -#define getpwnam _getpwnam -#define getpwuid _getpwuid -#define getrlimit _getrlimit -#define getsid _getsid -#define getspent _getspent -#define getspnam _getspnam -#define getsubopt _getsubopt -#define gettimeofday _gettimeofday -#define gettxt _gettxt -#define getuid _getuid -#define getutent _getutent -#define getutid _getutid -#define getutline _getutline -#define getutxent _getutxent -#define getutxid _getutxid -#define getutxline _getutxline -#define getvfsany _getvfsany -#define getvfsent _getvfsent -#define getvfsfile _getvfsfile -#define getvfsspec _getvfsspec -#define getw _getw -#define gmatch _gmatch -#define gsignal _gsignal -#define gtty _gtty -#define hcreate _hcreate -#define hdestroy _hdestroy -#define hrtalarm _hrtalarm -#define hrtascftime _hrtascftime -#define hrtasctime _hrtasctime -#define hrtcancel _hrtcancel -#define hrtcftime _hrtcftime -#define hrtcntl _hrtcntl -#define hrtctime _hrtctime -#define hrtnewres _hrtnewres -#define hrtsleep _hrtsleep -#define hrtstrftime _hrtstrftime -#define hsearch _hsearch -#define id2str _id2str -#define initgroups _initgroups -#define insque _insque -#define ioctl _ioctl -#define isastream _isastream -#define isatty _isatty -#define isencrypt _isencrypt -#define jrand48 _jrand48 -#define kill _kill -#define l3tol _l3tol -#define l64a _l64a -#define ladd _ladd -#define lchown _lchown -#define lckpwdf _lckpwdf -#define lcong48 _lcong48 -#define ldivide _ldivide -#define lexp10 _lexp10 -#define lfind _lfind -#define link _link -#define llog10 _llog10 -#define lmul _lmul -#define lockf _lockf -#define lrand48 _lrand48 -#define lsearch _lsearch -#define lseek _lseek -#define lshiftl _lshiftl -#define lsign _lsign -#define lstat _lstat -#define lsub _lsub -#define ltol3 _ltol3 -#define lxstat _lxstat -#define makecontext _makecontext -#define mctl _mctl -#define memalign _memalign -#define memccpy _memccpy -#define memcntl _memcntl -#define mincore _mincore -#define mkdir _mkdir -#define mkdirp _mkdirp -#define mkfifo _mkfifo -#define mknod _mknod -#define mktemp _mktemp -#define mlock _mlock -#define mlockall _mlockall -#define mmap _mmap -#define monitor _monitor -#define mount _mount -#define mprotect _mprotect -#define mrand48 _mrand48 -#define msgctl _msgctl -#define msgget _msgget -#define msgrcv _msgrcv -#define msgsnd _msgsnd -#define msync _msync -#define munlock _munlock -#define munlockall _munlockall -#define munmap _munmap -#define nfs_getfh _nfs_getfh -#define nfssvc _nfssvc -#define nftw _nftw -#define nice _nice -#define nrand48 _nrand48 -#define nuname _nuname -#define open _open -#define opendir _opendir -#define openlog _openlog -#define p2close _p2close -#define p2open _p2open -#define pathconf _pathconf -#define pathfind _pathfind -#define pause _pause -#define pclose _pclose -#define pipe _pipe -#define plock _plock -#define poll _poll -#define popen _popen -#define profil _profil -#define psiginfo _psiginfo -#define psignal _psignal -#define ptrace _ptrace -#define putenv _putenv -#define putmsg _putmsg -#define putpmsg _putpmsg -#define putpwent _putpwent -#define putspent _putspent -#define pututline _pututline -#define pututxline _pututxline -#define putw _putw -#define read _read -#define readdir _readdir -#define readlink _readlink -#define readv _readv -#define realpath _realpath -#define regcmp _regcmp -#define regex _regex -#define remque _remque -#define rmdir _rmdir -#define rmdirp _rmdirp -#define sbrk _sbrk -#define seed48 _seed48 -#define seekdir _seekdir -#define select _select -#define semctl _semctl -#define semget _semget -#define semop _semop -#define setcontext _setcontext -#define setegid _setegid -#define seteuid _seteuid -#define setgid _setgid -#define setgrent _setgrent -#define setgroups _setgroups -#define setitimer _setitimer -#define setkey _setkey -#define setlogmask _setlogmask -#define setpgid _setpgid -#define setpgrp _setpgrp -#define setpwent _setpwent -#define setrlimit _setrlimit -#define setsid _setsid -#define setspent _setspent -#define settimeofday _settimeofday -#define setuid _setuid -#define setutent _setutent -#define setutxent _setutxent -#define shmat _shmat -#define shmctl _shmctl -#define shmdt _shmdt -#define shmget _shmget -#define sig2str _sig2str -#define sigaction _sigaction -#define sigaddset _sigaddset -#define sigaltstack _sigaltstack -#define sigdelset _sigdelset -#define sigemptyset _sigemptyset -#define sigfillset _sigfillset -#define sigflag _sigflag -#define sighold _sighold -#define sigignore _sigignore -#define sigismember _sigismember -#define siglongjmp _siglongjmp -#define sigpause _sigpause -#define sigpending _sigpending -#define sigprocmask _sigprocmask -#define sigrelse _sigrelse -#define sigsend _sigsend -#define sigsendset _sigsendset -#define sigset _sigset -#define sigsetjmp _sigsetjmp -#define sigsuspend _sigsuspend -#define sleep _sleep -#define srand48 _srand48 -#define ssignal _ssignal -#define stat _stat -#define statfs _statfs -#define statvfs _statvfs -#define step _step -#define stime _stime -#define str2id _str2id -#define str2sig _str2sig -#define strccpy _strccpy -#define strcadd _strcadd -#define strdup _strdup -#define strecpy _strecpy -#define streadd _streadd -#define strfind _strfind -#define strrspn _strrspn -#define strtrns _strtrns -#define stty _stty -#define swab _swab -#define swapcontext _swapcontext -#define swapctl _swapctl -#define symlink _symlink -#define sync _sync -#define sys3b _sys3b -#define syscall _syscall -#define sysconf _sysconf -#define sysfs _sysfs -#define sysinfo _sysinfo -#define syslog _syslog -#define tcdrain _tcdrain -#define tcflow _tcflow -#define tcflush _tcflush -#define tcgetattr _tcgetattr -#define tcgetpgrp _tcgetpgrp -#define tcgetsid _tcgetsid -#define tcsendbreak _tcsendbreak -#define tcsetattr _tcsetattr -#define tcsetpgrp _tcsetpgrp -#define tdelete _tdelete -#define tell _tell -#define telldir _telldir -#define tempnam _tempnam -#define tfind _tfind -#define times _times -#define truncate _truncate -#define tsearch _tsearch -#define ttyname _ttyname -#define ttyslot _ttyslot -#define twalk _twalk -#define tzname _tzname -#define tzset _tzset -#define uadmin _uadmin -#define ulckpwdf _ulckpwdf -#define ulimit _ulimit -#define umask _umask -#define umount _umount -#define uname _uname -#define undial _undial -#define unlink _unlink -#define unordered _unordered -#define updutmp _updutmp -#define updwtmpx _updwtmpx -#define utime _utime -#define utmpname _utmpname -#define utmpxname _utmpxname -#define utssys _utssys -#define valloc _valloc -#define vfork _vfork -#define vsyslog _vsyslog -#define wait _wait -#define waitid _waitid -#define waitpid _waitpid -#define write _write -#define writev _writev -#define xmknod _xmknod -#define xstat _xstat -#define _assert __assert -#define _ctype __ctype -#define _filbuf __filbuf -#define _flsbuf __flsbuf -#define _iob __iob - -#ifdef __cplusplus -} -#endif - -#endif /* _LIBGEN_SYNONYMS_H */ diff --git a/usr/src/lib/liblgrp/Makefile.com b/usr/src/lib/liblgrp/Makefile.com index de7d096b65..30cfb354ce 100644 --- a/usr/src/lib/liblgrp/Makefile.com +++ b/usr/src/lib/liblgrp/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -51,7 +51,7 @@ $(LINTLIB) := SRCS = ../common/llib-llgrp .KEEP_STATE: -all : $(LIBS) +all : $(LIBS) fnamecheck lint : lintcheck diff --git a/usr/src/lib/liblm/Makefile.com b/usr/src/lib/liblm/Makefile.com index 07a3f029e0..9e76539683 100644 --- a/usr/src/lib/liblm/Makefile.com +++ b/usr/src/lib/liblm/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -49,7 +49,7 @@ LDLIBS += -lc .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libmacadm/Makefile.com b/usr/src/lib/libmacadm/Makefile.com index 95e9cf09f4..41d7daeaf6 100644 --- a/usr/src/lib/libmacadm/Makefile.com +++ b/usr/src/lib/libmacadm/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #pragma ident "%Z%%M% %I% %E% SMI" @@ -49,7 +49,7 @@ CPPFLAGS += -I$(SRCDIR) -D_REENTRANT .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libmail/Makefile.com b/usr/src/lib/libmail/Makefile.com index e3cdd63e3a..ca0c7dfdc0 100644 --- a/usr/src/lib/libmail/Makefile.com +++ b/usr/src/lib/libmail/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -48,13 +48,15 @@ $(LINTLIB):= SRCS = ../common/llib-lmail LINTSRC= $(LINTLIB:%.ln=%) -CPPFLAGS = -I../inc $(CPPFLAGS.master) +CPPFLAGS = -I../inc -I../../common/inc $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc .KEEP_STATE: +all: $(LIBS) fnamecheck + lint: lintcheck $(DYNLIB) $(DYNLIB64): $(MAPFILE) diff --git a/usr/src/lib/libmail/amd64/Makefile b/usr/src/lib/libmail/amd64/Makefile index bf7f82677c..7a9b08d46c 100644 --- a/usr/src/lib/libmail/amd64/Makefile +++ b/usr/src/lib/libmail/amd64/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -31,10 +31,4 @@ MAPDIR= ../spec/amd64 include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) - -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libmail/common/abspath.c b/usr/src/lib/libmail/common/abspath.c index 584d57b044..9f2bfae895 100644 --- a/usr/src/lib/libmail/common/abspath.c +++ b/usr/src/lib/libmail/common/abspath.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -43,7 +43,7 @@ * returned in "to". Otherwise, the value of "path" is * returned in "to". */ -#include "synonyms.h" +#include "c_synonyms.h" #include "libmail.h" #include <sys/types.h> diff --git a/usr/src/lib/libmail/common/casncmp.c b/usr/src/lib/libmail/common/casncmp.c index 46f750f9ab..18a61eaf23 100644 --- a/usr/src/lib/libmail/common/casncmp.c +++ b/usr/src/lib/libmail/common/casncmp.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -43,7 +43,7 @@ * Stop after n bytes or the trailing NUL. */ -#include "synonyms.h" +#include "c_synonyms.h" #include "libmail.h" #include <ctype.h> #include <sys/types.h> diff --git a/usr/src/lib/libmail/common/copystream.c b/usr/src/lib/libmail/common/copystream.c index 1c12d6d13c..eb92f738bb 100644 --- a/usr/src/lib/libmail/common/copystream.c +++ b/usr/src/lib/libmail/common/copystream.c @@ -19,16 +19,16 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ +#pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ /* @@ -47,7 +47,7 @@ false if any writes fail. */ -#include "synonyms.h" +#include "c_synonyms.h" #include "libmail.h" #include <sys/types.h> diff --git a/usr/src/lib/libmail/common/delempty.c b/usr/src/lib/libmail/common/delempty.c index ceb9a0e65e..49748593da 100644 --- a/usr/src/lib/libmail/common/delempty.c +++ b/usr/src/lib/libmail/common/delempty.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -45,7 +45,7 @@ * on the mode]. */ -#include "synonyms.h" +#include "c_synonyms.h" #include "libmail.h" #include <sys/types.h> #include <unistd.h> diff --git a/usr/src/lib/libmail/common/getdomain.c b/usr/src/lib/libmail/common/getdomain.c index 94688baa90..fc66e7f59c 100644 --- a/usr/src/lib/libmail/common/getdomain.c +++ b/usr/src/lib/libmail/common/getdomain.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include "libmail.h" #include <sys/types.h> #include <ctype.h> diff --git a/usr/src/lib/libmail/common/maillock.c b/usr/src/lib/libmail/common/maillock.c index aaaccbcce5..6a0140620a 100644 --- a/usr/src/lib/libmail/common/maillock.c +++ b/usr/src/lib/libmail/common/maillock.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include "maillock.h" #include <sys/types.h> #include <fcntl.h> diff --git a/usr/src/lib/libmail/common/notifyu.c b/usr/src/lib/libmail/common/notifyu.c index 5158839ce3..b4cb0ec119 100644 --- a/usr/src/lib/libmail/common/notifyu.c +++ b/usr/src/lib/libmail/common/notifyu.c @@ -19,18 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1998-1999 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ + #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include "libmail.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/usr/src/lib/libmail/common/popenvp.c b/usr/src/lib/libmail/common/popenvp.c index cade21151f..632c94de0f 100644 --- a/usr/src/lib/libmail/common/popenvp.c +++ b/usr/src/lib/libmail/common/popenvp.c @@ -19,12 +19,12 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,7 +42,7 @@ * quotes, etc. */ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include <assert.h> #include <string.h> diff --git a/usr/src/lib/libmail/common/s_string.c b/usr/src/lib/libmail/common/s_string.c index b74b35c908..5654f03eca 100644 --- a/usr/src/lib/libmail/common/s_string.c +++ b/usr/src/lib/libmail/common/s_string.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include <stdio.h> #include <ctype.h> diff --git a/usr/src/lib/libmail/common/setup_exec.c b/usr/src/lib/libmail/common/setup_exec.c index e1987806ad..b0efc3454e 100644 --- a/usr/src/lib/libmail/common/setup_exec.c +++ b/usr/src/lib/libmail/common/setup_exec.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include <ctype.h> #include "libmail.h" diff --git a/usr/src/lib/libmail/common/skipspace.c b/usr/src/lib/libmail/common/skipspace.c index 37468a902e..cbbc151852 100644 --- a/usr/src/lib/libmail/common/skipspace.c +++ b/usr/src/lib/libmail/common/skipspace.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */ +#pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include "libmail.h" #include <ctype.h> diff --git a/usr/src/lib/libmail/common/strmove.c b/usr/src/lib/libmail/common/strmove.c index ee6f967e6a..bb82e42c34 100644 --- a/usr/src/lib/libmail/common/strmove.c +++ b/usr/src/lib/libmail/common/strmove.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include "libmail.h" diff --git a/usr/src/lib/libmail/common/substr.c b/usr/src/lib/libmail/common/substr.c index 74c7be8de7..e2589974fa 100644 --- a/usr/src/lib/libmail/common/substr.c +++ b/usr/src/lib/libmail/common/substr.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include "libmail.h" diff --git a/usr/src/lib/libmail/common/systemvp.c b/usr/src/lib/libmail/common/systemvp.c index cbcc350cb9..4fb23af800 100644 --- a/usr/src/lib/libmail/common/systemvp.c +++ b/usr/src/lib/libmail/common/systemvp.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ /* @@ -42,7 +42,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include "libmail.h" #include <signal.h> diff --git a/usr/src/lib/libmail/common/trimnl.c b/usr/src/lib/libmail/common/trimnl.c index badc5167c6..4f09d69036 100644 --- a/usr/src/lib/libmail/common/trimnl.c +++ b/usr/src/lib/libmail/common/trimnl.c @@ -19,19 +19,19 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3 */ /*LINTLIBRARY*/ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include "libmail.h" #include <string.h> diff --git a/usr/src/lib/libmail/common/xgetenv.c b/usr/src/lib/libmail/common/xgetenv.c index 15f4b0a08f..5197a85d17 100644 --- a/usr/src/lib/libmail/common/xgetenv.c +++ b/usr/src/lib/libmail/common/xgetenv.c @@ -19,13 +19,13 @@ * * CDDL HEADER END */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -66,7 +66,7 @@ * These values may be adjusted below. */ -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include "libmail.h" #include <stdio.h> diff --git a/usr/src/lib/libmail/i386/Makefile b/usr/src/lib/libmail/i386/Makefile index 9e9ecfbaf6..1f54277775 100644 --- a/usr/src/lib/libmail/i386/Makefile +++ b/usr/src/lib/libmail/i386/Makefile @@ -20,10 +20,10 @@ # CDDL HEADER END # # -# Copyright (c) 1999, by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # lib/libmail/i386/Makefile @@ -31,8 +31,4 @@ MAPDIR= ../spec/i386 include ../Makefile.com -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libmail/sparc/Makefile b/usr/src/lib/libmail/sparc/Makefile index 6089c3ee87..5aad3e64df 100644 --- a/usr/src/lib/libmail/sparc/Makefile +++ b/usr/src/lib/libmail/sparc/Makefile @@ -20,8 +20,8 @@ # CDDL HEADER END # # -# Copyright (c) 1999, by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # #pragma ident "%Z%%M% %I% %E% SMI" # @@ -31,8 +31,4 @@ MAPDIR= ../spec/sparc include ../Makefile.com -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libmail/sparcv9/Makefile b/usr/src/lib/libmail/sparcv9/Makefile index 29a3f01d2b..fd82d2bc2a 100644 --- a/usr/src/lib/libmail/sparcv9/Makefile +++ b/usr/src/lib/libmail/sparcv9/Makefile @@ -20,8 +20,8 @@ # CDDL HEADER END # # -# Copyright (c) 1999, by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # #pragma ident "%Z%%M% %I% %E% SMI" # @@ -32,10 +32,4 @@ MAPDIR= ../spec/sparcv9 include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) - -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libmd5/Makefile.com b/usr/src/lib/libmd5/Makefile.com index b86bcd066a..dc87dce0b6 100644 --- a/usr/src/lib/libmd5/Makefile.com +++ b/usr/src/lib/libmd5/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -70,6 +70,8 @@ $(DYNLIB): $(MAPFILE) $(MAPFILE): @cd $(MAPDIR); pwd; $(MAKE) mapfile +all: $(LIBS) fnamecheck + lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmd5/amd64/Makefile b/usr/src/lib/libmd5/amd64/Makefile index b6ba793262..b294fed674 100644 --- a/usr/src/lib/libmd5/amd64/Makefile +++ b/usr/src/lib/libmd5/amd64/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -30,8 +30,4 @@ MAPDIR= ../spec/amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libmd5/i386/Makefile b/usr/src/lib/libmd5/i386/Makefile index adad035024..2bb20f4cd2 100644 --- a/usr/src/lib/libmd5/i386/Makefile +++ b/usr/src/lib/libmd5/i386/Makefile @@ -22,8 +22,8 @@ # # ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # lib/libmd5/i386/Makefile # @@ -31,8 +31,4 @@ MAPDIR= ../spec/i386 include ../Makefile.com -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libmd5/sparc/Makefile b/usr/src/lib/libmd5/sparc/Makefile index 53ff377479..689c36c4f8 100644 --- a/usr/src/lib/libmd5/sparc/Makefile +++ b/usr/src/lib/libmd5/sparc/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -33,8 +33,4 @@ include ../Makefile.com DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/$(DYNLIBPSR) -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libmd5/sparcv9/Makefile b/usr/src/lib/libmd5/sparcv9/Makefile index 9acf6b0215..86e137098a 100644 --- a/usr/src/lib/libmd5/sparcv9/Makefile +++ b/usr/src/lib/libmd5/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -34,9 +34,4 @@ include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/sparcv9/$(DYNLIBPSR) - -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libnsl/Makefile b/usr/src/lib/libnsl/Makefile index 8dc052919b..756e9d14d1 100644 --- a/usr/src/lib/libnsl/Makefile +++ b/usr/src/lib/libnsl/Makefile @@ -19,9 +19,8 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -159,6 +158,8 @@ nis/gen/nis_clnt.c: $(PROTOCOL_DIR)/nis.x $(PROTOCOL_DIR)/nis_object.x $(RPCGEN) -C -l $(PROTOCOL_DIR)/nis.x > nis_clnt-tmp.c $(SED) -e 's!\"$(PROTOCOL_DIR)/nis.h\"!\<rpcsvc/nis.h\>!' \ < nis_clnt-tmp.c |\ + $(SED) -e '/#include <memory.h>/i\ +#include "mt.h"' |\ $(SED) -e 's/_3/_clnt/' > $@ $(RM) nis_clnt-tmp.c @@ -168,6 +169,8 @@ nis/cache/nis_cache_xdr.cc: $(PROTOCOL_DIR)/nis_cache.x nis/cache/nis_cache_clnt.cc: $(PROTOCOL_DIR)/nis_cache.x $(RPCGEN) -C -l $(PROTOCOL_DIR)/nis_cache.x |\ + $(SED) -e '/#include <memory.h>/i\ +#include "mt.h"' |\ $(SED) -e 's!\"$(PROTOCOL_DIR)/nis_cache.h\"!"nis_cache.h"!' > $@ nis/cache/nis_cache.h: $(PROTOCOL_DIR)/nis_cache.x diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com index 053ccada40..7945cdb4c2 100644 --- a/usr/src/lib/libnsl/Makefile.com +++ b/usr/src/lib/libnsl/Makefile.com @@ -19,9 +19,8 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -220,6 +219,8 @@ LINTFLAGS64 += -m -DPORTMAP $(DYNLIB): $(MAPFILES) +all: $(LIBS) fnamecheck + # Don't lint WRAPPERS as they are explicitly unclean SRCS= $(DES:%.o=../des/%.c) \ $(DIAL:%.o=../dial/%.c) \ diff --git a/usr/src/lib/libnsl/amd64/Makefile b/usr/src/lib/libnsl/amd64/Makefile index e77d52f819..ed0a7167be 100644 --- a/usr/src/lib/libnsl/amd64/Makefile +++ b/usr/src/lib/libnsl/amd64/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -35,6 +35,4 @@ include ../../Makefile.lib.64 amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libnsl/common/daemon_utils.c b/usr/src/lib/libnsl/common/daemon_utils.c index 4c7cd52b95..b364e735c6 100644 --- a/usr/src/lib/libnsl/common/daemon_utils.c +++ b/usr/src/lib/libnsl/common/daemon_utils.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libnsl/common/nsl_stdio_prv.c b/usr/src/lib/libnsl/common/nsl_stdio_prv.c index 37049d1963..efa8388262 100644 --- a/usr/src/lib/libnsl/common/nsl_stdio_prv.c +++ b/usr/src/lib/libnsl/common/nsl_stdio_prv.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <fcntl.h> #include <errno.h> @@ -60,12 +61,12 @@ _raise_fd(int fd) if (fd >= min_fd) return (fd); - if ((nfd = _fcntl(fd, F_DUPFD, min_fd)) == -1) { + if ((nfd = fcntl(fd, F_DUPFD, min_fd)) == -1) { /* * If the shell limits [See limit(1)] the - * descriptors to 256, _fcntl will fail + * descriptors to 256, fcntl will fail * and errno will be set to EINVAL. Since - * the intention is to ignore _fcntl failures + * the intention is to ignore fcntl failures * and continue working with 'fd', we should * reset errno to _prevent_ apps relying on errno * to treat this as an error. diff --git a/usr/src/lib/libnsl/des/des_crypt.c b/usr/src/lib/libnsl/des/des_crypt.c index c3ada74226..2863c9277b 100644 --- a/usr/src/lib/libnsl/des/des_crypt.c +++ b/usr/src/lib/libnsl/des/des_crypt.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,9 +36,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * des_crypt.c, DES encryption library routines + * DES encryption library routines */ +#include "mt.h" #include <unistd.h> #include <fcntl.h> #include <sys/types.h> diff --git a/usr/src/lib/libnsl/des/des_soft.c b/usr/src/lib/libnsl/des/des_soft.c index 9ace43a671..ccd2942c85 100644 --- a/usr/src/lib/libnsl/des/des_soft.c +++ b/usr/src/lib/libnsl/des/des_soft.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,6 +45,7 @@ * be moved to text. */ +#include "mt.h" #include <sys/types.h> #include <des/softdes.h> #include <des/desdata.h> diff --git a/usr/src/lib/libnsl/dial/callers.c b/usr/src/lib/libnsl/dial/callers.c index c8d7a7a45f..11b09aeb2b 100644 --- a/usr/src/lib/libnsl/dial/callers.c +++ b/usr/src/lib/libnsl/dial/callers.c @@ -24,12 +24,13 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "uucp.h" static void alarmtr(int); @@ -49,8 +50,6 @@ static int Modemctrl; static unsigned connecttime; static int (*Setup)(); -extern int _fcntl(int, int, ...); - /* * to add a new caller: * declare the function that knows how to call on the device, @@ -275,8 +274,8 @@ processdev(char *flds[], char *dev[]) if (Modemctrl) { DEBUG(7, "clear O_NDELAY\n%s", ""); - if (_fcntl(dcf, F_SETFL, - (_fcntl(dcf, F_GETFL, 0) & ~O_NDELAY)) < 0) { + if (fcntl(dcf, F_SETFL, + (fcntl(dcf, F_GETFL, 0) & ~O_NDELAY)) < 0) { DEBUG(7, "clear O_NDELAY failed, errno %d\n", errno); Uerror = SS_DEVICE_FAILED; diff --git a/usr/src/lib/libnsl/dial/conn.c b/usr/src/lib/libnsl/dial/conn.c index 4c9834ba98..13dbadfc5f 100644 --- a/usr/src/lib/libnsl/dial/conn.c +++ b/usr/src/lib/libnsl/dial/conn.c @@ -24,12 +24,13 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "uucp.h" static char _ProtoSys[40]; /* protocol string from Systems file entry */ static char _ProtoDev[40]; /* protocol string from Devices file entry */ diff --git a/usr/src/lib/libnsl/dial/dial.c b/usr/src/lib/libnsl/dial/dial.c index 9aa5a2c75a..3fa448aa42 100644 --- a/usr/src/lib/libnsl/dial/dial.c +++ b/usr/src/lib/libnsl/dial/dial.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -99,6 +99,8 @@ * ************************************************************* */ +#include "mt.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libnsl/dial/getargs.c b/usr/src/lib/libnsl/dial/getargs.c index 416fb36c3e..5134c7da1e 100644 --- a/usr/src/lib/libnsl/dial/getargs.c +++ b/usr/src/lib/libnsl/dial/getargs.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,6 +30,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "uucp.h" /* diff --git a/usr/src/lib/libnsl/dial/interface.c b/usr/src/lib/libnsl/dial/interface.c index 3c789c1b0a..0381b9f5ee 100644 --- a/usr/src/lib/libnsl/dial/interface.c +++ b/usr/src/lib/libnsl/dial/interface.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -35,11 +35,12 @@ * provide alternate definitions for the I/O functions through global * interfaces. */ -#include "uucp.h" -#include <unistd.h> +#include "mt.h" +#include "uucp.h" +#include <unistd.h> #ifdef TLI -#include <tiuser.h> +#include <tiuser.h> #endif /* TLI */ static void sethup(int); diff --git a/usr/src/lib/libnsl/dial/line.c b/usr/src/lib/libnsl/dial/line.c index ce6c20c213..fd6378beca 100644 --- a/usr/src/lib/libnsl/dial/line.c +++ b/usr/src/lib/libnsl/dial/line.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -35,6 +35,7 @@ * merged together. */ +#include "mt.h" #include "uucp.h" static const struct sg_spds { diff --git a/usr/src/lib/libnsl/dial/stoa.c b/usr/src/lib/libnsl/dial/stoa.c index 89b0b397e2..197d87ac02 100644 --- a/usr/src/lib/libnsl/dial/stoa.c +++ b/usr/src/lib/libnsl/dial/stoa.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +30,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "uucp.h" +#include "mt.h" +#include "uucp.h" #ifdef TLI diff --git a/usr/src/lib/libnsl/dial/strecpy.c b/usr/src/lib/libnsl/dial/strecpy.c index f7559b2f10..22b3870cf9 100644 --- a/usr/src/lib/libnsl/dial/strecpy.c +++ b/usr/src/lib/libnsl/dial/strecpy.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +30,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "uucp.h" +#include "mt.h" +#include "uucp.h" #ifndef SMALL /* diff --git a/usr/src/lib/libnsl/dial/strsave.c b/usr/src/lib/libnsl/dial/strsave.c index 5af32721fa..0b97b2067f 100644 --- a/usr/src/lib/libnsl/dial/strsave.c +++ b/usr/src/lib/libnsl/dial/strsave.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,16 +30,9 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "uucp.h" -#if defined(sparc) -#define _STAT _stat -#else /* !sparc */ -#define _STAT stat -#endif /* sparc */ - -extern int _stat(const char *, struct stat *); - /* copy str into data space -- caller should report errors. */ static char * @@ -70,7 +63,7 @@ eaccess(char *path, mode_t amode) struct stat s; uid_t euid; - if (_STAT(path, &s) == -1) + if (stat(path, &s) == -1) return (-1); /* can't stat file */ amode &= 07; diff --git a/usr/src/lib/libnsl/dial/sysfiles.c b/usr/src/lib/libnsl/dial/sysfiles.c index b28d266f2f..afeea1da06 100644 --- a/usr/src/lib/libnsl/dial/sysfiles.c +++ b/usr/src/lib/libnsl/dial/sysfiles.c @@ -24,12 +24,13 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "uucp.h" #include <unistd.h> diff --git a/usr/src/lib/libnsl/dial/ulockf.c b/usr/src/lib/libnsl/dial/ulockf.c index 73540f92ca..4b4a8baa41 100644 --- a/usr/src/lib/libnsl/dial/ulockf.c +++ b/usr/src/lib/libnsl/dial/ulockf.c @@ -21,29 +21,20 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "uucp.h" -#include <unistd.h> -#include <stdlib.h> -/* #include <sys/types.h> */ -/* #include <sys/stat.h> */ - -#undef _STAT -#undef _FSTAT - -#define _STAT stat64 -#define _FSTAT fstat64 - -static void stlock(); -static int onelock(); +static void stlock(char *); +static int onelock(char *, char *, char *); /* * make a lock file with given 'name' @@ -260,7 +251,7 @@ fd_mklock(int fd) struct stat64 _st_buf; char lockname[BUFSIZ]; - if (_FSTAT(fd, &_st_buf) != 0) + if (fstat64(fd, &_st_buf) != 0) return (FAIL); (void) snprintf(lockname, sizeof (lockname), @@ -299,7 +290,7 @@ fd_rmlock(int fd) struct stat64 _st_buf; char lockname[BUFSIZ]; - if (_FSTAT(fd, &_st_buf) == 0) { + if (fstat64(fd, &_st_buf) == 0) { (void) snprintf(lockname, sizeof (lockname), "%s.%3.3lu.%3.3lu.%3.3lu", L_LOCK, (unsigned long)major(_st_buf.st_dev), diff --git a/usr/src/lib/libnsl/dial/uucpdefs.c b/usr/src/lib/libnsl/dial/uucpdefs.c index a33043cdc9..c80aa26a0a 100644 --- a/usr/src/lib/libnsl/dial/uucpdefs.c +++ b/usr/src/lib/libnsl/dial/uucpdefs.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,6 +30,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1 */ +#include "mt.h" #include "uucp.h" /* Configurable parameters */ diff --git a/usr/src/lib/libnsl/i386/Makefile b/usr/src/lib/libnsl/i386/Makefile index df28266458..5591ea9a22 100644 --- a/usr/src/lib/libnsl/i386/Makefile +++ b/usr/src/lib/libnsl/i386/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1995-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -28,6 +28,4 @@ include ../Makefile.com -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libnsl/include/mt.h b/usr/src/lib/libnsl/include/mt.h index eb6690e7db..19aa976718 100644 --- a/usr/src/lib/libnsl/include/mt.h +++ b/usr/src/lib/libnsl/include/mt.h @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 1993-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -44,7 +45,7 @@ * their default actions (killing the process, stopping the process). */ -#include "mtlib.h" +#include "c_synonyms.h" #include <thread.h> #include <pthread.h> #include <signal.h> @@ -65,10 +66,6 @@ extern void sig_rw_unlock(rwlock_t *); extern void _sigoff(void); extern void _sigon(void); -extern int _fcntl(int, int, ...); -extern int _ioctl(int, int, ...); -extern int _sigfillset(sigset_t *); - extern void *thr_get_storage(pthread_key_t *, size_t, void(*)(void *)); #ifdef __cplusplus diff --git a/usr/src/lib/libnsl/include/nsl_stdio_prv.h b/usr/src/lib/libnsl/include/nsl_stdio_prv.h index 652239cc62..94847760e4 100644 --- a/usr/src/lib/libnsl/include/nsl_stdio_prv.h +++ b/usr/src/lib/libnsl/include/nsl_stdio_prv.h @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -96,10 +97,6 @@ extern void __nsl_xdrstdio_create(XDR *xdrs, __NSL_FILE *file, #define __nsl_getc(f) __nsl_fgetc(f) #define __nsl_rewind(f) __nsl_frewind(f) -/* external functions */ - -extern int _fcntl(int, int, ...); - #ifdef __cplusplus } #endif diff --git a/usr/src/lib/libnsl/ipsec/algs.c b/usr/src/lib/libnsl/ipsec/algs.c index 436d675fcb..c75f99a894 100644 --- a/usr/src/lib/libnsl/ipsec/algs.c +++ b/usr/src/lib/libnsl/ipsec/algs.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <sys/types.h> #include <sys/errno.h> #include <sys/stat.h> diff --git a/usr/src/lib/libnsl/key/xcrypt.c b/usr/src/lib/libnsl/key/xcrypt.c index 0d0acb293e..5201ae3e64 100644 --- a/usr/src/lib/libnsl/key/xcrypt.c +++ b/usr/src/lib/libnsl/key/xcrypt.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,9 +36,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * xcrypt.c: Hex encryption/decryption and utility routines + * Hex encryption/decryption and utility routines */ +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/usr/src/lib/libnsl/nis/cache/client_cache.cc b/usr/src/lib/libnsl/nis/cache/client_cache.cc index aad0229c83..0962feeaaf 100644 --- a/usr/src/lib/libnsl/nis/cache/client_cache.cc +++ b/usr/src/lib/libnsl/nis/cache/client_cache.cc @@ -19,13 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright (c) 1996-2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <sys/types.h> #include <unistd.h> #include <string.h> @@ -34,19 +36,6 @@ #include "client_cache.h" #include "nis_cache.h" -/* - * For BPC programs (which only run on SPARC), we need to use _fstat - * so that we get the 5.x version of fstat instead of the 4.x version. - * On other architectures, the regular fstat is the right one to use. - */ - -#if defined(sparc) -#define _FSTAT _fstat -extern "C" int _fstat(int, struct stat *); -#else /* !sparc */ -#define _FSTAT fstat -#endif /* sparc */ - NisClientCache::NisClientCache(nis_error &err) : NisMappedCache(err, 0, 0) { @@ -351,7 +340,7 @@ NisClientCache::setClntState() struct stat stbuf; if (clnt_control(mgr_clnt, CLGET_FD, (char *)&curFd) != TRUE || - _FSTAT(curFd, &stbuf) == -1) { + fstat(curFd, &stbuf) == -1) { syslog(LOG_DEBUG, "NIS+ cache client: can't get rdev"); curRdev = (dev_t)-1L; } else { @@ -370,7 +359,7 @@ NisClientCache::checkClntState() /* check rdev of connection file descriptor */ /* do this first so that CLSET_FD_NCLOSE flag will be set if needed */ if (curRdev != (dev_t)-1L) { - if (_FSTAT(curFd, &stbuf) == -1) { + if (fstat(curFd, &stbuf) == -1) { /* probably because file descriptor was closed */ syslog(LOG_DEBUG, "NIS+ cache client: can't stat %d", curFd); diff --git a/usr/src/lib/libnsl/nis/cache/dummy_cache.c b/usr/src/lib/libnsl/nis/cache/dummy_cache.c index 2234493b7e..f98d0b0bc3 100644 --- a/usr/src/lib/libnsl/nis/cache/dummy_cache.c +++ b/usr/src/lib/libnsl/nis/cache/dummy_cache.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,6 +29,7 @@ /* The C interface to directory cache class functions */ +#include "mt.h" #include <rpcsvc/nis.h> int __nis_debuglevel = 0; diff --git a/usr/src/lib/libnsl/nis/cache/mapped_cache.cc b/usr/src/lib/libnsl/nis/cache/mapped_cache.cc index a1fa169a02..f110143426 100644 --- a/usr/src/lib/libnsl/nis/cache/mapped_cache.cc +++ b/usr/src/lib/libnsl/nis/cache/mapped_cache.cc @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -44,23 +45,9 @@ #include "nis_cache.h" #include <rpcsvc/daemon_utils.h> -/* - * For BPC programs (which only run on SPARC), we need to use _fstat - * so that we get the 5.x version of fstat instead of the 4.x version. - * On other architectures, the regular fstat is the right one to use. - */ - -#if defined(sparc) -#define _FSTAT _fstat -extern "C" int _fstat(int, struct stat *); -#else /* !sparc */ -#define _FSTAT fstat -#endif /* sparc */ - #define CACHE_VERSION 3 #define CACHE_MAGIC 0xbabeeeeeU - union semun { int val; struct semid_ds *buf; @@ -209,7 +196,7 @@ NisMappedCache::mapCache() fd = open(name, open_mode); if (fd == -1) goto done; - if (_FSTAT(fd, &stbuf) == -1) { + if (fstat(fd, &stbuf) == -1) { syslog(LOG_ERR, "can't stat %s: %m", name); goto done; } diff --git a/usr/src/lib/libnsl/nis/cache/mgr_cache.cc b/usr/src/lib/libnsl/nis/cache/mgr_cache.cc index 78cbedd875..654a82d6e4 100644 --- a/usr/src/lib/libnsl/nis/cache/mgr_cache.cc +++ b/usr/src/lib/libnsl/nis/cache/mgr_cache.cc @@ -19,13 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "mgr_cache.h" #include <string.h> #include <syslog.h> diff --git a/usr/src/lib/libnsl/nis/gen/nis_cast.c b/usr/src/lib/libnsl/nis/gen/nis_cast.c index 54acadb9cd..a11bfcffb1 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_cast.c +++ b/usr/src/lib/libnsl/nis/gen/nis_cast.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,6 +39,7 @@ * nis_cast: multicast to a specific group of hosts. */ +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libnsl/nis/gen/nis_cback_xdr.c b/usr/src/lib/libnsl/nis/gen/nis_cback_xdr.c index 864cc9104e..cb26534125 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_cback_xdr.c +++ b/usr/src/lib/libnsl/nis/gen/nis_cback_xdr.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,6 +31,7 @@ * Originally generated using rpcgen. */ +#include "mt.h" #include <rpc/rpc.h> #include <rpcsvc/nis_callback.h> #include "nis_clnt.h" diff --git a/usr/src/lib/libnsl/nis/gen/nis_hash.c b/usr/src/lib/libnsl/nis/gen/nis_hash.c index c828c2411d..25062b63f5 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_hash.c +++ b/usr/src/lib/libnsl/nis/gen/nis_hash.c @@ -19,18 +19,15 @@ * * CDDL HEADER END */ + /* - * nis_hash.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * nis_hash.c - * * GENERIC hash functions for NIS names. * * These functions provide a basic hashing mechanisim for efficiently @@ -46,6 +43,7 @@ * all entries (used when enumerating groups). */ +#include "mt.h" #include <string.h> #include <ctype.h> #include <malloc.h> diff --git a/usr/src/lib/libnsl/nis/gen/nis_local.h b/usr/src/lib/libnsl/nis/gen/nis_local.h index 8d030c5d59..fd25e88dd6 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_local.h +++ b/usr/src/lib/libnsl/nis/gen/nis_local.h @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +39,6 @@ extern "C" { #endif /* - * nis_local.h - * * Manifest constants for the NIS+ client library. */ @@ -221,13 +219,6 @@ extern int __nis_run_dump_callback(netobj *, rpcproc_t, */ extern mutex_t __nis_callback_lock; -/* - * External functions without prototypes. - */ -extern unsigned _sleep(unsigned); -extern int _fstat(int, struct stat *); -extern int _fcntl(int, int, ...); - #ifdef __cplusplus } #endif diff --git a/usr/src/lib/libnsl/nis/gen/nis_lookup.c b/usr/src/lib/libnsl/nis/gen/nis_lookup.c index d162e95609..1460a20d9d 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_lookup.c +++ b/usr/src/lib/libnsl/nis/gen/nis_lookup.c @@ -21,17 +21,16 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * nis_lookup.c - * * This module contains just the core lookup functions. */ +#include "mt.h" #include <stdlib.h> #include <unistd.h> #include <syslog.h> @@ -191,7 +190,7 @@ follow_link: sec = __nis_max_hard_lookup_time; --times_thru; } - _sleep(sec); + (void) sleep(sec); __nis_reset_call_state(&state); } call_done: diff --git a/usr/src/lib/libnsl/nis/gen/nis_names.c b/usr/src/lib/libnsl/nis/gen/nis_names.c index 317f6356a6..e31f1d1340 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_names.c +++ b/usr/src/lib/libnsl/nis/gen/nis_names.c @@ -21,16 +21,13 @@ */ /* - * nis_names.c - * - * Relative name search policies. - * - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <string.h> #include <rpcsvc/nis.h> diff --git a/usr/src/lib/libnsl/nis/gen/nis_rpc.c b/usr/src/lib/libnsl/nis/gen/nis_rpc.c index 87e8fd451d..a30ad5290f 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_rpc.c +++ b/usr/src/lib/libnsl/nis/gen/nis_rpc.c @@ -21,15 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * nis_rpc.c - * * This module contains some grungy RPC binding functions that are * used by the client library. */ @@ -47,11 +45,6 @@ #include "nis_clnt.h" #include "nis_local.h" -#if defined(sparc) -#define _FSTAT _fstat -#else /* !sparc */ -#define _FSTAT fstat -#endif /* sparc */ CLIENT * nis_make_rpchandle_uaddr(nis_server *, int, rpcprog_t, rpcvers_t, uint_t, int, int, char *); @@ -655,7 +648,7 @@ new_address: /* New entry */ sig_mutex_unlock(&srv_cache_lock); if (clnt_control(clnt, CLGET_FD, (char *)&fd)) - _fcntl(fd, F_SETFD, 1); + (void) fcntl(fd, F_SETFD, 1); /* make it "close on exec" */ } else { /* Match found in the cache */ @@ -1171,7 +1164,7 @@ set_rdev(server *srv) struct stat stbuf; if (clnt_control(srv->clnt, CLGET_FD, (char *)&fd) != TRUE || - _FSTAT(fd, &stbuf) == -1) { + fstat(fd, &stbuf) == -1) { syslog(LOG_DEBUG, "NIS+: can't get rdev"); srv->fd = -1; return; @@ -1189,7 +1182,7 @@ check_rdev(server *srv) if (srv->fd == -1) return (1); /* can't check it, assume it is okay */ - if (_FSTAT(srv->fd, &stbuf) == -1) { + if (fstat(srv->fd, &stbuf) == -1) { syslog(LOG_DEBUG, "NIS+: can't stat %d", srv->fd); /* could be because file descriptor was closed */ /* it's not our file descriptor, so don't try to close it */ diff --git a/usr/src/lib/libnsl/nis/gen/nis_subr.c b/usr/src/lib/libnsl/nis/gen/nis_subr.c index 71ab1338b0..4efce4de88 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_subr.c +++ b/usr/src/lib/libnsl/nis/gen/nis_subr.c @@ -21,15 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * nis_subr.c - * * This module contains the subroutines used by the server to manipulate * objects and names. */ @@ -1765,7 +1763,7 @@ __nis_clnt_create(int fd, struct netconfig *nc, char *uaddr, if (clnt) { if (clnt_control(clnt, CLGET_FD, (char *)&fd)) /* make it "close on exec" */ - _fcntl(fd, F_SETFD, FD_CLOEXEC); + (void) fcntl(fd, F_SETFD, FD_CLOEXEC); (void) clnt_control(clnt, CLSET_FD_CLOSE, NULL); } @@ -2242,7 +2240,7 @@ __nis_local_root(void) case NIS_CACHEEXPIRED: /* sleep 1 second and try same name again, up to 10 times */ /* REMIND: This is arbitrary! BAD! */ - _sleep(1); + (void) sleep(1); fatal_error = (try_count++ > 9); break; case NIS_NAMEUNREACHABLE: diff --git a/usr/src/lib/libnsl/nis/gen/nis_tags.c b/usr/src/lib/libnsl/nis/gen/nis_tags.c index f13d3e58a5..0916c5e671 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_tags.c +++ b/usr/src/lib/libnsl/nis/gen/nis_tags.c @@ -19,23 +19,21 @@ * * CDDL HEADER END */ + /* - * nis_tags.c - * - * Copyright (c) 1988-2001 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * nis_tags.c - * * This module contains the library functions that manipulate the * server state and statistics. It also includes the implementations * nis_getservlist and nis_freeservlist */ +#include "mt.h" #include <string.h> #include <malloc.h> #include <rpc/rpc.h> diff --git a/usr/src/lib/libnsl/nis/gen/nis_xdr.c b/usr/src/lib/libnsl/nis/gen/nis_xdr.c index b7b88816a7..63d26c43ce 100644 --- a/usr/src/lib/libnsl/nis/gen/nis_xdr.c +++ b/usr/src/lib/libnsl/nis/gen/nis_xdr.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,6 +31,7 @@ * Originally generated using rpcgen. */ +#include "mt.h" #include <rpc/rpc.h> #include <rpcsvc/nis.h> diff --git a/usr/src/lib/libnsl/nis/gen/npd_lib.c b/usr/src/lib/libnsl/nis/gen/npd_lib.c index 9d0f612c0c..b22439b608 100644 --- a/usr/src/lib/libnsl/nis/gen/npd_lib.c +++ b/usr/src/lib/libnsl/nis/gen/npd_lib.c @@ -19,18 +19,20 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * npd_lib.c + */ + +/* * Contains the encryption routines required by the server * and the client-side for NIS+ passwd update deamon. - * */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <string.h> #include <memory.h> #include <rpc/des_crypt.h> diff --git a/usr/src/lib/libnsl/nis/gen/print_obj.c b/usr/src/lib/libnsl/nis/gen/print_obj.c index 561af23835..a94093a36b 100644 --- a/usr/src/lib/libnsl/nis/gen/print_obj.c +++ b/usr/src/lib/libnsl/nis/gen/print_obj.c @@ -19,22 +19,19 @@ * * CDDL HEADER END */ + /* - * print_obj.c - * - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * - * print_obj.c - * * This module contains a function for printing objects to standard out. */ +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/usr/src/lib/libnsl/nsl/_utility.c b/usr/src/lib/libnsl/nsl/_utility.c index 5799e09f64..4f366a8978 100644 --- a/usr/src/lib/libnsl/nsl/_utility.c +++ b/usr/src/lib/libnsl/nsl/_utility.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -100,7 +100,7 @@ _t_checkfd(int fd, int force_sync, int api_semantics) */ timodpushed = 0; do { - retval = _ioctl(fd, I_FIND, "timod"); + retval = ioctl(fd, I_FIND, "timod"); } while (retval < 0 && errno == EINTR); if (retval < 0 || (retval == 0 && _T_IS_TLI(api_semantics))) { @@ -131,7 +131,7 @@ _t_checkfd(int fd, int force_sync, int api_semantics) * Assumes (correctly) that I_PUSH is * atomic w.r.t signals (EINTR error) */ - retval = _ioctl(fd, I_PUSH, "timod"); + retval = ioctl(fd, I_PUSH, "timod"); } while (retval < 0 && errno == EINTR); if (retval < 0) { @@ -162,7 +162,7 @@ _t_checkfd(int fd, int force_sync, int api_semantics) * not have been a network transport stream. */ if (timodpushed) - (void) _ioctl(fd, I_POP, 0); + (void) ioctl(fd, I_POP, 0); errno = sv_errno; return (NULL); } @@ -315,7 +315,7 @@ _t_is_event(int fd, struct _ti_user *tiptr) int size, retval; assert(MUTEX_HELD(&tiptr->ti_lock)); - if ((retval = _ioctl(fd, I_NREAD, &size)) < 0) { + if ((retval = ioctl(fd, I_NREAD, &size)) < 0) { t_errno = TSYSERR; return (-1); } @@ -364,9 +364,9 @@ _t_is_ok(int fd, struct _ti_user *tiptr, t_scalar_t type) * Temporarily convert a non blocking endpoint to a * blocking one and restore status later */ - cntlflag = _fcntl(fd, F_GETFL, 0); + cntlflag = fcntl(fd, F_GETFL, 0); if (cntlflag & (O_NDELAY | O_NONBLOCK)) - (void) _fcntl(fd, F_SETFL, cntlflag & ~(O_NDELAY | O_NONBLOCK)); + (void) fcntl(fd, F_SETFL, cntlflag & ~(O_NDELAY | O_NONBLOCK)); flags = RS_HIPRI; @@ -374,7 +374,7 @@ _t_is_ok(int fd, struct _ti_user *tiptr, t_scalar_t type) if (errno == EINTR) continue; if (cntlflag & (O_NDELAY | O_NONBLOCK)) - (void) _fcntl(fd, F_SETFL, cntlflag); + (void) fcntl(fd, F_SETFL, cntlflag); t_errno = TSYSERR; goto err_out; } @@ -382,7 +382,7 @@ _t_is_ok(int fd, struct _ti_user *tiptr, t_scalar_t type) /* did I get entire message */ if (retval > 0) { if (cntlflag & (O_NDELAY | O_NONBLOCK)) - (void) _fcntl(fd, F_SETFL, cntlflag); + (void) fcntl(fd, F_SETFL, cntlflag); t_errno = TSYSERR; errno = EIO; goto err_out; @@ -393,14 +393,14 @@ _t_is_ok(int fd, struct _ti_user *tiptr, t_scalar_t type) */ if (ctlbuf.len < (int)sizeof (t_scalar_t)) { if (cntlflag & (O_NDELAY | O_NONBLOCK)) - (void) _fcntl(fd, F_SETFL, cntlflag); + (void) fcntl(fd, F_SETFL, cntlflag); t_errno = TSYSERR; errno = EPROTO; goto err_out; } if (cntlflag & (O_NDELAY | O_NONBLOCK)) - (void) _fcntl(fd, F_SETFL, cntlflag); + (void) fcntl(fd, F_SETFL, cntlflag); /* LINTED pointer cast */ pptr = (union T_primitives *)ctlbuf.buf; @@ -436,7 +436,7 @@ _t_is_ok(int fd, struct _ti_user *tiptr, t_scalar_t type) * there is something that needs attention */ if (pptr->error_ack.TLI_error == TOUTSTATE) { - if ((retval = _ioctl(fd, I_NREAD, &size)) < 0) { + if ((retval = ioctl(fd, I_NREAD, &size)) < 0) { t_errno = TSYSERR; goto err_out; } @@ -481,7 +481,7 @@ _t_do_ioctl(int fd, char *buf, int size, int cmd, int *retlenp) strioc.ic_len = size; strioc.ic_dp = buf; - if ((retval = _ioctl(fd, I_STR, &strioc)) < 0) { + if ((retval = ioctl(fd, I_STR, &strioc)) < 0) { t_errno = TSYSERR; return (-1); } @@ -1118,7 +1118,7 @@ _t_adjust_state(int fd, int instate) arg.flags = 0; - if ((retval = _ioctl(fd, I_PEEK, &arg)) < 0) { + if ((retval = ioctl(fd, I_PEEK, &arg)) < 0) { t_errno = TSYSERR; return (-1); } diff --git a/usr/src/lib/libnsl/nsl/t_accept.c b/usr/src/lib/libnsl/nsl/t_accept.c index 0436d578d4..48dc8d6e72 100644 --- a/usr/src/lib/libnsl/nsl/t_accept.c +++ b/usr/src/lib/libnsl/nsl/t_accept.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -147,7 +147,7 @@ _tx_accept( } if (fd != resfd) { - if ((retval = _ioctl(resfd, I_NREAD, &size)) < 0) { + if ((retval = ioctl(resfd, I_NREAD, &size)) < 0) { sv_errno = errno; t_errno = TSYSERR; @@ -263,7 +263,7 @@ _tx_accept( strfdinsert.offset = (int)sizeof (t_scalar_t); strfdinsert.flags = 0; /* could be EXPEDITED also */ - if (_ioctl(fd, I_FDINSERT, &strfdinsert) < 0) { + if (ioctl(fd, I_FDINSERT, &strfdinsert) < 0) { if (errno == EAGAIN) t_errno = TFLOW; else diff --git a/usr/src/lib/libnsl/nsl/t_alloc.c b/usr/src/lib/libnsl/nsl/t_alloc.c index c30bafcad4..a8e05bc2d9 100644 --- a/usr/src/lib/libnsl/nsl/t_alloc.c +++ b/usr/src/lib/libnsl/nsl/t_alloc.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -83,7 +83,7 @@ _tx_alloc(int fd, int struct_type, int fields, int api_semantics) strioc.ic_len = (int)sizeof (struct T_info_req); strioc.ic_dp = (char *)&info; do { - retval = _ioctl(fd, I_STR, &strioc); + retval = ioctl(fd, I_STR, &strioc); } while (retval < 0 && errno == EINTR); if (retval < 0) { diff --git a/usr/src/lib/libnsl/nsl/t_connect.c b/usr/src/lib/libnsl/nsl/t_connect.c index b806b8f9e4..f298d16a7c 100644 --- a/usr/src/lib/libnsl/nsl/t_connect.c +++ b/usr/src/lib/libnsl/nsl/t_connect.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -115,7 +115,7 @@ _tx_connect( } (void) thr_sigsetmask(SIG_SETMASK, &mask, NULL); - if ((fctlflg = _fcntl(fd, F_GETFL, 0)) < 0) { + if ((fctlflg = fcntl(fd, F_GETFL, 0)) < 0) { t_errno = TSYSERR; goto err_out; } diff --git a/usr/src/lib/libnsl/nsl/t_getname.c b/usr/src/lib/libnsl/nsl/t_getname.c index 57b2f82af2..2581e41575 100644 --- a/usr/src/lib/libnsl/nsl/t_getname.c +++ b/usr/src/lib/libnsl/nsl/t_getname.c @@ -24,14 +24,14 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include <stdlib.h> #include "mt.h" +#include <stdlib.h> #include <errno.h> #include <unistd.h> #include <string.h> @@ -88,7 +88,7 @@ __tx_getname_locked(int fd, struct netbuf *name, int type) int retval; do { - retval = _ioctl(fd, + retval = ioctl(fd, (type == LOCALNAME) ? TI_GETMYNAME : TI_GETPEERNAME, name); } while (retval < 0 && errno == EINTR); diff --git a/usr/src/lib/libnsl/nsl/t_look.c b/usr/src/lib/libnsl/nsl/t_look.c index 527db7ee47..91ff5271cf 100644 --- a/usr/src/lib/libnsl/nsl/t_look.c +++ b/usr/src/lib/libnsl/nsl/t_look.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -129,7 +129,7 @@ _t_look_locked( strpeek.flags = 0; do { - retval = _ioctl(fd, I_PEEK, &strpeek); + retval = ioctl(fd, I_PEEK, &strpeek); } while (retval < 0 && errno == EINTR); if (retval < 0) { diff --git a/usr/src/lib/libnsl/nsl/t_open.c b/usr/src/lib/libnsl/nsl/t_open.c index 1b5d47df55..edf38e6449 100644 --- a/usr/src/lib/libnsl/nsl/t_open.c +++ b/usr/src/lib/libnsl/nsl/t_open.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -91,7 +91,7 @@ retry: * is module already pushed */ do { - retval = _ioctl(fd, I_FIND, "timod"); + retval = ioctl(fd, I_FIND, "timod"); } while (retval < 0 && errno == EINTR); if (retval < 0) { @@ -112,7 +112,7 @@ retry: * Assumes (correctly) that I_PUSH is * atomic w.r.t signals (EINTR error) */ - retval = _ioctl(fd, I_PUSH, "timod"); + retval = ioctl(fd, I_PUSH, "timod"); } while (retval < 0 && errno == EINTR); if (retval < 0) { @@ -175,7 +175,7 @@ retry: (void) thr_sigsetmask(SIG_SETMASK, &mask, NULL); do { - retval = _ioctl(fd, I_FLUSH, FLUSHRW); + retval = ioctl(fd, I_FLUSH, FLUSHRW); } while (retval < 0 && errno == EINTR); /* diff --git a/usr/src/lib/libnsl/nsl/t_rcv.c b/usr/src/lib/libnsl/nsl/t_rcv.c index d1bd56a00f..f7faad6886 100644 --- a/usr/src/lib/libnsl/nsl/t_rcv.c +++ b/usr/src/lib/libnsl/nsl/t_rcv.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -110,7 +110,7 @@ _tx_rcv(int fd, char *buf, unsigned nbytes, int *flags, int api_semantics) * */ do { - retval = _ioctl(fd, I_NREAD, &msglen); + retval = ioctl(fd, I_NREAD, &msglen); } while (retval < 0 && errno == EINTR); if (retval < 0) { diff --git a/usr/src/lib/libnsl/nsl/t_rcvv.c b/usr/src/lib/libnsl/nsl/t_rcvv.c index d8f413bd78..f6bb4f490d 100644 --- a/usr/src/lib/libnsl/nsl/t_rcvv.c +++ b/usr/src/lib/libnsl/nsl/t_rcvv.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -112,7 +112,7 @@ _tx_rcvv(int fd, struct t_iovec *tiov, unsigned int tiovcount, int *flags, * */ do { - retval = _ioctl(fd, I_NREAD, &msglen); + retval = ioctl(fd, I_NREAD, &msglen); } while (retval < 0 && errno == EINTR); if (retval < 0) { diff --git a/usr/src/lib/libnsl/nsl/t_snddis.c b/usr/src/lib/libnsl/nsl/t_snddis.c index 53f405bf7a..3eae262d06 100644 --- a/usr/src/lib/libnsl/nsl/t_snddis.c +++ b/usr/src/lib/libnsl/nsl/t_snddis.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -127,7 +127,7 @@ _tx_snddis(int fd, const struct t_call *call, int api_semantics) _t_flush_lookevents(tiptr); /* flush but not on listener */ do { - retval = _ioctl(fd, I_FLUSH, FLUSHW); + retval = ioctl(fd, I_FLUSH, FLUSHW); } while (retval < 0 && errno == EINTR); if (retval < 0) { sv_errno = errno; diff --git a/usr/src/lib/libnsl/nsl/t_unbind.c b/usr/src/lib/libnsl/nsl/t_unbind.c index 713ee038ff..512895550d 100644 --- a/usr/src/lib/libnsl/nsl/t_unbind.c +++ b/usr/src/lib/libnsl/nsl/t_unbind.c @@ -24,7 +24,7 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -119,7 +119,7 @@ _tx_unbind_locked(int fd, struct _ti_user *tiptr, struct strbuf *ctlbufp) goto err_out; } - if (_ioctl(fd, I_FLUSH, FLUSHRW) < 0) { + if (ioctl(fd, I_FLUSH, FLUSHRW) < 0) { t_errno = TSYSERR; goto err_out; } diff --git a/usr/src/lib/libnsl/nss/getauthattr.c b/usr/src/lib/libnsl/nss/getauthattr.c index bbae54a2ff..d734e99ab9 100644 --- a/usr/src/lib/libnsl/nss/getauthattr.c +++ b/usr/src/lib/libnsl/nss/getauthattr.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <sys/types.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libnsl/nss/getauuser.c b/usr/src/lib/libnsl/nss/getauuser.c index e7520d5517..877a108ff8 100644 --- a/usr/src/lib/libnsl/nss/getauuser.c +++ b/usr/src/lib/libnsl/nss/getauuser.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <sys/types.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libnsl/nss/gethostby_door.c b/usr/src/lib/libnsl/nss/gethostby_door.c index 2cfbfe6e74..8b7f66f46f 100644 --- a/usr/src/lib/libnsl/nss/gethostby_door.c +++ b/usr/src/lib/libnsl/nss/gethostby_door.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <pwd.h> #include <strings.h> #include <sys/mman.h> diff --git a/usr/src/lib/libnsl/nss/gethostbyname_r.c b/usr/src/lib/libnsl/nss/gethostbyname_r.c index 14f44b0214..27435b95fe 100644 --- a/usr/src/lib/libnsl/nss/gethostbyname_r.c +++ b/usr/src/lib/libnsl/nss/gethostbyname_r.c @@ -21,15 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * lib/libnsl/nss/gethostbyname_r.c - * * gethostbyname_r() is defined in this file. It is implemented on top of * _get_hostserv_inetnetdir_byname() which is also used to implement * netdir_getbyname() for inet family transports. In turn the common code @@ -51,6 +49,7 @@ * enumeration state, between gethostbyYY_r() and gethostent_r(); */ +#include "mt.h" #include <netdb.h> #include <netdir.h> #include <sys/types.h> diff --git a/usr/src/lib/libnsl/nss/gethostent.c b/usr/src/lib/libnsl/nss/gethostent.c index 0bf5b90cd0..8cbc3b9dec 100644 --- a/usr/src/lib/libnsl/nss/gethostent.c +++ b/usr/src/lib/libnsl/nss/gethostent.c @@ -21,16 +21,17 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * + */ + +/* * Ye olde non-reentrant interface (MT-unsafe, caveat utor) - * - * lib/libnsl/nss/gethostent.c */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <ctype.h> #include <string.h> diff --git a/usr/src/lib/libnsl/nss/gethostent6.c b/usr/src/lib/libnsl/nss/gethostent6.c index 2dd98e4280..75d1352308 100644 --- a/usr/src/lib/libnsl/nss/gethostent6.c +++ b/usr/src/lib/libnsl/nss/gethostent6.c @@ -21,11 +21,11 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * lib/libnsl/nss/gethostent6.c - * + */ + +/* * This file defines and implements the re-entrant enumeration routines for * IPv6 hosts: sethostent6(), gethostent6(), and endhostent6(). * They consult the switch policy directly and do not "share" their @@ -37,6 +37,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <sys/socket.h> #include <sys/types.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libnsl/nss/gethostent_r.c b/usr/src/lib/libnsl/nss/gethostent_r.c index 209d1e67a4..3ce99225af 100644 --- a/usr/src/lib/libnsl/nss/gethostent_r.c +++ b/usr/src/lib/libnsl/nss/gethostent_r.c @@ -21,11 +21,11 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * lib/libnsl/nss/gethostent_r.c - * + */ + +/* * This file defines and implements the re-entrant enumeration routines for * hosts: sethostent(), gethostent_r(), and endhostent(). They consult * the switch policy directly and do not "share" their enumeration state @@ -37,6 +37,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <sys/socket.h> #include <sys/types.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libnsl/nss/getipnodeby_door.c b/usr/src/lib/libnsl/nss/getipnodeby_door.c index 782704d927..8c0423196e 100644 --- a/usr/src/lib/libnsl/nss/getipnodeby_door.c +++ b/usr/src/lib/libnsl/nss/getipnodeby_door.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <pwd.h> #include <strings.h> #include <sys/mman.h> diff --git a/usr/src/lib/libnsl/nss/getprofattr.c b/usr/src/lib/libnsl/nss/getprofattr.c index e11de065bd..ffda122e05 100644 --- a/usr/src/lib/libnsl/nss/getprofattr.c +++ b/usr/src/lib/libnsl/nss/getprofattr.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <sys/types.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libnsl/nss/getrpcent.c b/usr/src/lib/libnsl/nss/getrpcent.c index 3db08cc425..d16bae73f9 100644 --- a/usr/src/lib/libnsl/nss/getrpcent.c +++ b/usr/src/lib/libnsl/nss/getrpcent.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,6 +31,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpcent.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libnsl/nss/getrpcent_r.c b/usr/src/lib/libnsl/nss/getrpcent_r.c index 076e762840..206b3896d0 100644 --- a/usr/src/lib/libnsl/nss/getrpcent_r.c +++ b/usr/src/lib/libnsl/nss/getrpcent_r.c @@ -21,14 +21,17 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * + */ + +/* * Rentrant (MT-safe) getrpcYY interfaces. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <ctype.h> #include <nss_dbdefs.h> #include <stdlib.h> diff --git a/usr/src/lib/libnsl/nss/getuserattr.c b/usr/src/lib/libnsl/nss/getuserattr.c index b1252f4bb4..30b196c8de 100644 --- a/usr/src/lib/libnsl/nss/getuserattr.c +++ b/usr/src/lib/libnsl/nss/getuserattr.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <limits.h> diff --git a/usr/src/lib/libnsl/nss/inet_ntop.c b/usr/src/lib/libnsl/nss/inet_ntop.c index 0d974866cc..28067cffa0 100644 --- a/usr/src/lib/libnsl/nss/inet_ntop.c +++ b/usr/src/lib/libnsl/nss/inet_ntop.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -22,6 +22,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <ctype.h> #include <string.h> diff --git a/usr/src/lib/libnsl/nss/inet_pton.c b/usr/src/lib/libnsl/nss/inet_pton.c index e7d43a5721..ec94b1f5e5 100644 --- a/usr/src/lib/libnsl/nss/inet_pton.c +++ b/usr/src/lib/libnsl/nss/inet_pton.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -22,6 +22,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <ctype.h> #include <string.h> diff --git a/usr/src/lib/libnsl/nss/parse.c b/usr/src/lib/libnsl/nss/parse.c index a0c5c8e775..80c22a3e40 100644 --- a/usr/src/lib/libnsl/nss/parse.c +++ b/usr/src/lib/libnsl/nss/parse.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <strings.h> diff --git a/usr/src/lib/libnsl/rpc/auth_time.c b/usr/src/lib/libnsl/rpc/auth_time.c index 2022e3fbdb..f12fc1acbb 100644 --- a/usr/src/lib/libnsl/rpc/auth_time.c +++ b/usr/src/lib/libnsl/rpc/auth_time.c @@ -21,11 +21,11 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * auth_time.c - * + */ + +/* * This module contains the private function __rpc_get_time_offset() * which will return the difference in seconds between the local system's * notion of time and a remote server's notion of time. This must be @@ -49,6 +49,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/usr/src/lib/libnsl/rpc/authdes_prot.c b/usr/src/lib/libnsl/rpc/authdes_prot.c index b264fe2760..8499f532af 100644 --- a/usr/src/lib/libnsl/rpc/authdes_prot.c +++ b/usr/src/lib/libnsl/rpc/authdes_prot.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,9 +36,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * authdes_prot.c, XDR routines for DES authentication + * XDR routines for DES authentication */ +#include "mt.h" #include <sys/types.h> #include <rpc/types.h> #include <rpc/xdr.h> diff --git a/usr/src/lib/libnsl/rpc/authsys_prot.c b/usr/src/lib/libnsl/rpc/authsys_prot.c index 5b86879f1c..44e005823c 100644 --- a/usr/src/lib/libnsl/rpc/authsys_prot.c +++ b/usr/src/lib/libnsl/rpc/authsys_prot.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,10 +36,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * authsys_prot.c * XDR for UNIX style authentication parameters for RPC */ +#include "mt.h" #include <rpc/types.h> #include <rpc/xdr.h> #include <rpc/auth.h> diff --git a/usr/src/lib/libnsl/rpc/can_use_af.c b/usr/src/lib/libnsl/rpc/can_use_af.c index e75590cf87..885045648b 100644 --- a/usr/src/lib/libnsl/rpc/can_use_af.c +++ b/usr/src/lib/libnsl/rpc/can_use_af.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "rpc_mt.h" #include <stdio.h> #include <fcntl.h> diff --git a/usr/src/lib/libnsl/rpc/clnt_bcast.c b/usr/src/lib/libnsl/rpc/clnt_bcast.c index d672c1b915..fc18ed6236 100644 --- a/usr/src/lib/libnsl/rpc/clnt_bcast.c +++ b/usr/src/lib/libnsl/rpc/clnt_bcast.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,13 +36,13 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * clnt_bcast.c * Client interface to broadcast service. * * The following is kludged-up support for simple rpc broadcasts. * Someday a large, complicated system will replace these routines. */ +#include "mt.h" #include <string.h> #include <strings.h> #include <rpc/rpc.h> diff --git a/usr/src/lib/libnsl/rpc/clnt_generic.c b/usr/src/lib/libnsl/rpc/clnt_generic.c index 7439299ae4..add0dfe880 100644 --- a/usr/src/lib/libnsl/rpc/clnt_generic.c +++ b/usr/src/lib/libnsl/rpc/clnt_generic.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -34,6 +35,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include "rpc_mt.h" #include <stdio.h> #include <errno.h> @@ -767,7 +769,7 @@ __rpc_raise_fd(int fd) if (fd >= __rpc_minfd) return (fd); - if ((nfd = _fcntl(fd, F_DUPFD, __rpc_minfd)) == -1) + if ((nfd = fcntl(fd, F_DUPFD, __rpc_minfd)) == -1) return (fd); if (t_sync(nfd) == -1) { diff --git a/usr/src/lib/libnsl/rpc/clnt_simple.c b/usr/src/lib/libnsl/rpc/clnt_simple.c index b447290b63..e060136988 100644 --- a/usr/src/lib/libnsl/rpc/clnt_simple.c +++ b/usr/src/lib/libnsl/rpc/clnt_simple.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,9 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * clnt_simple.c * Simplified front end to client rpc. - * */ #include "mt.h" @@ -147,7 +146,7 @@ rpc_call(const char *host, const rpcprog_t prognum, const rpcvers_t versnum, (void) CLNT_CONTROL(rcp->client, CLSET_RETRY_TIMEOUT, (char *)&timeout); if (CLNT_CONTROL(rcp->client, CLGET_FD, (char *)&fd)) - _fcntl(fd, F_SETFD, 1); /* make it "close on exec" */ + (void) fcntl(fd, F_SETFD, 1); /* close on exec */ rcp->prognum = prognum; rcp->versnum = versnum; if ((strlen(host) < (size_t)MAXHOSTNAMELEN) && diff --git a/usr/src/lib/libnsl/rpc/getdname.c b/usr/src/lib/libnsl/rpc/getdname.c index 31fafe637a..34d2ea22b4 100644 --- a/usr/src/lib/libnsl/rpc/getdname.c +++ b/usr/src/lib/libnsl/rpc/getdname.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,10 +36,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * getdname.c - * Gets and sets the domain name of the system + * Gets and sets the domain name of the system */ +#include "mt.h" #include "rpc_mt.h" #include <stdio.h> #include <stdlib.h> diff --git a/usr/src/lib/libnsl/rpc/gethostname.c b/usr/src/lib/libnsl/rpc/gethostname.c index 11372bcfc4..4fea8f6327 100644 --- a/usr/src/lib/libnsl/rpc/gethostname.c +++ b/usr/src/lib/libnsl/rpc/gethostname.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -34,14 +35,11 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <sys/utsname.h> #include <sys/types.h> #include <string.h> -#ifndef i386 -extern int _uname(); -#endif - /* * gethostname bsd compatibility */ diff --git a/usr/src/lib/libnsl/rpc/key_call.c b/usr/src/lib/libnsl/rpc/key_call.c index 03188f2f3a..da5e932f15 100644 --- a/usr/src/lib/libnsl/rpc/key_call.c +++ b/usr/src/lib/libnsl/rpc/key_call.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,7 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * key_call.c, Interface to keyserver + * Interface to keyserver * * setsecretkey(key) - set your secret key * encryptsessionkey(agent, deskey) - encrypt a session key to talk to agent @@ -58,12 +59,6 @@ #define CLASSIC_PK_DH(k, a) (((k) == 192) && ((a) == 0)) -#if defined(sparc) -#define _FSTAT _fstat -#else /* !sparc */ -#define _FSTAT fstat -#endif /* sparc */ - #ifdef DEBUG #define debug(msg) (void) fprintf(stderr, "%s\n", msg); #else @@ -844,7 +839,7 @@ getkeyserv_handle(int vers, int stale) /* Update fd in kcp because it was reopened in _update_did */ if (clnt_control(kcp->client, CLGET_FD, (void *)&fd) && (fd >= 0)) - _fcntl(fd, F_SETFD, FD_CLOEXEC); /* "close on exec" */ + (void) fcntl(fd, F_SETFD, FD_CLOEXEC); /* close exec */ kcp->fd = fd; return (kcp->client); } @@ -854,7 +849,7 @@ getkeyserv_handle(int vers, int stale) kcp->pid = getpid(); set_rdev(kcp); - _fcntl(kcp->fd, F_SETFD, FD_CLOEXEC); /* make it "close on exec" */ + (void) fcntl(kcp->fd, F_SETFD, FD_CLOEXEC); /* close on exec */ return (kcp->client); } @@ -984,7 +979,7 @@ set_rdev(struct key_call_private *kcp) struct stat stbuf; if (clnt_control(kcp->client, CLGET_FD, (char *)&fd) != TRUE || - _FSTAT(fd, &stbuf) == -1) { + fstat(fd, &stbuf) == -1) { syslog(LOG_DEBUG, "keyserv_client: can't get info"); kcp->fd = -1; return; @@ -1001,7 +996,7 @@ check_rdev(struct key_call_private *kcp) if (kcp->fd == -1) return (1); /* can't check it, assume it is okay */ - if (_FSTAT(kcp->fd, &stbuf) == -1) { + if (fstat(kcp->fd, &stbuf) == -1) { syslog(LOG_DEBUG, "keyserv_client: can't stat %d", kcp->fd); /* could be because file descriptor was closed */ /* it's not our file descriptor, so don't try to close it */ diff --git a/usr/src/lib/libnsl/rpc/key_prot.c b/usr/src/lib/libnsl/rpc/key_prot.c index 6d7e1eefbf..a1765efdfc 100644 --- a/usr/src/lib/libnsl/rpc/key_prot.c +++ b/usr/src/lib/libnsl/rpc/key_prot.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpc.h> #include <rpc/key_prot.h> diff --git a/usr/src/lib/libnsl/rpc/mt_misc.c b/usr/src/lib/libnsl/rpc/mt_misc.c index a042abb989..21e0328461 100644 --- a/usr/src/lib/libnsl/rpc/mt_misc.c +++ b/usr/src/lib/libnsl/rpc/mt_misc.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -126,7 +126,7 @@ _libnsl_lock_init() { int i; - (void) _sigfillset(&fillset); + (void) sigfillset(&fillset); for (i = 0; i < (sizeof (mutex_table) / sizeof (mutex_table[0])); i++) (void) mutex_init(mutex_table[i], 0, (void *) 0); diff --git a/usr/src/lib/libnsl/rpc/openchild.c b/usr/src/lib/libnsl/rpc/openchild.c index a663cfa4df..a3bd50f72d 100644 --- a/usr/src/lib/libnsl/rpc/openchild.c +++ b/usr/src/lib/libnsl/rpc/openchild.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,12 +36,11 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * openchild.c, - * * Open two pipes to a child process, one for reading, one for writing. The * pipes are accessed by FILE pointers. This is NOT a public interface, but * for internal use only! */ +#include "mt.h" #include <stdio.h> #include <sys/types.h> #include <rpc/types.h> diff --git a/usr/src/lib/libnsl/rpc/pmap_clnt.c b/usr/src/lib/libnsl/rpc/pmap_clnt.c index 1799fdfc8f..781f0f20fd 100644 --- a/usr/src/lib/libnsl/rpc/pmap_clnt.c +++ b/usr/src/lib/libnsl/rpc/pmap_clnt.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -36,11 +37,10 @@ #ifdef PORTMAP /* - * pmap_clnt.c * interface to pmap rpc service. - * */ +#include "mt.h" #include "rpc_mt.h" #include <rpc/rpc.h> #include <rpc/nettype.h> diff --git a/usr/src/lib/libnsl/rpc/pmap_prot.c b/usr/src/lib/libnsl/rpc/pmap_prot.c index f69d973da4..41d86ae3b2 100644 --- a/usr/src/lib/libnsl/rpc/pmap_prot.c +++ b/usr/src/lib/libnsl/rpc/pmap_prot.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,11 +36,11 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * pmap_prot.c * Protocol for the local binder service, or pmap. * All the pmap xdr routines here. */ +#include "mt.h" #include <rpc/types.h> #include <rpc/xdr.h> #include <rpc/pmap_prot.h> diff --git a/usr/src/lib/libnsl/rpc/rpc_callmsg.c b/usr/src/lib/libnsl/rpc/rpc_callmsg.c index 6f6ef3c758..20dcf02e49 100644 --- a/usr/src/lib/libnsl/rpc/rpc_callmsg.c +++ b/usr/src/lib/libnsl/rpc/rpc_callmsg.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -34,11 +35,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -/* - * rpc_callmsg.c - * - */ - +#include "mt.h" #include <stdlib.h> #include <sys/param.h> #include <rpc/rpc.h> diff --git a/usr/src/lib/libnsl/rpc/rpc_comdata.c b/usr/src/lib/libnsl/rpc/rpc_comdata.c index fc506cbe55..be46323cc6 100644 --- a/usr/src/lib/libnsl/rpc/rpc_comdata.c +++ b/usr/src/lib/libnsl/rpc/rpc_comdata.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -34,6 +35,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpc.h> /* diff --git a/usr/src/lib/libnsl/rpc/rpc_comdata1.c b/usr/src/lib/libnsl/rpc/rpc_comdata1.c index 072d45cdd0..ccfc8ca160 100644 --- a/usr/src/lib/libnsl/rpc/rpc_comdata1.c +++ b/usr/src/lib/libnsl/rpc/rpc_comdata1.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,6 +31,7 @@ * FD_SETSIZE definition must precede any save isa_defs.h since that * is where _LP64 is defined.... */ +#include "mt.h" #include <sys/isa_defs.h> #if !defined(_LP64) #ifdef FD_SETSIZE diff --git a/usr/src/lib/libnsl/rpc/rpc_generic.c b/usr/src/lib/libnsl/rpc/rpc_generic.c index 2fb4873eeb..c45f6071c4 100644 --- a/usr/src/lib/libnsl/rpc/rpc_generic.c +++ b/usr/src/lib/libnsl/rpc/rpc_generic.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,8 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * rpc_generic.c, Miscl routines for RPC. - * + * Miscl routines for RPC. */ #include "mt.h" @@ -59,14 +59,6 @@ #include <netdir.h> #include <netdb.h> -#if defined(sparc) -#define _STAT _stat -#define _FSTAT _fstat -#else /* !sparc */ -#define _STAT stat -#define _FSTAT fstat -#endif /* sparc */ - struct handle { NCONF_HANDLE *nhandle; int nflag; /* Whether NETPATH or NETCONFIG */ @@ -443,7 +435,7 @@ __rpcfd_to_nconf(int fd, int servtype) major_t fdmajor; struct t_info tinfo; - if (_FSTAT(fd, &statbuf) == -1) + if (fstat(fd, &statbuf) == -1) return (NULL); fdmajor = major(statbuf.st_rdev); @@ -478,7 +470,7 @@ __rpcfd_to_nconf(int fd, int servtype) while (nconf = getnetconfig(hndl)) { if (__rpc_matchserv(servtype, nconf->nc_semantics) == TRUE) { - if (!_STAT(nconf->nc_device, &statbuf)) { + if (!stat(nconf->nc_device, &statbuf)) { if (fdmajor == major(statbuf.st_rdev)) break; /* self cloning driver ? */ if (fdmajor == minor(statbuf.st_rdev)) diff --git a/usr/src/lib/libnsl/rpc/rpc_mt.h b/usr/src/lib/libnsl/rpc/rpc_mt.h index 29eedd675d..52b49c3a82 100644 --- a/usr/src/lib/libnsl/rpc/rpc_mt.h +++ b/usr/src/lib/libnsl/rpc/rpc_mt.h @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 1986-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -89,12 +90,6 @@ extern void rpc_fd_unlock(const void *handle, int fd); * way to avoid the warnings. */ -struct stat; - -extern unsigned _sleep(unsigned); -extern int _fstat(int, struct stat *); -extern int _stat(const char *, struct stat *); -extern int _fcntl(int, int, ...); extern int __getpublickey_cached(char *, char *, int *); extern void __getpublickey_flush(const char *); extern int __can_use_af(sa_family_t); diff --git a/usr/src/lib/libnsl/rpc/rpc_prot.c b/usr/src/lib/libnsl/rpc/rpc_prot.c index a911ac7820..27488d7b09 100644 --- a/usr/src/lib/libnsl/rpc/rpc_prot.c +++ b/usr/src/lib/libnsl/rpc/rpc_prot.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,8 +36,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * rpc_prot.c - * * This set of routines implements the rpc message definition, * its serializer and some common rpc utility routines. * The routines are meant for various implementations of rpc - @@ -45,6 +44,7 @@ * routines are also in this program. */ +#include "mt.h" #include <sys/param.h> #include <syslog.h> #include <rpc/rpc.h> diff --git a/usr/src/lib/libnsl/rpc/rpc_sel2poll.c b/usr/src/lib/libnsl/rpc/rpc_sel2poll.c index 30b7ee66b7..60f9197a66 100644 --- a/usr/src/lib/libnsl/rpc/rpc_sel2poll.c +++ b/usr/src/lib/libnsl/rpc/rpc_sel2poll.c @@ -21,14 +21,16 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <sys/select.h> #include <sys/types.h> #include <sys/time.h> diff --git a/usr/src/lib/libnsl/rpc/rpcb_clnt.c b/usr/src/lib/libnsl/rpc/rpcb_clnt.c index 6fe84c4033..9c2f4f92d9 100644 --- a/usr/src/lib/libnsl/rpc/rpcb_clnt.c +++ b/usr/src/lib/libnsl/rpc/rpcb_clnt.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,7 +36,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * rpcb_clnt.c * interface to rpcbind rpc service. */ @@ -61,10 +61,6 @@ #include <string.h> #include <unistd.h> -#if !(defined(__i386) && !defined(__amd64)) -extern int _uname(); -#endif - static struct timeval tottimeout = { 60, 0 }; static const struct timeval rmttimeout = { 3, 0 }; static struct timeval rpcbrmttime = { 15, 0 }; @@ -463,7 +459,7 @@ local_rpcb(void) #if defined(__i386) && !defined(__amd64) if ((_nuname(&utsname) == -1) || #else - if ((_uname(&utsname) == -1) || + if ((uname(&utsname) == -1) || #endif ((hostname = strdup(utsname.nodename)) == NULL)) { syslog(LOG_ERR, "local_rpcb : strdup failed."); @@ -634,7 +630,7 @@ __rpcbind_is_up(void) #if defined(__i386) && !defined(__amd64) if (_nuname(&name) == -1) #else - if (_uname(&name) == -1) + if (uname(&name) == -1) #endif return (TRUE); diff --git a/usr/src/lib/libnsl/rpc/rpcb_prot.c b/usr/src/lib/libnsl/rpc/rpcb_prot.c index 777823e930..d81e7e19f8 100644 --- a/usr/src/lib/libnsl/rpc/rpcb_prot.c +++ b/usr/src/lib/libnsl/rpc/rpcb_prot.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,10 +36,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * rpcb_prot.c * XDR routines for the rpcbinder version 3. */ +#include "mt.h" #include <rpc/rpc.h> #include <rpc/types.h> #include <rpc/xdr.h> diff --git a/usr/src/lib/libnsl/rpc/rpcb_st_xdr.c b/usr/src/lib/libnsl/rpc/rpcb_st_xdr.c index 854aeed79c..938bb8d625 100644 --- a/usr/src/lib/libnsl/rpc/rpcb_st_xdr.c +++ b/usr/src/lib/libnsl/rpc/rpcb_st_xdr.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,6 +32,7 @@ * routines used with the rpcbind stats facility. */ +#include "mt.h" #include <rpc/rpc.h> /* Link list of all the stats about getport and getaddr */ diff --git a/usr/src/lib/libnsl/rpc/rtime_tli.c b/usr/src/lib/libnsl/rpc/rtime_tli.c index 4c9d7b0ed5..a32ab64239 100644 --- a/usr/src/lib/libnsl/rpc/rtime_tli.c +++ b/usr/src/lib/libnsl/rpc/rtime_tli.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,7 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * rtime_tli.c - get time from remote machine + * get time from remote machine * * gets time, obtaining value from host * on the (udp, tcp)/time tli connection. Since timeserver returns @@ -43,6 +44,7 @@ * subtract seconds before Jan 1, 1970 to get * what unix uses. */ +#include "mt.h" #include <rpc/rpc.h> #include <errno.h> #include <sys/poll.h> diff --git a/usr/src/lib/libnsl/rpc/svc_auth_loopb.c b/usr/src/lib/libnsl/rpc/svc_auth_loopb.c index 9c05dcaa3a..f19f8deaea 100644 --- a/usr/src/lib/libnsl/rpc/svc_auth_loopb.c +++ b/usr/src/lib/libnsl/rpc/svc_auth_loopb.c @@ -21,18 +21,18 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * svc_auth_loopb.c * Handles the loopback UNIX flavor authentication parameters on the * service side of rpc. */ +#include "mt.h" #include <stdio.h> #include <rpc/rpc.h> #include <syslog.h> diff --git a/usr/src/lib/libnsl/rpc/svc_auth_sys.c b/usr/src/lib/libnsl/rpc/svc_auth_sys.c index 634a6345e3..e86fb86136 100644 --- a/usr/src/lib/libnsl/rpc/svc_auth_sys.c +++ b/usr/src/lib/libnsl/rpc/svc_auth_sys.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,7 +36,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * svc_auth_sys.c * Handles UNIX flavor authentication parameters on the service side of rpc. * There are two svc auth implementations here: AUTH_SYS and AUTH_SHORT. * __svcauth_sys does full blown unix style uid, gid+gids auth, @@ -45,6 +45,7 @@ * */ +#include "mt.h" #include <stdio.h> #include <rpc/rpc.h> #include <syslog.h> diff --git a/usr/src/lib/libnsl/rpc/svc_run.c b/usr/src/lib/libnsl/rpc/svc_run.c index 8b775d6ac8..2d0d5faad8 100644 --- a/usr/src/lib/libnsl/rpc/svc_run.c +++ b/usr/src/lib/libnsl/rpc/svc_run.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -320,10 +321,6 @@ alloc_pollset(int npollfds) return (0); } -extern int _sigemptyset(sigset_t *); -extern int _sigaddset(sigset_t *, int); -extern int _sigprocmask(int, const sigset_t *, sigset_t *); - static void _svc_run(void) { @@ -337,9 +334,9 @@ _svc_run(void) * to be interrupted due to alarm() but that we don't end up in * an MT-unsafe signal handler at an inopportune time. */ - (void) _sigemptyset(&set); - (void) _sigaddset(&set, SIGALRM); - (void) _sigprocmask(SIG_BLOCK, &set, &oldset); + (void) sigemptyset(&set); + (void) sigaddset(&set, SIGALRM); + (void) sigprocmask(SIG_BLOCK, &set, &oldset); while (!svc_exit_done) { /* * Check whether there is any server fd on which we may want @@ -354,9 +351,9 @@ _svc_run(void) if (npollfds == 0) break; /* None waiting, hence return */ - (void) _sigprocmask(SIG_SETMASK, &oldset, NULL); + (void) sigprocmask(SIG_SETMASK, &oldset, NULL); i = poll(svc_pollset, npollfds, -1); - (void) _sigprocmask(SIG_BLOCK, &set, &oldset); + (void) sigprocmask(SIG_BLOCK, &set, &oldset); switch (i) { case -1: /* @@ -370,7 +367,7 @@ _svc_run(void) svc_getreq_poll(svc_pollset, i); } } - (void) _sigprocmask(SIG_SETMASK, &oldset, NULL); + (void) sigprocmask(SIG_SETMASK, &oldset, NULL); } /* @@ -777,12 +774,12 @@ create_pipe(void) "RPC: svc could not create pipe - exiting")); exit(1); } - if (_fcntl(svc_pipe[0], F_SETFL, O_NONBLOCK) == -1) { + if (fcntl(svc_pipe[0], F_SETFL, O_NONBLOCK) == -1) { syslog(LOG_ERR, dgettext(__nsl_dom, "RPC: svc pipe error - exiting")); exit(1); } - if (_fcntl(svc_pipe[1], F_SETFL, O_NONBLOCK) == -1) { + if (fcntl(svc_pipe[1], F_SETFL, O_NONBLOCK) == -1) { syslog(LOG_ERR, dgettext(__nsl_dom, "RPC: svc pipe error - exiting")); exit(1); diff --git a/usr/src/lib/libnsl/rpc/svc_vc.c b/usr/src/lib/libnsl/rpc/svc_vc.c index 6bcfc5ee07..7bb9b35553 100644 --- a/usr/src/lib/libnsl/rpc/svc_vc.c +++ b/usr/src/lib/libnsl/rpc/svc_vc.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,7 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * svc_vc.c -- Server side for Connection Oriented RPC. + * Server side for Connection Oriented RPC. * * Actually implements two flavors of transporter - * a rendezvouser (a listener and connection establisher) @@ -791,7 +792,7 @@ do_accept(int srcfd, char *tpname, char *netid, struct t_call *tcp, if (destfd < 256) { int nfd; - nfd = _fcntl(destfd, F_DUPFD, 256); + nfd = fcntl(destfd, F_DUPFD, 256); if (nfd != -1) { if (t_close(destfd) == -1) { char errorstr[100]; @@ -825,7 +826,7 @@ do_accept(int srcfd, char *tpname, char *netid, struct t_call *tcp, t_errno = TBADF; return; } - (void) _fcntl(destfd, F_SETFD, 1); /* make it "close on exec" */ + (void) fcntl(destfd, F_SETFD, 1); /* make it "close on exec" */ if ((tinfo.servtype != T_COTS) && (tinfo.servtype != T_COTS_ORD)) { /* Not a connection oriented mode */ (void) syslog(LOG_ERR, errstring, do_accept_str, diff --git a/usr/src/lib/libnsl/rpc/svid_funcs.c b/usr/src/lib/libnsl/rpc/svid_funcs.c index fd6a79c799..9ea59ac630 100644 --- a/usr/src/lib/libnsl/rpc/svid_funcs.c +++ b/usr/src/lib/libnsl/rpc/svid_funcs.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,6 +34,7 @@ * (we hope unused) file. */ +#include "mt.h" #include <rpc/rpc.h> #include <sys/types.h> #include <synch.h> diff --git a/usr/src/lib/libnsl/rpc/ti_opts.c b/usr/src/lib/libnsl/rpc/ti_opts.c index 55fd1b4fe4..1b5e910261 100644 --- a/usr/src/lib/libnsl/rpc/ti_opts.c +++ b/usr/src/lib/libnsl/rpc/ti_opts.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -34,6 +35,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdio.h> #include <netinet/in.h> #include <netinet/tcp.h> diff --git a/usr/src/lib/libnsl/rpc/xdr.c b/usr/src/lib/libnsl/rpc/xdr.c index c22b4f0579..6d5095ff11 100644 --- a/usr/src/lib/libnsl/rpc/xdr.c +++ b/usr/src/lib/libnsl/rpc/xdr.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,12 +36,13 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * xdr.c, Generic XDR routines implementation. + * Generic XDR routines implementation. * * These are the "generic" xdr routines used to serialize and de-serialize * most common data items. See xdr.h for more info on the interface to * xdr. */ +#include "mt.h" #include <stdlib.h> #include <sys/types.h> #include <sys/isa_defs.h> diff --git a/usr/src/lib/libnsl/rpc/xdr_array.c b/usr/src/lib/libnsl/rpc/xdr_array.c index 735634296c..c3b4508e31 100644 --- a/usr/src/lib/libnsl/rpc/xdr_array.c +++ b/usr/src/lib/libnsl/rpc/xdr_array.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,12 +36,13 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * xdr_array.c, Generic XDR routines impelmentation. + * Generic XDR routines impelmentation. * * These are the "non-trivial" xdr primitives used to serialize and de-serialize * arrays. See xdr.h for more info on the interface to xdr. */ +#include "mt.h" #include <sys/types.h> #include <syslog.h> #include <stdio.h> diff --git a/usr/src/lib/libnsl/rpc/xdr_float.c b/usr/src/lib/libnsl/rpc/xdr_float.c index fed3bc64ce..d28f7679b6 100644 --- a/usr/src/lib/libnsl/rpc/xdr_float.c +++ b/usr/src/lib/libnsl/rpc/xdr_float.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,13 +36,14 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * xdr_float.c, Generic XDR routines impelmentation. + * Generic XDR routines impelmentation. * * These are the "floating point" xdr routines used to (de)serialize * most common data items. See xdr.h for more info on the interface to * xdr. */ +#include "mt.h" #include <sys/types.h> #include <stdio.h> #include <rpc/types.h> diff --git a/usr/src/lib/libnsl/rpc/xdr_refer.c b/usr/src/lib/libnsl/rpc/xdr_refer.c index 88e37a780e..e3be8f2529 100644 --- a/usr/src/lib/libnsl/rpc/xdr_refer.c +++ b/usr/src/lib/libnsl/rpc/xdr_refer.c @@ -21,9 +21,10 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* @@ -35,11 +36,12 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * xdr_refer.c, Generic XDR routines impelmentation. + * Generic XDR routines impelmentation. * * These are the "non-trivial" xdr primitives used to serialize and de-serialize * "pointers". See xdr.h for more info on the interface to xdr. */ +#include "mt.h" #include <sys/types.h> #include <syslog.h> #include <stdio.h> diff --git a/usr/src/lib/libnsl/rpc/xdr_sizeof.c b/usr/src/lib/libnsl/rpc/xdr_sizeof.c index 99f60bab68..29d9f7d275 100644 --- a/usr/src/lib/libnsl/rpc/xdr_sizeof.c +++ b/usr/src/lib/libnsl/rpc/xdr_sizeof.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,6 +31,7 @@ * General purpose routine to see how much space something will use * when serialized using XDR. */ +#include "mt.h" #include <rpc/types.h> #include <rpc/xdr.h> #include <sys/types.h> diff --git a/usr/src/lib/libnsl/rpc/xdr_stdio_prv.c b/usr/src/lib/libnsl/rpc/xdr_stdio_prv.c index 66b4d5819e..4c5f7fd292 100644 --- a/usr/src/lib/libnsl/rpc/xdr_stdio_prv.c +++ b/usr/src/lib/libnsl/rpc/xdr_stdio_prv.c @@ -21,14 +21,14 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * xdr_stdio_prv.c, XDR implementation on special standard i/o file. + * XDR implementation on special standard i/o file. * * To avoid the file descriptor limitation in stdio, we implement * a private version of the same routines from xdr_stdio.c using @@ -38,6 +38,7 @@ * from the stream. */ +#include "mt.h" #include "rpc_mt.h" #include <rpc/types.h> #include <stdio.h> diff --git a/usr/src/lib/libnsl/saf/checkver.c b/usr/src/lib/libnsl/saf/checkver.c index 9717215d76..ad533d077c 100644 --- a/usr/src/lib/libnsl/saf/checkver.c +++ b/usr/src/lib/libnsl/saf/checkver.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,6 +30,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libnsl/saf/doconfig.c b/usr/src/lib/libnsl/saf/doconfig.c index 4d520c5dac..b0bafd059e 100644 --- a/usr/src/lib/libnsl/saf/doconfig.c +++ b/usr/src/lib/libnsl/saf/doconfig.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +30,7 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - +#include "mt.h" #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -47,17 +47,6 @@ #include <signal.h> #include "sac.h" -#if defined(sparc) -#define _STAT _stat -#define _FSTAT _fstat -#else /* !sparc */ -#define _STAT stat -#define _FSTAT fstat -#endif /* sparc */ - -extern int _stat(const char *, struct stat *); -extern int _fstat(int, struct stat *); - #define COMMENT '#' #define NOWAIT 0 #define WAIT 1 @@ -93,7 +82,7 @@ doconfig(int fd, char *script, long rflag) char *p; /* scratch pointer */ /* if the script does not exist, then there is nothing to do */ - if (_STAT(script, &statbuf) < 0) + if (stat(script, &statbuf) < 0) return (0); fp = fopen(script, "r"); diff --git a/usr/src/lib/libnsl/sparc/Makefile b/usr/src/lib/libnsl/sparc/Makefile index df28266458..5591ea9a22 100644 --- a/usr/src/lib/libnsl/sparc/Makefile +++ b/usr/src/lib/libnsl/sparc/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1995-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -28,6 +28,4 @@ include ../Makefile.com -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libnsl/sparcv9/Makefile b/usr/src/lib/libnsl/sparcv9/Makefile index 8b04146eff..da1777943b 100644 --- a/usr/src/lib/libnsl/sparcv9/Makefile +++ b/usr/src/lib/libnsl/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1998-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -36,6 +36,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = -K PIC sparcv9_CC_PICFLAGS = -KPIC -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libnsl/yp/dbm.c b/usr/src/lib/libnsl/yp/dbm.c index 2c38c36599..561ac1d432 100644 --- a/usr/src/lib/libnsl/yp/dbm.c +++ b/usr/src/lib/libnsl/yp/dbm.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpcsvc/dbm.h> #include <sys/types.h> #include <sys/stat.h> @@ -46,14 +47,6 @@ #include <stdio.h> #include <errno.h> -#if defined(sparc) -#define _FSTAT _fstat -extern int _fstat(int, struct stat *); -#else /* !sparc */ -#define _FSTAT fstat -#endif /* sparc */ - - void dbm_access(long); void delitem(char *, int); void chkblk(char *); @@ -96,7 +89,7 @@ dbminit(char *file) } if (pagf < 0 || dirf < 0) return (-1); - (void) _FSTAT(dirf, &statb); + (void) fstat(dirf, &statb); maxbno = statb.st_size*BYTESIZ-1; return (0); } diff --git a/usr/src/lib/libnsl/yp/yp_all.c b/usr/src/lib/libnsl/yp/yp_all.c index 4308a7d279..dda70b58fe 100644 --- a/usr/src/lib/libnsl/yp/yp_all.c +++ b/usr/src/lib/libnsl/yp/yp_all.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,9 +36,9 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <unistd.h> -#include "mt.h" #include <rpc/rpc.h> #include <syslog.h> #include "yp_b.h" diff --git a/usr/src/lib/libnsl/yp/yp_b.h b/usr/src/lib/libnsl/yp/yp_b.h index f089153ff8..2ae2aa9768 100644 --- a/usr/src/lib/libnsl/yp/yp_b.h +++ b/usr/src/lib/libnsl/yp/yp_b.h @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -158,9 +158,6 @@ extern CLIENT *__yp_clnt_create_rsvdport(const char *, rpcprog_t, extern void __yp_rel_binding(struct dom_binding *); extern CLIENT *__clnt_create_loopback(rpcprog_t, rpcvers_t, int *); -extern int _fcntl(int, int, ...); -extern uint_t _sleep(uint_t); - #ifdef __cplusplus } #endif diff --git a/usr/src/lib/libnsl/yp/yp_b_clnt.c b/usr/src/lib/libnsl/yp/yp_b_clnt.c index 82349d38c4..2232260eea 100644 --- a/usr/src/lib/libnsl/yp/yp_b_clnt.c +++ b/usr/src/lib/libnsl/yp/yp_b_clnt.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpc.h> #include <sys/time.h> #include <sys/types.h> diff --git a/usr/src/lib/libnsl/yp/yp_b_xdr.c b/usr/src/lib/libnsl/yp/yp_b_xdr.c index 48c16ed3b2..be010b0eb5 100644 --- a/usr/src/lib/libnsl/yp/yp_b_xdr.c +++ b/usr/src/lib/libnsl/yp/yp_b_xdr.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpc.h> #include <netconfig.h> #include "yp_b.h" diff --git a/usr/src/lib/libnsl/yp/yp_bind.c b/usr/src/lib/libnsl/yp/yp_bind.c index 4d84cad177..8504bfb03c 100644 --- a/usr/src/lib/libnsl/yp/yp_bind.c +++ b/usr/src/lib/libnsl/yp/yp_bind.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -55,14 +55,6 @@ #include <sys/tiuser.h> #include "nsl_stdio_prv.h" -#if defined(sparc) -#define _FSTAT _fstat -extern int _fstat(int, struct stat *); -#else /* !sparc */ -#define _FSTAT fstat -#endif /* sparc */ - - #define BFSIZE (YPMAXDOMAIN + 32) /* size of binding file */ int __ypipbufsize = 8192; /* size used for clnt_tli_create */ @@ -425,7 +417,7 @@ load_dom_binding(struct ypbind_resp *ypbind_res, char *domain, int *err) pdomb->cache_bad = 0; set_rdev(pdomb); if (clnt_control(pdomb->dom_client, CLGET_FD, (char *)&fd)) - _fcntl(fd, F_SETFD, 1); /* make it "close on exec" */ + (void) fcntl(fd, F_SETFD, 1); /* make it "close on exec" */ (void) strcpy(pdomb->dom_domain, domain); /* Remember the domain name */ pdomb->ref_count = 0; @@ -1187,7 +1179,7 @@ set_rdev(struct dom_binding *pdomb) struct stat stbuf; if (clnt_control(pdomb->dom_client, CLGET_FD, (char *)&fd) != TRUE || - _FSTAT(fd, &stbuf) == -1) { + fstat(fd, &stbuf) == -1) { syslog(LOG_DEBUG, "ypbind client: can't get rdev"); pdomb->fd = -1; return; @@ -1204,7 +1196,7 @@ check_rdev(struct dom_binding *pdomb) if (pdomb->fd == -1) return (1); /* can't check it, assume it is okay */ - if (_FSTAT(pdomb->fd, &stbuf) == -1) { + if (fstat(pdomb->fd, &stbuf) == -1) { syslog(LOG_DEBUG, "yp_bind client: can't stat %d", pdomb->fd); /* could be because file descriptor was closed */ /* it's not our file descriptor, so don't try to close it */ diff --git a/usr/src/lib/libnsl/yp/yp_enum.c b/usr/src/lib/libnsl/yp/yp_enum.c index bf8d964e41..f9d57e086c 100644 --- a/usr/src/lib/libnsl/yp/yp_enum.c +++ b/usr/src/lib/libnsl/yp/yp_enum.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <unistd.h> #include <rpc/rpc.h> @@ -99,7 +100,7 @@ __yp_first_cflookup( reason == YPERR_BUSY /* as if */) { yp_unbind(domain); if (hardlookup) - (void) _sleep(_ypsleeptime); /* retry */ + (void) sleep(_ypsleeptime); /* retry */ else return (reason); } else @@ -264,7 +265,7 @@ __yp_next_cflookup( reason == YPERR_BUSY /* as if */) { yp_unbind(domain); if (hardlookup) - (void) _sleep(_ypsleeptime); /* retry */ + (void) sleep(_ypsleeptime); /* retry */ else return (reason); } else diff --git a/usr/src/lib/libnsl/yp/yp_master.c b/usr/src/lib/libnsl/yp/yp_master.c index c748689c91..287bb13e75 100644 --- a/usr/src/lib/libnsl/yp/yp_master.c +++ b/usr/src/lib/libnsl/yp/yp_master.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <unistd.h> #include <rpc/rpc.h> @@ -85,7 +86,7 @@ yp_master(char *domain, char *map, char **master) __yp_rel_binding(pdomb); if (reason == YPERR_RPC) { yp_unbind(domain); - (void) _sleep(_ypsleeptime); + (void) sleep(_ypsleeptime); } else { break; } @@ -152,7 +153,7 @@ __yp_master_rsvdport(char *domain, char *map, char **master) free_dom_binding(pdomb); if (reason == YPERR_RPC) { yp_unbind(domain); - (void) _sleep(_ypsleeptime); + (void) sleep(_ypsleeptime); } else { break; } diff --git a/usr/src/lib/libnsl/yp/yp_match.c b/usr/src/lib/libnsl/yp/yp_match.c index 74c7c9200f..9e26615932 100644 --- a/usr/src/lib/libnsl/yp/yp_match.c +++ b/usr/src/lib/libnsl/yp/yp_match.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,9 +36,9 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <unistd.h> -#include "mt.h" #include "../rpc/rpc_mt.h" #include <rpc/rpc.h> #include <sys/types.h> @@ -232,7 +232,7 @@ __yp_match_cflookup(char *domain, char *map, char *key, int keylen, char **val, reason == YPERR_BUSY /* as if */) { yp_unbind(domain); if (hardlookup) - (void) _sleep(_ypsleeptime); /* retry */ + (void) sleep(_ypsleeptime); /* retry */ else return (reason); } else @@ -422,7 +422,7 @@ __yp_match_rsvdport_cflookup( reason == YPERR_BUSY /* as if */) { yp_unbind(domain); if (hardlookup) - (void) _sleep(_ypsleeptime); /* retry */ + (void) sleep(_ypsleeptime); /* retry */ else return (reason); } else diff --git a/usr/src/lib/libnsl/yp/yp_order.c b/usr/src/lib/libnsl/yp/yp_order.c index be52047cfe..148a83b945 100644 --- a/usr/src/lib/libnsl/yp/yp_order.c +++ b/usr/src/lib/libnsl/yp/yp_order.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <stdlib.h> #include <unistd.h> #include <rpc/rpc.h> @@ -85,7 +86,7 @@ yp_order(char *domain, char *map, unsigned long *order) __yp_rel_binding(pdomb); if (reason == YPERR_RPC) { yp_unbind(domain); - (void) _sleep(_ypsleeptime); + (void) sleep(_ypsleeptime); } else { break; } diff --git a/usr/src/lib/libnsl/yp/yp_rsvd.c b/usr/src/lib/libnsl/yp/yp_rsvd.c index 79f7091831..49ea111f34 100644 --- a/usr/src/lib/libnsl/yp/yp_rsvd.c +++ b/usr/src/lib/libnsl/yp/yp_rsvd.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <sys/types.h> #include <string.h> #include <stdio.h> diff --git a/usr/src/lib/libnsl/yp/yp_update.c b/usr/src/lib/libnsl/yp/yp_update.c index 602eae41b1..f4125cd5f6 100644 --- a/usr/src/lib/libnsl/yp/yp_update.c +++ b/usr/src/lib/libnsl/yp/yp_update.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,6 +39,7 @@ /* * YP updater interface */ +#include "mt.h" #include <stdio.h> #include <rpc/rpc.h> #include "yp_b.h" diff --git a/usr/src/lib/libnsl/yp/yp_xdr.c b/usr/src/lib/libnsl/yp/yp_xdr.c index fee67d006f..cad722b5f0 100644 --- a/usr/src/lib/libnsl/yp/yp_xdr.c +++ b/usr/src/lib/libnsl/yp/yp_xdr.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -40,6 +40,7 @@ * This contains ALL xdr routines used by the YP rpc interface. */ +#include "mt.h" #include <unistd.h> #include <stdlib.h> #include <rpc/rpc.h> diff --git a/usr/src/lib/libnsl/yp/yperr_string.c b/usr/src/lib/libnsl/yp/yperr_string.c index b2a75d81e4..48e1dcdc36 100644 --- a/usr/src/lib/libnsl/yp/yperr_string.c +++ b/usr/src/lib/libnsl/yp/yperr_string.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpcsvc/ypclnt.h> #include <sys/types.h> diff --git a/usr/src/lib/libnsl/yp/yppasswd_xdr.c b/usr/src/lib/libnsl/yp/yppasswd_xdr.c index 8e37564058..ef6bde059a 100644 --- a/usr/src/lib/libnsl/yp/yppasswd_xdr.c +++ b/usr/src/lib/libnsl/yp/yppasswd_xdr.c @@ -21,12 +21,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpc.h> #include <rpcsvc/yppasswd.h> diff --git a/usr/src/lib/libnsl/yp/ypprot_err.c b/usr/src/lib/libnsl/yp/ypprot_err.c index f48316975b..666f6fb65f 100644 --- a/usr/src/lib/libnsl/yp/ypprot_err.c +++ b/usr/src/lib/libnsl/yp/ypprot_err.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpc.h> #include <rpcsvc/yp_prot.h> #include <rpcsvc/ypclnt.h> diff --git a/usr/src/lib/libnsl/yp/ypupd.c b/usr/src/lib/libnsl/yp/ypupd.c index 405ccd830a..74462ba245 100644 --- a/usr/src/lib/libnsl/yp/ypupd.c +++ b/usr/src/lib/libnsl/yp/ypupd.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,6 +36,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include "mt.h" #include <rpc/rpc.h> #include <sys/types.h> #include <rpcsvc/ypupd.h> diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile index f7c9174148..5ee75d0e36 100644 --- a/usr/src/lib/libresolv/Makefile +++ b/usr/src/lib/libresolv/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -61,10 +61,10 @@ CLOBBERFILES += $(MAPFILE) C99MODE= $(C99_DISABLE) # We really want to say this: -# CPPFLAGS += -DDEBUG -DSYSV -D_REENTRANT -I. +# CPPFLAGS += -DDEBUG -DSYSV -D_REENTRANT -I. -I../common/inc # but some system header files are replaced by local versions # so we must put -I. ahead of the default include directories: -CPPFLAGS = -I. $(CPPFLAGS.master) -DDEBUG -DSYSV -D_REENTRANT +CPPFLAGS = -I. -I../common/inc $(CPPFLAGS.master) -DDEBUG -DSYSV -D_REENTRANT LDLIBS += -lsocket -lnsl -lc DYNFLAGS += $(MAPOPTS) @@ -83,7 +83,7 @@ package := TARGET= package LIBS = $(DYNLIB) -all: $(SUBDIRS) $(LIBS) +all: $(SUBDIRS) $(LIBS) fnamecheck install: all $(ROOTDYNLIBS) $(SUBDIRS) diff --git a/usr/src/lib/libresolv/res_comp.c b/usr/src/lib/libresolv/res_comp.c index 030378fe39..9fb2a255f4 100644 --- a/usr/src/lib/libresolv/res_comp.c +++ b/usr/src/lib/libresolv/res_comp.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +40,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "c_synonyms.h" #include <sys/types.h> #include <stdio.h> #include <arpa/nameser.h> diff --git a/usr/src/lib/libresolv/res_debug.c b/usr/src/lib/libresolv/res_debug.c index 47a8f2c97f..9821484e1d 100644 --- a/usr/src/lib/libresolv/res_debug.c +++ b/usr/src/lib/libresolv/res_debug.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +40,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "c_synonyms.h" #include <sys/types.h> #include <netinet/in.h> #include <stdio.h> diff --git a/usr/src/lib/libresolv/res_gethost.c b/usr/src/lib/libresolv/res_gethost.c index b7c42b335e..53081cd5fe 100644 --- a/usr/src/lib/libresolv/res_gethost.c +++ b/usr/src/lib/libresolv/res_gethost.c @@ -11,10 +11,14 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SunOS 1.11; UCB 6.32 */ +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ -#include "synonyms.h" +#pragma ident "%Z%%M% %I% %E% SMI" /* SunOS 1.11; UCB 6.32 */ +#include "c_synonyms.h" #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/usr/src/lib/libresolv/res_init.c b/usr/src/lib/libresolv/res_init.c index 630b45d8c8..6a40c6ac84 100644 --- a/usr/src/lib/libresolv/res_init.c +++ b/usr/src/lib/libresolv/res_init.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +40,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "c_synonyms.h" #include <sys/types.h> #include <sys/sockio.h> #include <sys/socket.h> diff --git a/usr/src/lib/libresolv/res_mkquery.c b/usr/src/lib/libresolv/res_mkquery.c index 1bc6ba1584..e202d93b41 100644 --- a/usr/src/lib/libresolv/res_mkquery.c +++ b/usr/src/lib/libresolv/res_mkquery.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +40,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "c_synonyms.h" #include <stdio.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/usr/src/lib/libresolv/res_query.c b/usr/src/lib/libresolv/res_query.c index 70d9d8be47..8c8fb792b6 100644 --- a/usr/src/lib/libresolv/res_query.c +++ b/usr/src/lib/libresolv/res_query.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +40,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "c_synonyms.h" #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/usr/src/lib/libresolv/res_send.c b/usr/src/lib/libresolv/res_send.c index 4d304763e3..495193b065 100644 --- a/usr/src/lib/libresolv/res_send.c +++ b/usr/src/lib/libresolv/res_send.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,8 +44,7 @@ * Send query to name server and wait for reply. */ -#include "synonyms.h" - +#include "c_synonyms.h" #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> diff --git a/usr/src/lib/libresolv/res_sethost.c b/usr/src/lib/libresolv/res_sethost.c index cb95cb7f0d..cce56ce82c 100644 --- a/usr/src/lib/libresolv/res_sethost.c +++ b/usr/src/lib/libresolv/res_sethost.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +40,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "c_synonyms.h" #include <sys/types.h> #include <arpa/nameser.h> #include <netinet/in.h> diff --git a/usr/src/lib/libresolv2/Makefile.com b/usr/src/lib/libresolv2/Makefile.com index e2a59c440f..74cc75e5a3 100644 --- a/usr/src/lib/libresolv2/Makefile.com +++ b/usr/src/lib/libresolv2/Makefile.com @@ -1,5 +1,5 @@ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -122,7 +122,7 @@ CRYPTFLAGS= -DCYLINK_DSS -DHMAC_MD5 -DUSE_MD5 -DDNSSAFE LOCFLAGS += $(CRYPTFLAGS) LOCFLAGS += -D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \ - $(SOLCOMPAT) -I../include + $(SOLCOMPAT) -I../include -I../../common/inc CPPFLAGS += $(LOCFLAGS) DYNFLAGS += $(MAPOPTS) $(ZNODELETE) @@ -130,6 +130,8 @@ LDLIBS += -lsocket -lnsl -lc .KEEP_STATE: +all: $(LIBS) fnamecheck + lint: lintcheck $(DYNLIB): $(MAPFILES) diff --git a/usr/src/lib/libresolv2/amd64/Makefile b/usr/src/lib/libresolv2/amd64/Makefile index 682f635c8c..4d512a2004 100644 --- a/usr/src/lib/libresolv2/amd64/Makefile +++ b/usr/src/lib/libresolv2/amd64/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -10,10 +10,4 @@ MAPDIR= ../spec/amd64 include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) - -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libresolv2/common/isc/eventlib.c b/usr/src/lib/libresolv2/common/isc/eventlib.c index 8bd1eaf5e0..beaed1c6bc 100644 --- a/usr/src/lib/libresolv2/common/isc/eventlib.c +++ b/usr/src/lib/libresolv2/common/isc/eventlib.c @@ -1,5 +1,5 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -53,6 +53,9 @@ static const char rcsid[] = "$Id: eventlib.c,v 1.48 2002/07/17 07:37:34 marka Ex #include "port_after.h" #ifdef SUNW_POLL +#if defined(pselect) +#undef pselect +#endif #define pselect Pselect #endif /* SUNW_POLL */ diff --git a/usr/src/lib/libresolv2/common/resolv/res_send.c b/usr/src/lib/libresolv2/common/resolv/res_send.c index 90ea5dad84..ba496dc333 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_send.c +++ b/usr/src/lib/libresolv2/common/resolv/res_send.c @@ -1,5 +1,5 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -113,6 +113,9 @@ static const char rcsid[] = "$Id: res_send.c,v 8.52 2003/04/29 02:13:08 marka Ex #ifdef SUNW_POLL #include <stropts.h> #include <poll.h> +#if defined(pselect) +#undef pselect +#endif #define pselect Pselect #endif /* SUNW_POLL */ diff --git a/usr/src/lib/libresolv2/cylink/Makefile.com b/usr/src/lib/libresolv2/cylink/Makefile.com index 427ca32947..2f870b3ede 100644 --- a/usr/src/lib/libresolv2/cylink/Makefile.com +++ b/usr/src/lib/libresolv2/cylink/Makefile.com @@ -1,5 +1,5 @@ # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -49,13 +49,13 @@ CRYPTFLAGS= -DCYLINK_DSS -DHMAC_MD5 -DUSE_MD5 -DDNSSAFE \ CPPFLAGS += $(CRYPTFLAGS) $(CRYPTINCL) CPPFLAGS += -D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \ - $(SOLCOMPAT) -I../../include + $(SOLCOMPAT) -I../../include -I../../../common/inc REDLOC= $(ZREDLOCSYM) .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libresolv2/dnssafe/Makefile.com b/usr/src/lib/libresolv2/dnssafe/Makefile.com index 1d85bdbc47..df4c642780 100644 --- a/usr/src/lib/libresolv2/dnssafe/Makefile.com +++ b/usr/src/lib/libresolv2/dnssafe/Makefile.com @@ -1,5 +1,5 @@ # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -68,13 +68,13 @@ CRYPTFLAGS= -DCYLINK_DSS -DHMAC_MD5 -DUSE_MD5 -DDNSSAFE \ CPPFLAGS += $(CRYPTFLAGS) $(CRYPTINCL) CPPFLAGS += -D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \ - $(SOLCOMPAT) -I../../include + $(SOLCOMPAT) -I../../include -I../../../common/inc REDLOC= $(ZREDLOCSYM) .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libresolv2/i386/Makefile b/usr/src/lib/libresolv2/i386/Makefile index 417285a02e..3c5e466c4d 100644 --- a/usr/src/lib/libresolv2/i386/Makefile +++ b/usr/src/lib/libresolv2/i386/Makefile @@ -1,8 +1,8 @@ # -# Copyright (c) 1997-1999 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # lib/libresolv2/sparc/Makefile @@ -10,8 +10,4 @@ MAPDIR= ../spec/i386 include ../Makefile.com -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libresolv2/include/port_before.h b/usr/src/lib/libresolv2/include/port_before.h index 18b9291f3b..f3399d1031 100644 --- a/usr/src/lib/libresolv2/include/port_before.h +++ b/usr/src/lib/libresolv2/include/port_before.h @@ -1,5 +1,5 @@ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -131,7 +131,7 @@ #endif #ifdef SUNW_SYNONYMS -#include "synonyms.h" +#include "c_synonyms.h" #endif /* diff --git a/usr/src/lib/libresolv2/irs/Makefile.com b/usr/src/lib/libresolv2/irs/Makefile.com index d99eb7f828..509e5b2425 100644 --- a/usr/src/lib/libresolv2/irs/Makefile.com +++ b/usr/src/lib/libresolv2/irs/Makefile.com @@ -1,5 +1,5 @@ # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -52,11 +52,12 @@ CRYPTFLAGS= -DCYLINK_DSS -DHMAC_MD5 -DUSE_MD5 -DDNSSAFE CPPFLAGS += $(CRYPTFLAGS) $(CRYPTINCL) CPPFLAGS += -D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \ - -D__SUNW_IRS_INIT_NODEFINE $(SOLCOMPAT) -I../../include + -D__SUNW_IRS_INIT_NODEFINE $(SOLCOMPAT) \ + -I../../include -I../../../common/inc .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libresolv2/sparc/Makefile b/usr/src/lib/libresolv2/sparc/Makefile index 490d924db5..1dca7a6c60 100644 --- a/usr/src/lib/libresolv2/sparc/Makefile +++ b/usr/src/lib/libresolv2/sparc/Makefile @@ -1,8 +1,8 @@ # -# Copyright (c) 1997-1999 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # lib/libresolv2/sparc/Makefile @@ -10,8 +10,4 @@ MAPDIR= ../spec/sparc include ../Makefile.com -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) diff --git a/usr/src/lib/libresolv2/sparcv9/Makefile b/usr/src/lib/libresolv2/sparcv9/Makefile index 72aa5e4563..dcec10d2ca 100644 --- a/usr/src/lib/libresolv2/sparcv9/Makefile +++ b/usr/src/lib/libresolv2/sparcv9/Makefile @@ -1,8 +1,8 @@ # -# Copyright 1997-2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # lib/libresolv2/sparcv9/Makefile @@ -18,10 +18,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = -K PIC sparcv9_CC_PICFLAGS = -KPIC -LIBS = $(DYNLIB) $(LINTLIB) - -.KEEP_STATE: - -all: $(LIBS) - install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/librsm/Makefile.com b/usr/src/lib/librsm/Makefile.com index e99a7259f8..86e2b1ae5d 100644 --- a/usr/src/lib/librsm/Makefile.com +++ b/usr/src/lib/librsm/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -52,7 +52,7 @@ $(NOT_RELEASE_BUILD)DEBUG = -DDEBUG $(NOT_RELEASE_BUILD)COPTFLAG = $(NOT_RELEASE_BUILD)COPTFLAG64 = -CPPFLAGS = -I../inc $(CPPFLAGS.master) -D_REENTRANT $(DEBUG) +CPPFLAGS = -I../inc -I../../common/inc $(CPPFLAGS.master) -D_REENTRANT $(DEBUG) DYNFLAGS += -M$(MAPFILE) @@ -60,7 +60,7 @@ LDLIBS += -lc .KEEP_STATE: -all: $(LIBS) $(LINTLIB) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/librsm/common/rsmgen.c b/usr/src/lib/librsm/common/rsmgen.c index cd9fc04be3..382c373752 100644 --- a/usr/src/lib/librsm/common/rsmgen.c +++ b/usr/src/lib/librsm/common/rsmgen.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright (c) 1999-2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "c_synonyms.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/usr/src/lib/librsm/common/rsmlib.c b/usr/src/lib/librsm/common/rsmlib.c index f68ff2cfae..193e5f85fa 100644 --- a/usr/src/lib/librsm/common/rsmlib.c +++ b/usr/src/lib/librsm/common/rsmlib.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 1996-2002 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "c_synonyms.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/usr/src/lib/librt/Makefile.com b/usr/src/lib/librt/Makefile.com index 7028f578ba..2612ecdbff 100644 --- a/usr/src/lib/librt/Makefile.com +++ b/usr/src/lib/librt/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -68,7 +68,7 @@ CLOBBERFILES= test .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/librt/common/fallocate.c b/usr/src/lib/librt/common/fallocate.c index f0085ce07d..d4b1d0de1f 100644 --- a/usr/src/lib/librt/common/fallocate.c +++ b/usr/src/lib/librt/common/fallocate.c @@ -19,13 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "c_synonyms.h" #include <errno.h> #include <fcntl.h> #include <sys/types.h> diff --git a/usr/src/lib/librt/common/mqueue.c b/usr/src/lib/librt/common/mqueue.c index b72baca365..e9d9c3a88b 100644 --- a/usr/src/lib/librt/common/mqueue.c +++ b/usr/src/lib/librt/common/mqueue.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,7 +40,7 @@ #pragma weak mq_setattr = _mq_setattr #pragma weak mq_getattr = _mq_getattr -#include "synonyms.h" +#include "c_synonyms.h" #define _KMEMUSER #include <sys/param.h> /* _MQ_OPEN_MAX, _MQ_PRIO_MAX, _SEM_VALUE_MAX */ #undef _KMEMUSER diff --git a/usr/src/lib/librt/common/pos4obj.c b/usr/src/lib/librt/common/pos4obj.c index 7277d88021..2d6917ed33 100644 --- a/usr/src/lib/librt/common/pos4obj.c +++ b/usr/src/lib/librt/common/pos4obj.c @@ -19,13 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "c_synonyms.h" #include <sys/types.h> #include <errno.h> #include <fcntl.h> diff --git a/usr/src/lib/librt/common/sched.c b/usr/src/lib/librt/common/sched.c index 941f6f513d..9ef91cf6b9 100644 --- a/usr/src/lib/librt/common/sched.c +++ b/usr/src/lib/librt/common/sched.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include <sched.h> #include <errno.h> diff --git a/usr/src/lib/librt/common/sem.c b/usr/src/lib/librt/common/sem.c index ec25da254d..d971019a8f 100644 --- a/usr/src/lib/librt/common/sem.c +++ b/usr/src/lib/librt/common/sem.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,7 +39,7 @@ #pragma weak sem_post = _sem_post #pragma weak sem_getvalue = _sem_getvalue -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include <semaphore.h> #include <synch.h> diff --git a/usr/src/lib/librt/common/shm.c b/usr/src/lib/librt/common/shm.c index 1ce575f034..bd27c0ed48 100644 --- a/usr/src/lib/librt/common/shm.c +++ b/usr/src/lib/librt/common/shm.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "c_synonyms.h" #include <sys/types.h> #include <sys/mman.h> #include <fcntl.h> diff --git a/usr/src/lib/libscf/common/libscf_impl.h b/usr/src/lib/libscf/common/libscf_impl.h index 8d3acaaf5b..6dfef8577c 100644 --- a/usr/src/lib/libscf/common/libscf_impl.h +++ b/usr/src/lib/libscf/common/libscf_impl.h @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +31,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #ifndef NATIVE_BUILD -#include "mtlib.h" +#include "c_synonyms.h" #endif #include <libscf.h> diff --git a/usr/src/lib/libsendfile/Makefile.com b/usr/src/lib/libsendfile/Makefile.com index 3ee2e960be..c1810c305b 100644 --- a/usr/src/lib/libsendfile/Makefile.com +++ b/usr/src/lib/libsendfile/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -46,7 +46,7 @@ CFLAGS += $(CCVERBOSE) .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/libsocket/inet/ether_addr.c b/usr/src/lib/libsocket/inet/ether_addr.c index 7bf8d069ef..3fbdb3bbb0 100644 --- a/usr/src/lib/libsocket/inet/ether_addr.c +++ b/usr/src/lib/libsocket/inet/ether_addr.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -47,7 +48,7 @@ * bytes are always in network order. */ -#include "mtlib.h" +#include "c_synonyms.h" #include <stdio.h> #include <ctype.h> #include <string.h> diff --git a/usr/src/lib/libumem/common/linktest_stand.c b/usr/src/lib/libumem/common/linktest_stand.c index 452eda1bd7..dca820adf0 100644 --- a/usr/src/lib/libumem/common/linktest_stand.c +++ b/usr/src/lib/libumem/common/linktest_stand.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,9 +35,9 @@ void __umem_assert_failed(void) {} void _atomic_add_64(void) {} void _atomic_add_32_nv(void) {} +void _dladdr1(void) {} void bcopy(void) {} void bzero(void) {} -void dladdr1(void) {} void exit(void) {} void getenv(void) {} void gethrtime(void) {} diff --git a/usr/src/lib/libumem/common/misc.c b/usr/src/lib/libumem/common/misc.c index f2b57f48cc..d0d945cade 100644 --- a/usr/src/lib/libumem/common/misc.c +++ b/usr/src/lib/libumem/common/misc.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "mtlib.h" +#include "c_synonyms.h" #include <unistd.h> #include <dlfcn.h> #include <signal.h> diff --git a/usr/src/lib/libumem/common/stub_stand.c b/usr/src/lib/libumem/common/stub_stand.c index 1714e5b99a..7f37261638 100644 --- a/usr/src/lib/libumem/common/stub_stand.c +++ b/usr/src/lib/libumem/common/stub_stand.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -118,7 +119,7 @@ __mutex_unlock(mutex_t *mp) } int -issetugid(void) +_issetugid(void) { return (1); } diff --git a/usr/src/lib/libumem/common/umem.c b/usr/src/lib/libumem/common/umem.c index 6f2304390f..d69b245e97 100644 --- a/usr/src/lib/libumem/common/umem.c +++ b/usr/src/lib/libumem/common/umem.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -357,7 +358,7 @@ * lh_lock */ -#include "mtlib.h" +#include "c_synonyms.h" #include <umem_impl.h> #include <sys/vmem_impl_user.h> #include "umem_base.h" diff --git a/usr/src/lib/libumem/common/umem_fork.c b/usr/src/lib/libumem/common/umem_fork.c index 8aa7a31dd4..5c3c9ff836 100644 --- a/usr/src/lib/libumem/common/umem_fork.c +++ b/usr/src/lib/libumem/common/umem_fork.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "mtlib.h" +#include "c_synonyms.h" #include "umem_base.h" #include "vmem_base.h" diff --git a/usr/src/lib/libumem/common/vmem.c b/usr/src/lib/libumem/common/vmem.c index 62522d44d1..21b77750ad 100644 --- a/usr/src/lib/libumem/common/vmem.c +++ b/usr/src/lib/libumem/common/vmem.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -108,7 +109,7 @@ * sorted in address order. */ -#include "mtlib.h" +#include "c_synonyms.h" #include <sys/vmem_impl_user.h> #include <alloca.h> #include <sys/sysmacros.h> diff --git a/usr/src/lib/libumem/common/vmem_base.c b/usr/src/lib/libumem/common/vmem_base.c index 4fe63ccabf..f5fdd1da18 100644 --- a/usr/src/lib/libumem/common/vmem_base.c +++ b/usr/src/lib/libumem/common/vmem_base.c @@ -19,14 +19,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "mtlib.h" +#include "c_synonyms.h" #include "vmem_base.h" #include "umem_base.h" diff --git a/usr/src/lib/libumem/common/vmem_sbrk.c b/usr/src/lib/libumem/common/vmem_sbrk.c index b68a370014..3c59372fbe 100644 --- a/usr/src/lib/libumem/common/vmem_sbrk.c +++ b/usr/src/lib/libumem/common/vmem_sbrk.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -51,7 +52,7 @@ * before calling sbrk(). */ -#include "mtlib.h" +#include "c_synonyms.h" #include <errno.h> #include <limits.h> #include <sys/sysmacros.h> diff --git a/usr/src/lib/libuutil/Makefile.com b/usr/src/lib/libuutil/Makefile.com index 5efd10fd41..031fbcc897 100644 --- a/usr/src/lib/libuutil/Makefile.com +++ b/usr/src/lib/libuutil/Makefile.com @@ -20,10 +20,10 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # @@ -85,7 +85,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) $(NOT_NATIVE) fnamecheck lint: $(LINTLIB) globallint diff --git a/usr/src/lib/libuutil/common/libuutil_common.h b/usr/src/lib/libuutil/common/libuutil_common.h index 4c5853cb3d..269cbc2bf5 100644 --- a/usr/src/lib/libuutil/common/libuutil_common.h +++ b/usr/src/lib/libuutil/common/libuutil_common.h @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,11 +31,11 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * We don't bind to the internal libc threading interfaces if this is a + * We don't bind to the internal libc interfaces if this is a * native build. */ #ifndef NATIVE_BUILD -#include "mtlib.h" +#include "c_synonyms.h" #endif #include <libuutil.h> diff --git a/usr/src/lib/libxnet/Makefile.com b/usr/src/lib/libxnet/Makefile.com index 35c9361a26..9e6ba12bb3 100644 --- a/usr/src/lib/libxnet/Makefile.com +++ b/usr/src/lib/libxnet/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -53,7 +53,7 @@ BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/lib/nsswitch/files/Makefile.com b/usr/src/lib/nsswitch/files/Makefile.com index 86fb3a898d..e71a2db442 100644 --- a/usr/src/lib/nsswitch/files/Makefile.com +++ b/usr/src/lib/nsswitch/files/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1993-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -61,3 +61,5 @@ CPPFLAGS += -I../../../common/inc LDLIBS += -lnsl DYNLIB1 = nss_files.so$(VERS) + +all: $(DYNLIB1) fnamecheck diff --git a/usr/src/lib/nsswitch/files/common/files_common.h b/usr/src/lib/nsswitch/files/common/files_common.h index afa56329d5..06ba03b576 100644 --- a/usr/src/lib/nsswitch/files/common/files_common.h +++ b/usr/src/lib/nsswitch/files/common/files_common.h @@ -19,10 +19,13 @@ * * CDDL HEADER END */ + /* - * Copyright 1995-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * + */ + +/* * Common code and structures used by name-service-switch "files" backends. */ @@ -31,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "c_synonyms.h" #include <nss_common.h> #include <nss_dbdefs.h> #include <stdio.h> diff --git a/usr/src/lib/nsswitch/user/Makefile.com b/usr/src/lib/nsswitch/user/Makefile.com index 8d3f1ca0f0..dc99a72441 100644 --- a/usr/src/lib/nsswitch/user/Makefile.com +++ b/usr/src/lib/nsswitch/user/Makefile.com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -43,3 +43,5 @@ CPPFLAGS += -I../../../common/inc LDLIBS += -lnsl DYNLIB1 = nss_user.so$(VERS) + +all: $(DYNLIB1) fnamecheck diff --git a/usr/src/lib/nsswitch/user/common/user_common.h b/usr/src/lib/nsswitch/user/common/user_common.h index 03f97385d3..d0539447b0 100644 --- a/usr/src/lib/nsswitch/user/common/user_common.h +++ b/usr/src/lib/nsswitch/user/common/user_common.h @@ -19,10 +19,13 @@ * * CDDL HEADER END */ + /* - * Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * + */ + +/* * Common code and structures used by name-service-switch "user" backends. */ @@ -31,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "c_synonyms.h" #include <nss_common.h> #include <nss_dbdefs.h> #include <stdio.h> diff --git a/usr/src/lib/pam_modules/projects/Makefile.com b/usr/src/lib/pam_modules/projects/Makefile.com index d44a1ce6b2..7b4a2bbce8 100644 --- a/usr/src/lib/pam_modules/projects/Makefile.com +++ b/usr/src/lib/pam_modules/projects/Makefile.com @@ -20,12 +20,12 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # usr/src/lib/pam_modules/projects/Makefile.com # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_projects.a VERS= .1 @@ -33,7 +33,7 @@ OBJECTS = projects.o include ../../Makefile.pam_modules -all: $(LIBS) +all: $(LIBS) fnamecheck lint: lintcheck diff --git a/usr/src/tools/SUNWonbld/prototype_com b/usr/src/tools/SUNWonbld/prototype_com index f3fbed8fc1..96b33cbef2 100644 --- a/usr/src/tools/SUNWonbld/prototype_com +++ b/usr/src/tools/SUNWonbld/prototype_com @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -56,6 +56,7 @@ f none opt/onbld/bin/acr 555 root bin f none opt/onbld/bin/bfu 555 root bin f none opt/onbld/bin/bldenv 555 root bin f none opt/onbld/bin/build_cscope 555 root bin +f none opt/onbld/bin/check_fnames 555 root bin f none opt/onbld/bin/check_rtime 555 root bin f none opt/onbld/bin/checkpaths 555 root bin f none opt/onbld/bin/checkproto 555 root bin diff --git a/usr/src/tools/scripts/Makefile b/usr/src/tools/scripts/Makefile index 86820c29ed..6952d19a72 100644 --- a/usr/src/tools/scripts/Makefile +++ b/usr/src/tools/scripts/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -33,6 +33,7 @@ SHFILES= \ build_cscope \ checkpaths \ checkproto \ + check_fnames \ cstyle \ elfcmp \ flg.flp \ diff --git a/usr/src/tools/scripts/check_fnames.sh b/usr/src/tools/scripts/check_fnames.sh new file mode 100644 index 0000000000..7fe1b6b0d2 --- /dev/null +++ b/usr/src/tools/scripts/check_fnames.sh @@ -0,0 +1,179 @@ +#!/bin/ksh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" + +CMD=`/usr/bin/basename $0` +ELFDUMP=/usr/ccs/bin/elfdump +EXPR=/usr/bin/expr +FILE=/usr/bin/file +GREP=/usr/xpg4/bin/grep +NM=/usr/ccs/bin/nm +RM=/usr/bin/rm +SED=/usr/bin/sed +SORT=/usr/bin/sort +STATUS=0 + +usage() { + echo "usage: $CMD -s synonyms-file -l shared-lib object-file ..." + $RM -f forbid.$$ + exit 1 +} + +# Add to the list of forbidden names from the shared library +examine_library() { + if [ -f $1 ] + then + : + else + echo "$CMD: error: -l $1: non-existent file" + usage + fi + if $FILE $1 | $GREP -q 'ELF .* dynamic lib' + then + : + else + echo "$CMD: error: -l $1: not a shared library" + usage + fi + + SUBDIR= + if $FILE $1 | $GREP -q '64-bit' + then + SUBDIR=/64 + fi + + # Generate the list of forbidden names from the shared library + + $NM -Dphvx $1 | $GREP -v '^0x0000.*0000 ' >match.$$ + $ELFDUMP -d $1 | $GREP NEEDED >needed.$$ + $ELFDUMP -d $1 | $GREP SUNW_FILTER >>needed.$$ + + while read a b c NEEDED + do + case $NEEDED in + /*) ;; + *) NEEDED=/usr/lib${SUBDIR}/$NEEDED ;; + esac + if [ -f ${ROOT}${NEEDED} ] + then + NEEDED=${ROOT}${NEEDED} + fi + if [ -f "$NEEDED" ] + then + $NM -Dphvx $NEEDED | + $GREP -v '^0x0000.*0000 ' >>match.$$ + fi + done <needed.$$ + + addr1="" + name1="" + while read addr2 trash name2 + do + if [ "$addr1" = "$addr2" ] + then + echo "$name1" + while [ "$addr1" = "$addr2" ] + do + echo "$name2" + addr1="$addr2" + name1="$name2" + read addr2 trash name2 + done + fi + addr1="$addr2" + name1="$name2" + done <match.$$ | $GREP -v '^[^\.]' >>forbid.$$ + + $RM -f match.$$ needed.$$ +} + +# Add to the list of forbidden names from the synonyms file +examine_synonyms() { + if [ -f $1 ] + then + : + else + echo "$CMD: error: -s $1: non-existent file" + usage + fi + $GREP '^#define' $1 | $GREP -v _COMMON_ | + while read d NAME trash + do + echo $NAME + done >>forbid.$$ +} + +if [ $# -eq 0 ] +then + usage +fi + +>forbid.$$ + +GOT_LIB_SYN=0 +while getopts l:s: ARG +do + case $ARG in + l) examine_library $OPTARG + GOT_LIB_SYN=1 + ;; + s) examine_synonyms $OPTARG + GOT_LIB_SYN=1 + ;; + \?) usage + ;; + esac +done +shift `$EXPR $OPTIND - 1` + +if [ $GOT_LIB_SYN -eq 0 -o $# -eq 0 ] +then + usage +fi + +$SORT -u -o forbid.$$ forbid.$$ + +# Examine each object file, looking for forbidden names +for file +do + if $FILE $file | $GREP -q 'ELF.*relocatable' + then + LIST="`$NM -uph $file | $GREP -w -f forbid.$$`" + if [ ! -z "$LIST" ] + then + echo "$CMD: error: forbidden names found in $file" + echo "$LIST" + STATUS=1 + fi + else + echo "$CMD: error: $file: not a relocatable object file" + STATUS=1 + fi +done + +$RM -f forbid.$$ + +exit $STATUS diff --git a/usr/src/ucblib/libucb/port/stdio/doprnt.c b/usr/src/ucblib/libucb/port/stdio/doprnt.c index 0f95dca946..6a9a807c29 100644 --- a/usr/src/ucblib/libucb/port/stdio/doprnt.c +++ b/usr/src/ucblib/libucb/port/stdio/doprnt.c @@ -19,8 +19,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,7 +46,7 @@ * _doprnt: common code for printf, fprintf, sprintf */ -#include "../gen/synonyms.h" +#include "../../../lib/common/inc/c_synonyms.h" #include <sys/types.h> #include "file64.h" #include <stdio.h> |