summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2002-12-04 07:51:45 +0000
committerJim Meyering <jim@meyering.net>2002-12-04 07:51:45 +0000
commitc68d6cafca023bfab10e41b6a3be4fd5e6d00b50 (patch)
treeef1370c49d14492a646d8be05d12da70f8e35e85 /lib
parentc0ff7df8cbd8161e35fd2a39632750abb0424076 (diff)
downloadcoreutils-c68d6cafca023bfab10e41b6a3be4fd5e6d00b50.tar.xz
Simply #define SAFE_WRITE and include safe-read.c.
Diffstat (limited to 'lib')
-rw-r--r--lib/safe-write.c70
1 files changed, 3 insertions, 67 deletions
diff --git a/lib/safe-write.c b/lib/safe-write.c
index 942d65073..fbafa7cc6 100644
--- a/lib/safe-write.c
+++ b/lib/safe-write.c
@@ -1,5 +1,5 @@
/* An interface to write that retries after interrupts.
- Copyright (C) 1993, 1994, 1998, 2002 Free Software Foundation, Inc.
+ Copyright (C) 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
@@ -15,69 +15,5 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Specification. */
-#include "safe-write.h"
-
-/* Get ssize_t. */
-#include <sys/types.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#ifdef EINTR
-# define IS_EINTR(x) ((x) == EINTR)
-#else
-# define IS_EINTR(x) 0
-#endif
-
-#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
-
-/* Write up to COUNT bytes at BUF to descriptor FD, retrying if interrupted.
- Return the actual number of bytes written, zero for EOF, or SAFE_WRITE_ERROR
- upon error. */
-size_t
-safe_write (int fd, void const *buf, size_t count)
-{
- ssize_t result;
-
- /* POSIX limits COUNT to SSIZE_MAX, but we limit it further, requiring
- that COUNT <= INT_MAX, to avoid triggering a bug in Tru64 5.1.
- When decreasing COUNT, keep the file pointer block-aligned.
- Note that in any case, write may succeed, yet write fewer than COUNT
- bytes, so the caller must be prepared to handle partial results. */
- if (count > INT_MAX)
- count = INT_MAX & ~8191;
-
- do
- {
- result = write (fd, buf, count);
- }
- while (result < 0 && IS_EINTR (errno));
-
- return (size_t) result;
-}
+#define SAFE_WRITE
+#include "safe-read.c"