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

rdpdr/disk: fix renames; target path was not contructed properly

Browse Source
This commit is contained in:
Anthony Tong 2011-11-24 00:29:12 -06:00
parent d974829442
commit 11e75881da
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,7 @@ DISK_FILE* disk_file_new(const char* base_path, const char* path, uint32 id,
file = xnew(DISK_FILE);
file->id = id;
file->basepath = base_path;
disk_file_set_fullpath(file, disk_file_combine_fullpath(base_path, path));
file->fd = -1;
@ -437,16 +438,9 @@ boolean disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, ui
uniconv = freerdp_uniconv_new();
s = freerdp_uniconv_in(uniconv, stream_get_tail(input), FileNameLength);
freerdp_uniconv_free(uniconv);
fullpath = xmalloc(strlen(file->fullpath) + strlen(s) + 2);
strcpy(fullpath, file->fullpath);
p = strrchr(fullpath, '/');
if (p == NULL)
p = fullpath;
else
p++;
strcpy(p, s[0] == '\\' || s[0] == '/' ? s + 1 : s);
fullpath = disk_file_combine_fullpath(file->basepath, s);
xfree(s);
disk_file_fix_path(fullpath);
if (rename(file->fullpath, fullpath) == 0)
{

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

@ -33,6 +33,7 @@ struct _DISK_FILE
int fd;
int err;
DIR* dir;
char* basepath;
char* fullpath;
char* filename;
boolean delete_pending;