summaryrefslogtreecommitdiff
path: root/lib/safe-read.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-08-18 09:44:49 +0000
committerJim Meyering <jim@meyering.net>2003-08-18 09:44:49 +0000
commitb1b4af8047b2d6c2b2ea0d552969e25f872da675 (patch)
treeee8166cbc3f75e901def92c7c94473473d360165 /lib/safe-read.c
parent84a9ab5a07427ab8322424cd0c401e847326e7e2 (diff)
downloadcoreutils-b1b4af8047b2d6c2b2ea0d552969e25f872da675.tar.xz
Sync with gnulib.
Diffstat (limited to 'lib/safe-read.c')
-rw-r--r--lib/safe-read.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/lib/safe-read.c b/lib/safe-read.c
index c36f6e824..c21d1cf19 100644
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -1,5 +1,5 @@
/* An interface to read and write that retries after interrupts.
- Copyright (C) 1993, 1994, 1998, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1998, 2002-2003 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
@@ -19,6 +19,13 @@
# include <config.h>
#endif
+/* Specification. */
+#ifdef SAFE_WRITE
+# include "safe-write.h"
+#else
+# include "safe-read.h"
+#endif
+
/* Get ssize_t. */
#include <sys/types.h>
#if HAVE_UNISTD_H
@@ -38,28 +45,10 @@ extern int errno;
#include <limits.h>
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-
-/* The extra casts work around common compiler bugs. */
-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
- It is necessary at least when t == time_t. */
-#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
- ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
-#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
-
-#ifndef INT_MAX
-# define INT_MAX TYPE_MAXIMUM (int)
-#endif
-
#ifdef SAFE_WRITE
-# include "safe-write.h"
# define safe_rw safe_write
# define rw write
#else
-# include "safe-read.h"
# define safe_rw safe_read
# define rw read
# undef const