diff --git a/.gitignore b/.gitignore index 93de002..d8a4e5a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,5 @@ help.o logo.o sql_test.o gtk_test.o -os_info.o +sys_info.o netbenixCMD \ No newline at end of file diff --git a/README.md b/README.md index f6edc8f..134812f 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,8 @@ Version: *0.1.0* ## Features: - A help page (OMG!!!) - A little GTK Test -- Can detect if you're using linux or Windows and tell the Architecture you're running on +- Can detect if you're using linux or not and tell the Architecture you're running on +- Can give you a bit of information about your CPU (but just a little bit) ## Building: Install packages: make, gtk3, libgtk-3-dev, gcc, mysql @@ -29,4 +30,4 @@ After building use ```./netbenixCMD ``` to start the program - ```--help``` => Displays all arguments - ```--gtk-test``` => Opens the GTK Test Window - ```--sql-test``` => Makes a test connection to a mysql server -- ```--os-info``` => Outputs your OS Information \ No newline at end of file +- ```--sys-info``` => Gives you information about your system \ No newline at end of file diff --git a/commands/help.c b/commands/help.c index a156ea3..1f45664 100644 --- a/commands/help.c +++ b/commands/help.c @@ -9,5 +9,5 @@ void outputHelp(){ printf("--help : this help page\n"); printf("--gtk-test : opens the gtk test\n"); printf("--sql-test : make a test connection to a mysql server\n"); - printf("--os-info : shows informations about your os\n"); + printf("--sys-info : shows informations about your system\n"); } \ No newline at end of file diff --git a/main.c b/main.c index 3a4e3c1..d847629 100644 --- a/main.c +++ b/main.c @@ -5,14 +5,13 @@ #include #include #include -#include "commands/gtk_test.h" +#include "commands/help.h" +#include "commands/gtk_test.h" +#include "commands/sql_test.h" #include "etc/logo.h" #include "utils/logger.h" -#include "utils/os_info.h" -#include "commands/help.h" - -#include "commands/sql_test.h" +#include "utils/sys_info.h" #define VERSION "0.1.0" @@ -46,8 +45,8 @@ int main(int argc, char *argv[]){ } else if (!strcmp(argv[1], "--gtk-test")){ logger("Stating GTK Test"); createGTKTestWindow(); - } else if (!strcmp(argv[1], "--os-info")){ - logger("Showing OS Information"); + } else if (!strcmp(argv[1], "--sys-info")){ + logger("Showing System Information"); print_Specs(); } else if (!strcmp(argv[1], "--sql-test")){ logger("Starting SQL Test"); diff --git a/makefile b/makefile index 79e1d0f..0abc62b 100644 --- a/makefile +++ b/makefile @@ -2,7 +2,7 @@ CC= gcc ARGS= -export-dynamic -ansi -std=gnu99 CFLAGS= $(shell pkg-config --cflags gtk+-3.0) -I/usr/include/mysql LDLIBS= $(shell pkg-config --libs gtk+-3.0) -L/usr/lib/mysql -lmysqlclient -OBJ= main.o logo.o logger.o help.o os_info.o gtk_test.o sql_test.o +OBJ= main.o logo.o logger.o help.o sys_info.o gtk_test.o sql_test.o netbenixCMD: $(OBJ) $(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS) @@ -14,8 +14,8 @@ logger.o: utils/logger.c $(CC) $(CFLAGS) -c utils/logger.c help.o: commands/help.c $(CC) $(CFLAGS) -c commands/help.c -os_info.o: utils/os_info.c - $(CC) $(CFLAGS) $(ARGS) -c utils/os_info.c +sys_info.o: utils/sys_info.c + $(CC) $(CFLAGS) $(ARGS) -c utils/sys_info.c gtk_test.o: commands/gtk_test.c $(CC) $(CFLAGS) -c commands/gtk_test.c sql_test.o: commands/sql_test.c diff --git a/utils/os_info.c b/utils/sys_info.c similarity index 99% rename from utils/os_info.c rename to utils/sys_info.c index 1386377..2b0d5fa 100644 --- a/utils/os_info.c +++ b/utils/sys_info.c @@ -5,7 +5,7 @@ #include #include -#include "os_info.h" +#include "sys_info.h" #include "logger.h" #include diff --git a/utils/os_info.h b/utils/sys_info.h similarity index 87% rename from utils/os_info.h rename to utils/sys_info.h index 452ba8d..f289b6f 100644 --- a/utils/os_info.h +++ b/utils/sys_info.h @@ -1,5 +1,5 @@ -#ifndef _OS_INFO_H_ -#define _OS_INFO_H_ +#ifndef _SYS_INFO_H_ +#define _SYS_INFO_H_ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx); unsigned int getCPUStepping();