X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ffileio.c;h=6844d96410043bbda129e5396da013cd01a81ac8;hb=83672a528db7fe9cace421905b7efd06c11b7c98;hp=a9db0b53e78d0edbf6b54d69ea72ebd1629e698a;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git

diff --git a/src/fileio.c b/src/fileio.c
index a9db0b5..6844d96 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -981,8 +981,13 @@ See also the function `substitute-in-file-name'.
       if (IS_DIRECTORY_SEP (nm[1])
 	  || nm[1] == 0)	/* ~ by itself */
 	{
-	  if (!(newdir = (Bufbyte *) get_home_directory()))
+	  char * newdir_external = get_home_directory ();
+
+	  if (newdir_external == NULL)
 	    newdir = (Bufbyte *) "";
+	  else
+	    GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (newdir_external, newdir);
+
 	  nm++;
 #ifdef WINDOWSNT
 	  collapse_newdir = 0;
@@ -1255,8 +1260,7 @@ See also the function `substitute-in-file-name'.
     }
   else
     {
-      if (!(IS_DIRECTORY_SEP (target[0]) && IS_DIRECTORY_SEP (target[1])))
-      abort ();
+      assert (IS_DIRECTORY_SEP (target[0]) && IS_DIRECTORY_SEP (target[1]));
     }
   CORRECT_DIR_SEPS (target);
 #endif /* WINDOWSNT */