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/cfftot1 | |
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/cfftot1')
-rw-r--r-- | Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 | 2 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc | 18 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 index 7518f8e2515..d6f6f9f7980 100644 --- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 +++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.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/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc index 9e5e7c1a009..945d0d606bc 100644 --- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc +++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc @@ -1,6 +1,6 @@ /* cfftot1.cc -- driver for translating CFF fonts to Type 1 fonts * - * Copyright (c) 2002-2010 Eddie Kohler + * Copyright (c) 2002-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 @@ -125,10 +125,16 @@ do_file(const char *infn, const char *outfn, PermString name, ErrorHandler *errh errh->fatal("%s: empty file", infn); if (c == 1 || c == 'O') { StringAccum sa(150000); - while (!feof(f)) { - int forward = fread(sa.reserve(32768), 1, 32768, f); - sa.adjust_length(forward); - } + int amt; + do { + if (char *x = sa.reserve(32768)) { + amt = fread(x, 1, 32768, f); + sa.adjust_length(amt); + } else + amt = 0; + } while (amt != 0); + if (!feof(f) || ferror(f)) + errh->lerror(infn, "%s", strerror(errno)); if (f != stdin) fclose(f); @@ -210,7 +216,7 @@ main(int argc, char *argv[]) case VERSION_OPT: printf("cfftot1 (LCDF typetools) %s\n", VERSION); - printf("Copyright (C) 2002-2010 Eddie Kohler\n\ + printf("Copyright (C) 2002-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/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc index 68a35f62303..44541d5e208 100644 --- a/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc +++ b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc @@ -1,6 +1,6 @@ /* maket1font.{cc,hh} -- translate CFF fonts to Type 1 fonts * - * Copyright (c) 2002-2010 Eddie Kohler + * Copyright (c) 2002-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 |