mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Use get_directory_path instead of dirname()

Browse Source
This commit is contained in:
X123M3-256
2017-01-17 21:33:24 +00:00
committed by Ted John
parent 7380c789e0
commit d89fc32864
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/cmdline_sprite.c
View File

@@ -662,6 +662,7 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc)
const char *spriteFilePath = argv[1];
const char *spriteDescriptionPath = argv[2];
const char* directoryPath = path_get_directory(argv[1]);
json_error_t error;
json_t* sprite_list=json_load_file(spriteDescriptionPath, JSON_REJECT_DUPLICATES, &error);
@@ -707,7 +708,7 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc)
//Resolve absolute sprite path
char* imagePath=platform_get_absolute_path(json_string_value(path),spriteDescriptionPath);
char* imagePath=platform_get_absolute_path(json_string_value(path),directoryPath);
rct_g1_element spriteElement;
uint8 *buffer;
@@ -717,7 +718,7 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc)
json_decref(sprite_list);
return -1;
}
free(imagePath);
if (!sprite_file_open(spriteFilePath)) {
fprintf(stderr, "Unable to open sprite file: %s\nCanceling\n", spriteFilePath);
@@ -751,7 +752,8 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc)
}
json_decref(sprite_list);
free(directoryPath);
fprintf(stdout, "Finished\n");
return 1;
} else {

12
src/openrct2/platform/posix.c
View File

@@ -265,12 +265,12 @@ bool platform_directory_delete(const utf8 *path)
char* platform_get_absolute_path(const char* relative_path,const char* base_path)
{
char path[MAX_PATH];
//This is to get around the fact that dirname() doesn't take a const char*
char base_path_copy[MAX_PATH];
safe_strcpy(base_path_copy,base_path,MAX_PATH);
snprintf(path,MAX_PATH,"%s/%s",dirname(base_path_copy),relative_path);
if(base_path!=NULL) {
snprintf(path,MAX_PATH,"%s/%s",base_path,relative_path);
} else {
safe_strcpy(path,base_path,MAX_PATH);
}
return realpath(path,NULL);
}