diff options
| author |  Jim Meyering <jim@meyering.net> | 2007-06-27 16:28:53 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-06-27 21:02:44 -0700 |
| commit | f57882505efe05990102a0d96b37c09baadae03d (patch) | |
| tree | 416b045a8020aaf06209f1883d0e4fb10d68c204 | |
| parent | git-send-email: make options easier to configure. (diff) | |
| download | tgif-f57882505efe05990102a0d96b37c09baadae03d.tar.xz | |
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>
| -rw-r--r-- | builtin-log.c | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index 073a2a16a3..a4186eac8e 100644 --- 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) - realstdout = fdopen(dup(1), "w"); + realstdout = xfdopen(xdup(1), "w"); prepare_revision_walk(&rev); while ((commit = get_revision(&rev)) != NULL) { diff --git a/git-compat-util.h b/git-compat-util.h index b2ab3f8256..362e040f52 100644 --- 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; |