diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-03-18 08:58:40 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-03-18 08:58:40 +0000 |
commit | 167298e9e82e1dd43b0a8e97d30ba5c58e8e98ea (patch) | |
tree | 6fa7a472f69fcd147d5c873b3bb237b33a10eeda /Build/source/texk/bibtexu | |
parent | 30dd886c5532920b4670260266bf16c1db123f7c (diff) |
more bibtex/bibtex8/bibtexu updates and tests
git-svn-id: svn://tug.org/texlive/trunk@17492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/bibtexu')
-rw-r--r-- | Build/source/texk/bibtexu/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/bibtexu/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/bibtexu/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/texk/bibtexu/bibtex-1.c | 9 |
4 files changed, 13 insertions, 8 deletions
diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog index 58776f6f766..b004e57bc90 100644 --- a/Build/source/texk/bibtexu/ChangeLog +++ b/Build/source/texk/bibtexu/ChangeLog @@ -6,6 +6,10 @@ * gblvars.h (M_cites): Removed. * utils.c (parse_cmd_line, usage): Ignore/remove --mcites. + * bibtex-1.c (add_database_cite): Fix bug, from bibtex.ch. + + * Makefile.am (AM_CPPFLAGS): Remove obsolete -funsigned-char. + 2010-03-16 Peter Breitenlohner <peb@mppmu.mpg.de> * bibtex-1.c, utils.c: Delay allocation of entry_ints and diff --git a/Build/source/texk/bibtexu/Makefile.am b/Build/source/texk/bibtexu/Makefile.am index cc535b4c766..7a622a4fd39 100644 --- a/Build/source/texk/bibtexu/Makefile.am +++ b/Build/source/texk/bibtexu/Makefile.am @@ -9,12 +9,6 @@ INCLUDES = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES) AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT AM_CFLAGS = $(WARNING_CFLAGS) -## FIXME: (1) this should go away once the code has been carefully -## FIXME: analyzed and uses 'unsigned char' where necessary. -## FIXME: (2) this should go to AM_CFLAGS, but AIX xlc only -## FIXME: accepts this flag when compiling, not when linking. -AM_CPPFLAGS += -funsigned-char - bin_PROGRAMS = bibtexu # Force Automake to use CXXLD for linking diff --git a/Build/source/texk/bibtexu/Makefile.in b/Build/source/texk/bibtexu/Makefile.in index ab32d8502fa..dd8ab119dba 100644 --- a/Build/source/texk/bibtexu/Makefile.in +++ b/Build/source/texk/bibtexu/Makefile.in @@ -271,7 +271,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 INCLUDES = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES) -AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT -funsigned-char +AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT AM_CFLAGS = $(WARNING_CFLAGS) # Force Automake to use CXXLD for linking diff --git a/Build/source/texk/bibtexu/bibtex-1.c b/Build/source/texk/bibtexu/bibtex-1.c index 66067bd3371..07c0391f2bd 100644 --- a/Build/source/texk/bibtexu/bibtex-1.c +++ b/Build/source/texk/bibtexu/bibtex-1.c @@ -236,7 +236,7 @@ END void add_database_cite (CiteNumber_T *new_cite) BEGIN check_cite_overflow (*new_cite); - check_field_overflow (num_fields * (*new_cite)); + check_field_overflow (num_fields * (*new_cite + 1)); cite_list[*new_cite] = hash_text[cite_loc]; ilk_info[cite_loc] = *new_cite; ilk_info[lc_cite_loc] = cite_loc; @@ -2817,8 +2817,15 @@ void check_field_overflow (Integer_T total_fields) BEGIN if (total_fields > Max_Fields) BEGIN + field_ptr = Max_Fields; BIB_XRETALLOC ("field_info", field_info, StrNumber_T, Max_Fields, Max_Fields + MAX_FIELDS); + /* Initialize to |missing|. */ + while (field_ptr < Max_Fields) + BEGIN + field_info[field_ptr] = MISSING; + INCR (field_ptr); + END END END /*^^^^^^^^^^^^^^^^^^^^^^^^^^ END OF SECTION 226 ^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ |