mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 15:21:51 -08:00
Code Issues Projects Releases Wiki Activity

Improve directory-access diagnostics

Browse source 
* src/callproc.c (init_callproc): Diagnose I/O errors,
access errors, etc. for the game directory.
* src/charset.c (init_charset): Improve quality of diagnostic
when the charsets directory has I/O errors, access errors, etc.
This commit is contained in:
Paul Eggert 2019-09-15 20:12:07 -07:00
parent a625ca5c26
commit de3daf0639
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/callproc.c
View file

@ -1598,6 +1598,8 @@ init_callproc (void)
Lisp_Object path_game = build_unibyte_string (PATH_GAME);
if (file_accessible_directory_p (path_game))
gamedir = path_game;
else if (errno != ENOENT && errno != ENOTDIR)
dir_warning ("game dir", path_game);
}
Vshared_game_score_directory = gamedir;
}

20
src/charset.c
View file

@ -2292,14 +2292,18 @@ init_charset (void)
{
/* This used to be non-fatal (dir_warning), but it should not
happen, and if it does sooner or later it will cause some
obscure problem (eg bug#6401), so better abort. */
fprintf (stderr, "Error: charsets directory not found:\n\
%s\n\
Emacs will not function correctly without the character map files.\n%s\
Please check your installation!\n",
SDATA (tempdir),
egetenv("EMACSDATA") ? "The EMACSDATA environment \
variable is set, maybe it has the wrong value?\n" : "");
obscure problem (eg bug#6401), so better exit. */
fprintf (stderr,
("Error: %s: %s\n"
"Emacs will not function correctly "
"without the character map files.\n"
"%s"
"Please check your installation!\n"),
SDATA (tempdir), strerror (errno),
(egetenv ("EMACSDATA")
? ("The EMACSDATA environment variable is set. "
"Maybe it has the wrong value?\n")
: ""));
exit (1);
}