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

7 files changed, 21 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index ac160630070..b9ec0871440 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* setupvar.c (setupboundvariable): `program_invocation_name' has
+	been renamed into `kpse_invocation_name'.
+
 2011-03-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* texmfmp.c (calledit): [__MINGW32__] Drop win32_system() and
diff --git a/Build/source/texk/web2c/lib/setupvar.c b/Build/source/texk/web2c/lib/setupvar.c
index 702d379689a..a37b3f713a6 100644
--- a/Build/source/texk/web2c/lib/setupvar.c
+++ b/Build/source/texk/web2c/lib/setupvar.c
@@ -23,7 +23,7 @@ setupboundvariable (integer *var, const_string var_name, integer dflt)
     if (conf_val < 0 || (conf_val == 0 && dflt > 0)) {
       fprintf (stderr,
                "%s: Bad value (%ld) in texmf.cnf for %s, keeping %ld.\n",
-               program_invocation_name,
+               kpse_invocation_name,
                (long) conf_val, var_name, (long) dflt);
     } else {
       *var = conf_val; /* We'll make further checks later.  */
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 78e5934aa79..de5ec885faa 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -628,7 +628,7 @@ maininit (int ac, string *av)
   if (!user_progname)
     user_progname = dump_name;
   
-  /* Do this early so we can inspect program_invocation_name and
+  /* Do this early so we can inspect kpse_invocation_name and
      kpse_program_name below, and because we have to do this before
      any path searching.  */
   kpse_set_program_name (argv[0], user_progname);
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;
             }
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 191350314c0..87a88b7ed94 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* utils.c (pdftex_fail, pdftex_warn): `program_invocation_name'
+	has been renamed into `kpse_invocation_name'.
+
 2011-01-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* writepng.c: Remove png-1.2 cruft.
diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c
index ccf5c1ee51d..71e47b4b21a 100644
--- a/Build/source/texk/web2c/pdftexdir/utils.c
+++ b/Build/source/texk/web2c/pdftexdir/utils.c
@@ -239,7 +239,7 @@ void pdftex_fail(const char *fmt, ...)
     va_start(args, fmt);
     println();
     safe_print("!pdfTeX error: ");
-    safe_print(program_invocation_name);
+    safe_print(kpse_invocation_name);
     if (cur_file_name) {
         safe_print(" (file ");
         safe_print(cur_file_name);
@@ -271,7 +271,7 @@ void pdftex_warn(const char *fmt, ...)
     va_start(args, fmt);
     println();
     println();
-    tex_printf("pdfTeX warning: %s", program_invocation_name);
+    tex_printf("pdfTeX warning: %s", kpse_invocation_name);
     if (cur_file_name)
         tex_printf(" (file %s)", cur_file_name);
     tex_printf(": ");