diff --git a/write_or_die.c b/write_or_die.c
index 1224cac5da7e8bf51266eadf24e9e58e6e5a37cb..5c4bc8515ab9484131de7e065e08657315004f8c 100644 (file)
--- a/write_or_die.c
+++ b/write_or_die.c
{
char *p = buf;
ssize_t total = 0;
- ssize_t loaded = 0;
while (count > 0) {
- loaded = xread(fd, p, count);
- if (loaded <= 0) {
- if (total)
- return total;
- else
- return loaded;
- }
+ ssize_t loaded = xread(fd, p, count);
+ if (loaded <= 0)
+ return total ? total : loaded;
count -= loaded;
p += loaded;
total += loaded;
return total;
}
-void read_or_die(int fd, void *buf, size_t count)
-{
- ssize_t loaded;
-
- if (!count)
- return;
- loaded = read_in_full(fd, buf, count);
- if (loaded == 0)
- die("unexpected end of file");
- else if (loaded < 0)
- die("read error (%s)", strerror(errno));
-}
-
int write_in_full(int fd, const void *buf, size_t count)
{
const char *p = buf;
ssize_t total = 0;
while (count > 0) {
- size_t written = xwrite(fd, p, count);
+ ssize_t written = xwrite(fd, p, count);
if (written < 0)
return -1;
if (!written) {