From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 13 Sep 2001 14:01:54 +0000 (+0000)
Subject: (Ffile_symlink_p): If readlink returns ERANGE, take
X-Git-Tag: emacs-pretest-21.0.106~121
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81c3310d7b1ddb7970077a85068b1dc8b502042a;p=emacs.git

(Ffile_symlink_p): If readlink returns ERANGE, take
that to mean that the buffer is too small.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d1741c8a7ce..c053a1530d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-13  Gerd Moellmann  <gerd@gnu.org>
 
+	* fileio.c (Ffile_symlink_p): If readlink returns ERANGE, take
+	that to mean that the buffer is too small.
+
 	* xdisp.c (reseat_1): Set IT's multibyte_p flag according to the
 	current buffer's multibyteness when discarding the iterator's
 	stack.
diff --git a/src/fileio.c b/src/fileio.c
index 1a90e511322..eba2ac0bbaf 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3096,22 +3096,29 @@ Otherwise returns nil.")
 
   filename = ENCODE_FILE (filename);
 
-  bufsize = 100;
-  while (1)
+  bufsize = 50;
+  buf = NULL;
+  do
     {
-      buf = (char *) xmalloc (bufsize);
+      bufsize *= 2;
+      buf = (char *) xrealloc (buf, bufsize);
       bzero (buf, bufsize);
+      
+      errno = 0;
       valsize = readlink (XSTRING (filename)->data, buf, bufsize);
-      if (valsize < bufsize) break;
-      /* Buffer was not long enough */
-      xfree (buf);
-      bufsize *= 2;
-    }
-  if (valsize == -1)
-    {
-      xfree (buf);
-      return Qnil;
+      if (valsize == -1
+#ifdef ERANGE
+	  /* HP-UX reports ERANGE if buffer is too small.  */
+	  && errno != ERANGE
+#endif
+	  )
+	{
+	  xfree (buf);
+	  return Qnil;
+	}
     }
+  while (valsize >= bufsize);
+  
   val = make_string (buf, valsize);
   if (buf[0] == '/' && index (buf, ':'))
     val = concat2 (build_string ("/:"), val);