(surely_read): return nbytes

diff --git a/ChangeLog b/ChangeLog
index 6db0860dea38dc558ecc50b73ecb5cb11b5b5269..882fff12ebab2233e43aa549e67726a3a6375280 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2005-06-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * ttftool/util.c (surely_read): return nbytes
+
        * stepmake/bin/text2html.py (txt2html): add utf-8 marker. 
 
+       * VERSION (PACKAGE_NAME): release 2.5.30
+
        * flower/string-convert.cc (precision_string): >? fix.
 
        * scm/ps-to-png.scm (make-ps-images): search-gs for multipage too.

diff --git a/ttftool/util.c b/ttftool/util.c
index 872431a34012906b04ec10f9b32ecaa0f60e13ab..ce794ba118578e451523ef18bd90c8a30516fdeb 100644 (file)
--- a/ttftool/util.c
+++ b/ttftool/util.c
@@ -88,10 +88,12 @@ surely_read (int fildes, void *buf, size_t nbyte)
 
   if (n < 0 || nbyte > 0)
     {
-      syserror ("error during read()");
+      char s[100];
+      sprintf (s, "error during read(), n = %d, nbyte = %d", n, nbyte);
+      syserror (s);
     }
   
-  return n;
+  return nbyte;
 }
 
 char *