m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Calculate_relative_path()

Browse Source
This commit is contained in:
Thomas Bernard 2019-02-04 23:45:33 +01:00
parent d131b48274
commit 02f9d68f8e
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/filesel.c
View File

@ -2381,11 +2381,11 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
// We must enter the directory // We must enter the directory
if (directory_to_change_to[0] == '.' && if (directory_to_change_to[0] == '.' &&
(directory_to_change_to[1] == '/' || directory_to_change_to[1] == '\\' || (directory_to_change_to[1] == '\0' || directory_to_change_to[1] == '/' || directory_to_change_to[1] == '\\' ||
(directory_to_change_to[1] == '.' && (directory_to_change_to[1] == '.' &&
(directory_to_change_to[2] == '/' || directory_to_change_to[2] == '\\')))) // Relative path (directory_to_change_to[2] == '\0' || directory_to_change_to[2] == '/' || directory_to_change_to[2] == '\\')))) // Relative path
{ {
GFX2_Log(GFX2_DEBUG, "Relative bookmark %s. Change to %s first\n", GFX2_Log(GFX2_DEBUG, "Relative bookmark \"%s\", Change to \"%s\" first.\n",
directory_to_change_to, Data_directory); directory_to_change_to, Data_directory);
Change_directory(Data_directory); Change_directory(Data_directory);
} }

24
src/io.c
View File

@ -960,13 +960,27 @@ const char * Calculate_relative_path(const char * ref_path, const char * path)
last_separator = i; last_separator = i;
#endif #endif
} }
if (real_ref_path[i] == '\0' && path[i] == PATH_SEPARATOR[0]) // at this point, all chars from index 0 to i-1 are identical in
// real_ref_path and path.
// real_ref_path[i] and path[i] are either different, or both '\0'
if (real_ref_path[i] == PATH_SEPARATOR[0] && real_ref_path[i + 1] == '\0' && path[i] == '\0')
return "."; // path are identical (real_ref_path has additional trailing separator)
if (real_ref_path[i] == '\0')
{ {
snprintf(rel_path, MAX_PATH_CHARACTERS, ".%s", path + i); // path is under ref_path if (path[i] == '\0')
return rel_path; return "."; // path are identical
// path is under ref_path
if (path[i] == PATH_SEPARATOR[0])
{
snprintf(rel_path, MAX_PATH_CHARACTERS, ".%s", path + i);
return rel_path;
}
else if (i > 0 && real_ref_path[i - 1] == PATH_SEPARATOR[0])
{
snprintf(rel_path, MAX_PATH_CHARACTERS, ".%s", path + i - 1);
return rel_path;
}
} }
if (real_ref_path[i] == '\0' && path[i] == '\0')
return "."; // path are identical
if (last_separator <= 0) if (last_separator <= 0)
return path; // no common part found return absolute path return path; // no common part found return absolute path
// count the number of path separators in the reference path // count the number of path separators in the reference path