Patch add-win-fs-unicode-support for *Directory/Filesystem functions Bug #63401

Patch version 2012-10-30 22:09 UTC

• 2012-10-30 22:09 UTC [diff to current]
• 2012-10-30 22:07 UTC [diff to current]
• 2012-10-30 22:06 UTC [diff to current]
• 2012-10-30 22:05 UTC [diff to current]

Developer: j4f@bk.ru

#include <malloc.h>
#include <string.h>
#include <errno.h>

#include "php.h"
#include "readdir.h"
#include "TSRM.h"



/**********************************************************************
 * Implement dirent-style opendir/readdir/rewinddir/closedir on Win32
 *
 * Functions defined are opendir(), readdir(), rewinddir() and
 * closedir() with the same prototypes as the normal dirent.h
 * implementation.
 *
 * Does not implement telldir(), seekdir(), or scandir().  The dirent
 * struct is compatible with Unix, except that d_ino is always 1 and
 * d_off is made up as we go along.
 *
 * The DIR typedef is not compatible with Unix.
 **********************************************************************/


HANDLE FindFirstFileWW2( LPCSTR lpFileName,  WIN32_FIND_DATA *lpFindFileData) {

  wchar_t *lpFileNameW;
  char cFileNameR[260];          // return value
  char cAlternateFileNameR[14];  // return value
  HANDLE hFindW;
  WIN32_FIND_DATAW lpFindFileDataW;
  int lpFileNameW_len;

  lpFileNameW_len = MultiByteToWideChar( CP_UTF8,  0,  lpFileName,  -1,  NULL,  0 );
  lpFileNameW = (wchar_t *)malloc(lpFileNameW_len *2);
  //lpFileNameW = lpFileName.GetBuffer(lpFileNameW_len - 1);
  //lpFileNameW = lpFileNameW.GetBuffer(lpFileNameW_len);

  MultiByteToWideChar( CP_UTF8,  0,  lpFileName,  -1,  lpFileNameW,  lpFileNameW_len *2 );

  hFindW = FindFirstFileW(lpFileNameW, &lpFindFileDataW);

  free(lpFileNameW);


  WideCharToMultiByte( CP_UTF8,  0,  lpFindFileDataW.cFileName,           -1,  cFileNameR,           260, NULL, NULL);
  WideCharToMultiByte( CP_UTF8,  0,  lpFindFileDataW.cAlternateFileName,  -1,  cAlternateFileNameR,  14,  NULL, NULL);


  lpFindFileData->dwFileAttributes   = lpFindFileDataW.dwFileAttributes;
  lpFindFileData->ftCreationTime     = lpFindFileDataW.ftCreationTime;
  lpFindFileData->ftLastAccessTime   = lpFindFileDataW.ftLastAccessTime;
  lpFindFileData->ftLastWriteTime    = lpFindFileDataW.ftLastWriteTime;
  lpFindFileData->nFileSizeHigh      = lpFindFileDataW.nFileSizeHigh;
  lpFindFileData->nFileSizeLow       = lpFindFileDataW.nFileSizeLow;
  lpFindFileData->dwReserved0        = lpFindFileDataW.dwReserved0;
  lpFindFileData->dwReserved1        = lpFindFileDataW.dwReserved1;
  strcpy(lpFindFileData->cFileName          , cFileNameR);
  strcpy(lpFindFileData->cAlternateFileName , cAlternateFileNameR);


  return  hFindW;
  }




BOOL WINAPI FindNextFileWW2( HANDLE hFindFile,  WIN32_FIND_DATA *lpFindFileData) {

  char cFileNameR[260];          // return value
  char cAlternateFileNameR[14];  // return value
  WIN32_FIND_DATAW lpFindFileDataW;
  BOOL result;


  result = FindNextFileW( hFindFile, &lpFindFileDataW );

  WideCharToMultiByte( CP_UTF8,  0,  lpFindFileDataW.cFileName,           -1,  cFileNameR,           260, NULL, NULL);
  WideCharToMultiByte( CP_UTF8,  0,  lpFindFileDataW.cAlternateFileName,  -1,  cAlternateFileNameR,  14, NULL, NULL);


  lpFindFileData->dwFileAttributes   = lpFindFileDataW.dwFileAttributes;
  lpFindFileData->ftCreationTime     = lpFindFileDataW.ftCreationTime;
  lpFindFileData->ftLastAccessTime   = lpFindFileDataW.ftLastAccessTime;
  lpFindFileData->ftLastWriteTime    = lpFindFileDataW.ftLastWriteTime;
  lpFindFileData->nFileSizeHigh      = lpFindFileDataW.nFileSizeHigh;
  lpFindFileData->nFileSizeLow       = lpFindFileDataW.nFileSizeLow;
  lpFindFileData->dwReserved0        = lpFindFileDataW.dwReserved0;
  lpFindFileData->dwReserved1        = lpFindFileDataW.dwReserved1;
  strcpy(lpFindFileData->cFileName          , cFileNameR);
  strcpy(lpFindFileData->cAlternateFileName , cAlternateFileNameR);


  return  result;
  }



DIR *opendir(const char *dir)
{
	DIR *dp;
	char *filespec;
	HANDLE handle;
	int index;
	char resolved_path_buff[MAXPATHLEN];
	TSRMLS_FETCH();

	if (!VCWD_REALPATH(dir, resolved_path_buff)) {
		return NULL;
	}

	filespec = (char *)malloc(strlen(resolved_path_buff) + 2 + 1);
	if (filespec == NULL) {
		return NULL;
	}
	strcpy(filespec, resolved_path_buff);
	index = strlen(filespec) - 1;
	if (index >= 0 && (filespec[index] == '/' || 
	   (filespec[index] == '\\' && (index == 0 || !IsDBCSLeadByte(filespec[index-1])))))
		filespec[index] = '\0';
	strcat(filespec, "\\*");

	dp = (DIR *) malloc(sizeof(DIR));
	if (dp == NULL) {
		return NULL;
	}
	dp->offset = 0;
	dp->finished = 0;

	//if ((handle = FindFirstFile(filespec, &(dp->fileinfo))) == INVALID_HANDLE_VALUE) {     // mod@yur
	if ((handle = FindFirstFileWW2(filespec, &(dp->fileinfo))) == INVALID_HANDLE_VALUE) {    // add@yur
		DWORD err = GetLastError();
		if (err == ERROR_NO_MORE_FILES || err == ERROR_FILE_NOT_FOUND) {
			dp->finished = 1;
		} else {
			free(dp);
			free(filespec);
			return NULL;
		}
	}
	dp->dir = strdup(resolved_path_buff);
	dp->handle = handle;
	free(filespec);

	return dp;
}

struct dirent *readdir(DIR *dp)
{
	if (!dp || dp->finished)
		return NULL;

	if (dp->offset != 0) {
		//if (FindNextFile(dp->handle, &(dp->fileinfo)) == 0) {   // mod@yur
		if (FindNextFileWW2(dp->handle, &(dp->fileinfo)) == 0) {  // add@yur
			dp->finished = 1;
			return NULL;
		}
	}
	dp->offset++;

	strlcpy(dp->dent.d_name, dp->fileinfo.cFileName, _MAX_FNAME+1);
	dp->dent.d_ino = 1;
	dp->dent.d_reclen = strlen(dp->dent.d_name);
	dp->dent.d_off = dp->offset;

	return &(dp->dent);
}

int readdir_r(DIR *dp, struct dirent *entry, struct dirent **result)
{
	if (!dp || dp->finished) {
		*result = NULL;
		return 0;
	}

	if (dp->offset != 0) {
		//if (FindNextFile(dp->handle, &(dp->fileinfo)) == 0) {   // mod@yur
		if (FindNextFileWW2(dp->handle, &(dp->fileinfo)) == 0) {  // add@yur
			dp->finished = 1;
			*result = NULL;
			return 0;
		}
	}
	dp->offset++;

	strlcpy(dp->dent.d_name, dp->fileinfo.cFileName, _MAX_FNAME+1);
	dp->dent.d_ino = 1;
	dp->dent.d_reclen = strlen(dp->dent.d_name);
	dp->dent.d_off = dp->offset;

	memcpy(entry, &dp->dent, sizeof(*entry));

	*result = &dp->dent;

	return 0;
}

int closedir(DIR *dp)
{
	if (!dp)
		return 0;
	/* It is valid to scan an empty directory but we have an invalid
	   handle in this case (no first file found). */
	if (dp->handle != INVALID_HANDLE_VALUE) {
		FindClose(dp->handle);
	}
	if (dp->dir)
		free(dp->dir);
	if (dp)
		free(dp);

	return 0;
}

int rewinddir(DIR *dp)
{
	/* Re-set to the beginning */
	char *filespec;
	HANDLE handle;
	int index;

	FindClose(dp->handle);

	dp->offset = 0;
	dp->finished = 0;

	filespec = (char *)malloc(strlen(dp->dir) + 2 + 1);
	if (filespec == NULL) {
		return -1;
	}

	strcpy(filespec, dp->dir);
	index = strlen(filespec) - 1;
	if (index >= 0 && (filespec[index] == '/' || 
	   (filespec[index] == '\\' && (index == 0 || !IsDBCSLeadByte(filespec[index-1])))))
		filespec[index] = '\0';
	strcat(filespec, "/*");

	//if ((handle = FindFirstFile(filespec, &(dp->fileinfo))) == INVALID_HANDLE_VALUE) {   // mod@yur
	if ((handle = FindFirstFileWW2(filespec, &(dp->fileinfo))) == INVALID_HANDLE_VALUE) {  // add@yur
		dp->finished = 1;
	}
	
	dp->handle = handle;
	free(filespec);

	return 0;
}