From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 8 Aug 2007 22:24:40 +0000 (+0000)
Subject: natVMInetAddressPosix.cc (java::net::VMInetAddress::getLocalHostname): Allocate buffe... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad10fdc2b781c481fe7793dc9eb735d0bb493921;p=gcc.git

natVMInetAddressPosix.cc (java::net::VMInetAddress::getLocalHostname): Allocate buffer dynamically.

2007-08-08  Samuel Thibault  <samuel.thibault@ens-lyon.org>

        * java/net/natVMInetAddressPosix.cc
        (java::net::VMInetAddress::getLocalHostname) [!MAXHOSTNAMELEN]:
        Allocate buffer dynamically.

From-SVN: r127305
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e9dbb5fb3bb..cbec57f311e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-08  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* java/net/natVMInetAddressPosix.cc
+	(java::net::VMInetAddress::getLocalHostname) [!MAXHOSTNAMELEN]:
+	Allocate buffer dynamically.
+
 2007-08-04  Alfred M. Szmidt  <ams@gnu.org>
 
 	* java/io/natFilePosix.cc (init_native) [!MAXPATHLEN]: Define to 0.
diff --git a/libjava/java/net/natVMInetAddressPosix.cc b/libjava/java/net/natVMInetAddressPosix.cc
index 7fbe1bb1ff0..bc25f3654aa 100644
--- a/libjava/java/net/natVMInetAddressPosix.cc
+++ b/libjava/java/net/natVMInetAddressPosix.cc
@@ -47,10 +47,25 @@ java::net::VMInetAddress::getLocalHostname ()
 {
   char *chars;
 #ifdef HAVE_GETHOSTNAME
+#ifdef MAXHOSTNAMELEN
   char buffer[MAXHOSTNAMELEN];
   if (gethostname (buffer, MAXHOSTNAMELEN))
     return NULL;
   chars = buffer;
+#else
+  size_t size = 256;
+  while (1) {
+    char buffer[size];
+    if (!gethostname (buffer, size-1))
+      {
+	buffer[size-1] = 0;
+	return JvNewStringUTF (buffer);
+      }
+    else if (errno != ENAMETOOLONG)
+      return NULL;
+    size *= 2;
+  }
+#endif
 #elif HAVE_UNAME
   struct utsname stuff;
   if (uname (&stuff) != 0)