git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, j6t@kdbg.org, gitster@pobox.com,
	jrnieder@gmail.com
Subject: [PATCH v2 3/6] msvc: opendir: do not start the search
Date: Tue, 23 Nov 2010 19:38:26 +0100	[thread overview]
Message-ID: <1290537509-360-4-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1290537509-360-1-git-send-email-kusmabite@gmail.com>

compat/mingw.c's readdir expects to be the one that starts the search,
and if it isn't, then the first entry will be missing or incorrect.

Fix this by removing the call to _findfirst, and initializing dd_handle
to INVALID_HANDLE_VALUE.

At the same time, make sure we use FindClose instead of _findclose,
which is symmetric to readdir's FindFirstFile. Take into account that
the find-handle might already be closed by readdir.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
 compat/msvc.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/compat/msvc.c b/compat/msvc.c
index c195365..88c6093 100644
--- a/compat/msvc.c
+++ b/compat/msvc.c
@@ -16,17 +16,13 @@ DIR *opendir(const char *name)
 	p->dd_name[len] = '/';
 	p->dd_name[len+1] = '*';
 
-	p->dd_handle = _findfirst(p->dd_name, &p->dd_dta);
-
-	if (p->dd_handle == -1) {
-		free(p);
-		return NULL;
-	}
+	p->dd_handle = (long)INVALID_HANDLE_VALUE;
 	return p;
 }
 int closedir(DIR *dir)
 {
-	_findclose(dir->dd_handle);
+	if (dir->dd_handle != (long)INVALID_HANDLE_VALUE)
+		FindClose((HANDLE)dir->dd_handle);
 	free(dir);
 	return 0;
 }
-- 
1.7.3.2.493.gc8738

  parent reply	other threads:[~2010-11-23 18:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-23 18:38 [PATCH v2 0/6] win32-dirent Erik Faye-Lund
2010-11-23 18:38 ` [PATCH v2 1/6] msvc: opendir: fix malloc-failure Erik Faye-Lund
2010-11-23 18:38 ` [PATCH v2 2/6] msvc: opendir: allocate enough memory Erik Faye-Lund
2010-11-26 18:34   ` Junio C Hamano
2010-11-23 18:38 ` Erik Faye-Lund [this message]
2010-11-23 18:38 ` [PATCH v2 4/6] win32: dirent: handle errors Erik Faye-Lund
2010-11-23 18:38 ` [PATCH v2 5/6] msvc: opendir: handle paths ending with a slash Erik Faye-Lund
2010-11-23 19:31   ` René Scharfe
2010-11-23 19:48     ` Erik Faye-Lund
2010-11-23 20:16       ` René Scharfe
2010-11-23 18:38 ` [PATCH v2 6/6] win32: use our own dirent.h Erik Faye-Lund

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=1290537509-360-4-git-send-email-kusmabite@gmail.com \
    --to=kusmabite@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=jrnieder@gmail.com \
    --cc=msysgit@googlegroups.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).