Skip to content

Commit 6429c20

Browse files
CarterLiCarterLi
committed
OS: prefer pretty names
Hopefully we can end the controversy. Fix #1483 #1038
1 parent 88ebeb2 commit 6429c20

File tree

4 files changed

+24
-54
lines changed

4 files changed

+24
-54
lines changed

‎src/detection/os/os_android.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ void ffDetectOSImpl(FFOSResult* os)
55
{
66
ffStrbufSetStatic(&os->name, "Android");
77

8-
ffStrbufSetStatic(&os->prettyName, "Android");
9-
108
ffStrbufSetStatic(&os->id, "android");
119

1210
ffSettingsGetAndroidProperty("ro.build.version.release", &os->version);

‎src/detection/os/os_apple.m‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ static bool detectOSCodeName(FFOSResult* os)
5454
case 14: ffStrbufSetStatic(&os->codename, "Mojave"); return true;
5555
case 13: ffStrbufSetStatic(&os->codename, "High Sierra"); return true;
5656
case 12: ffStrbufSetStatic(&os->codename, "Sierra"); return true;
57-
case 11: ffStrbufSetStatic(&os->codename, "El Capitan"); ffStrbufSetStatic(&os->prettyName, "OS X"); return true;
58-
case 10: ffStrbufSetStatic(&os->codename, "Yosemite"); ffStrbufSetStatic(&os->prettyName, "OS X"); return true;
59-
case 9: ffStrbufSetStatic(&os->codename, "Mavericks"); ffStrbufSetStatic(&os->prettyName, "OS X"); return true;
60-
case 8: ffStrbufSetStatic(&os->codename, "Mountain Lion"); ffStrbufSetStatic(&os->prettyName, "OS X"); return true;
61-
case 7: ffStrbufSetStatic(&os->codename, "Lion"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
62-
case 6: ffStrbufSetStatic(&os->codename, "Snow Leopard"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
63-
case 5: ffStrbufSetStatic(&os->codename, "Leopard"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
64-
case 4: ffStrbufSetStatic(&os->codename, "Tiger"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
57+
case 11: ffStrbufSetStatic(&os->codename, "El Capitan"); return true;
58+
case 10: ffStrbufSetStatic(&os->codename, "Yosemite"); return true;
59+
case 9: ffStrbufSetStatic(&os->codename, "Mavericks"); return true;
60+
case 8: ffStrbufSetStatic(&os->codename, "Mountain Lion"); return true;
61+
case 7: ffStrbufSetStatic(&os->codename, "Lion"); return true;
62+
case 6: ffStrbufSetStatic(&os->codename, "Snow Leopard"); return true;
63+
case 5: ffStrbufSetStatic(&os->codename, "Leopard"); return true;
64+
case 4: ffStrbufSetStatic(&os->codename, "Tiger"); return true;
6565
case 3: ffStrbufSetStatic(&os->codename, "Panther"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
66-
case 2: ffStrbufSetStatic(&os->codename, "Jaguar"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
67-
case 1: ffStrbufSetStatic(&os->codename, "Puma"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
68-
case 0: ffStrbufSetStatic(&os->codename, "Cheetah"); ffStrbufSetStatic(&os->prettyName, "Mac OS X"); return true;
66+
case 2: ffStrbufSetStatic(&os->codename, "Jaguar"); return true;
67+
case 1: ffStrbufSetStatic(&os->codename, "Puma"); return true;
68+
case 0: ffStrbufSetStatic(&os->codename, "Cheetah"); return true;
6969
}
7070
}
7171
}
@@ -106,8 +106,6 @@ void ffDetectOSImpl(FFOSResult* os)
106106
if(os->buildID.length == 0)
107107
ffSysctlGetString("kern.osversion", &os->buildID);
108108

109-
if(os->prettyName.length == 0)
110-
ffStrbufSetStatic(&os->prettyName, "macOS");
111109
ffStrbufAppend(&os->versionID, &os->version);
112110

113111
if(!detectOSCodeName(os))

‎src/detection/os/os_windows.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ void ffDetectOSImpl(FFOSResult* os)
1313
const wchar_t* rawName = BrandingFormatString(L"%WINDOWS_LONG%");
1414
ffStrbufSetWS(&os->variant, rawName);
1515
GlobalFree((HGLOBAL)rawName);
16+
ffStrbufSet(&os->prettyName, &os->variant);
1617
ffStrbufTrimRight(&os->variant, ' ');
1718

1819
//WMI returns the "Microsoft" prefix while BrandingFormatString doesn't. Make them consistent.
@@ -22,14 +23,12 @@ void ffDetectOSImpl(FFOSResult* os)
2223
if(ffStrbufStartsWithS(&os->variant, "Windows "))
2324
{
2425
ffStrbufAppendS(&os->name, "Windows");
25-
ffStrbufAppendS(&os->prettyName, "Windows");
2626

2727
ffStrbufSubstrAfter(&os->variant, strlen("Windows ") - 1);
2828

2929
if(ffStrbufStartsWithS(&os->variant, "Server "))
3030
{
3131
ffStrbufAppendS(&os->name, " Server");
32-
ffStrbufAppendS(&os->prettyName, " Server");
3332
ffStrbufSubstrAfter(&os->variant, strlen(" Server") - 1);
3433
}
3534

@@ -38,7 +37,7 @@ void ffDetectOSImpl(FFOSResult* os)
3837
ffStrbufSubstrAfter(&os->variant, index);
3938

4039
// Windows Server 20xx Rx
41-
if(ffStrbufEndsWithC(&os->prettyName, 'r'))
40+
if(ffStrbufEndsWithC(&os->name, 'r'))
4241
{
4342
if(os->variant.chars[0] == 'R' &&
4443
ffCharIsDigit(os->variant.chars[1]) &&
@@ -56,6 +55,6 @@ void ffDetectOSImpl(FFOSResult* os)
5655
ffStrbufClear(&os->variant);
5756
}
5857

59-
ffStrbufAppendF(&os->id, "%*s %*s", os->prettyName.length, os->prettyName.chars, os->version.length, os->version.chars);
58+
ffStrbufAppendF(&os->id, "%s %s", os->name.chars, os->version.chars);
6059
ffStrbufSetStatic(&os->idLike, "Windows");
6160
}

‎src/modules/os/os.c‎

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,38 +51,6 @@ static void buildOutputDefault(const FFOSResult* os, FFstrbuf* result)
5151
ffStrbufAppend(result, &os->variantID);
5252
ffStrbufAppendC(result, ')');
5353
}
54-
55-
//Append architecture if it is missing
56-
if(!ffStrbufContainIgnCase(result, &instance.state.platform.sysinfo.architecture))
57-
{
58-
ffStrbufAppendC(result, ' ');
59-
ffStrbufAppend(result, &instance.state.platform.sysinfo.architecture);
60-
}
61-
}
62-
63-
static void buildOutputNixOS(const FFOSResult* os, FFstrbuf* result)
64-
{
65-
ffStrbufAppendS(result, "NixOS");
66-
67-
if(os->buildID.length > 0)
68-
{
69-
ffStrbufAppendC(result, ' ');
70-
ffStrbufAppend(result, &os->buildID);
71-
}
72-
73-
if(os->codename.length > 0)
74-
{
75-
ffStrbufAppendS(result, " (");
76-
ffStrbufAppendC(result, (char) toupper(os->codename.chars[0]));
77-
ffStrbufAppendS(result, os->codename.chars + 1);
78-
ffStrbufAppendC(result, ')');
79-
}
80-
81-
if(instance.state.platform.sysinfo.architecture.length > 0)
82-
{
83-
ffStrbufAppendC(result, ' ');
84-
ffStrbufAppend(result, &instance.state.platform.sysinfo.architecture);
85-
}
8654
}
8755

8856
void ffPrintOS(FFOSOptions* options)
@@ -99,11 +67,18 @@ void ffPrintOS(FFOSOptions* options)
9967
{
10068
FF_STRBUF_AUTO_DESTROY result = ffStrbufCreate();
10169

102-
if(ffStrbufIgnCaseCompS(&os->id, "nixos") == 0)
103-
buildOutputNixOS(os, &result);
70+
if(os->prettyName.length > 0)
71+
ffStrbufAppend(&result, &os->prettyName);
10472
else
10573
buildOutputDefault(os, &result);
10674

75+
//Append architecture if it is missing
76+
if(!ffStrbufContainIgnCase(&result, &instance.state.platform.sysinfo.architecture))
77+
{
78+
ffStrbufAppendC(&result, ' ');
79+
ffStrbufAppend(&result, &instance.state.platform.sysinfo.architecture);
80+
}
81+
10782
ffPrintLogoAndKey(FF_OS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
10883
ffStrbufPutTo(&result, stdout);
10984
}
@@ -195,7 +170,7 @@ static FFModuleBaseInfo ffModuleInfo = {
195170
.formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
196171
{"Name of the kernel", "sysname"},
197172
{"Name of the OS", "name"},
198-
{"Pretty name of the OS", "pretty-name"},
173+
{"Pretty name of the OS, if available", "pretty-name"},
199174
{"ID of the OS", "id"},
200175
{"ID like of the OS", "id-like"},
201176
{"Variant of the OS", "variant"},

0 commit comments

Comments
 (0)