Merge branch 'master' into master

1 files changed, 24 insertions, 3 deletions

diff --git a/src/bug_report.cpp b/src/bug_report.cpp
index 9a1cb2254..02a2b1ba2 100644
--- a/src/bug_report.cpp
+++ b/src/bug_report.cpp
@@ -17,6 +17,11 @@
 	#include <sys/sysctl.h>

 #endif

 

+#if defined(GB_SYSTEM_OPENBSD)

+	#include <sys/sysctl.h>

+	#include <sys/utsname.h>

+#endif

+

 /*

 	NOTE(Jeroen): This prints the Windows product edition only, to be called from `print_platform_details`.

 */

@@ -242,6 +247,14 @@ void report_ram_info() {
 		if (sysctl(sysctls, 2, &ram_amount, &val_size, NULL, 0) != -1) {

 			gb_printf("%lld MiB\n", ram_amount / gb_megabytes(1));

 		}

+	#elif defined(GB_SYSTEM_OPENBSD)

+		uint64_t ram_amount;

+		size_t   val_size = sizeof(ram_amount);

+

+		int sysctls[] = { CTL_HW, HW_PHYSMEM64 };

+		if (sysctl(sysctls, 2, &ram_amount, &val_size, NULL, 0) != -1) {

+			gb_printf("%lld MiB\n", ram_amount / gb_megabytes(1));

+		}

 	#else

 		gb_printf("Unknown.\n");

 	#endif

@@ -473,11 +486,11 @@ void print_bug_report_help() {
 

 	#elif defined(GB_SYSTEM_LINUX)

 		/*

-			Try to parse `/usr/lib/os-release` for `PRETTY_NAME="Ubuntu 20.04.3 LTS`

+			Try to parse `/etc/os-release` for `PRETTY_NAME="Ubuntu 20.04.3 LTS`

 		*/

 		gbAllocator a = heap_allocator();

 

-		gbFileContents release = gb_file_read_contents(a, 1, "/usr/lib/os-release");

+		gbFileContents release = gb_file_read_contents(a, 1, "/etc/os-release");

 		defer (gb_file_free_contents(&release));

 

 		b32 found = 0;

@@ -643,6 +656,14 @@ void print_bug_report_help() {
 		} else {

 			gb_printf("macOS: Unknown\n");

 		}			

+	#elif defined(GB_SYSTEM_OPENBSD)

+		struct utsname un;

+		

+		if (uname(&un) != -1) {

+			gb_printf("%s %s %s %s\n", un.sysname, un.release, un.version, un.machine);

+		} else {

+			gb_printf("OpenBSD: Unknown\n");    

+		}

 	#else

 		gb_printf("Unknown\n");

 

@@ -657,4 +678,4 @@ void print_bug_report_help() {
 		And RAM info.

 	*/

 	report_ram_info();

-}
\ No newline at end of file
+}