mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Darwin) Remove hashing

Browse Source
This commit is contained in:
twinaphex 2020-02-23 04:58:08 +01:00
parent 8fe2fe7b62
commit 79536a4767
1 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
frontend/drivers/platform_darwin.m
View File

@ -52,7 +52,6 @@
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include <file/file_path.h> #include <file/file_path.h>
#include <streams/file_stream.h> #include <streams/file_stream.h>
#include <rhash.h>
#include <features/features_cpu.h> #include <features/features_cpu.h>
#include <string/stdstring.h> #include <string/stdstring.h>
@ -338,12 +337,16 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
{ {
CFURLRef bundle_url; CFURLRef bundle_url;
CFStringRef bundle_path; CFStringRef bundle_path;
#if TARGET_OS_IPHONE
char resolved_home_dir_buf[
PATH_MAX_LENGTH] = {0};
char resolved_bundle_dir_buf[
PATH_MAX_LENGTH] = {0};
#endif
char temp_dir[PATH_MAX_LENGTH] = {0}; char temp_dir[PATH_MAX_LENGTH] = {0};
char bundle_path_buf[PATH_MAX_LENGTH] = {0}; char bundle_path_buf[PATH_MAX_LENGTH] = {0};
char home_dir_buf[PATH_MAX_LENGTH] = {0}; char home_dir_buf[PATH_MAX_LENGTH] = {0};
CFBundleRef bundle = CFBundleGetMainBundle(); CFBundleRef bundle = CFBundleGetMainBundle();
(void)temp_dir;
if (!bundle) if (!bundle)
return; return;
@ -351,26 +354,25 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
bundle_url = CFBundleCopyBundleURL(bundle); bundle_url = CFBundleCopyBundleURL(bundle);
bundle_path = CFURLCopyPath(bundle_url); bundle_path = CFURLCopyPath(bundle_url);
CFStringGetCString(bundle_path, bundle_path_buf, sizeof(bundle_path_buf), kCFStringEncodingUTF8); CFStringGetCString(bundle_path,
(void)home_dir_buf; bundle_path_buf, sizeof(bundle_path_buf), kCFStringEncodingUTF8);
CFSearchPathForDirectoriesInDomains(CFDocumentDirectory, CFSearchPathForDirectoriesInDomains(CFDocumentDirectory,
CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf)); CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf));
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
char resolved_home_dir_buf[PATH_MAX_LENGTH] = {0}; if (realpath(home_dir_buf, resolved_home_dir_buf))
if (realpath(home_dir_buf, resolved_home_dir_buf)) { {
retro_assert(strlcpy(home_dir_buf, retro_assert(strlcpy(home_dir_buf,
resolved_home_dir_buf, resolved_home_dir_buf,
sizeof(home_dir_buf)) < sizeof(home_dir_buf)); sizeof(home_dir_buf)) < sizeof(home_dir_buf));
}
if (realpath(bundle_path_buf, resolved_bundle_dir_buf))
{
retro_assert(strlcpy(bundle_path_buf,
resolved_bundle_dir_buf,
sizeof(bundle_path_buf)) < sizeof(bundle_path_buf));
} }
char resolved_bundle_dir_buf[PATH_MAX_LENGTH] = {0};
if (realpath(bundle_path_buf, resolved_bundle_dir_buf))
{
retro_assert(strlcpy(bundle_path_buf,
resolved_bundle_dir_buf,
sizeof(bundle_path_buf)) < sizeof(bundle_path_buf));
}
#endif #endif
strlcat(home_dir_buf, "/RetroArch", sizeof(home_dir_buf)); strlcat(home_dir_buf, "/RetroArch", sizeof(home_dir_buf));
@ -693,32 +695,20 @@ end:
return ret; return ret;
} }
#define DARWIN_ARCH_X86_64 0x23dea434U
#define DARWIN_ARCH_X86 0x0b88b8cbU
#define DARWIN_ARCH_POWER_MAC 0xba3772d8U
static enum frontend_architecture frontend_darwin_get_architecture(void) static enum frontend_architecture frontend_darwin_get_architecture(void)
{ {
struct utsname buffer; struct utsname buffer;
uint32_t buffer_hash;
if (uname(&buffer) != 0) if (uname(&buffer) != 0)
return FRONTEND_ARCH_NONE; return FRONTEND_ARCH_NONE;
(void)buffer_hash;
#ifdef OSX #ifdef OSX
buffer_hash = djb2_calculate(buffer.machine); if (string_is_equal(buffer.machine, "x86_64"))
return FRONTEND_ARCH_X86_64;
switch (buffer_hash) if (string_is_equal(buffer.machine, "x86"))
{ return FRONTEND_ARCH_X86;
case DARWIN_ARCH_X86_64: if (string_is_equal(buffer.machine, "Power Macintosh"))
return FRONTEND_ARCH_X86_64; return FRONTEND_ARCH_PPC;
case DARWIN_ARCH_X86:
return FRONTEND_ARCH_X86;
case DARWIN_ARCH_POWER_MAC:
return FRONTEND_ARCH_PPC;
}
return FRONTEND_ARCH_NONE; return FRONTEND_ARCH_NONE;
#else #else
@ -732,29 +722,27 @@ static int frontend_darwin_parse_drive_list(void *data, bool load_content)
int ret = -1; int ret = -1;
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#ifdef HAVE_MENU #ifdef HAVE_MENU
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;
CFURLRef bundle_url;
CFStringRef bundle_path;
char bundle_path_buf[PATH_MAX_LENGTH] = {0}; char bundle_path_buf[PATH_MAX_LENGTH] = {0};
char home_dir_buf[PATH_MAX_LENGTH] = {0}; char home_dir_buf[PATH_MAX_LENGTH] = {0};
CFBundleRef bundle = CFBundleGetMainBundle(); CFBundleRef bundle = CFBundleGetMainBundle();
enum msg_hash_enums enum_idx = load_content ? enum msg_hash_enums enum_idx = load_content
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR : ? MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR
MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY; : MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY;
CFURLRef bundle_url = CFBundleCopyBundleURL(bundle);
CFStringRef bundle_path = CFURLCopyPath(bundle_url);
bundle_url = CFBundleCopyBundleURL(bundle); CFStringGetCString(bundle_path, bundle_path_buf,
bundle_path = CFURLCopyPath(bundle_url); sizeof(bundle_path_buf), kCFStringEncodingUTF8);
CFStringGetCString(bundle_path, bundle_path_buf, sizeof(bundle_path_buf), kCFStringEncodingUTF8); CFSearchPathForDirectoriesInDomains(CFDocumentDirectory,
(void)home_dir_buf; CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf));
CFSearchPathForDirectoriesInDomains(CFDocumentDirectory, CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf));
menu_entries_append_enum(list, menu_entries_append_enum(list,
home_dir_buf, home_dir_buf,
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
enum_idx, enum_idx,
FILE_TYPE_DIRECTORY, 0, 0); FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list, "/", menu_entries_append_enum(list, "/",
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
enum_idx, enum_idx,