From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v21 11/19] refs.c: make remove_empty_directories always set errno to something sane
Date: Mon, 14 Jul 2014 13:58:53 -0700 [thread overview]
Message-ID: <1405371541-32121-12-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1405371541-32121-1-git-send-email-sahlberg@google.com>
Making errno when returning from remove_empty_directories() more
obviously meaningful, which should provide some peace of mind for
people auditing lock_ref_sha1_basic.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index a48f805..cc69581 100644
--- a/refs.c
+++ b/refs.c
@@ -1960,14 +1960,16 @@ static int remove_empty_directories(const char *file)
* only empty directories), remove them.
*/
struct strbuf path;
- int result;
+ int result, save_errno;
strbuf_init(&path, 20);
strbuf_addstr(&path, file);
result = remove_dir_recursively(&path, REMOVE_DIR_EMPTY_ONLY);
+ save_errno = errno;
strbuf_release(&path);
+ errno = save_errno;
return result;
}
@@ -2056,6 +2058,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log)
return logs_found;
}
+/* This function should make sure errno is meaningful on error */
static struct ref_lock *lock_ref_sha1_basic(const char *refname,
const unsigned char *old_sha1,
int flags, int *type_p)
--
2.0.1.546.gf603308
next prev parent reply other threads:[~2014-07-14 20:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 20:58 [PATCH v21 00/19] Use ref transactions Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 01/19] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 02/19] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 03/19] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 04/19] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 05/19] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 06/19] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 07/19] lockfile.c: make lock_file return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 08/19] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 09/19] refs.c: make sure log_ref_setup returns a meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 10/19] refs.c: verify_lock should set errno to something meaningful Ronnie Sahlberg
2014-07-14 20:58 ` Ronnie Sahlberg [this message]
2014-07-14 20:58 ` [PATCH v21 12/19] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 13/19] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 14/19] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 15/19] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 16/19] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 17/19] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 18/19] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 19/19] refs.c: change ref_transaction_update() to do error checking and return status 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=1405371541-32121-12-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
/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).