git-apply: require -p<n> when working in a subdirectory.

diff --git a/write_or_die.c b/write_or_die.c
index 488de721da8a316c06bf53e9091633e5ac415390..5c4bc8515ab9484131de7e065e08657315004f8c 100644 (file)
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -4,16 +4,11 @@ int read_in_full(int fd, void *buf, size_t count)
 {
        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;
@@ -22,26 +17,13 @@ int read_in_full(int fd, void *buf, size_t count)
        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) {
@@ -58,14 +40,7 @@ int write_in_full(int fd, const void *buf, size_t count)
 
 void write_or_die(int fd, const void *buf, size_t count)
 {
-       ssize_t written;
-
-       if (!count)
-               return;
-       written = write_in_full(fd, buf, count);
-       if (written == 0)
-               die("disk full?");
-       else if (written < 0) {
+       if (write_in_full(fd, buf, count) < 0) {
                if (errno == EPIPE)
                        exit(0);
                die("write error (%s)", strerror(errno));
@@ -74,16 +49,7 @@ void write_or_die(int fd, const void *buf, size_t count)
 
 int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
 {
-       ssize_t written;
-
-       if (!count)
-               return 1;
-       written = write_in_full(fd, buf, count);
-       if (written == 0) {
-               fprintf(stderr, "%s: disk full?\n", msg);
-               return 0;
-       }
-       else if (written < 0) {
+       if (write_in_full(fd, buf, count) < 0) {
                if (errno == EPIPE)
                        exit(0);
                fprintf(stderr, "%s: write error (%s)\n",
@@ -96,16 +62,7 @@ int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
 
 int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
 {
-       ssize_t written;
-
-       if (!count)
-               return 1;
-       written = write_in_full(fd, buf, count);
-       if (written == 0) {
-               fprintf(stderr, "%s: disk full?\n", msg);
-               return 0;
-       }
-       else if (written < 0) {
+       if (write_in_full(fd, buf, count) < 0) {
                fprintf(stderr, "%s: write error (%s)\n",
                        msg, strerror(errno));
                return 0;