aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/lang
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>1999-12-15 22:38:56 +0000
committerTom Tromey <tromey@gcc.gnu.org>1999-12-15 22:38:56 +0000
commit6150df627a7fb825a10280e54c35c8250e69bae0 (patch)
treea62a290aa80d703465c399c7618dc878d025cffd /libjava/java/lang
parent5a626f11f4069f2b9d8f16ca9d8c210a5458cd6c (diff)
downloadgcc-6150df627a7fb825a10280e54c35c8250e69bae0.zip
gcc-6150df627a7fb825a10280e54c35c8250e69bae0.tar.gz
gcc-6150df627a7fb825a10280e54c35c8250e69bae0.tar.bz2
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
Diffstat (limited to 'libjava/java/lang')
-rw-r--r--libjava/java/lang/natSystem.cc6
1 files changed, 5 insertions, 1 deletions
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'.