Add freaderror() analogous to fwriteerror() in gnulib.

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index 98bd3dd030bc76393c17a8d5cc3abd465b116da1..2dc9e0ba001aa00a453d57492937ce8577d53474 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,11 @@
+Fri Mar 31 10:38:46 2006  Ben Pfaff  <blp@gnu.org>
+
+       Add freaderror() analogous to fwriteerror() in gnulib.
+
+       * freaderror.c: New file.
+
+       * freaderror.h: New file.
+
 Thu Mar 30 16:15:37 2006  Ben Pfaff  <blp@gnu.org>
 
        * str.c: (ds_create) Adjust capacity selection.

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 5341c0728b19c691937de7f4a33d32a1af1681c8..6e988a9d4fb1d7f54d80bb1d2300b3d3d78a8be3 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -13,6 +13,8 @@ src_libpspp_libpspp_a_SOURCES = \
        src/libpspp/copyleft.h \
        src/libpspp/compiler.h \
        src/libpspp/debug-print.h \
+       src/libpspp/freaderror.c \
+       src/libpspp/freaderror.h \
        src/libpspp/hash.c \
        src/libpspp/hash.h \
        src/libpspp/magic.c \

diff --git a/src/libpspp/freaderror.c b/src/libpspp/freaderror.c
new file mode 100644 (file)
index 0000000..73e5346
--- /dev/null
+++ b/src/libpspp/freaderror.c
@@ -0,0 +1,62 @@
+/* Detect read error on a stream.
+   Copyright (C) 2003-2005, 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+   Modified by Ben Pfaff <blp@cs.stanford.edu> for PSPP.
+
+   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 Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "freaderror.h"
+
+#include <errno.h>
+#include <stdbool.h>
+
+/* Close the stream FP, and test whether some error occurred on
+   the stream FP.
+   FP must be a stream opened for reading.
+   Return 0 if no error occurred and fclose (fp) succeeded.
+   Return -1 and set errno if there was an error.  The errno value will be 0
+   if the cause of the error cannot be determined. */
+int
+freaderror (FILE *fp)
+{
+  /* Need to
+     1. test the error indicator of the stream,
+     2. flush the buffers both in userland and in the kernel, through fclose,
+        testing for error again.  */
+
+  /* Clear errno, so that on non-POSIX systems the caller doesn't see a
+     wrong value of errno when we return -1.  */
+  errno = 0;
+
+  if (ferror (fp))
+    {
+      /* The stream had an error earlier, but its errno was lost.
+        If the error was not temporary, we can get the same
+        errno by reading one more byte.  */
+      getc (fp);
+      fclose (fp);
+      return -1;
+    }
+
+  if (fclose (fp))
+    return -1; /* errno is set here */
+
+  return 0;
+}

diff --git a/src/libpspp/freaderror.h b/src/libpspp/freaderror.h
new file mode 100644 (file)
index 0000000..875d19d
--- /dev/null
+++ b/src/libpspp/freaderror.h
@@ -0,0 +1,22 @@
+/* Detect read error on a stream.
+   Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+   Modified by Ben Pfaff <blp@cs.stanford.edu> for PSPP.
+
+   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 Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <stdio.h>
+
+extern int freaderror (FILE *fp);