From 11e75881daa8e406d9d25f4720d1b05885857d01 Mon Sep 17 00:00:00 2001
From: Anthony Tong <atong@trustedcs.com>
Date: Thu, 24 Nov 2011 00:29:12 -0600
Subject: [PATCH] rdpdr/disk: fix renames; target path was not contructed
 properly

---
 channels/rdpdr/disk/disk_file.c | 12 +++---------
 channels/rdpdr/disk/disk_file.h |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/channels/rdpdr/disk/disk_file.c b/channels/rdpdr/disk/disk_file.c
index c359c064b..600baec3e 100644
--- a/channels/rdpdr/disk/disk_file.c
+++ b/channels/rdpdr/disk/disk_file.c
@@ -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)
 			{
diff --git a/channels/rdpdr/disk/disk_file.h b/channels/rdpdr/disk/disk_file.h
index 885745187..fb5123782 100644
--- a/channels/rdpdr/disk/disk_file.h
+++ b/channels/rdpdr/disk/disk_file.h
@@ -33,6 +33,7 @@ struct _DISK_FILE
 	int fd;
 	int err;
 	DIR* dir;
+	char* basepath;
 	char* fullpath;
 	char* filename;
 	boolean delete_pending;