mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #263 from atong-tcs/rdpdr

Browse Source 
initial wildcard rdpdr support
This commit is contained in:
Marc-André Moreau 2011-12-09 10:13:33 -08:00
commit 80add94130
2 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
channels/rdpdr/disk/disk_file.c
View File

@ -55,6 +55,36 @@
(_f->delete_pending ? FILE_ATTRIBUTE_TEMPORARY : 0) | \
(st.st_mode & S_IWUSR ? 0 : FILE_ATTRIBUTE_READONLY))
static boolean disk_file_wildcard_match(const char* pattern, const char* filename)
{
const char *p = pattern, *f = filename;
char c;
/*
* TODO: proper wildcard rules per msft's File System Behavior Overview
* Simple cases for now.
*/
f = filename;
while ((c = *p++))
{
if (c == '*')
{
c = *p++;
if (!c) /* shortcut */
return true;
/* TODO: skip to tail comparison */
}
if (c != *f++)
return false;
}
if (!*f)
return true;
return false;
}
static void disk_file_fix_path(char* path)
{
int len;
@ -272,6 +302,7 @@ void disk_file_free(DISK_FILE* file)
unlink(file->fullpath);
}
xfree(file->pattern);
xfree(file->fullpath);
xfree(file);
}
@ -474,16 +505,46 @@ boolean disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, ui
size_t len;
boolean ret;
DEBUG_SVC("path %s FsInformationClass %d", path, FsInformationClass);
DEBUG_SVC("path %s FsInformationClass %d InitialQuery %d", path, FsInformationClass, InitialQuery);
if (!file->dir)
{
stream_write_uint32(output, 0); /* Length */
stream_write_uint8(output, 0); /* Padding */
return false;
}
if (InitialQuery != 0)
{
rewinddir(file->dir);
xfree(file->pattern);
if (path[0])
file->pattern = strdup(strrchr(path, '\\') + 1);
else
file->pattern = NULL;
}
if (file->pattern)
{
do
{
ent = readdir(file->dir);
if (ent == NULL)
continue;
if (disk_file_wildcard_match(file->pattern, ent->d_name))
break;
} while (ent);
}
else
{
ent = readdir(file->dir);
}
ent = readdir(file->dir);
if (ent == NULL)
{
DEBUG_SVC(" pattern %s not found.\n", file->pattern);
stream_write_uint32(output, 0); /* Length */
stream_write_uint8(output, 0); /* Padding */
return false;
@ -498,6 +559,8 @@ boolean disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, ui
}
xfree(ent_path);
DEBUG_SVC(" pattern %s matched %s\n", file->pattern, ent_path);
uniconv = freerdp_uniconv_new();
ent_path = freerdp_uniconv_out(uniconv, ent->d_name, &len);
freerdp_uniconv_free(uniconv);

1
channels/rdpdr/disk/disk_file.h
View File

@ -36,6 +36,7 @@ struct _DISK_FILE
char* basepath;
char* fullpath;
char* filename;
char* pattern;
boolean delete_pending;
};