From 526582da8c8fabccfebea407a9da54822daa4f88 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 6 May 2014 07:34:34 +0000 Subject: pdfTeX, e-(u)pTeX: Slightly reorganize to avoid duplicat code git-svn-id: svn://tug.org/texlive/trunk@33876 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 8 +++++ Build/source/texk/web2c/pdftexdir/ptexlib.h | 1 - Build/source/texk/web2c/pdftexdir/utils.c | 55 ----------------------------- 3 files changed, 8 insertions(+), 56 deletions(-) (limited to 'Build/source/texk/web2c/pdftexdir') diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 3b287c45fd7..e00f8e182a8 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,11 @@ +2014-05-06 Peter Breitenlohner + + Update to e-pTeX and e-upTeX from Akira Kakuto. + * ptexlib.h (getfiledump): Move declaration also used by + e-(u)pTeX from here to ../texmfmp.h. + * utils.c (getfiledump): Move definition also used by + e-(u)pTeX from here to ../lib/texmfmp.c. + 2014-03-18 Akira Kakuto * pdftex.web and writefont.c: Import from r704. diff --git a/Build/source/texk/web2c/pdftexdir/ptexlib.h b/Build/source/texk/web2c/pdftexdir/ptexlib.h index b79c98147ef..c4581b5fa20 100644 --- a/Build/source/texk/web2c/pdftexdir/ptexlib.h +++ b/Build/source/texk/web2c/pdftexdir/ptexlib.h @@ -220,7 +220,6 @@ extern void escapestring(poolpointer in); extern void escapehex(poolpointer in); extern void unescapehex(poolpointer in); extern void getmd5sum(strnumber s, boolean file); -extern void getfiledump(strnumber s, int offset, int length); extern void matchstrings(strnumber s, strnumber t, int subcount, boolean icase); extern void getmatch(int i); extern void makepdftexbanner(void); diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c index 70d504d3502..02352fefece 100644 --- a/Build/source/texk/web2c/pdftexdir/utils.c +++ b/Build/source/texk/web2c/pdftexdir/utils.c @@ -878,61 +878,6 @@ void getmd5sum(strnumber s, boolean file) poolptr += len; } -void getfiledump(strnumber s, int offset, int length) -{ - FILE *f; - int read, i; - poolpointer data_ptr; - poolpointer data_end; - char *file_name; - - if (length == 0) { - /* empty result string */ - return; - } - - if (poolptr + 2 * length + 1 >= poolsize) { - /* no place for result */ - poolptr = poolsize; - /* error by str_toks that calls str_room(1) */ - return; - } - - file_name = kpse_find_tex(makecfilename(s)); - if (file_name == NULL) { - return; /* empty string */ - } - - /* read file data */ - f = fopen(file_name, FOPEN_RBIN_MODE); - if (f == NULL) { - xfree(file_name); - return; - } - recorder_record_input(file_name); - if (fseek(f, offset, SEEK_SET) != 0) { - xfree(file_name); - return; - } - /* there is enough space in the string pool, the read - data are put in the upper half of the result, thus - the conversion to hex can be done without overwriting - unconverted bytes. */ - data_ptr = poolptr + length; - read = fread(&strpool[data_ptr], sizeof(char), length, f); - fclose(f); - - /* convert to hex */ - data_end = data_ptr + read; - for (; data_ptr < data_end; data_ptr++) { - i = snprintf((char *) &strpool[poolptr], 3, - "%.2X", (unsigned int) strpool[data_ptr]); - check_nprintf(i, 3); - poolptr += i; - } - xfree(file_name); -} - #define DEFAULT_SUB_MATCH_COUNT 10 static int sub_match_count = DEFAULT_SUB_MATCH_COUNT; static regmatch_t *pmatch = NULL; -- cgit v1.2.3