OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natSystem.cc (getpwuid_adaptor): New overloaded function that detects the signature of getpwuid_r.

Browse Source 
* java/lang/natSystem.cc (getpwuid_adaptor): New overloaded
function that detects the signature of getpwuid_r.
(init_properties): Use it.
* java/util/natDate.cc (ctime_adaptor): Likewise for ctime_r.
(toString): Use it.

From-SVN: r28790
This commit is contained in:
Alexandre Oliva 1999-08-21 11:56:24 +00:00
parent 5b33370d63
commit fb82082db3
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libjava/java/lang/natSystem.cc
View File

@ -231,6 +231,34 @@ java::lang::System::identityHashCode (jobject obj)
#endif
static char *default_file_encoding = DEFAULT_FILE_ENCODING;
#if HAVE_GETPWUID_R
/* Use overload resolution to find out the signature of getpwuid_r. */
/* This is Posix getpwuid_r. */
template <typename T_uid, typename T_passwd, typename T_buf, typename T_len>
static inline int
getpwuid_adaptor(int (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
T_buf *buf_r, T_len len_r,
T_passwd **pwd_entry_ptr),
uid_t user_id, struct passwd *pwd_r,
char *buf_r, size_t len_r, struct passwd **pwd_entry)
{
return getpwuid_r(user_id, pwd_r, buf_r, len_r, pwd_entry);
}
/* This is used on IRIX 5.2. */
template <typename T_uid, typename T_passwd, typename T_buf, typename T_len>
static inline int
getpwuid_adaptor(T_passwd * (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
T_buf *buf_r, T_len len_r),
uid_t user_id, struct passwd *pwd_r,
char *buf_r, size_t len_r, struct passwd **pwd_entry)
{
*pwd_entry = getpwuid_r(user_id, pwd_r, buf_r, len_r);
return (*pwd_entry == NULL) ? errno : 0;
}
#endif
void
java::lang::System::init_properties (void)
{
@ -293,7 +321,8 @@ java::lang::System::init_properties (void)
while (buf_r != NULL)
{
int r = getpwuid_r (user_id, &pwd_r, buf_r, len_r, &pwd_entry);
int r = getpwuid_adaptor
(getpwuid_r, user_id, &pwd_r, buf_r, len_r, &pwd_entry);
if (r == 0)
break;
else if (r != ERANGE)

24
libjava/java/util/natDate.cc
View File

@ -28,13 +28,35 @@ details. */
#include <sys/time.h>
#endif
#if HAVE_CTIME_R
/* Use overload resolution to find out the signature of ctime_r. */
/* This is Posix ctime_r(). */
template <typename T_clock, typename T_buf, size_t buflen>
static inline char *
ctime_adaptor (char* (*ctime_r)(T_clock *clock, T_buf *buf),
time_t *clock, char (&buf)[buflen])
{
return ctime_r(clock, buf);
}
/* This is an old-style ctime_r, used on IRIX 5.2. */
template <typename T_clock, typename T_buf, typename T_buflen, size_t buflen>
static inline char *
ctime_adaptor (char* (*ctime_r)(T_clock *clock, T_buf *buf, T_buflen len),
time_t *clock, char (&buf)[buflen])
{
return ctime_r(clock, buf, buflen);
}
#endif
jstring
java::util::Date::toString()
{
#ifdef HAVE_CTIME_R
time_t t = millis / 1000;
char buf[30];
return JvNewStringLatin1 (ctime_r (&t, buf));
return JvNewStringLatin1 (ctime_adaptor (ctime_r, &t, buf));
#elif defined (HAVE_CTIME)
// FIXME: this isn't thread-safe.
time_t t = millis / 1000;