mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

Merge branch 'master' of https://bitbucket.org/4coder/4coder

master
Allen Webster 2016-09-01 16:29:15 -04:00
parent f236e7c9d1 f3a6b15dec
commit f7afb72796
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
linux_4ed.cpp
View File

@ -499,26 +499,45 @@ Sys_Set_File_List_Sig(system_set_file_list){
internal internal
Sys_Get_Canonical_Sig(system_get_canonical){ Sys_Get_Canonical_Sig(system_get_canonical){
int32_t result = 0; char* path = (char*) alloca(len + 1);
char* write_p = path;
const char* read_p = filename;
char* path = realpath(strndupa(filename, len), NULL); while(read_p < filename + len){
if(path){ if(read_p == filename || read_p[0] == '/'){
size_t path_len = strlen(path); if(read_p[1] == '/'){
if(max >= path_len){ ++read_p;
memcpy(buffer, path, path_len); } else if(read_p[1] == '.'){
result = path_len; if(read_p[2] == '/' || !read_p[2]){
read_p += 2;
} else if(read_p[2] == '.' && (read_p[3] == '/' || !read_p[3])){
while(write_p > path && *--write_p != '/');
read_p += 3;
} else {
*write_p++ = *read_p++;
} }
} else {
*write_p++ = *read_p++;
}
} else {
*write_p++ = *read_p++;
}
}
if(write_p == path) *write_p++ = '/';
if(max >= (write_p - path)){
memcpy(buffer, path, write_p - path);
} else {
write_p = path;
}
#if FRED_INTERNAL #if FRED_INTERNAL
if(strncmp(filename, path, len) != 0){ if(len != (write_p - path) || memcmp(filename, path, len) != 0){
LINUX_FN_DEBUG("[%.*s] -> [%s]", len, filename, path); LINUX_FN_DEBUG("[%.*s] -> [%.*s]", len, filename, (int)(write_p - path), path);
} }
#endif #endif
free(path);
} else {
LINUX_FN_DEBUG("[%.*s] -> [null]", len, filename);
}
return result; return write_p - path;
} }
internal internal