From 6150df627a7fb825a10280e54c35c8250e69bae0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 15 Dec 1999 22:38:56 +0000 Subject: natSystem.cc (init_properties): Don't set user.name or user.home if NO_GETUID defined. * java/lang/natSystem.cc (init_properties): Don't set user.name or user.home if NO_GETUID defined. Only set user.dir if getcwd exists. * include/config.h.in: Rebuilt. * acconfig.h (NO_GETUID): New define. * configure.in: Rebuilt. * configure.in: Define NO_GETUID in cross case. Check for getcwd in native case. From-SVN: r30964 --- libjava/java/lang/natSystem.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 4e4316a..1519647 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -282,6 +282,7 @@ java::lang::System::init_properties (void) } #endif /* HAVE_UNAME */ +#ifndef NO_GETUID #ifdef HAVE_PWD_H uid_t user_id = getuid (); struct passwd *pwd_entry; @@ -315,7 +316,9 @@ java::lang::System::init_properties (void) SET ("user.home", pwd_entry->pw_dir); } #endif /* HAVE_PWD_H */ +#endif /* NO_GETUID */ +#ifdef HAVE_GETCWD #ifdef HAVE_UNISTD_H /* Use getcwd to set "user.dir". */ int buflen = 250; @@ -334,7 +337,8 @@ java::lang::System::init_properties (void) } if (buffer != NULL) free (buffer); -#endif +#endif /* HAVE_UNISTD_H */ +#endif /* HAVE_GETCWD */ // Set some properties according to whatever was compiled in with // `-D'. -- cgit v1.1