thelilfrog/cpufetch
1
0
Fork 0
mirror of https://github.com/Dr-Noob/cpufetch.git synced 2026-03-25 07:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[v1.03] Print version when reporting an error or bug (implements #172)

Browse Source
This commit is contained in:
Dr-Noob
2023-01-18 22:30:05 +01:00
parent 57f11f3eab
commit 07e920896b
3 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/common/main.c
View File

@@ -6,37 +6,6 @@
#include "printer.h"
#include "global.h"
#ifdef ARCH_X86
static const char* ARCH_STR = "x86_64 build";
#include "../x86/cpuid.h"
#elif ARCH_PPC
static const char* ARCH_STR = "PowerPC build";
#include "../ppc/ppc.h"
#elif ARCH_ARM
static const char* ARCH_STR = "ARM build";
#include "../arm/midr.h"
#endif
#ifdef __linux__
#ifdef __ANDROID__
static const char* OS_STR = "Android";
#else
static const char* OS_STR = "Linux";
#endif
#elif __FreeBSD__
static const char* OS_STR = "FreeBSD";
#elif _WIN32
static const char* OS_STR = "Windows";
#elif defined __APPLE__ || __MACH__
static const char* OS_STR = "macOS";
#else
static const char* OS_STR = "Unknown OS";
#endif
#ifndef GIT_FULL_VERSION
static const char* VERSION = "1.03";
#endif
void print_help(char *argv[]) {
const char **t = args_str;
const char *c = args_chr;
@@ -108,14 +77,6 @@ void print_help(char *argv[]) {
printf(" To correctly measure peak performance, see: https://github.com/Dr-Noob/peakperf\n");
}
void print_version() {
#ifdef GIT_FULL_VERSION
printf("cpufetch %s (%s %s)\n", GIT_FULL_VERSION, OS_STR, ARCH_STR);
#else
printf("cpufetch v%s (%s %s)\n", VERSION, OS_STR, ARCH_STR);
#endif
}
int main(int argc, char* argv[]) {
if(!parse_args(argc,argv))
return EXIT_FAILURE;
@@ -126,7 +87,7 @@ int main(int argc, char* argv[]) {
}
if(show_version()) {
print_version();
print_version(stdout);
return EXIT_SUCCESS;
}
@@ -137,7 +98,7 @@ int main(int argc, char* argv[]) {
return EXIT_FAILURE;
if(show_debug()) {
print_version();
print_version(stdout);
print_debug(cpu);
return EXIT_SUCCESS;
}
@@ -145,7 +106,7 @@ int main(int argc, char* argv[]) {
// TODO: This should be moved to the end of args.c
if(show_raw()) {
#ifdef ARCH_X86
print_version();
print_version(stdout);
print_raw(cpu);
return EXIT_SUCCESS;
#else