m4-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Changes to m4/m4/output.c


From: Gary V . Vaughan
Subject: Changes to m4/m4/output.c
Date: Wed, 04 May 2005 13:08:36 -0400

Index: m4/m4/output.c
diff -u m4/m4/output.c:1.19 m4/m4/output.c:1.20
--- m4/m4/output.c:1.19 Sun May  1 11:10:05 2005
+++ m4/m4/output.c      Wed May  4 17:08:36 2005
@@ -1,5 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989, 90, 91, 92, 93, 94, 98 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 2002
+   Free Software Foundation, Inc.
 
    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
@@ -574,13 +575,13 @@
     return;
 
   /* Insert output by big chunks.  */
-
-  while (length = read (fileno (file), buffer, COPY_BUFFER_SIZE),
+  errno = 0;
+  while (length = fread (buffer, 1, COPY_BUFFER_SIZE, file),
         length != 0)
-    if (length == (size_t) -1)
+    output_text (buffer, length);
+
+  if (errno)
       M4ERROR ((EXIT_FAILURE, errno, _("reading inserted file")));
-    else
-      output_text (buffer, length);
 }
 
 /* Insert diversion number DIVNUM into the current output file.  The




reply via email to

[Prev in Thread] Current Thread [Next in Thread]