80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #4458 from cold-brewed/plat-dir-updates

Browse Source 
Add new platform functions for global directories
This commit is contained in:
Miran Grča
2024-05-17 23:46:14 +02:00
committed by GitHub
parent 0561f65592 aaf3ab575e
commit 0dad92c9ef
3 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/plat.h
View File

@@ -138,7 +138,9 @@ extern int plat_getcwd(char *bufp, int max);
extern int plat_chdir(char *path); extern int plat_chdir(char *path);
extern void plat_tempfile(char *bufp, char *prefix, char *suffix); extern void plat_tempfile(char *bufp, char *prefix, char *suffix);
extern void plat_get_exe_name(char *s, int size); extern void plat_get_exe_name(char *s, int size);
extern void plat_get_global_config_dir(char* strptr); extern void plat_get_global_config_dir(char *outbuf, uint8_t len);
extern void plat_get_global_data_dir(char *outbuf, uint8_t len);
extern void plat_get_temp_dir(char *outbuf, uint8_t len);
extern void plat_init_rom_paths(void); extern void plat_init_rom_paths(void);
extern int plat_dir_check(char *path); extern int plat_dir_check(char *path);
extern int plat_dir_create(char *path); extern int plat_dir_create(char *path);

36
src/qt/qt_platform.cpp
View File

@@ -634,15 +634,34 @@ plat_chdir(char *path)
} }
void void
plat_get_global_config_dir(char* strptr) plat_get_global_config_dir(char *outbuf, const uint8_t len)
{ {
#ifdef __APPLE__ const auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::AppConfigLocation)[0]);
auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)[0] + "/net.86Box.86Box/"); if (!dir.exists()) {
#else if (!dir.mkpath(".")) {
auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)[0] + "/86Box/"); qWarning("Failed to create global configuration directory %s", dir.absolutePath().toUtf8().constData());
#endif }
if (!dir.exists()) dir.mkpath("."); }
strncpy(strptr, dir.canonicalPath().toUtf8().constData(), 1024); strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len);
}
void
plat_get_global_data_dir(char *outbuf, const uint8_t len)
{
const auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)[0]);
if (!dir.exists()) {
if (!dir.mkpath(".")) {
qWarning("Failed to create global data directory %s", dir.absolutePath().toUtf8().constData());
}
}
strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len);
}
void
plat_get_temp_dir(char *outbuf, const uint8_t len)
{
const auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::TempLocation)[0]);
strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len);
} }
void void
@@ -662,6 +681,7 @@ plat_init_rom_paths(void)
for (auto &path : paths) { for (auto &path : paths) {
#ifdef __APPLE__ #ifdef __APPLE__
rom_add_path(QDir(path).filePath("net.86Box.86Box/roms").toUtf8().constData()); rom_add_path(QDir(path).filePath("net.86Box.86Box/roms").toUtf8().constData());
rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData());
#else #else
rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData()); rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData());
#endif #endif

31
src/unix/unix.c
View File

@@ -826,15 +826,32 @@ plat_init_rom_paths(void)
} }
void void
plat_get_global_config_dir(char *strptr) plat_get_global_config_dir(char *outbuf, const uint8_t len)
{ {
#ifdef __APPLE__
char *prefPath = SDL_GetPrefPath(NULL, "net.86Box.86Box");
#else
char *prefPath = SDL_GetPrefPath(NULL, "86Box"); char *prefPath = SDL_GetPrefPath(NULL, "86Box");
#endif strncpy(outbuf, prefPath, len);
strncpy(strptr, prefPath, 1024); path_slash(outbuf);
path_slash(strptr); SDL_free(prefPath);
}
void
plat_get_global_data_dir(char *outbuf, const uint8_t len)
{
char *prefPath = SDL_GetPrefPath(NULL, "86Box");
strncpy(outbuf, prefPath, len);
path_slash(outbuf);
SDL_free(prefPath);
}
void
plat_get_temp_dir(char *outbuf, uint8_t len)
{
const char *tmpdir = getenv("TMPDIR");
if (tmpdir == NULL) {
tmpdir = "/tmp";
}
strncpy(outbuf, tmpdir, len);
path_slash(outbuf);
} }
bool bool