Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-10-16 23:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

lsteamclient: For relative paths, only fix up backslashes

Browse Source
This commit is contained in:
Andrew Eikum 2018-11-30 08:47:13 -06:00
parent 11a7c7a695
commit dcd5907f59
1 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lsteamclient/steamclient_main.c
View File

@ -59,32 +59,50 @@ unsigned int steamclient_unix_path_to_dos_path(bool api_result, const char *src,
return r == 0 ? 0 : r - 1; return r == 0 ? 0 : r - 1;
} }
#define IS_ABSOLUTE(x) (*x == '/' || *x == '\\' || (*x && *(x + 1) == ':'))
/* returns non-zero on success, zero on failure */ /* returns non-zero on success, zero on failure */
bool steamclient_dos_path_to_unix_path(const char *src, char *dst) bool steamclient_dos_path_to_unix_path(const char *src, char *dst)
{ {
WCHAR srcW[PATH_MAX];
char *unix_fn;
uint32 r;
*dst = 0; *dst = 0;
if(!src) if(!src || !*src)
return 0; return 0;
r = MultiByteToWideChar(CP_UNIXCP, 0, src, -1, srcW, PATH_MAX); if(IS_ABSOLUTE(src)){
if(r == 0) /* absolute path, use wine conversion */
return 0; WCHAR srcW[PATH_MAX];
char *unix_path;
uint32 r;
unix_fn = wine_get_unix_file_name(srcW); r = MultiByteToWideChar(CP_UNIXCP, 0, src, -1, srcW, PATH_MAX);
if(!unix_fn){ if(r == 0)
WARN("Unable to convert DOS filename to unix: %s\n", src); return 0;
return 0;
unix_path = wine_get_unix_file_name(srcW);
if(!unix_path){
WARN("Unable to convert DOS filename to unix: %s\n", src);
return 0;
}
strncpy(dst, unix_path, PATH_MAX);
HeapFree(GetProcessHeap(), 0, unix_path);
}else{
/* relative path, just fix up backslashes */
const char *s;
char *d;
for(s = src, d = dst; *src; ++s, ++d){
if(*s == '\\')
*d = '/';
else
*d = *s;
}
*d = 0;
} }
strncpy(dst, unix_fn, PATH_MAX);
HeapFree(GetProcessHeap(), 0, unix_fn);
return 1; return 1;
} }
@ -105,8 +123,21 @@ const char **steamclient_dos_to_unix_stringlist(const char **src)
out = HeapAlloc(GetProcessHeap(), 0, len); out = HeapAlloc(GetProcessHeap(), 0, len);
for(s = src, o = out; *s; ++s, ++o){ for(s = src, o = out; *s; ++s, ++o){
MultiByteToWideChar(CP_UNIXCP, 0, *s, -1, scratch, sizeof(scratch)/sizeof(*scratch)); if(IS_ABSOLUTE(*s)){
*o = wine_get_unix_file_name(scratch); MultiByteToWideChar(CP_UNIXCP, 0, *s, -1, scratch, sizeof(scratch)/sizeof(*scratch));
*o = wine_get_unix_file_name(scratch);
}else{
const char *r;
char *l;
*o = HeapAlloc(GetProcessHeap(), 0, strlen(*s) + 1);
for(l = *s, r = *o; *l; ++l, ++r){
if(*r == '\\')
*l = '/';
else
*l = *r;
}
*l = 0;
}
} }
*o = NULL; *o = NULL;