Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-06-07 20:42:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

tst: passthrough-fuse: windows-posix layer: dirfd

Browse Source
This commit is contained in:
Bill Zissimopoulos 2017-01-29 15:45:36 -08:00
parent 9c2b4e5631
commit c0aaebd0a5
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tst/passthrough-fuse/winposix.c
View File

@ -31,7 +31,7 @@
struct _DIR struct _DIR
{ {
HANDLE handle; HANDLE h, fh;
struct dirent dirent; struct dirent dirent;
char path[]; char path[];
}; };
@ -330,14 +330,10 @@ int rmdir(const char *path)
DIR *opendir(const char *path) DIR *opendir(const char *path)
{ {
DWORD FileAttributes = GetFileAttributesA(path); HANDLE h = CreateFileA(path,
if (INVALID_FILE_ATTRIBUTES == FileAttributes) FILE_READ_ATTRIBUTES, 0, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
if (INVALID_HANDLE_VALUE == h)
return error0(); return error0();
if (0 == (FileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
errno = ENOTDIR;
return 0;
}
size_t pathlen = strlen(path); size_t pathlen = strlen(path);
if (0 < pathlen && '/' == path[pathlen - 1]) if (0 < pathlen && '/' == path[pathlen - 1])
@ -345,10 +341,14 @@ DIR *opendir(const char *path)
DIR *dirp = malloc(sizeof *dirp + pathlen + 3); /* sets errno */ DIR *dirp = malloc(sizeof *dirp + pathlen + 3); /* sets errno */
if (0 == dirp) if (0 == dirp)
{
CloseHandle(h);
return 0; return 0;
}
memset(dirp, 0, sizeof *dirp); memset(dirp, 0, sizeof *dirp);
dirp->handle = INVALID_HANDLE_VALUE; dirp->h = h;
dirp->fh = INVALID_HANDLE_VALUE;
memcpy(dirp->path, path, pathlen); memcpy(dirp->path, path, pathlen);
dirp->path[pathlen + 0] = '/'; dirp->path[pathlen + 0] = '/';
dirp->path[pathlen + 1] = '*'; dirp->path[pathlen + 1] = '*';
@ -357,25 +357,33 @@ DIR *opendir(const char *path)
return dirp; return dirp;
} }
int dirfd(DIR *dirp)
{
return (int)(intptr_t)dirp->h;
}
void rewinddir(DIR *dirp) void rewinddir(DIR *dirp)
{ {
if (INVALID_HANDLE_VALUE != dirp->handle) if (INVALID_HANDLE_VALUE != dirp->fh)
FindClose(dirp->handle); {
FindClose(dirp->fh);
dirp->fh = INVALID_HANDLE_VALUE;
}
} }
struct dirent *readdir(DIR *dirp) struct dirent *readdir(DIR *dirp)
{ {
WIN32_FIND_DATAA FindData; WIN32_FIND_DATAA FindData;
if (INVALID_HANDLE_VALUE != dirp->handle) if (INVALID_HANDLE_VALUE == dirp->fh)
{ {
dirp->handle = FindFirstFileA(dirp->path, &FindData); dirp->fh = FindFirstFileA(dirp->path, &FindData);
if (INVALID_HANDLE_VALUE == dirp) if (INVALID_HANDLE_VALUE == dirp->fh)
return error0(); return error0();
} }
else else
{ {
if (!FindNextFileA(dirp->handle, &FindData)) if (!FindNextFileA(dirp->fh, &FindData))
return error0(); return error0();
} }
@ -386,9 +394,10 @@ struct dirent *readdir(DIR *dirp)
int closedir(DIR *dirp) int closedir(DIR *dirp)
{ {
if (INVALID_HANDLE_VALUE != dirp->handle) if (INVALID_HANDLE_VALUE != dirp->fh)
FindClose(dirp->handle); FindClose(dirp->fh);
CloseHandle(dirp->h);
free(dirp); free(dirp);
return 0; return 0;

1
tst/passthrough-fuse/winposix.h
View File

@ -58,6 +58,7 @@ int mkdir(const char *path, fuse_mode_t mode);
int rmdir(const char *path); int rmdir(const char *path);
DIR *opendir(const char *path); DIR *opendir(const char *path);
int dirfd(DIR *dirp);
void rewinddir(DIR *dirp); void rewinddir(DIR *dirp);
struct dirent *readdir(DIR *dirp); struct dirent *readdir(DIR *dirp);
int closedir(DIR *dirp); int closedir(DIR *dirp);