From e94d9ee5a54aafce193010647473253303322176 Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Thu, 10 Nov 2022 13:19:22 +0000 Subject: Better error message if setlocale fails. git-svn-id: svn://tug.org/texlive/trunk@64983 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/ChangeLog | 3 +++ Build/source/texk/web2c/luatexdir/lua/luainit.c | 4 ++-- Build/source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 9cd534c2c56..d8b6a5d5de6 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,6 @@ +2022-11-10 Luigi Scarso + * Better error message if setlocale fails + 2022-10-28 Luigi Scarso * \variablefam (backport from luametatex, handy for latex) (H .Hagen) diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.c b/Build/source/texk/web2c/luatexdir/lua/luainit.c index 35683fccca3..9eecb714cef 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luainit.c +++ b/Build/source/texk/web2c/luatexdir/lua/luainit.c @@ -997,7 +997,7 @@ void lua_initialize(int ac, char **av) */ env_locale = setlocale (LC_ALL, ""); if (!env_locale && !lua_only) { - fprintf(stderr,"Unable to read environment locale: exit now.\n"); + fprintf(stderr,"Unable to read locale data: please check the 'locale' settings of your environment for consistency. Exiting now.\n"); exit(1); } tmp = setlocale (LC_CTYPE, NULL); @@ -1018,7 +1018,7 @@ void lua_initialize(int ac, char **av) */ env_locale = setlocale (LC_ALL, old_locale); if (!env_locale) { - fprintf(stderr,"Unable to restore original locale %s: exit now.\n",old_locale); + fprintf(stderr,"Unable to restore original locale %s: exiting now.\n",old_locale); exit(1); } xfree(old_locale); diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index e7cc57b48d7..2630418c80c 100644 --- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1,4 +1,4 @@ #ifndef luatex_svn_revision_h #define luatex_svn_revision_h -#define luatex_svn_revision 7547 +#define luatex_svn_revision 7548 #endif -- cgit v1.2.3