diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-07 10:49:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-07 10:49:53 +0000 |
commit | fa94e399e78544fb77abd60e1b0090b6248d6d1d (patch) | |
tree | 5d8bf807fbb359b43ef2a0144a4193a3f0778b5b /Build/source/texk/web2c/luatexdir | |
parent | ca7b5c3464b1daa17a18ba5a512b36a11fd0561e (diff) |
Rename program_invocation_*name => kpse_invocation_*name
(1) to avoid conflict with /usr/include/sys/error.h from Cygwin, and
(2) to indicate that these are not the variables from glibc.
git-svn-id: svn://tug.org/texlive/trunk@21624 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/luainit.w | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texfileio.w | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w index 017558ad1db..3efeb7a949c 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luainit.w +++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w @@ -43,7 +43,7 @@ does much more, making it hard to use for our purpose. In fact, it sets three C variables: - |program_invocation_name| |program_invocation_short_name| |kpse->program_name| + |kpse_invocation_name| |kpse_invocation_short_name| |kpse->program_name| and four environment variables: @@ -743,11 +743,11 @@ void lua_initialize(int ac, char **av) } ptexbanner = banner; - program_invocation_name = cleaned_invocation_name(argv[0]); + kpse_invocation_name = cleaned_invocation_name(argv[0]); /* be 'luac' */ if (argc > 1 && - (STREQ(program_invocation_name, "texluac") || + (STREQ(kpse_invocation_name, "texluac") || STREQ(argv[1], "--luaconly") || STREQ(argv[1], "--luac"))) { exit(luac_main(ac, av)); } diff --git a/Build/source/texk/web2c/luatexdir/tex/texfileio.w b/Build/source/texk/web2c/luatexdir/tex/texfileio.w index 73ca7146192..ccae2f15433 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texfileio.w +++ b/Build/source/texk/web2c/luatexdir/tex/texfileio.w @@ -1131,7 +1131,7 @@ opennameok(const_string fname, const_string check_var, if (base[0] == 0 || (base[0] == '.' && !IS_DIR_SEP(base[1]) && !STREQ(base, ".tex"))) { fprintf(stderr, "%s: Not %s to %s (%s = %s).\n", - program_invocation_name, ok_type_name[action], fname, + kpse_invocation_name, ok_type_name[action], fname, check_var, open_choice); return false; } @@ -1152,7 +1152,7 @@ opennameok(const_string fname, const_string check_var, || fname != strstr(fname, texmfoutput) || !IS_DIR_SEP(fname[strlen(texmfoutput)])) { fprintf(stderr, "%s: Not %s to %s (%s = %s).\n", - program_invocation_name, ok_type_name[action], fname, + kpse_invocation_name, ok_type_name[action], fname, check_var, open_choice); return false; } @@ -1161,7 +1161,7 @@ opennameok(const_string fname, const_string check_var, anywhere. */ if (fname[0] == '.' && fname[1] == '.' && IS_DIR_SEP(fname[2])) { fprintf(stderr, "%s: Not %s to %s (%s = %s).\n", - program_invocation_name, ok_type_name[action], fname, + kpse_invocation_name, ok_type_name[action], fname, check_var, open_choice); return false; } else { @@ -1173,7 +1173,7 @@ opennameok(const_string fname, const_string check_var, because the "../" case was handled above. */ if (IS_DIR_SEP(dotpair[2]) && IS_DIR_SEP(dotpair[-1])) { fprintf(stderr, "%s: Not %s to %s (%s = %s).\n", - program_invocation_name, ok_type_name[action], fname, + kpse_invocation_name, ok_type_name[action], fname, check_var, open_choice); return false; } |