From 9b43d4df0d02e4269c60c76bebfe4b4128139233 Mon Sep 17 00:00:00 2001 From: TheDarkBug Date: Thu, 22 Jul 2021 18:39:34 +0200 Subject: [PATCH] Added cpuinfo to freebsd port --- uwufetch.c | 67 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/uwufetch.c b/uwufetch.c index d928f76..6c0817f 100644 --- a/uwufetch.c +++ b/uwufetch.c @@ -23,8 +23,10 @@ #include #include #else +#ifndef __FREEBSD__ #include #endif +#endif #include #include @@ -65,8 +67,10 @@ struct package_manager }; struct utsname sys_var; #ifndef __APPLE__ +#ifdef __linux__ struct sysinfo sys; #endif +#endif struct winsize win; int iscygwin = 0; @@ -152,7 +156,11 @@ int main(int argc, char *argv[]) if (argc == 1) parse_config(); if ((argc == 1 && ascii_image_flag == 0) || (argc > 1 && ascii_image_flag == 0)) + { + printf("\n"); // print a new line + printf("\033[1A"); // go up one line if possible print_ascii(); + } else if (ascii_image_flag == 1) print_image(); uwu_kernel(); @@ -338,20 +346,22 @@ void print_info() #ifdef __APPLE__ uptime = uptime_mac(); #else +#ifndef __FREEBSD__ uptime = sys.uptime; +#endif #endif switch (uptime) { - case 0 ... 3599: - printf("\033[18C%s%sUWUPTIME %s%lim\n", + case 0 ... 3599: + printf("\033[18C%s%sUWUPTIME %s%lim\n", NORMAL, BOLD, NORMAL, uptime / 60 % 60); - break; - case 3600 ... 86399: - printf("\033[18C%s%sUWUPTIME %s%lih, %lim\n", + break; + case 3600 ... 86399: + printf("\033[18C%s%sUWUPTIME %s%lih, %lim\n", NORMAL, BOLD, NORMAL, uptime / 3600, uptime / 60 % 60); - break; - default: - printf("\033[18C%s%sUWUPTIME %s%lid, %lih, %lim\n", + break; + default: + printf("\033[18C%s%sUWUPTIME %s%lid, %lih, %lim\n", NORMAL, BOLD, NORMAL, uptime / 86400, uptime / 3600 % 24, uptime / 60 % 60); } } @@ -370,7 +380,11 @@ void get_info() // os version, cpu and board info FILE *os_release = fopen("/etc/os-release", "r"); +#ifndef __FREEBSD__ FILE *cpuinfo = fopen("/proc/cpuinfo", "r"); +#else + FILE *cpuinfo = popen("sysctl -a | egrep -i 'hw.model'", "r"); +#endif FILE *host_model_info = fopen("/sys/devices/virtual/dmi/id/product_version", "r"); #ifdef __CYGWIN__ iscygwin = 1; @@ -392,8 +406,13 @@ void get_info() break; } } + while (fgets(line, sizeof(line), cpuinfo)) +#ifdef __FREEBSD__ + if (sscanf(line, "hw.model: %[^\n]", cpu_model)) +#else if (sscanf(line, "model name : %[^\n]", cpu_model)) +#endif break; sprintf(user, "%s", getenv("USER")); if (iscygwin == 0) @@ -418,9 +437,11 @@ void get_info() while (fgets(line, sizeof(line), host_model_info)) if (sscanf(line, "%[^\n]", host_model)) break; +#ifndef __FREEBSD__ while (fgets(line, sizeof(line), cpuinfo)) if (sscanf(line, "Hardware : %[^\n]", cpu_model)) break; +#endif } else if (library) // macOS { @@ -435,7 +456,9 @@ void get_info() else sprintf(version_name, "unknown"); } +#ifndef __FREEBSD__ fclose(cpuinfo); +#endif gethostname(host, 256); sscanf(getenv("SHELL"), "%s", shell); if (strlen(shell) > 16) @@ -447,7 +470,9 @@ void get_info() // system resources uname(&sys_var); #ifndef __APPLE__ +#ifndef __FREEBSD__ sysinfo(&sys); // somehow this function has to be called again in print_info() +#endif #endif truncate_name(sys_var.release); @@ -893,21 +918,23 @@ void usage(char *arg) void uwu_kernel() { - #define KERNEL_TO_UWU(str, original, uwufied) \ - if (strcmp(str, original) == 0) \ - sprintf(str, "%s", uwufied) +#define KERNEL_TO_UWU(str, original, uwufied) \ + if (strcmp(str, original) == 0) \ + sprintf(str, "%s", uwufied) char *temp_kernel = kernel; char *token; char splitted[16][128] = {}; int count = 0; - while((token = strsep(&temp_kernel, " "))) { + while ((token = strsep(&temp_kernel, " "))) + { strcpy(splitted[count], token); count++; } strcpy(kernel, ""); - for(int i = 0;i < 16;i++) { + for (int i = 0; i < 16; i++) + { // kernel name KERNEL_TO_UWU(splitted[i], "Linux", "Linuwu"); @@ -946,10 +973,11 @@ void uwu_kernel() // Windows KERNEL_TO_UWU(splitted[i], "windows", "WinyandOwOws"); - if(i != 0) strcat(kernel, " "); + if (i != 0) + strcat(kernel, " "); strcat(kernel, splitted[i]); } - #undef KERNEL_TO_UWU +#undef KERNEL_TO_UWU } void uwu_name() @@ -1008,8 +1036,11 @@ void uwu_name() void truncate_name(char *name) { - for (int i = target_width; i < 256; i++) - name[i] = '\0'; + char arr[target_width]; + + for (int i = 0; i < target_width; i++) + arr[i] = name[i]; + name = arr; } // remove square brackets (for gpu names) @@ -1026,4 +1057,4 @@ void remove_brackets(char *str) else i++; } -} +} \ No newline at end of file