projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge `chinese-isoir165'.
[chise/xemacs-chise.git]
/
src
/
fileio.c
diff --git
a/src/fileio.c
b/src/fileio.c
index
a9db0b5
..
6844d96
100644
(file)
--- 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 (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 *) "";
newdir = (Bufbyte *) "";
+ else
+ GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (newdir_external, newdir);
+
nm++;
#ifdef WINDOWSNT
collapse_newdir = 0;
nm++;
#ifdef WINDOWSNT
collapse_newdir = 0;
@@
-1255,8
+1260,7
@@
See also the function `substitute-in-file-name'.
}
else
{
}
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 */
}
CORRECT_DIR_SEPS (target);
#endif /* WINDOWSNT */