From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v2 06/15] copy.c: make copy_fd preserve meaningful errno
Date: Mon, 3 Nov 2014 08:55:48 -0800 [thread overview]
Message-ID: <1415033757-9539-7-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1415033757-9539-1-git-send-email-sahlberg@google.com>
Update copy_fd to return a meaningful errno on failure.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
copy.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/copy.c b/copy.c
index f2970ec..a8d366e 100644
--- a/copy.c
+++ b/copy.c
@@ -8,12 +8,17 @@ int copy_fd(int ifd, int ofd)
if (!len)
break;
if (len < 0) {
- return error("copy-fd: read returned %s",
- strerror(errno));
+ int save_errno = errno;
+ error("copy-fd: read returned %s", strerror(errno));
+ errno = save_errno;
+ return -1;
+ }
+ if (write_in_full(ofd, buffer, len) < 0) {
+ int save_errno = errno;
+ error("copy-fd: write returned %s", strerror(errno));
+ errno = save_errno;
+ return -1;
}
- if (write_in_full(ofd, buffer, len) < 0)
- return error("copy-fd: write returned %s",
- strerror(errno));
}
return 0;
}
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-11-03 16:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 16:55 [PATCH v2 00/15] ref-transactions-reflog Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 01/15] refs.c make ref_transaction_create a wrapper to ref_transaction_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 03/15] refs.c: rename the transaction functions Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 04/15] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 05/15] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-11-03 16:55 ` Ronnie Sahlberg [this message]
2014-11-03 16:55 ` [PATCH v2 07/15] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 08/15] refs.c: add a flag to allow reflog updates to truncate the log Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 09/15] refs.c: only write reflog update if msg is non-NULL Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 10/15] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 11/15] reflog.c: use a reflog transaction when writing during expire Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 12/15] refs.c: rename log_ref_setup to create_reflog Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 13/15] refs.c: make unlock_ref/close_ref/commit_ref static Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 14/15] refs.c: remove lock_any_ref_for_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 15/15] refs.c: allow deleting refs with a broken sha1 Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415033757-9539-7-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).