From daa10770a5d7da90789b35aa8cc3b4aa33bb7de5 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 19 Mar 2010 15:29:56 +0000 Subject: bibtex8: get default csfile name from texmf.cnf git-svn-id: svn://tug.org/texlive/trunk@17502 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/bibtexu/ChangeLog | 5 +++++ Build/source/texk/bibtexu/bibtex.c | 2 +- Build/source/texk/bibtexu/utils.c | 9 +++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'Build/source/texk/bibtexu') diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog index ea50ae8ef08..74f5260579c 100644 --- a/Build/source/texk/bibtexu/ChangeLog +++ b/Build/source/texk/bibtexu/ChangeLog @@ -1,3 +1,8 @@ +2010-03-19 Peter Breitenlohner + + * bibtex.c: Call kpse_set_program_name with "bibtexu". + * utils.c: Default csfile from environment or config file. + 2010-03-18 Peter Breitenlohner Dynamic allocation of name_of_file strings. No padding. diff --git a/Build/source/texk/bibtexu/bibtex.c b/Build/source/texk/bibtexu/bibtex.c index 63b4103bceb..0184451dc34 100644 --- a/Build/source/texk/bibtexu/bibtex.c +++ b/Build/source/texk/bibtexu/bibtex.c @@ -274,7 +274,7 @@ BEGIN command_line_arg_strings = (char **) argv; #ifdef KPATHSEA - kpse_set_program_name(argv[0], NULL); + kpse_set_program_name(argv[0], "bibtexu"); #endif history = SPOTLESS; diff --git a/Build/source/texk/bibtexu/utils.c b/Build/source/texk/bibtexu/utils.c index 452696b2bda..32623bd9796 100644 --- a/Build/source/texk/bibtexu/utils.c +++ b/Build/source/texk/bibtexu/utils.c @@ -132,6 +132,8 @@ #include #include #include +#include +#include #include #ifndef WIN32 #include @@ -1671,8 +1673,10 @@ int c8read_csf (void) */ if (Str_csfile == NULL) { #ifdef KPATHSEA - /* FIXME: this default value should be stored in texmf.in */ - Str_csfile = xstrdup("88591lat.csf"); + /* Default value from environment or texmf.cnf */ + Str_csfile = kpse_var_value (DEFAULT_BIBTEX_CSFILE); + if (Str_csfile == NULL) /* Use fallback value */ + Str_csfile = xstrdup ("88591lat.csf"); #else if (strlen (CSF_FILE_ENVVAR) != 0) { debug_msg (DBG_CSF, "c8read_csf: --csfile not set, checking '%s'", @@ -1825,6 +1829,7 @@ int c8read_csf (void) ** Finished reading, close the CS file then return TRUE. */ close_file (c8_cs_file); + free (Str_csfile); return TRUE; } /* c8read_csf () */ -- cgit v1.2.3