Git development
 help / color / mirror / Atom feed
From: Sam Vilain <sam@vilain.net>
To: git@vger.kernel.org
Cc: Sam Vilain <samv@maia.lan>, Sam Vilain <sam@vilain.net>
Subject: [PATCH] sha1_file: make sure correct error is propagated
Date: Fri, 14 Nov 2008 20:19:34 +1300	[thread overview]
Message-ID: <1226647174-15844-1-git-send-email-sam@vilain.net> (raw)

From: Sam Vilain <samv@maia.lan>

In the case that a object directory exists, but is not writable, the
code path that tries to create it is followed and the returned errno
and path that of the directory tried to be created.  The resultant
error message is confusing.

So, if the mkstemp() fails with EPERM, don't try to create the
directory - return straight away.

Signed-off-by: Sam Vilain <sam@vilain.net>
---
 sha1_file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index ab2b520..7662330 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2231,7 +2231,7 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename)
 	memcpy(buffer, filename, dirlen);
 	strcpy(buffer + dirlen, "tmp_obj_XXXXXX");
 	fd = mkstemp(buffer);
-	if (fd < 0 && dirlen) {
+	if (fd < 0 && dirlen && (errno != EPERM)) {
 		/* Make sure the directory exists */
 		memcpy(buffer, filename, dirlen);
 		buffer[dirlen-1] = 0;
-- 
debian.1.5.6.1

             reply	other threads:[~2008-11-14  7:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-14  7:19 Sam Vilain [this message]
2008-11-14  7:44 ` [PATCH] sha1_file: make sure correct error is propagated Francis Galiegue
2008-11-14  9:41   ` Sam Vilain
2008-11-14 19:05     ` Junio C Hamano
2008-11-14 19:09       ` Francis Galiegue
2008-11-14 19:50         ` Andreas Ericsson
2008-11-14 20:08           ` Francis Galiegue
2008-11-15  5:44         ` Junio C Hamano
2008-11-15  6:30           ` Sam Vilain

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=1226647174-15844-1-git-send-email-sam@vilain.net \
    --to=sam@vilain.net \
    --cc=git@vger.kernel.org \
    --cc=samv@maia.lan \
    /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