Merge branch 'ef/win32-dirent'
* ef/win32-dirent: win32: use our own dirent.h msvc: opendir: handle paths ending with a slash win32: dirent: handle errors msvc: opendir: do not start the search msvc: opendir: allocate enough memory msvc: opendir: fix malloc-failure Conflicts: Makefile
This commit is contained in:
commit
1e86274cd4
7
Makefile
7
Makefile
@ -504,6 +504,7 @@ LIB_H += compat/mingw.h
|
|||||||
LIB_H += compat/win32/pthread.h
|
LIB_H += compat/win32/pthread.h
|
||||||
LIB_H += compat/win32/syslog.h
|
LIB_H += compat/win32/syslog.h
|
||||||
LIB_H += compat/win32/sys/poll.h
|
LIB_H += compat/win32/sys/poll.h
|
||||||
|
LIB_H += compat/win32/dirent.h
|
||||||
LIB_H += csum-file.h
|
LIB_H += csum-file.h
|
||||||
LIB_H += decorate.h
|
LIB_H += decorate.h
|
||||||
LIB_H += delta.h
|
LIB_H += delta.h
|
||||||
@ -1096,7 +1097,9 @@ ifeq ($(uname_S),Windows)
|
|||||||
AR = compat/vcbuild/scripts/lib.pl
|
AR = compat/vcbuild/scripts/lib.pl
|
||||||
CFLAGS =
|
CFLAGS =
|
||||||
BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
|
BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
|
||||||
COMPAT_OBJS = compat/msvc.o compat/winansi.o compat/win32/pthread.o compat/win32/syslog.o compat/win32/sys/poll.o
|
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
|
||||||
|
compat/win32/pthread.o compat/win32/syslog.o \
|
||||||
|
compat/win32/sys/poll.o compat/win32/dirent.o
|
||||||
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
|
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
|
||||||
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
|
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
|
||||||
EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
|
EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
|
||||||
@ -1169,7 +1172,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
|
|||||||
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
|
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
|
||||||
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
|
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
|
||||||
compat/win32/pthread.o compat/win32/syslog.o \
|
compat/win32/pthread.o compat/win32/syslog.o \
|
||||||
compat/win32/sys/poll.o
|
compat/win32/sys/poll.o compat/win32/dirent.o
|
||||||
EXTLIBS += -lws2_32
|
EXTLIBS += -lws2_32
|
||||||
PTHREAD_LIBS =
|
PTHREAD_LIBS =
|
||||||
X = .exe
|
X = .exe
|
||||||
|
@ -1566,63 +1566,3 @@ pid_t waitpid(pid_t pid, int *status, unsigned options)
|
|||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NO_MINGW_REPLACE_READDIR
|
|
||||||
/* MinGW readdir implementation to avoid extra lstats for Git */
|
|
||||||
struct mingw_DIR
|
|
||||||
{
|
|
||||||
struct _finddata_t dd_dta; /* disk transfer area for this dir */
|
|
||||||
struct mingw_dirent dd_dir; /* Our own implementation, including d_type */
|
|
||||||
long dd_handle; /* _findnext handle */
|
|
||||||
int dd_stat; /* 0 = next entry to read is first entry, -1 = off the end, positive = 0 based index of next entry */
|
|
||||||
char dd_name[1]; /* given path for dir with search pattern (struct is extended) */
|
|
||||||
};
|
|
||||||
|
|
||||||
struct dirent *mingw_readdir(DIR *dir)
|
|
||||||
{
|
|
||||||
WIN32_FIND_DATAA buf;
|
|
||||||
HANDLE handle;
|
|
||||||
struct mingw_DIR *mdir = (struct mingw_DIR*)dir;
|
|
||||||
|
|
||||||
if (!dir->dd_handle) {
|
|
||||||
errno = EBADF; /* No set_errno for mingw */
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dir->dd_handle == (long)INVALID_HANDLE_VALUE && dir->dd_stat == 0)
|
|
||||||
{
|
|
||||||
DWORD lasterr;
|
|
||||||
handle = FindFirstFileA(dir->dd_name, &buf);
|
|
||||||
lasterr = GetLastError();
|
|
||||||
dir->dd_handle = (long)handle;
|
|
||||||
if (handle == INVALID_HANDLE_VALUE && (lasterr != ERROR_NO_MORE_FILES)) {
|
|
||||||
errno = err_win_to_posix(lasterr);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else if (dir->dd_handle == (long)INVALID_HANDLE_VALUE) {
|
|
||||||
return NULL;
|
|
||||||
} else if (!FindNextFileA((HANDLE)dir->dd_handle, &buf)) {
|
|
||||||
DWORD lasterr = GetLastError();
|
|
||||||
FindClose((HANDLE)dir->dd_handle);
|
|
||||||
dir->dd_handle = (long)INVALID_HANDLE_VALUE;
|
|
||||||
/* POSIX says you shouldn't set errno when readdir can't
|
|
||||||
find any more files; so, if another error we leave it set. */
|
|
||||||
if (lasterr != ERROR_NO_MORE_FILES)
|
|
||||||
errno = err_win_to_posix(lasterr);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* We get here if `buf' contains valid data. */
|
|
||||||
strcpy(dir->dd_dir.d_name, buf.cFileName);
|
|
||||||
++dir->dd_stat;
|
|
||||||
|
|
||||||
/* Set file type, based on WIN32_FIND_DATA */
|
|
||||||
mdir->dd_dir.d_type = 0;
|
|
||||||
if (buf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
|
|
||||||
mdir->dd_dir.d_type |= DT_DIR;
|
|
||||||
else
|
|
||||||
mdir->dd_dir.d_type |= DT_REG;
|
|
||||||
|
|
||||||
return (struct dirent*)&dir->dd_dir;
|
|
||||||
}
|
|
||||||
#endif // !NO_MINGW_REPLACE_READDIR
|
|
||||||
|
@ -322,35 +322,6 @@ int main(int argc, const char **argv) \
|
|||||||
} \
|
} \
|
||||||
static int mingw_main(c,v)
|
static int mingw_main(c,v)
|
||||||
|
|
||||||
#ifndef NO_MINGW_REPLACE_READDIR
|
|
||||||
/*
|
|
||||||
* A replacement of readdir, to ensure that it reads the file type at
|
|
||||||
* the same time. This avoid extra unneeded lstats in git on MinGW
|
|
||||||
*/
|
|
||||||
#undef DT_UNKNOWN
|
|
||||||
#undef DT_DIR
|
|
||||||
#undef DT_REG
|
|
||||||
#undef DT_LNK
|
|
||||||
#define DT_UNKNOWN 0
|
|
||||||
#define DT_DIR 1
|
|
||||||
#define DT_REG 2
|
|
||||||
#define DT_LNK 3
|
|
||||||
|
|
||||||
struct mingw_dirent
|
|
||||||
{
|
|
||||||
long d_ino; /* Always zero. */
|
|
||||||
union {
|
|
||||||
unsigned short d_reclen; /* Always zero. */
|
|
||||||
unsigned char d_type; /* Reimplementation adds this */
|
|
||||||
};
|
|
||||||
unsigned short d_namlen; /* Length of name in d_name. */
|
|
||||||
char d_name[FILENAME_MAX]; /* File name. */
|
|
||||||
};
|
|
||||||
#define dirent mingw_dirent
|
|
||||||
#define readdir(x) mingw_readdir(x)
|
|
||||||
struct dirent *mingw_readdir(DIR *dir);
|
|
||||||
#endif // !NO_MINGW_REPLACE_READDIR
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Used by Pthread API implementation for Windows
|
* Used by Pthread API implementation for Windows
|
||||||
*/
|
*/
|
||||||
|
@ -3,33 +3,4 @@
|
|||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
#include "../strbuf.h"
|
#include "../strbuf.h"
|
||||||
|
|
||||||
DIR *opendir(const char *name)
|
|
||||||
{
|
|
||||||
int len;
|
|
||||||
DIR *p;
|
|
||||||
p = (DIR*)malloc(sizeof(DIR));
|
|
||||||
memset(p, 0, sizeof(DIR));
|
|
||||||
strncpy(p->dd_name, name, PATH_MAX);
|
|
||||||
len = strlen(p->dd_name);
|
|
||||||
p->dd_name[len] = '/';
|
|
||||||
p->dd_name[len+1] = '*';
|
|
||||||
|
|
||||||
if (p == NULL)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
p->dd_handle = _findfirst(p->dd_name, &p->dd_dta);
|
|
||||||
|
|
||||||
if (p->dd_handle == -1) {
|
|
||||||
free(p);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
int closedir(DIR *dir)
|
|
||||||
{
|
|
||||||
_findclose(dir->dd_handle);
|
|
||||||
free(dir);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "mingw.c"
|
#include "mingw.c"
|
||||||
|
@ -1,128 +0,0 @@
|
|||||||
/*
|
|
||||||
* DIRENT.H (formerly DIRLIB.H)
|
|
||||||
* This file has no copyright assigned and is placed in the Public Domain.
|
|
||||||
* This file is a part of the mingw-runtime package.
|
|
||||||
*
|
|
||||||
* The mingw-runtime package and its code is distributed in the hope that it
|
|
||||||
* will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR
|
|
||||||
* IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to
|
|
||||||
* warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
*
|
|
||||||
* You are free to use this package and its code without limitation.
|
|
||||||
*/
|
|
||||||
#ifndef _DIRENT_H_
|
|
||||||
#define _DIRENT_H_
|
|
||||||
#include <io.h>
|
|
||||||
|
|
||||||
#define PATH_MAX 512
|
|
||||||
|
|
||||||
#define __MINGW_NOTHROW
|
|
||||||
|
|
||||||
#ifndef RC_INVOKED
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct dirent
|
|
||||||
{
|
|
||||||
long d_ino; /* Always zero. */
|
|
||||||
unsigned short d_reclen; /* Always zero. */
|
|
||||||
unsigned short d_namlen; /* Length of name in d_name. */
|
|
||||||
char d_name[FILENAME_MAX]; /* File name. */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is an internal data structure. Good programmers will not use it
|
|
||||||
* except as an argument to one of the functions below.
|
|
||||||
* dd_stat field is now int (was short in older versions).
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
/* disk transfer area for this dir */
|
|
||||||
struct _finddata_t dd_dta;
|
|
||||||
|
|
||||||
/* dirent struct to return from dir (NOTE: this makes this thread
|
|
||||||
* safe as long as only one thread uses a particular DIR struct at
|
|
||||||
* a time) */
|
|
||||||
struct dirent dd_dir;
|
|
||||||
|
|
||||||
/* _findnext handle */
|
|
||||||
long dd_handle;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Status of search:
|
|
||||||
* 0 = not started yet (next entry to read is first entry)
|
|
||||||
* -1 = off the end
|
|
||||||
* positive = 0 based index of next entry
|
|
||||||
*/
|
|
||||||
int dd_stat;
|
|
||||||
|
|
||||||
/* given path for dir with search pattern (struct is extended) */
|
|
||||||
char dd_name[PATH_MAX+3];
|
|
||||||
} DIR;
|
|
||||||
|
|
||||||
DIR* __cdecl __MINGW_NOTHROW opendir (const char*);
|
|
||||||
struct dirent* __cdecl __MINGW_NOTHROW readdir (DIR*);
|
|
||||||
int __cdecl __MINGW_NOTHROW closedir (DIR*);
|
|
||||||
void __cdecl __MINGW_NOTHROW rewinddir (DIR*);
|
|
||||||
long __cdecl __MINGW_NOTHROW telldir (DIR*);
|
|
||||||
void __cdecl __MINGW_NOTHROW seekdir (DIR*, long);
|
|
||||||
|
|
||||||
|
|
||||||
/* wide char versions */
|
|
||||||
|
|
||||||
struct _wdirent
|
|
||||||
{
|
|
||||||
long d_ino; /* Always zero. */
|
|
||||||
unsigned short d_reclen; /* Always zero. */
|
|
||||||
unsigned short d_namlen; /* Length of name in d_name. */
|
|
||||||
wchar_t d_name[FILENAME_MAX]; /* File name. */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is an internal data structure. Good programmers will not use it
|
|
||||||
* except as an argument to one of the functions below.
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
/* disk transfer area for this dir */
|
|
||||||
//struct _wfinddata_t dd_dta;
|
|
||||||
|
|
||||||
/* dirent struct to return from dir (NOTE: this makes this thread
|
|
||||||
* safe as long as only one thread uses a particular DIR struct at
|
|
||||||
* a time) */
|
|
||||||
struct _wdirent dd_dir;
|
|
||||||
|
|
||||||
/* _findnext handle */
|
|
||||||
long dd_handle;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Status of search:
|
|
||||||
* 0 = not started yet (next entry to read is first entry)
|
|
||||||
* -1 = off the end
|
|
||||||
* positive = 0 based index of next entry
|
|
||||||
*/
|
|
||||||
int dd_stat;
|
|
||||||
|
|
||||||
/* given path for dir with search pattern (struct is extended) */
|
|
||||||
wchar_t dd_name[1];
|
|
||||||
} _WDIR;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
_WDIR* __cdecl __MINGW_NOTHROW _wopendir (const wchar_t*);
|
|
||||||
struct _wdirent* __cdecl __MINGW_NOTHROW _wreaddir (_WDIR*);
|
|
||||||
int __cdecl __MINGW_NOTHROW _wclosedir (_WDIR*);
|
|
||||||
void __cdecl __MINGW_NOTHROW _wrewinddir (_WDIR*);
|
|
||||||
long __cdecl __MINGW_NOTHROW _wtelldir (_WDIR*);
|
|
||||||
void __cdecl __MINGW_NOTHROW _wseekdir (_WDIR*, long);
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* Not RC_INVOKED */
|
|
||||||
|
|
||||||
#endif /* Not _DIRENT_H_ */
|
|
108
compat/win32/dirent.c
Normal file
108
compat/win32/dirent.c
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
#include "../git-compat-util.h"
|
||||||
|
#include "dirent.h"
|
||||||
|
|
||||||
|
struct DIR {
|
||||||
|
struct dirent dd_dir; /* includes d_type */
|
||||||
|
HANDLE dd_handle; /* FindFirstFile handle */
|
||||||
|
int dd_stat; /* 0-based index */
|
||||||
|
char dd_name[1]; /* extend struct */
|
||||||
|
};
|
||||||
|
|
||||||
|
DIR *opendir(const char *name)
|
||||||
|
{
|
||||||
|
DWORD attrs = GetFileAttributesA(name);
|
||||||
|
int len;
|
||||||
|
DIR *p;
|
||||||
|
|
||||||
|
/* check for valid path */
|
||||||
|
if (attrs == INVALID_FILE_ATTRIBUTES) {
|
||||||
|
errno = ENOENT;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check if it's a directory */
|
||||||
|
if (!(attrs & FILE_ATTRIBUTE_DIRECTORY)) {
|
||||||
|
errno = ENOTDIR;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check that the pattern won't be too long for FindFirstFileA */
|
||||||
|
len = strlen(name);
|
||||||
|
if (is_dir_sep(name[len - 1]))
|
||||||
|
len--;
|
||||||
|
if (len + 2 >= MAX_PATH) {
|
||||||
|
errno = ENAMETOOLONG;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
p = malloc(sizeof(DIR) + len + 2);
|
||||||
|
if (!p)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
memset(p, 0, sizeof(DIR) + len + 2);
|
||||||
|
strcpy(p->dd_name, name);
|
||||||
|
p->dd_name[len] = '/';
|
||||||
|
p->dd_name[len+1] = '*';
|
||||||
|
|
||||||
|
p->dd_handle = INVALID_HANDLE_VALUE;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct dirent *readdir(DIR *dir)
|
||||||
|
{
|
||||||
|
WIN32_FIND_DATAA buf;
|
||||||
|
HANDLE handle;
|
||||||
|
|
||||||
|
if (!dir || !dir->dd_handle) {
|
||||||
|
errno = EBADF; /* No set_errno for mingw */
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dir->dd_handle == INVALID_HANDLE_VALUE && dir->dd_stat == 0) {
|
||||||
|
DWORD lasterr;
|
||||||
|
handle = FindFirstFileA(dir->dd_name, &buf);
|
||||||
|
lasterr = GetLastError();
|
||||||
|
dir->dd_handle = handle;
|
||||||
|
if (handle == INVALID_HANDLE_VALUE && (lasterr != ERROR_NO_MORE_FILES)) {
|
||||||
|
errno = err_win_to_posix(lasterr);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
} else if (dir->dd_handle == INVALID_HANDLE_VALUE) {
|
||||||
|
return NULL;
|
||||||
|
} else if (!FindNextFileA(dir->dd_handle, &buf)) {
|
||||||
|
DWORD lasterr = GetLastError();
|
||||||
|
FindClose(dir->dd_handle);
|
||||||
|
dir->dd_handle = INVALID_HANDLE_VALUE;
|
||||||
|
/* POSIX says you shouldn't set errno when readdir can't
|
||||||
|
find any more files; so, if another error we leave it set. */
|
||||||
|
if (lasterr != ERROR_NO_MORE_FILES)
|
||||||
|
errno = err_win_to_posix(lasterr);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* We get here if `buf' contains valid data. */
|
||||||
|
strcpy(dir->dd_dir.d_name, buf.cFileName);
|
||||||
|
++dir->dd_stat;
|
||||||
|
|
||||||
|
/* Set file type, based on WIN32_FIND_DATA */
|
||||||
|
dir->dd_dir.d_type = 0;
|
||||||
|
if (buf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
|
||||||
|
dir->dd_dir.d_type |= DT_DIR;
|
||||||
|
else
|
||||||
|
dir->dd_dir.d_type |= DT_REG;
|
||||||
|
|
||||||
|
return &dir->dd_dir;
|
||||||
|
}
|
||||||
|
|
||||||
|
int closedir(DIR *dir)
|
||||||
|
{
|
||||||
|
if (!dir) {
|
||||||
|
errno = EBADF;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dir->dd_handle != INVALID_HANDLE_VALUE)
|
||||||
|
FindClose(dir->dd_handle);
|
||||||
|
free(dir);
|
||||||
|
return 0;
|
||||||
|
}
|
24
compat/win32/dirent.h
Normal file
24
compat/win32/dirent.h
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
#ifndef DIRENT_H
|
||||||
|
#define DIRENT_H
|
||||||
|
|
||||||
|
typedef struct DIR DIR;
|
||||||
|
|
||||||
|
#define DT_UNKNOWN 0
|
||||||
|
#define DT_DIR 1
|
||||||
|
#define DT_REG 2
|
||||||
|
#define DT_LNK 3
|
||||||
|
|
||||||
|
struct dirent {
|
||||||
|
long d_ino; /* Always zero. */
|
||||||
|
char d_name[FILENAME_MAX]; /* File name. */
|
||||||
|
union {
|
||||||
|
unsigned short d_reclen; /* Always zero. */
|
||||||
|
unsigned char d_type; /* Reimplementation adds this */
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
DIR *opendir(const char *dirname);
|
||||||
|
struct dirent *readdir(DIR *dir);
|
||||||
|
int closedir(DIR *dir);
|
||||||
|
|
||||||
|
#endif /* DIRENT_H */
|
Loading…
Reference in New Issue
Block a user