From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v15 09/48] refs.c: make sure log_ref_setup returns a meaningful errno
Date: Tue, 10 Jun 2014 15:28:57 -0700 [thread overview]
Message-ID: <1402439376-25839-10-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1402439376-25839-1-git-send-email-sahlberg@google.com>
Making errno when returning from log_ref_setup() meaningful,
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 29 ++++++++++++++++++++---------
refs.h | 4 +++-
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/refs.c b/refs.c
index b4b05bd..6f85bd8 100644
--- a/refs.c
+++ b/refs.c
@@ -2723,6 +2723,7 @@ static int copy_msg(char *buf, const char *msg)
return cp - buf;
}
+/* This function must set a meaningful errno on failure */
int log_ref_setup(const char *refname, char *logfile, int bufsize)
{
int logfd, oflags = O_APPEND | O_WRONLY;
@@ -2733,9 +2734,12 @@ int log_ref_setup(const char *refname, char *logfile, int bufsize)
starts_with(refname, "refs/remotes/") ||
starts_with(refname, "refs/notes/") ||
!strcmp(refname, "HEAD"))) {
- if (safe_create_leading_directories(logfile) < 0)
- return error("unable to create directory for %s",
- logfile);
+ if (safe_create_leading_directories(logfile) < 0) {
+ int save_errno = errno;
+ error("unable to create directory for %s", logfile);
+ errno = save_errno;
+ return -1;
+ }
oflags |= O_CREAT;
}
@@ -2746,15 +2750,22 @@ int log_ref_setup(const char *refname, char *logfile, int bufsize)
if ((oflags & O_CREAT) && errno == EISDIR) {
if (remove_empty_directories(logfile)) {
- return error("There are still logs under '%s'",
- logfile);
- }
+ int save_errno = errno;
+ error("There are still logs under '%s'",
+ logfile);
+ errno = save_errno;
+ return -1;
+ }
logfd = open(logfile, oflags, 0666);
}
- if (logfd < 0)
- return error("Unable to append to %s: %s",
- logfile, strerror(errno));
+ if (logfd < 0) {
+ int save_errno = errno;
+ error("Unable to append to %s: %s", logfile,
+ strerror(errno));
+ errno = save_errno;
+ return -1;
+ }
}
adjust_shared_perm(logfile);
diff --git a/refs.h b/refs.h
index 948cc53..979c12f 100644
--- a/refs.h
+++ b/refs.h
@@ -154,7 +154,9 @@ extern void unlock_ref(struct ref_lock *lock);
/** Writes sha1 into the ref specified by the lock. **/
extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg);
-/** Setup reflog before using. **/
+/*
+ * Setup reflog before using. Set errno to something meaningful on failure.
+ */
int log_ref_setup(const char *refname, char *logfile, int bufsize);
/** Reads log for the value of ref during at_time. **/
--
2.0.0.574.g30c2c5e
next prev parent reply other threads:[~2014-06-10 22:32 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-10 22:28 [PATCH v15 00/48] Use ref transactions Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 01/48] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 02/48] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 03/48] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 04/48] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 05/48] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 06/48] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 07/48] lockfile.c: make lock_file return a meaningful errno on failurei Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 08/48] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-06-10 22:28 ` Ronnie Sahlberg [this message]
2014-06-10 22:28 ` [PATCH v15 10/48] refs.c: verify_lock should set errno to something meaningful Ronnie Sahlberg
2014-06-10 22:28 ` [PATCH v15 11/48] refs.c: make remove_empty_directories alwasy set errno to something sane Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 12/48] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 13/48] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 14/48] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 15/48] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 16/48] refs.c: add an err argument to delete_ref_loose Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 17/48] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 18/48] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 19/48] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 20/48] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 21/48] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 22/48] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 23/48] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 24/48] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 25/48] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 26/48] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 27/48] commit.c: use ref transactions " Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 28/48] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 29/48] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 30/48] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 31/48] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 32/48] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 33/48] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 34/48] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 35/48] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 36/48] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 37/48] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 38/48] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 39/48] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 40/48] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 41/48] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 42/48] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 43/48] refs.c: move the check for valid refname to lock_ref_sha1_basic Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 44/48] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 45/48] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 46/48] refs.c: propagate any errno==ENOTDIR from _commit back to the callers Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 47/48] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-06-10 22:29 ` [PATCH v15 48/48] refs.c: make write_ref_sha1 static Ronnie Sahlberg
2014-06-12 22:15 ` [PATCH v15 00/48] Use ref transactions Junio C Hamano
2014-06-13 15:52 ` 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=1402439376-25839-10-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).