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>

diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c
index 82a515c21b322a0e50c7b5dbdd12e74341b20e98..52420ec7d4dad7b8e984bd7f5a36330f1fa88e24 100644 (file)
--- a/compat/win32/dirent.c
+++ b/compat/win32/dirent.c
@@ -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 */
-       memcpy(ent->d_name, fdata->cFileName, sizeof(ent->d_name));
+       /* convert UTF-16 name to UTF-8 */
+       xwcstoutf(ent->d_name, fdata->cFileName, sizeof(ent->d_name));

 
        /* Set file type, based on WIN32_FIND_DATA */
        if (fdata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 
        /* Set file type, based on WIN32_FIND_DATA */
        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];
-       WIN32_FIND_DATAA fdata;
+       wchar_t pattern[MAX_PATH + 2]; /* + 2 for '/' '*' */
+       WIN32_FIND_DATAW fdata;

        HANDLE h;
        int len;
        DIR *dir;
 
        HANDLE h;
        int len;
        DIR *dir;
 

-       /* check that name is not NULL */
-       if (!name) {
-               errno = EINVAL;
+       /* convert name to UTF-16 and check length < MAX_PATH */
+       if ((len = xutftowcs_path(pattern, name)) < 0)

                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 '*' */
        if (len && !is_dir_sep(pattern[len - 1]))
 
        /* append optional '/' and wildcard '*' */
        if (len && !is_dir_sep(pattern[len - 1]))


@@ -47,7 +37,7 @@ DIR *opendir(const char *name)
        pattern[len] = 0;
 
        /* open find handle */
        pattern[len] = 0;
 
        /* open find handle */

-       h = FindFirstFileA(pattern, &fdata);
+       h = FindFirstFileW(pattern, &fdata);

        if (h == INVALID_HANDLE_VALUE) {
                DWORD err = GetLastError();
                errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err);
        if (h == INVALID_HANDLE_VALUE) {
                DWORD err = GetLastError();
                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 (dir->dd_stat) {
                /* get next entry and convert from WIN32_FIND_DATA to dirent */
        /* if first entry, dirent has already been set up by opendir */
        if (dir->dd_stat) {
                /* get next entry and convert from WIN32_FIND_DATA to dirent */

-               WIN32_FIND_DATAA fdata;
-               if (FindNextFileA(dir->dd_handle, &fdata)) {
+               WIN32_FIND_DATAW fdata;
+               if (FindNextFileW(dir->dd_handle, &fdata)) {

                        finddata2dirent(&dir->dd_dir, &fdata);
                } else {
                        DWORD lasterr = GetLastError();
                        finddata2dirent(&dir->dd_dir, &fdata);
                } else {
                        DWORD lasterr = GetLastError();

diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h
index 8838cd61fc282b3713db76e088130f82b6c6fe33..058207e4bfed628376d94f8002278317b5c65074 100644 (file)
--- a/compat/win32/dirent.h
+++ b/compat/win32/dirent.h
@@ -10,7 +10,7 @@ typedef struct DIR DIR;
 
 struct dirent {
        unsigned char d_type;      /* file type to prevent lstat after readdir */
 
 struct dirent {
        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);