diff options
| author | Andy Whitcroft <apw@shadowen.org> | 2007-01-08 15:58:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-08 15:44:47 -0800 |
| commit | 93d26e4cb9cec2eb8abb4f37e6dda2c86fcceeac (patch) | |
| tree | 8d3cda91ddd8242531995cb304f37578bfaa7cf0 /builtin-grep.c | |
| parent | e08140568a131bcd26e64a0bc8188040847be998 (diff) | |
| download | git-93d26e4cb9cec2eb8abb4f37e6dda2c86fcceeac.tar.gz git-93d26e4cb9cec2eb8abb4f37e6dda2c86fcceeac.tar.xz | |
short i/o: fix calls to read to use xread or read_in_full
We have a number of badly checked read() calls. Often we are
expecting read() to read exactly the size we requested or fail, this
fails to handle interrupts or short reads. Add a read_in_full()
providing those semantics. Otherwise we at a minimum need to check
for EINTR and EAGAIN, where this is appropriate use xread().
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 3b1b1cbbf..2bfbdb714 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -136,7 +136,7 @@ static int grep_file(struct grep_opt *opt, const char *filename) if (i < 0) goto err_ret; data = xmalloc(st.st_size + 1); - if (st.st_size != xread(i, data, st.st_size)) { + if (st.st_size != read_in_full(i, data, st.st_size)) { error("'%s': short read %s", filename, strerror(errno)); close(i); free(data); |