|
5 | 5 |
|
6 | 6 | void ffPrintOS(FFinstance* instance) |
7 | 7 | { |
8 | | - if(ffPrintFromCache(instance, FF_OS_MODULE_NAME, &instance->config.osKey, &instance->config.osFormat, FF_OS_NUM_FORMAT_ARGS)) |
9 | | - return; |
10 | | - |
11 | 8 | const FFOSResult* result = ffDetectOS(instance); |
12 | 9 |
|
13 | 10 | if(result->name.length == 0 && result->prettyName.length == 0) |
@@ -69,20 +66,28 @@ void ffPrintOS(FFinstance* instance) |
69 | 66 | ffStrbufAppendC(&os, ']'); |
70 | 67 | } |
71 | 68 |
|
72 | | - ffPrintAndWriteToCache(instance, FF_OS_MODULE_NAME, &instance->config.osKey, &os, &instance->config.osFormat, FF_OS_NUM_FORMAT_ARGS, (FFformatarg[]){ |
73 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->systemName}, |
74 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->name}, |
75 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->prettyName}, |
76 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->id}, |
77 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->idLike}, |
78 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->variant}, |
79 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->variantID}, |
80 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->version}, |
81 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->versionID}, |
82 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->codename}, |
83 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->buildID}, |
84 | | - {FF_FORMAT_ARG_TYPE_STRBUF, &result->architecture} |
85 | | - }); |
| 69 | + if(instance->config.osFormat.length == 0) |
| 70 | + { |
| 71 | + ffPrintLogoAndKey(instance, FF_OS_MODULE_NAME, 0, &instance->config.osKey); |
| 72 | + ffStrbufPutTo(&os, stdout); |
| 73 | + } |
| 74 | + else |
| 75 | + { |
| 76 | + ffPrintFormatString(instance, FF_OS_MODULE_NAME, 0, &instance->config.osKey, &instance->config.osFormat, NULL, FF_OS_NUM_FORMAT_ARGS, (FFformatarg[]){ |
| 77 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->systemName}, |
| 78 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->name}, |
| 79 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->prettyName}, |
| 80 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->id}, |
| 81 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->idLike}, |
| 82 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->variant}, |
| 83 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->variantID}, |
| 84 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->version}, |
| 85 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->versionID}, |
| 86 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->codename}, |
| 87 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->buildID}, |
| 88 | + {FF_FORMAT_ARG_TYPE_STRBUF, &result->architecture} |
| 89 | + }); |
| 90 | + } |
86 | 91 |
|
87 | 92 | ffStrbufDestroy(&os); |
88 | 93 | } |
0 commit comments