summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/bibtex8/ChangeLog5
-rw-r--r--Build/source/texk/bibtex8/utils.c2
-rw-r--r--Build/source/texk/bibtexu/ChangeLog5
-rw-r--r--Build/source/texk/bibtexu/utils.c2
-rw-r--r--Build/source/texk/kpathsea/ChangeLog12
-rw-r--r--Build/source/texk/kpathsea/config.h2
-rw-r--r--Build/source/texk/kpathsea/progname.h2
-rw-r--r--Build/source/texk/kpathsea/types.h8
-rw-r--r--Build/source/texk/ps2pkm/ChangeLog5
-rw-r--r--Build/source/texk/ps2pkm/ps2pk.c6
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog5
-rw-r--r--Build/source/texk/web2c/lib/setupvar.c2
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luainit.w6
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texfileio.w8
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/utils.c4
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL5
-rw-r--r--Build/source/texk/xdvik/hypertex.c2
19 files changed, 64 insertions, 24 deletions
diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog
index 79ad11ce080..86ae827da7c 100644
--- a/Build/source/texk/bibtex8/ChangeLog
+++ b/Build/source/texk/bibtex8/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * utils.c (setup_bound_variable): `program_invocation_name' has
+ been renamed into `kpse_invocation_name'.
+
2010-05-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* bibtex.h: fix a bug in the macro BIB_XRETALLOC_STRING.
diff --git a/Build/source/texk/bibtex8/utils.c b/Build/source/texk/bibtex8/utils.c
index 4f4fff105c4..70f85cd9c14 100644
--- a/Build/source/texk/bibtex8/utils.c
+++ b/Build/source/texk/bibtex8/utils.c
@@ -1233,7 +1233,7 @@ static void setup_bound_variable (Integer_T *var, const char *name,
{
#ifdef KPATHSEA
char *expansion = kpse_var_value (name);
- const char *me = program_invocation_name;
+ const char *me = kpse_invocation_name;
const char *src = " or texmf.cnf";
#else
char *expansion = getenv (name);
diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog
index 3dc516d9b07..62e5b2cf769 100644
--- a/Build/source/texk/bibtexu/ChangeLog
+++ b/Build/source/texk/bibtexu/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * utils.c (setup_bound_variable): `program_invocation_name' has
+ been renamed into `kpse_invocation_name'.
+
2010-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/bibtexu.test (new): Just 'bibtexu -version'.
diff --git a/Build/source/texk/bibtexu/utils.c b/Build/source/texk/bibtexu/utils.c
index b6f9fffc455..6d27809fefa 100644
--- a/Build/source/texk/bibtexu/utils.c
+++ b/Build/source/texk/bibtexu/utils.c
@@ -1261,7 +1261,7 @@ static void setup_bound_variable (Integer_T *var, const char *name,
{
#ifdef KPATHSEA
char *expansion = kpse_var_value (name);
- const char *me = program_invocation_name;
+ const char *me = kpse_invocation_name;
const char *src = " or texmf.cnf";
#else
char *expansion = getenv (name);
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 7eb1b1894f6..a9dac927efc 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * types.h: Rename the variables program_invocation_name and
+ program_invocation_short_name into kpse_invocation_name and
+ kpse_invocation_short_name repectively, (1) in order to avoid
+ conflicts with /usr/include/sys/errno.h from Cygwin, and (2)
+ because they are not the same as those from the GNU C library.
+
+ Problem reported by Ken Brown <kbrow1i@gmail.com>.
+
2011-03-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* lib.h, xftell.c (xftell): Change return type from unsigned to
@@ -6,7 +16,7 @@
2011-03-01 Karl Berry <karl@tug.org>
* texmf.cnf: be more explicit that all trees, including TEXMFHOME,
- must follow the TDS>
+ must follow the TDS.
2011-03-01 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/kpathsea/config.h b/Build/source/texk/kpathsea/config.h
index fdd7f81bf93..515bd97f644 100644
--- a/Build/source/texk/kpathsea/config.h
+++ b/Build/source/texk/kpathsea/config.h
@@ -105,7 +105,7 @@
#include <kpathsea/debug.h> /* Runtime tracing. */
#include <kpathsea/lib.h> /* STREQ, etc. */
#include <kpathsea/types.h> /* <sys/types.h>, boolean, string, etc. */
-#include <kpathsea/progname.h> /* for program_invocation_*name */
+#include <kpathsea/progname.h> /* for kpse_invocation_*name */
/* If you want to find subdirectories in a directory with non-Unix
diff --git a/Build/source/texk/kpathsea/progname.h b/Build/source/texk/kpathsea/progname.h
index 9692b22ed4f..7b81fbd35d3 100644
--- a/Build/source/texk/kpathsea/progname.h
+++ b/Build/source/texk/kpathsea/progname.h
@@ -30,7 +30,7 @@ extern KPSEDLL string kpathsea_selfdir (kpathsea kpse, const_string argv0);
/* Set the first two variables above (if they're not predefined) to a copy
of ARGV0 and everything in ARGV0 after the last directory separator,
respectively. Set kpse_program_name to a copy of PROGNAME or the
- value of program_invocation_short_name if PROGNAME is NULL.
+ value of kpse_invocation_short_name if PROGNAME is NULL.
This function also determines the AUTO* variables. */
extern KPSEDLL void kpathsea_set_program_name (kpathsea kpse,
diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h
index e16e428145e..f6ac30b1444 100644
--- a/Build/source/texk/kpathsea/types.h
+++ b/Build/source/texk/kpathsea/types.h
@@ -278,10 +278,10 @@ extern KPSEDLL kpathsea kpse_def;
#define kpse_format_info kpse_def_inst.format_info
#define kpse_debug_hash_lookup_int kpse_def_inst.debug_hash_lookup_int
-#undef program_invocation_name
-#define program_invocation_name kpse_def_inst.invocation_name
-#undef program_invocation_short_name
-#define program_invocation_short_name kpse_def_inst.invocation_short_name
+#undef kpse_invocation_name
+#define kpse_invocation_name kpse_def_inst.invocation_name
+#undef kpse_invocation_short_name
+#define kpse_invocation_short_name kpse_def_inst.invocation_short_name
#endif /* KPSE_COMPAT_API */
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index 7600d60ce6c..3aa1ef6a8fb 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ps2pk.c (main): `program_invocation_name' has been renamed
+ into `kpse_invocation_name'.
+
2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* ps2pk.c: Use kpse_set_program_name() instead of
diff --git a/Build/source/texk/ps2pkm/ps2pk.c b/Build/source/texk/ps2pkm/ps2pk.c
index 7d917816f8f..5fa885b0e1a 100644
--- a/Build/source/texk/ps2pkm/ps2pk.c
+++ b/Build/source/texk/ps2pkm/ps2pk.c
@@ -423,19 +423,19 @@ int argc; char *argv[];
free(altname);
}
if (!psfile)
- fatal("%s: PS file %s not found!\n", program_invocation_name,
+ fatal("%s: PS file %s not found!\n", kpse_invocation_name,
psname);
if (afmname == NULL)
afmname = newname(psname, ".afm");
afmfile = kpse_find_file(afmname,kpse_afm_format,0);
if (!afmfile)
- fatal("%s: AFM file %s not found!\n", program_invocation_name,
+ fatal("%s: AFM file %s not found!\n", kpse_invocation_name,
afmname);
if (encname) {
encfile = kpse_find_file(encname,kpse_enc_format,0);
if (!encfile)
- fatal("%s: enc file %s not found!\n", program_invocation_name,
+ fatal("%s: enc file %s not found!\n", kpse_invocation_name,
encname);
}
else
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(": ");
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index eaec8201f84..17c883fa7ba 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2011-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * hypertex.c (launch_xdvi): `program_invocation_name' has been
+ renamed into `kpse_invocation_name'.
+
2010-05-25 Karl Berry <karl@tug.org>
* m4/xdvi-check-iconv.m4 (--with-iconv): new option to
diff --git a/Build/source/texk/xdvik/hypertex.c b/Build/source/texk/xdvik/hypertex.c
index 0ccc03bb94a..add3bc9f7ca 100644
--- a/Build/source/texk/xdvik/hypertex.c
+++ b/Build/source/texk/xdvik/hypertex.c
@@ -1906,7 +1906,7 @@ launch_xdvi(const char *filename, const char *anchor_name)
ASSERT(filename != NULL, "filename argument to launch_xdvi() mustn't be NULL");
- argv[i++] = program_invocation_name;
+ argv[i++] = kpse_invocation_name;
/* FIXME: there's something broken with this and invoking xdvi.bin.
To reproduce the problem, invoke from the shell:
xdvi.bin -geometry 829x1172 /usr/share/texmf/doc/programs/kpathsea.dvi
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 23:48:38 +0000