From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 12 Jul 2006 08:37:45 +0000 (+0000)
Subject: Include blockinput.h.
X-Git-Tag: emacs-pretest-22.0.90~1520
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67c08d6c724409dec6e87005c4418ee85a4bf4ec;p=emacs.git

Include blockinput.h.
(Fexpand_file_name, search_embedded_absfilename): Add BLOCK_INPUT
around getpwnam.
(search_embedded_absfilename): Remove spurious xfree.
---

diff --git a/src/fileio.c b/src/fileio.c
index b4fc934900b..21e6fd3a86c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -77,6 +77,7 @@ extern int errno;
 #include "charset.h"
 #include "coding.h"
 #include "window.h"
+#include "blockinput.h"
 
 #ifdef WINDOWSNT
 #define NOMINMAX 1
@@ -1386,7 +1387,9 @@ See also the function `substitute-in-file-name'.  */)
 	  bcopy ((char *) nm, o, p - nm);
 	  o [p - nm] = 0;
 
+	  BLOCK_INPUT;
 	  pw = (struct passwd *) getpwnam (o + 1);
+	  UNBLOCK_INPUT;
 	  if (pw)
 	    {
 	      newdir = (unsigned char *) pw -> pw_dir;
@@ -1917,7 +1920,9 @@ See also the function `substitute-in-file-name'.")
 	o[len] = 0;
 
 	/* Look up the user name. */
+	BLOCK_INPUT;
 	pw = (struct passwd *) getpwnam (o + 1);
+	UNBLOCK_INPUT;
 	if (!pw)
 	  error ("\"%s\" isn't a registered user", o + 1);
 
@@ -2111,10 +2116,11 @@ search_embedded_absfilename (nm, endp)
 	      /* If we have ~user and `user' exists, discard
 		 everything up to ~.  But if `user' does not exist, leave
 		 ~user alone, it might be a literal file name.  */
-	      if ((pw = getpwnam (o + 1)))
+	      BLOCK_INPUT;
+	      pw = getpwnam (o + 1);
+	      UNBLOCK_INPUT;
+	      if (pw)
 		return p;
-	      else
-		xfree (pw);
 	    }
 	  else
 	    return p;