Skip to content

Commit 3c5f69b

Browse files
committed
OS (Haiku): report pre version as -
1 parent 36a452c commit 3c5f69b

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

src/detection/os/os_haiku.c

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,31 @@ void ffDetectOSImpl(FFOSResult* os)
5353
break;
5454

5555
FF_TEST_HAIKU_VERSION(1_ALPHA_1, "R1A1")
56-
FF_TEST_HAIKU_VERSION(1_PRE_ALPHA_2, "R1AP2")
56+
FF_TEST_HAIKU_VERSION(1_PRE_ALPHA_2, "R1A2-")
5757
FF_TEST_HAIKU_VERSION(1_ALPHA_2, "R1A2")
58-
FF_TEST_HAIKU_VERSION(1_PRE_ALPHA_3, "R1AP3")
58+
FF_TEST_HAIKU_VERSION(1_PRE_ALPHA_3, "R1A3-")
5959
FF_TEST_HAIKU_VERSION(1_ALPHA_3, "R1A3")
60-
FF_TEST_HAIKU_VERSION(1_PRE_ALPHA_4, "R1AP4")
60+
FF_TEST_HAIKU_VERSION(1_PRE_ALPHA_4, "R1A4-")
6161
FF_TEST_HAIKU_VERSION(1_ALPHA_4, "R1A4")
62-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_1, "R1BP1")
62+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_1, "R1B1-")
6363
FF_TEST_HAIKU_VERSION(1_BETA_1, "R1B1")
64-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_2, "R1BP2")
64+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_2, "R1B2-")
6565
FF_TEST_HAIKU_VERSION(1_BETA_2, "R1B2")
66-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_3, "R1BP3")
66+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_3, "R1B3-")
6767
FF_TEST_HAIKU_VERSION(1_BETA_3, "R1B3")
68-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_4, "R1BP4")
68+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_4, "R1B4-")
6969
FF_TEST_HAIKU_VERSION(1_BETA_4, "R1B4")
70-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_5, "R1BP5")
70+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_5, "R1B5-")
7171
FF_TEST_HAIKU_VERSION(1_BETA_5, "R1B5")
72-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_6, "R1BP6")
72+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_6, "R1B6-")
7373
FF_TEST_HAIKU_VERSION(1_BETA_6, "R1B6")
74-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_7, "R1BP7")
74+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_7, "R1B7-")
7575
FF_TEST_HAIKU_VERSION(1_BETA_7, "R1B7")
76-
FF_TEST_HAIKU_VERSION(1_PRE_BETA_8, "R1BP8")
76+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_8, "R1B8-")
7777
FF_TEST_HAIKU_VERSION(1_BETA_8, "R1B8")
78+
FF_TEST_HAIKU_VERSION(1_PRE_BETA_9, "R1B9-")
79+
FF_TEST_HAIKU_VERSION(1_BETA_9, "R1B9")
80+
FF_TEST_HAIKU_VERSION(1, "R1")
7881
}
7982

8083
break;
@@ -84,6 +87,6 @@ void ffDetectOSImpl(FFOSResult* os)
8487
if (!os->version.length)
8588
{
8689
if (get_system_info(&sys) == B_OK)
87-
ffStrbufAppendF(&os->version, "R%ld", sys.kernel_version);
90+
ffStrbufAppendF(&os->version, "R%ldx", sys.kernel_version);
8891
}
8992
}

0 commit comments

Comments
 (0)