Commit 169d04b8 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix initialization of shared-game-score-directory on MS-Windows

* src/callproc.c (init_callproc) [WINDOWSNT]: Run PATH_GAME
through w32_relocate, to expand %emacs_dir%.
[DOS_NT]: Accept EACCES as not "unusual" errno value.
Reported by Richard Copley <rcopley@gmail.com>.
parent 6684db8c
Pipeline #3153 passed with stage
in 54 minutes and 59 seconds
......@@ -1595,10 +1595,21 @@ init_callproc (void)
Lisp_Object gamedir = Qnil;
if (PATH_GAME)
{
Lisp_Object path_game = build_unibyte_string (PATH_GAME);
const char *cpath_game = PATH_GAME;
#ifdef WINDOWSNT
/* On MS-Windows, PATH_GAME normally starts with a literal
"%emacs_dir%", so it will never work without some tweaking. */
cpath_game = w32_relocate (cpath_game);
#endif
Lisp_Object path_game = build_unibyte_string (cpath_game);
if (file_accessible_directory_p (path_game))
gamedir = path_game;
else if (errno != ENOENT && errno != ENOTDIR)
else if (errno != ENOENT && errno != ENOTDIR
#ifdef DOS_NT
/* DOS/Windows sometimes return EACCES for bad file names */
&& errno != EACCES
#endif
)
dir_warning ("game dir", path_game);
}
Vshared_game_score_directory = gamedir;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment