Print this page
2989 Eliminate use of LOGNAME_MAX in ON
1166 useradd have warning with name more 8 chars
*** 18,27 ****
--- 18,29 ----
*
* CDDL HEADER END
*/
/*
+ * Copyright (c) 2013 Gary Mills
+ *
* Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
*** 348,358 ****
--- 350,373 ----
#if defined(_XPG4_2)
extern int gethostname(char *, size_t);
#elif !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
extern int gethostname(char *, int);
#endif
+
+ #ifndef __GETLOGIN_DEFINED /* Avoid duplicate in stdlib.h */
+ #define __GETLOGIN_DEFINED
+ #ifndef __USE_LEGACY_LOGNAME__
+ #ifdef __PRAGMA_REDEFINE_EXTNAME
+ #pragma redefine_extname getlogin getloginx
+ #else /* __PRAGMA_REDEFINE_EXTNAME */
+ extern char *getloginx(void);
+ #define getlogin getloginx
+ #endif /* __PRAGMA_REDEFINE_EXTNAME */
+ #endif /* __USE_LEGACY_LOGNAME__ */
extern char *getlogin(void);
+ #endif /* __GETLOGIN_DEFINED */
+
#if defined(_XPG4) || defined(__EXTENSIONS__)
extern int getopt(int, char *const *, const char *);
extern char *optarg;
extern int opterr, optind, optopt;
/* Marked as LEGACY in SUSv2 and removed in SUSv3 */
*** 679,689 ****
--- 694,717 ----
extern long gethostid();
#endif
#if !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) || defined(__EXTENSIONS__)
extern int gethostname();
#endif
+
+ #ifndef __GETLOGIN_DEFINED /* Avoid duplicate in stdlib.h */
+ #define __GETLOGIN_DEFINED
+ #ifndef __USE_LEGACY_LOGNAME__
+ #ifdef __PRAGMA_REDEFINE_EXTNAME
+ #pragma redefine_extname getlogin getloginx
+ #else /* __PRAGMA_REDEFINE_EXTNAME */
+ extern char *getloginx();
+ #define getlogin getloginx
+ #endif /* __PRAGMA_REDEFINE_EXTNAME */
+ #endif /* __USE_LEGACY_LOGNAME__ */
extern char *getlogin();
+ #endif /* __GETLOGIN_DEFINED */
+
#if defined(_XPG4) || defined(__EXTENSIONS__)
extern int getopt();
extern char *optarg;
extern int opterr, optind, optopt;
#if !defined(_XPG6) || defined(__EXTENSIONS__)
*** 937,968 ****
#if defined(__STDC__)
#if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
#ifdef __PRAGMA_REDEFINE_EXTNAME
#pragma redefine_extname getlogin_r __posix_getlogin_r
- #pragma redefine_extname ttyname_r __posix_ttyname_r
extern int getlogin_r(char *, int);
- extern int ttyname_r(int, char *, size_t);
#else /* __PRAGMA_REDEFINE_EXTNAME */
-
extern int __posix_getlogin_r(char *, int);
- extern int __posix_ttyname_r(int, char *, size_t);
#ifdef __lint
#define getlogin_r __posix_getlogin_r
- #define ttyname_r __posix_ttyname_r
#else /* !__lint */
static int
getlogin_r(char *__name, int __len)
{
return (__posix_getlogin_r(__name, __len));
}
static int
ttyname_r(int __fildes, char *__buf, size_t __size)
{
return (__posix_ttyname_r(__fildes, __buf, __size));
}
--- 965,1017 ----
#if defined(__STDC__)
#if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
+ #ifndef __USE_LEGACY_LOGNAME__
#ifdef __PRAGMA_REDEFINE_EXTNAME
+ #pragma redefine_extname getlogin_r __posix_getloginx_r
+ extern int getlogin_r(char *, int);
+ #else /* __PRAGMA_REDEFINE_EXTNAME */
+ extern int __posix_getloginx_r(char *, int);
+ #define getlogin_r __posix_getloginx_r
+ #endif /* __PRAGMA_REDEFINE_EXTNAME */
+ #else /* __USE_LEGACY_LOGNAME__ */
+ #ifdef __PRAGMA_REDEFINE_EXTNAME
#pragma redefine_extname getlogin_r __posix_getlogin_r
extern int getlogin_r(char *, int);
#else /* __PRAGMA_REDEFINE_EXTNAME */
extern int __posix_getlogin_r(char *, int);
#ifdef __lint
#define getlogin_r __posix_getlogin_r
#else /* !__lint */
static int
getlogin_r(char *__name, int __len)
{
return (__posix_getlogin_r(__name, __len));
}
+
+ #endif /* !__lint */
+ #endif /* __PRAGMA_REDEFINE_EXTNAME */
+ #endif /* __USE_LEGACY_LOGNAME__ */
+
+ #ifdef __PRAGMA_REDEFINE_EXTNAME
+ #pragma redefine_extname ttyname_r __posix_ttyname_r
+ extern int ttyname_r(int, char *, size_t);
+ #else /* __PRAGMA_REDEFINE_EXTNAME */
+ extern int __posix_ttyname_r(int, char *, size_t);
+
+ #ifdef __lint
+
+ #define ttyname_r __posix_ttyname_r
+
+ #else /* !__lint */
+
static int
ttyname_r(int __fildes, char *__buf, size_t __size)
{
return (__posix_ttyname_r(__fildes, __buf, __size));
}
*** 970,1002 ****
#endif /* !__lint */
#endif /* __PRAGMA_REDEFINE_EXTNAME */
#else /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
extern char *getlogin_r(char *, int);
extern char *ttyname_r(int, char *, int);
#endif /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
#else /* __STDC__ */
#if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
#ifdef __PRAGMA_REDEFINE_EXTNAME
#pragma redefine_extname getlogin_r __posix_getlogin_r
- #pragma redefine_extname ttyname_r __posix_ttyname_r
extern int getlogin_r();
- extern int ttyname_r();
#else /* __PRAGMA_REDEFINE_EXTNAME */
-
extern int __posix_getlogin_r();
- extern int __posix_ttyname_r();
#ifdef __lint
#define getlogin_r __posix_getlogin_r
- #define ttyname_r __posix_ttyname_r
#else /* !__lint */
static int
getlogin_r(__name, __len)
--- 1019,1064 ----
#endif /* !__lint */
#endif /* __PRAGMA_REDEFINE_EXTNAME */
#else /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
+ #ifndef __USE_LEGACY_LOGNAME__
+ #ifdef __PRAGMA_REDEFINE_EXTNAME
+ #pragma redefine_extname getlogin_r getloginx_r
+ #else /* __PRAGMA_REDEFINE_EXTNAME */
+ extern char *getloginx_r(char *, int);
+ #define getlogin_r getloginx_r
+ #endif /* __PRAGMA_REDEFINE_EXTNAME */
+ #endif /* __USE_LEGACY_LOGNAME__ */
extern char *getlogin_r(char *, int);
+
extern char *ttyname_r(int, char *, int);
#endif /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
#else /* __STDC__ */
#if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
+ #ifndef __USE_LEGACY_LOGNAME__
#ifdef __PRAGMA_REDEFINE_EXTNAME
+ #pragma redefine_extname getlogin_r __posix_getloginx_r
+ extern int getlogin_r();
+ #else /* __PRAGMA_REDEFINE_EXTNAME */
+ extern int __posix_getloginx_r();
+ #define getlogin_r __posix_getloginx_r
+ #endif /* __PRAGMA_REDEFINE_EXTNAME */
+ #else /* __USE_LEGACY_LOGNAME__ */
+ #ifdef __PRAGMA_REDEFINE_EXTNAME
#pragma redefine_extname getlogin_r __posix_getlogin_r
extern int getlogin_r();
#else /* __PRAGMA_REDEFINE_EXTNAME */
extern int __posix_getlogin_r();
#ifdef __lint
#define getlogin_r __posix_getlogin_r
#else /* !__lint */
static int
getlogin_r(__name, __len)
*** 1003,1013 ****
char *__name;
int __len;
{
return (__posix_getlogin_r(__name, __len));
}
! static int
ttyname_r(__fildes, __buf, __size)
int __fildes;
char *__buf;
size_t __size;
{
--- 1065,1091 ----
char *__name;
int __len;
{
return (__posix_getlogin_r(__name, __len));
}
! #endif /* !__lint */
! #endif /* __PRAGMA_REDEFINE_EXTNAME */
! #endif /* __USE_LEGACY_LOGNAME__ */
!
! #ifdef __PRAGMA_REDEFINE_EXTNAME
! #pragma redefine_extname ttyname_r __posix_ttyname_r
! extern int ttyname_r();
! #else /* __PRAGMA_REDEFINE_EXTNAME */
!
! extern int __posix_ttyname_r();
!
! #ifdef __lint
!
! #define ttyname_r __posix_ttyname_r
!
! #else /* !__lint */
!
ttyname_r(__fildes, __buf, __size)
int __fildes;
char *__buf;
size_t __size;
{
*** 1016,1026 ****
--- 1094,1113 ----
#endif /* !__lint */
#endif /* __PRAGMA_REDEFINE_EXTNAME */
#else /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
+ #ifndef __USE_LEGACY_LOGNAME__
+ #ifdef __PRAGMA_REDEFINE_EXTNAME
+ #pragma redefine_extname getlogin_r getloginx_r
+ #else /* __PRAGMA_REDEFINE_EXTNAME */
+ extern char *getloginx_r();
+ #define getlogin_r getloginx_r
+ #endif /* __PRAGMA_REDEFINE_EXTNAME */
+ #endif /* __USE_LEGACY_LOGNAME__ */
extern char *getlogin_r();
+
extern char *ttyname_r();
#endif /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */
#endif /* __STDC__ */