diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-08-30 05:35:00 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-08-30 05:35:00 +0000 |
commit | 393f15ebb52f333071ef3f2880b3f92995f96333 (patch) | |
tree | d4bf82ad46a69598b9708dc2393cc8a432c73365 /Build/source/utils/t1utils/TLpatches | |
parent | 4d58309c4ddb4a7028a925071630626b464345dd (diff) |
t1utils: Try not to use system memmem
git-svn-id: svn://tug.org/texlive/trunk@45170 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/t1utils/TLpatches')
6 files changed, 43 insertions, 8 deletions
diff --git a/Build/source/utils/t1utils/TLpatches/ChangeLog b/Build/source/utils/t1utils/TLpatches/ChangeLog index e56f7c8cbd1..18f3ab141bc 100644 --- a/Build/source/utils/t1utils/TLpatches/ChangeLog +++ b/Build/source/utils/t1utils/TLpatches/ChangeLog @@ -1,3 +1,7 @@ +2017-08-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * patch-08-notuse-system-memmem: Added. + 2017-08-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import t1utils-1.41. diff --git a/Build/source/utils/t1utils/TLpatches/TL-Changes b/Build/source/utils/t1utils/TLpatches/TL-Changes index 7c4de062f7e..c2c75e73544 100644 --- a/Build/source/utils/t1utils/TLpatches/TL-Changes +++ b/Build/source/utils/t1utils/TLpatches/TL-Changes @@ -14,4 +14,3 @@ Removed: Moved this file to ../: strerror.c - memmem.c diff --git a/Build/source/utils/t1utils/TLpatches/patch-03-warnings b/Build/source/utils/t1utils/TLpatches/patch-03-warnings index ae2f72f454c..da2e03e98d6 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-03-warnings +++ b/Build/source/utils/t1utils/TLpatches/patch-03-warnings @@ -2,7 +2,7 @@ diff -ur t1utils-1.41.orig/clp.c t1utils-1.41/clp.c --- t1utils-1.41.orig/clp.c Thu Aug 17 00:20:27 2017 -+++ t1utils-1.41/clp.c Mon Aug 28 14:14:04 2017 ++++ t1utils-1.41/clp.c Mon Aug 28 15:43:58 2017 @@ -1095,22 +1095,28 @@ parse_int(Clp_Parser* clp, const char* arg, int complain, void* user_data) { diff --git a/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary b/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary index c941f59ddf5..150d3d4747d 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary +++ b/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary @@ -2,7 +2,7 @@ diff -ur t1utils-1.41.orig/t1ascii.c t1utils-1.41/t1ascii.c --- t1utils-1.41.orig/t1ascii.c Thu Aug 17 01:31:02 2017 -+++ t1utils-1.41/t1ascii.c Mon Aug 28 14:22:17 2017 ++++ t1utils-1.41/t1ascii.c Mon Aug 28 15:43:58 2017 @@ -286,6 +286,7 @@ /* As we are processing a PFB (binary) input */ /* file, we must set its file mode to binary. */ @@ -13,7 +13,7 @@ diff -ur t1utils-1.41.orig/t1ascii.c t1utils-1.41/t1ascii.c /* prepare font reader */ diff -ur t1utils-1.41.orig/t1disasm.c t1utils-1.41/t1disasm.c --- t1utils-1.41.orig/t1disasm.c Thu Aug 17 01:31:24 2017 -+++ t1utils-1.41/t1disasm.c Mon Aug 28 14:23:22 2017 ++++ t1utils-1.41/t1disasm.c Mon Aug 28 15:43:58 2017 @@ -727,6 +727,7 @@ /* As we might be processing a PFB (binary) input file, we must set its file mode to binary. */ @@ -24,7 +24,7 @@ diff -ur t1utils-1.41.orig/t1disasm.c t1utils-1.41/t1disasm.c /* prepare font reader */ diff -ur t1utils-1.41.orig/t1unmac.c t1utils-1.41/t1unmac.c --- t1utils-1.41.orig/t1unmac.c Thu Aug 17 01:31:39 2017 -+++ t1utils-1.41/t1unmac.c Mon Aug 28 14:26:09 2017 ++++ t1utils-1.41/t1unmac.c Mon Aug 28 15:43:58 2017 @@ -656,8 +655,7 @@ _setmode(_fileno(ifp), _O_BINARY); /* If we are processing a PFB (binary) output */ diff --git a/Build/source/utils/t1utils/TLpatches/patch-07-warnings b/Build/source/utils/t1utils/TLpatches/patch-07-warnings index 931af1db983..0d5bbf7fb4f 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-07-warnings +++ b/Build/source/utils/t1utils/TLpatches/patch-07-warnings @@ -2,8 +2,8 @@ diff -ur t1utils-1.41.orig/t1asmhelp.h t1utils-1.41/t1asmhelp.h --- t1utils-1.41.orig/t1asmhelp.h Thu Aug 17 00:20:27 2017 -+++ t1utils-1.41/t1asmhelp.h Mon Aug 28 14:30:14 2017 -@@ -26,7 +26,8 @@ ++++ t1utils-1.41/t1asmhelp.h Wed Aug 30 13:42:34 2017 +@@ -26,7 +28,8 @@ } @@ -13,7 +13,14 @@ diff -ur t1utils-1.41.orig/t1asmhelp.h t1utils-1.41/t1asmhelp.h static void set_cs_start(const char* line, size_t line_len) -@@ -43,7 +44,7 @@ +@@ -37,13 +40,13 @@ + if ((p = memmem(line, line_len, "string currentfile", 18)) + && memmem(line, line_len, "readstring", 10)) { + /* locate the name of the charstring start command */ +- for (q = p; q != line && q[-1] != '/'; --q) ++ for (q = p; q != line && *(q-1) != '/'; --q) + /* nada */; + if (q != line) { for (r = q; r != p && !isspace((unsigned char) *r) && *r != '{'; ++r) /* nada */; if (cs_start_set) diff --git a/Build/source/utils/t1utils/TLpatches/patch-08-notuse-system-memmem b/Build/source/utils/t1utils/TLpatches/patch-08-notuse-system-memmem new file mode 100644 index 00000000000..ed4a780c4fb --- /dev/null +++ b/Build/source/utils/t1utils/TLpatches/patch-08-notuse-system-memmem @@ -0,0 +1,25 @@ +diff -ur t1utils-1.41.orig/memmem.c t1utils-1.41/memmem.c +--- t1utils-1.41.orig/memmem.c Thu Aug 17 00:20:27 2017 ++++ t1utils-1.41/memmem.c Wed Aug 30 13:40:56 2017 +@@ -9,6 +9,8 @@ + extern "C" { + #endif + ++#define memmem my_memmem ++ + void* + memmem(const void* haystack, size_t haystack_len, + const void* needle, size_t needle_len) +diff -ur t1utils-1.41.orig/t1asmhelp.h t1utils-1.41/t1asmhelp.h +--- t1utils-1.41.orig/t1asmhelp.h Thu Aug 17 00:20:27 2017 ++++ t1utils-1.41/t1asmhelp.h Wed Aug 30 13:42:34 2017 +@@ -7,6 +7,8 @@ + lenIV to <num>. This indicates the number of random bytes at the beginning + of each charstring. */ + ++#define memmem my_memmem ++ + static void + set_lenIV(const char* line, size_t line_len) + { + |