diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-09 09:13:01 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-09 09:13:01 +0000 |
commit | 0e19d1df8195bf356fa4eed719e36a9d28d2d8f7 (patch) | |
tree | 03208ea086e97df8514c70b1456d76892218fb13 /Build/source/texk/lcdf-typetools/t1reencode | |
parent | c0f3e72caec3910bcc56cf882e713b6e71ca08f1 (diff) |
lcdf-typetools 2.88
git-svn-id: svn://tug.org/texlive/trunk@21658 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools/t1reencode')
3 files changed, 11 insertions, 10 deletions
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 index 1d1e50fa984..5b6c2e294f5 100644 --- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 +++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 @@ -1,4 +1,4 @@ -.ds V 2.85 +.ds V 2.88 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc index caba5dc0e33..b07857e1632 100644 --- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc +++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc @@ -1,6 +1,6 @@ /* t1reencode.cc -- driver for reencoding Type 1 fonts * - * Copyright (c) 2005-2010 Eddie Kohler + * Copyright (c) 2005-2011 Eddie Kohler * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -978,7 +978,7 @@ main(int argc, char *argv[]) case VERSION_OPT: printf("t1reencode (LCDF typetools) %s\n", VERSION); - printf("Copyright (C) 1999-2010 Eddie Kohler\n\ + printf("Copyright (C) 1999-2011 Eddie Kohler\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty, not even for merchantability or fitness for a\n\ particular purpose.\n"); diff --git a/Build/source/texk/lcdf-typetools/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/t1reencode/util.cc index 1666555e5ff..89f43391152 100644 --- a/Build/source/texk/lcdf-typetools/t1reencode/util.cc +++ b/Build/source/texk/lcdf-typetools/t1reencode/util.cc @@ -43,15 +43,16 @@ read_file(String filename, ErrorHandler *errh, bool warning) } StringAccum sa; - while (!feof(f)) { + int amt; + do { if (char *x = sa.reserve(8192)) { - int amt = fread(x, 1, 8192, f); + amt = fread(x, 1, 8192, f); sa.adjust_length(amt); - } else { - errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), "Out of memory!"); - break; - } - } + } else + amt = 0; + } while (amt != 0); + if (!feof(f) || ferror(f)) + errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), strerror(errno)); if (f != stdin) fclose(f); return sa.take_string(); |