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

rdpdr/disk: fix rename.

Browse Source
This commit is contained in:
Vic Lee 2011-08-08 00:37:31 +08:00
parent cc3160cb9d
commit e4585c801e
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,23 +51,29 @@
(_f->delete_pending ? FILE_ATTRIBUTE_TEMPORARY : 0) | \ (_f->delete_pending ? FILE_ATTRIBUTE_TEMPORARY : 0) | \
(st.st_mode & S_IWUSR ? 0 : FILE_ATTRIBUTE_READONLY)) (st.st_mode & S_IWUSR ? 0 : FILE_ATTRIBUTE_READONLY))
static void disk_file_fix_path(char* path)
{
int len;
int i;
len = strlen(path);
for (i = 0; i < len; i++)
{
if (path[i] == '\\')
path[i] = '/';
}
if (len > 0 && path[len - 1] == '/')
path[len - 1] = '\0';
}
static char* disk_file_combine_fullpath(const char* base_path, const char* path) static char* disk_file_combine_fullpath(const char* base_path, const char* path)
{ {
char* fullpath; char* fullpath;
int len;
int i;
fullpath = xmalloc(strlen(base_path) + strlen(path) + 1); fullpath = xmalloc(strlen(base_path) + strlen(path) + 1);
strcpy(fullpath, base_path); strcpy(fullpath, base_path);
strcat(fullpath, path); strcat(fullpath, path);
len = strlen(fullpath); disk_file_fix_path(fullpath);
for (i = 0; i < len; i++)
{
if (fullpath[i] == '\\')
fullpath[i] = '/';
}
if (len > 0 && fullpath[len - 1] == '/')
fullpath[len - 1] = '\0';
return fullpath; return fullpath;
} }
@ -424,15 +430,18 @@ boolean disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, ui
p = fullpath; p = fullpath;
else else
p++; p++;
strcpy(p, s); strcpy(p, s[0] == '\\' || s[0] == '/' ? s + 1 : s);
xfree(s); xfree(s);
disk_file_fix_path(fullpath);
if (rename(file->fullpath, fullpath) == 0) if (rename(file->fullpath, fullpath) == 0)
{ {
DEBUG_SVC("renamed %s to %s", file->fullpath, fullpath);
disk_file_set_fullpath(file, fullpath); disk_file_set_fullpath(file, fullpath);
} }
else else
{ {
DEBUG_WARN("rename %s to %s failed", file->fullpath, fullpath);
free(fullpath); free(fullpath);
return False; return False;
} }