kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Win32: Unicode file name support (dirent) 

Changes opendir/readdir to use Windows Unicode APIs and convert between
UTF-8/UTF-16.

Removes parameter checks that are already covered by xutftowcs_path. This
changes detection of ENAMETOOLONG from MAX_PATH - 2 to MAX_PATH (matching
is_dir_empty in mingw.c). If name + "/*" or the resulting absolute path is
too long, FindFirstFile fails and errno is set through err_win_to_posix.

Increases the size of dirent.d_name to accommodate the full
WIN32_FIND_DATA.cFileName converted to UTF-8 (UTF-16 to UTF-8 conversion
may grow by factor three in the worst case).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Karsten Blees 2012-01-14 22:01:09 +01:00 committed by Junio C Hamano
parent 85faec9d3a
commit 0217569bb2
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compat/win32/dirent.c
View File

@ -6,10 +6,10 @@ struct DIR {
int dd_stat; /* 0-based index */ int dd_stat; /* 0-based index */
}; };


static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAA *fdata) static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAW *fdata)
{ {
/* copy file name from WIN32_FIND_DATA to dirent */ /* convert UTF-16 name to UTF-8 */
memcpy(ent->d_name, fdata->cFileName, sizeof(ent->d_name)); xwcstoutf(ent->d_name, fdata->cFileName, sizeof(ent->d_name));


/* Set file type, based on WIN32_FIND_DATA */ /* Set file type, based on WIN32_FIND_DATA */
if (fdata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) if (fdata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@ -20,25 +20,15 @@ static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAA *fdata)


DIR *opendir(const char *name) DIR *opendir(const char *name)
{ {
char pattern[MAX_PATH]; wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
WIN32_FIND_DATAA fdata; WIN32_FIND_DATAW fdata;
HANDLE h; HANDLE h;
int len; int len;
DIR *dir; DIR *dir;


/* check that name is not NULL */ /* convert name to UTF-16 and check length < MAX_PATH */
if (!name) { if ((len = xutftowcs_path(pattern, name)) < 0)
errno = EINVAL;
return NULL; return NULL;
}
/* check that the pattern won't be too long for FindFirstFileA */
len = strlen(name);
if (len + 2 >= MAX_PATH) {
errno = ENAMETOOLONG;
return NULL;
}
/* copy name to temp buffer */
memcpy(pattern, name, len + 1);


/* append optional '/' and wildcard '*' */ /* append optional '/' and wildcard '*' */
if (len && !is_dir_sep(pattern[len - 1])) if (len && !is_dir_sep(pattern[len - 1]))
@ -47,7 +37,7 @@ DIR *opendir(const char *name)
pattern[len] = 0; pattern[len] = 0;


/* open find handle */ /* open find handle */
h = FindFirstFileA(pattern, &fdata); h = FindFirstFileW(pattern, &fdata);
if (h == INVALID_HANDLE_VALUE) { if (h == INVALID_HANDLE_VALUE) {
DWORD err = GetLastError(); DWORD err = GetLastError();
errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err); errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err);
@ -72,8 +62,8 @@ struct dirent *readdir(DIR *dir)
/* if first entry, dirent has already been set up by opendir */ /* if first entry, dirent has already been set up by opendir */
if (dir->dd_stat) { if (dir->dd_stat) {
/* get next entry and convert from WIN32_FIND_DATA to dirent */ /* get next entry and convert from WIN32_FIND_DATA to dirent */
WIN32_FIND_DATAA fdata; WIN32_FIND_DATAW fdata;
if (FindNextFileA(dir->dd_handle, &fdata)) { if (FindNextFileW(dir->dd_handle, &fdata)) {
finddata2dirent(&dir->dd_dir, &fdata); finddata2dirent(&dir->dd_dir, &fdata);
} else { } else {
DWORD lasterr = GetLastError(); DWORD lasterr = GetLastError();

2
compat/win32/dirent.h
View File

@ -10,7 +10,7 @@ typedef struct DIR DIR;


struct dirent { struct dirent {
unsigned char d_type; /* file type to prevent lstat after readdir */ unsigned char d_type; /* file type to prevent lstat after readdir */
char d_name[MAX_PATH]; /* file name */ char d_name[MAX_PATH * 3]; /* file name (* 3 for UTF-8 conversion) */
}; };


DIR *opendir(const char *dirname); DIR *opendir(const char *dirname);