git-log: detect dup and fdopen failure

This defines xdup() and xfdopen() in git-compat-util.h to give
us error-catching variants of them without cluttering the code
too much.

Signed-off-by: Jim Meyering <jim@meyering.net>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-log.c b/builtin-log.c
index 073a2a16a3fafd66d13b1ed106a0016617ec63ad..a4186eac8ea395143d25b16b94171b3d4e75d444 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -589,7 +589,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                get_patch_ids(&rev, &ids, prefix);
 
        if (!use_stdout)
                get_patch_ids(&rev, &ids, prefix);
 
        if (!use_stdout)

-               realstdout = fdopen(dup(1), "w");
+               realstdout = xfdopen(xdup(1), "w");

 
        prepare_revision_walk(&rev);
        while ((commit = get_revision(&rev)) != NULL) {
 
        prepare_revision_walk(&rev);
        while ((commit = get_revision(&rev)) != NULL) {

diff --git a/git-compat-util.h b/git-compat-util.h
index b2ab3f82567d54607a07f4061153adae86854fa9..362e040f52cf8df17811ae95e46f0b60d2b6f071 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -287,6 +287,22 @@ static inline ssize_t xwrite(int fd, const void *buf, size_t len)
        }
 }
 
        }
 }
 

+static inline int xdup(int fd)
+{
+       int ret = dup(fd);
+       if (ret < 0)
+               die("dup failed: %s", strerror(errno));
+       return ret;
+}
+
+static inline FILE *xfdopen(int fd, const char *mode)
+{
+       FILE *stream = fdopen(fd, mode);
+       if (stream == NULL)
+               die("Out of memory? fdopen failed: %s", strerror(errno));
+       return stream;
+}
+

 static inline size_t xsize_t(off_t len)
 {
        return (size_t)len;
 static inline size_t xsize_t(off_t len)
 {
        return (size_t)len;