fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 00:37:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

OS: make osFile a global option

Browse Source 
`OS` is used by Module `Package`
This commit is contained in:
李通洲
2023-06-12 15:42:26 +08:00
parent d7115022e4
commit e9b3a799bc
7 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/os/option.h
-4
View File
@@ -8,8 +8,4 @@ typedef struct FFOSOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
#if defined(__linux__) || defined(__FreeBSD__)
FFstrbuf file;
#endif
} FFOSOptions;
src/modules/os/os.c
-23
View File
@@ -140,10 +140,6 @@ void ffInitOSOptions(FFOSOptions* options)
{
options->moduleName = FF_OS_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
#if defined(__linux__) || defined(__FreeBSD__)
ffStrbufInit(&options->file);
#endif
}
bool ffParseOSCommandOptions(FFOSOptions* options, const char* key, const char* value)
@@ -153,23 +149,12 @@ bool ffParseOSCommandOptions(FFOSOptions* options, const char* key, const char*
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
#if defined(__linux__) || defined(__FreeBSD__)
if (strcasecmp(subKey, "file") == 0)
{
ffOptionParseString(key, value, &options->file);
return true;
}
#endif
return false;
}
void ffDestroyOSOptions(FFOSOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
#if defined(__linux__) || defined(__FreeBSD__)
ffStrbufDestroy(&options->file);
#endif
}
void ffParseOSJsonObject(FFinstance* instance, yyjson_val* module)
@@ -190,14 +175,6 @@ void ffParseOSJsonObject(FFinstance* instance, yyjson_val* module)
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
#if defined(__linux__) || defined(__FreeBSD__)
if (strcasecmp(key, "file") == 0)
{
ffStrbufSetS(&options.file, yyjson_get_str(val));
continue;
}
#endif
ffPrintError(instance, FF_OS_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}