From 41dcc4dcccecca49e3f75212ce9e614ffe2bdcc8 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 27 Sep 2017 02:02:11 -0400 Subject: distinguish error versus short read from read_in_full() Many callers of read_in_full() expect to see the exact number of bytes requested, but their error handling lumps together true read errors and short reads due to unexpected EOF. We can give more specific error messages by separating these cases (showing errno when appropriate, and otherwise describing the short read). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/get-tar-commit-id.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'builtin/get-tar-commit-id.c') diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c index cd3e656828..2706fcfaf2 100644 --- a/builtin/get-tar-commit-id.c +++ b/builtin/get-tar-commit-id.c @@ -26,8 +26,10 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix) usage(builtin_get_tar_commit_id_usage); n = read_in_full(0, buffer, HEADERSIZE); + if (n < 0) + die_errno("git get-tar-commit-id: read error"); if (n != HEADERSIZE) - die("git get-tar-commit-id: read error"); + die_errno("git get-tar-commit-id: EOF before reading tar header"); if (header->typeflag[0] != 'g') return 1; if (!skip_prefix(content, "52 comment=", &comment)) -- cgit v1.2.1