All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Jeff King <peff@peff.net>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
	 Michael Blume <blume.mike@gmail.com>,
	Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org,  msysGit <msysgit@googlegroups.com>
Subject: [PATCH v2] Windows: correct detection of EISDIR in mingw_open()
Date: Sun, 16 Nov 2014 22:06:26 +0100	[thread overview]
Message-ID: <546911D2.6060007@kdbg.org> (raw)
In-Reply-To: <54670E8E.5040901@kdbg.org>

According to the Linux open(2) man page, open() returns EISDIR if a
directory was attempted to be opened for writing. Our emulation in
mingw_open() does not get this right: it checks only for O_CREAT. Fix
it to check for a write request.

This fixes a failure in reflog handling, which opens files with
O_APPEND|O_WRONLY, but without O_CREAT, and expects EISDIR when the
named file happens to be a directory.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 This version of the patch uses O_ACCMODE.

 compat/mingw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 2ee3fe3..c702731 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -312,7 +312,7 @@ int mingw_open (const char *filename, int oflags, ...)
 		return -1;
 	fd = _wopen(wfilename, oflags, mode);
 
-	if (fd < 0 && (oflags & O_CREAT) && errno == EACCES) {
+	if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) {
 		DWORD attrs = GetFileAttributesW(wfilename);
 		if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY))
 			errno = EISDIR;
-- 
2.0.0.12.gbcf935e

-- 
-- 
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en

--- 
You received this message because you are subscribed to the Google Groups "Git for Windows" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

  reply	other threads:[~2014-11-16 21:06 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-08 19:28 Test failure Michael Blume
2014-11-09  1:43 ` Jeff King
2014-11-09  1:59   ` [PATCH] t1410: fix breakage on case-insensitive filesystems Jeff King
2014-11-09 17:34     ` Michael Blume
2014-11-09 17:48       ` Junio C Hamano
2014-11-10  6:30         ` Jeff King
2014-11-10  6:47           ` Junio C Hamano
2014-11-10  7:04             ` Jeff King
2014-11-09 20:04       ` Torsten Bögershausen
2014-11-09 21:36         ` Michael Blume
2014-11-09 21:42           ` Torsten Bögershausen
2014-11-10  2:46             ` Michael Blume
2014-11-10  2:56     ` Junio C Hamano
2014-11-10  6:09       ` Jeff King
2014-11-12 20:20     ` Johannes Sixt
2014-11-12 21:59       ` Jeff King
2014-11-13  8:50         ` Johannes Sixt
2014-11-13  9:08           ` Jeff King
2014-11-13 16:30             ` Junio C Hamano
2014-11-14 19:11             ` Johannes Sixt
2014-11-14 19:23               ` Jeff King
2014-11-14 20:03               ` Junio C Hamano
2014-11-14 21:04               ` Andreas Schwab
2014-11-15  8:27                 ` Johannes Sixt
2014-11-16 21:06                   ` Johannes Sixt [this message]
2014-11-09  5:44   ` Test failure Michael Blume

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=546911D2.6060007@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=blume.mike@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=msysgit@googlegroups.com \
    --cc=peff@peff.net \
    --cc=schwab@linux-m68k.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.