X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsafe-read.c;h=e404586c75fe9b31c2153473111606d8d04d7fd1;hb=1fa55b5e0731bc535c7f3be42d30cf2ac8725085;hp=2303ea111a58c12509ffb11ac608661fd9cd7a31;hpb=1934bbbae2095a684c35adeee169867abe734277;p=gnulib.git

diff --git a/lib/safe-read.c b/lib/safe-read.c
index 2303ea111..e404586c7 100644
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -1,5 +1,5 @@
 /* safe-read.c -- an interface to read that retries after interrupts
-   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998 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
@@ -12,42 +12,35 @@
    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   */
 
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <sys/types.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
 #include <errno.h>
-#ifndef STDC_HEADERS
+#ifndef errno
 extern int errno;
 #endif
 
+#include "safe-read.h"
+
 /* Read LEN bytes at PTR from descriptor DESC, retrying if interrupted.
    Return the actual number of bytes read, zero for EOF, or negative
    for an error.  */
 
-int
-safe_read (desc, ptr, len)
-     int desc;
-     char *ptr;
-     int len;
+ssize_t
+safe_read (int desc, void *ptr, size_t len)
 {
-  int n_chars;
+  ssize_t n_chars;
 
   if (len <= 0)
     return len;