diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-19 16:18:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-19 18:28:16 -0800 |
| commit | 1c15afb9343bca82e687d008ec983a9110ac9c40 (patch) | |
| tree | ed760b10c0c124e7ec3c1934e4bb1291a8faf0a0 /git-compat-util.h | |
| parent | 1fdfd05db2f6e6bacd8c8255992fa4a7f1756176 (diff) | |
| download | git-1c15afb9343bca82e687d008ec983a9110ac9c40.tar.gz | |
xread/xwrite: do not worry about EINTR at calling sites.
We had errno==EINTR check after read(2)/write(2) sprinkled all
over the places, always doing continue. Consolidate them into
xread()/xwrite() wrapper routines.
Credits for suggestion goes to HPA -- bugs are mine.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index ead0ede587..0c98c9937d 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -84,6 +84,28 @@ static inline void *xcalloc(size_t nmemb, size_t size) return ret; } +static inline ssize_t xread(int fd, void *buf, size_t len) +{ + ssize_t nr; + while (1) { + nr = read(fd, buf, len); + if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) + continue; + return nr; + } +} + +static inline ssize_t xwrite(int fd, const void *buf, size_t len) +{ + ssize_t nr; + while (1) { + nr = write(fd, buf, len); + if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) + continue; + return nr; + } +} + /* Sane ctype - no locale, and works with signed chars */ #undef isspace #undef isdigit |