exhq/neowofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed cpu name (openbsd)

Browse source
This commit is contained in:
adri 2022-06-24 16:36:38 +02:00
parent 3b3624f110
commit cb3db2e634
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
uwufetch.c
View file

@ -937,12 +937,12 @@ struct info get_info()
#ifdef __OPENBSD__ #ifdef __OPENBSD__
FILE* os_release = popen("echo ID=openbsd", "r"); // os-release does not exist in OpenBSD FILE* os_release = popen("echo ID=openbsd", "r"); // os-release does not exist in OpenBSD
#else #else
FILE* os_release = fopen("/etc/os-release", "r"); // os name file FILE* os_release = fopen("/etc/os-release", "r"); // os name file
#endif #endif
#ifndef __BSD__ #ifndef __BSD__
FILE* cpuinfo = fopen("/proc/cpuinfo", "r"); // cpu name file for not-freebsd systems FILE* cpuinfo = fopen("/proc/cpuinfo", "r"); // cpu name file for not-freebsd systems
#else #else
FILE* cpuinfo = popen("sysctl -a | egrep -i 'hw.model'", "r"); // cpu name command for freebsd FILE* cpuinfo = popen("sysctl 'hw.model'", "r"); // cpu name command for freebsd
#endif #endif
// trying to get some kind of information about the name of the computer (hopefully a product full name) // trying to get some kind of information about the name of the computer (hopefully a product full name)
FILE* model_fp /* = fopen("/sys/devices/virtual/dmi/id/product_version", "r") */; // trying to get product version FILE* model_fp /* = fopen("/sys/devices/virtual/dmi/id/product_version", "r") */; // trying to get product version
@ -983,14 +983,18 @@ struct info get_info()
} }
} }
#elif defined(__BSD__) || defined(__APPLE__) #elif defined(__BSD__) || defined(__APPLE__)
#if defined(__BSD__) #if defined(__BSD__) && !defined(__OPENBSD__)
#define HOSTCTL "hw.hv_vendor" #define HOSTCTL "hw.hv_vendor"
#elif defined(__APPLE__) #elif defined(__APPLE__) || defined(__OPENBSD__)
#define HOSTCTL "hw.model" #define HOSTCTL "hw.model"
#endif #endif
model_fp = popen("sysctl -a " HOSTCTL, "r"); model_fp = popen("sysctl " HOSTCTL, "r");
while (fgets(buffer, sizeof(buffer), model_fp)) while (fgets(buffer, sizeof(buffer), model_fp))
#if defined(__FREEBSD__) || defined(__APPLE__)
if (sscanf(buffer, HOSTCTL ": %[^\n]", user_info.model)) break; if (sscanf(buffer, HOSTCTL ": %[^\n]", user_info.model)) break;
#elif defined(__OPENBSD__)
if (sscanf(buffer, HOSTCTL "=%[^\n]", user_info.model)) break;
#endif
#endif // _WIN32 #endif // _WIN32
if (os_release) { // get normal vars if os_release exists if (os_release) { // get normal vars if os_release exists
while (fgets(buffer, sizeof(buffer), os_release) && !(sscanf(buffer, "\nID=\"%s\"", user_info.os_name) || sscanf(buffer, "\nID=%s", user_info.os_name))) while (fgets(buffer, sizeof(buffer), os_release) && !(sscanf(buffer, "\nID=\"%s\"", user_info.os_name) || sscanf(buffer, "\nID=%s", user_info.os_name)))