fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Third round of fixes for FFPlatform

Browse Source
This commit is contained in:
Linus Dierheimer
2023-01-15 16:45:16 +01:00
parent 7bef5008c2
commit c1d92206f5
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/platform/FFPlatform_unix.c
+6 -2
View File
@@ -39,7 +39,7 @@ static void getConfigDirs(FFPlatform* platform)
ffPlatformPathAddHome(&platform->configDirs, platform, ".config/");
#if defined(__APPLE__)
ffPlatformPathAddHome(&state->configDirs, platform, "/Library/Preferences/");
ffPlatformPathAddHome(&platform->configDirs, platform, "/Library/Preferences/");
#endif
ffPlatformPathAddHome(&platform->configDirs, platform, "");
@@ -135,7 +135,11 @@ void ffPlatformInitImpl(FFPlatform* platform)
getUserName(platform, pwd);
getHostName(platform, &uts);
getDomainName(platform);
#ifdef __linux__
getDomainName(platform);
#endif
getUserShell(platform, pwd);
ffStrbufAppendS(&platform->systemName, uts.sysname);
src/util/platform/FFPlatform_windows.c
+8 -8
View File
@@ -88,7 +88,7 @@ static void getConfigDirs(FFPlatform* platform)
ffPlatformPathAddEnv(&platform->configDirs, "XDG_CONFIG_DIRS");
}
static void getConfigDirs(FFPlatform* platform)
static void getDataDirs(FFPlatform* platform)
{
ffPlatformPathAddEnv(&platform->dataDirs, "XDG_DATA_HOME");
ffPlatformPathAddHome(&platform->dataDirs, platform, "/.local/share/");
@@ -185,25 +185,25 @@ static void getSystemArchitecture(FFPlatform* platform)
switch(sysInfo.wProcessorArchitecture)
{
case PROCESSOR_ARCHITECTURE_AMD64:
strcpy(name->machine, "x86_64");
ffStrbufAppendS(&platform->systemArchitecture, "x86_64");
break;
case PROCESSOR_ARCHITECTURE_IA64:
strcpy(name->machine, "ia64");
ffStrbufAppendS(&platform->systemArchitecture, "ia64");
break;
case PROCESSOR_ARCHITECTURE_INTEL:
strcpy(name->machine, "x86");
ffStrbufAppendS(&platform->systemArchitecture, "i686");
break;
case PROCESSOR_ARCHITECTURE_ARM64:
strcpy(name->machine, "aarch64");
ffStrbufAppendS(&platform->systemArchitecture, "aarch64");
break;
case PROCESSOR_ARCHITECTURE_ARM:
strcpy(name->machine, "arm");
ffStrbufAppendS(&platform->systemArchitecture, "arm");
break;
case PROCESSOR_ARCHITECTURE_PPC:
strcpy(name->machine, "ppc");
ffStrbufAppendS(&platform->systemArchitecture, "ppc");
break;
case PROCESSOR_ARCHITECTURE_MIPS:
strcpy(name->machine, "mips");
ffStrbufAppendS(&platform->systemArchitecture, "mips");
break;
case PROCESSOR_ARCHITECTURE_UNKNOWN:
default: