Inital commit

# Conflicts:
#	.gitignore
#	etc/man.c
#	etc/your-reality.c
#	etc/your-reality.h
#	main.c
#	makefile

.gitignore

@@ -1,21 +1,18 @@
-.vscode
-glade/test_window.glade~
-netbenixCMD
-output.log
-main.o
-logger.o
-help.o
-logo.o
-sql_test.o
-gtk_test.o
-sys_info.o
-show_dir.o
-change_dir.o
-update_check.o
-man.o
-calc.o
-<<<<<<< HEAD
-math_ext.o
-=======
->>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
+.vscode
+glade/test_window.glade~
+netbenixCMD
+output.log
+main.o
+logger.o
+help.o
+logo.o
+sql_test.o
+gtk_test.o
+sys_info.o
+show_dir.o
+change_dir.o
+update_check.o
+man.o
+calc.o
+math_ext.o
 your-reality.o

etc/man.c

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,4 +47,52 @@ void showManEntry(char *arg[]){
     } else {
         printf("Entry not found.\n");
     }
+=======
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// Color Codes:
+// Reset:       \033[0m
+// Red:         \033[0;31m
+// Green:       \033[0;32m
+// Yellow:      \033[0;33m
+// Blue:        \033[0;34m
+// Magenta:     \033[0;35m
+// Cyan:        \033[0;36m
+// BoldRed:     \033[1;31m
+// BoldGreen:   \033[1;32m
+// BoldYellow:  \033[1;33m
+// BoldBlue:    \033[1;34m
+// BoldMagenta: \033[1;35m
+// BoldCyan:    \033[1;36m
+
+//Main function to start man is at the bottom
+
+//MAN ENTRIES
+//LS
+void manEntry_ls(){
+    printf("\033[0;33m##################\033[0m\n");
+    printf("\033[0;33m# Manual of \033[0;36m'ls' \033[0;33m#\033[0m\n");
+    printf("\033[0;33m##################\033[0m\n\n");
+    printf("\033[0;33mNAME\033[0m\n");
+    printf("\t\033[0;36mls - list directory contents\033[0m\n\n");
+    printf("\033[0;33mUSAGE\033[0m\n");
+    printf("\t\033[0;36mls \033[0;35m[DIRECTORY]\033[0m\n\n");
+    printf("\033[0;33mDESCRIPTION\033[0m\n");
+    printf("\t\033[0;36mList files and directorys in the given directory. Sorts entries alphabetically.\033[0m\n\n");
+}
+
+
+
+//MAIN FUNCTION
+void showManEntry(char *arg[]){
+    if(!strcmp(arg[1], "man")){
+        printf("Coming soon.\n");
+    } else if(!strcmp(arg[1], "ls")){
+        manEntry_ls();
+    } else {
+        printf("Entry not found.\n");
+    }
+>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
 }

etc/your-reality.c

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #include <stdio.h>
 #include <unistd.h>
 
@@ -36,3 +37,43 @@ void yourReality(){
     p("\033[0m");
     printf("\e[?25h");
 }
+=======
+#include <stdio.h>
+#include <unistd.h>
+
+#include "your-reality.h"
+
+//Lyrics from "Your Reality" by Dan Salvato
+
+//fs -> flush & sleep
+void fs(int milliseconds){
+    fflush(stdout);
+    usleep(milliseconds*1000);
+}
+
+//p -> printf
+void p(char* txt){
+    printf(txt);
+}
+
+void yourReality(){
+    
+    printf("\e[?25l");
+    p("Loading   ");
+    for(int i = 0; i < 2; i++){
+        //\033[XC   =>     X columns right
+        //\033[XD   =>     X columns left
+        printf("\033[3D   "); printf("\033[3D"); 
+        fs(500); printf("."); fs(500); printf("."); fs(500); printf("."); fs(500);
+        
+    }
+    printf("\n");
+    printf("\033[0;33mEvery ");  fs(350); printf("day, ");
+    fs(700);
+    p("I "); fs(450); p("imagine "); fs(350); p("a "); fs(350); p("future "); fs(350); p("where "); fs(750);
+    p("i "); fs(300); p("can "); fs(300); p("be "); fs(300); p("with "); fs(300); p("you.");
+
+    p("\033[0m");
+    printf("\e[?25h");
+}
+>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80

etc/your-reality.h

@@ -1,6 +1,14 @@
+<<<<<<< HEAD
 #ifndef _YOUR_REALITY_H
 #define _YOUR_REALITY_H
 
 void yourReality();
 
+=======
+#ifndef _YOUR_REALITY_H
+#define _YOUR_REALITY_H
+
+void yourReality();
+
+>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
 #endif

main.c

@@ -1,183 +1,181 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkconfig.h>
-#include <gtk/gtk.h>
-#include <unistd.h>
-#include <linux/limits.h>
-
-#include "commands/help.h"
-#include "commands/show_dir.h"
-#include "commands/change_dir.h"
-#include "utils/gtk_test.h"
-#include "utils/sql_test.h"
-#include "etc/logo.h"
-#include "etc/man.h"
-#include "etc/math_ext.h"
-#include "etc/your-reality.h"
-#include "utils/logger.h"
-#include "utils/sys_info.h"
-#include "utils/update_check.h"
-#include "utils/calc.h"
-
-
-#define VERSION "0.2.6"
-
-bool VER_CHECK_ON_START = true;
-bool DEV_MODE = false;
-bool FUN_CONTENT = false;
-
-// Color Codes:
-// Reset:       \033[0m
-// Red:         \033[0;31m
-// Green:       \033[0;32m
-// Yellow:      \033[0;33m
-// Blue:        \033[0;34m
-// Magenta:     \033[0;35m
-// Cyan:        \033[0;36m
-// BoldRed:     \033[1;31m
-// BoldGreen:   \033[1;32m
-// BoldYellow:  \033[1;33m
-// BoldBlue:    \033[1;34m
-// BoldMagenta: \033[1;35m
-// BoldCyan:    \033[1;36m
-
-
-//Handles the commands
-int commandHandler(char *cmd){
-    char *token = strtok(cmd, " ");
-    int argc = 1;
-    char *arg[10];
-    int i = 0;
-    while( token != NULL ){
-        arg[i] = token;
-        token = strtok(NULL, " ");
-        if(token != NULL){
-            i++;
-            argc++;
-        }
-    }
-    char *p = arg[i];
-    p[strlen(p)-1] = 0;
-    arg[i] = p;
-
-    //Start to compare the command
-    if(!strcmp(arg[0], "help")){ 
-        printf("\033[1;34mcd \033[0;35m[dir]\033[0m      :   change directory\n");
-        printf("\033[1;34mls \033[0;35m[dir]\033[0m      :   show contents of directory\n");
-        printf("\033[1;34mhelp\033[0m          :   this help list\n");
-        printf("\033[1;34mman \033[0;35m[cmd]\033[0m     :   manual for the commands\n");
-        printf("\033[1;34mversion\033[0m       :   shows the version\n");
-        printf("\033[1;34mexit\033[0m          :   exit the program\n");
-        return 0;
-    } else if(!strcmp(arg[0], "version")){ 
-        printf("netbenixCMD (Version: \033[1;34m%s\033[0m)\n", VERSION);
-        printf("Author: \033[1;34m%s\033[0m\n", "netbenix");
-        printf("Github: \033[1;34mhttps://github.com/netbenix/netbenixCMD\033[0m\n");
-        logger("Showing program version.");
-        return 0;
-    } else if(!strcmp(arg[0], "exit")){
-        return 1;
-    } else if(!strcmp(arg[0], "ls")){
-        showDirectory(arg);
-        return 0;
-    } else if(!strcmp(arg[0], "cd")){
-        changeCurrentWorkDir(arg);
-        return 0;
-    } else if(!strcmp(arg[0], "man")){
-        showManEntry(arg);
-        return 0;
-    } else if(!strcmp(arg[0], "calc")){
-        startCalc();
-        return 0;
-    } else if(!strcmp(arg[0], "rainbow") && FUN_CONTENT){
-        while(1){              
-            printf("\033[0;31m#####");
-            printf("\033[0;32m#####");
-            printf("\033[0;33m#####");
-            printf("\033[0;34m#####");
-            printf("\033[0;35m#####");
-        }
-    } else if(!strcmp(arg[0], "your-reality") && FUN_CONTENT){
-        yourReality();
-    } else {
-        printf("Unknown command. Please use 'help' for more information.\n");
-        logger("User entered unknown command.");
-        return 0;
-    }
-}
-
-//Action starts here
-int main(int argc, char *argv[]){
-    char buffer[1024];
-    extern char loggerDirPath[PATH_MAX];
-    realpath("." , loggerDirPath);
-    logger("================================================");
-    snprintf(buffer, sizeof(buffer), "Starting netbenixCMD (Version: %s)", VERSION);
-    logger(buffer);
-    log_Specs(); //Log system specs
-    showLogo(); //Show the logo
-    logger("Logo Displayed.");
-    if(argc > 2){
-        printf("Too many arguments. Please use --help for more information.\n");
-        snprintf(buffer, sizeof(buffer), "[ERROR] Too many arguments. Argument count: %i", argc-1);
-        logger(buffer);
-    }
-
-    //Check the startup args
-    if(argc == 2){
-    if(!strcmp(argv[1], "--help")){
-        logger("Showing Help.");
-        outputHelp();
-        exit(0);
-    } else if (!strcmp(argv[1], "--gtk-test")){
-        logger("Stating GTK Test.");
-        createGTKTestWindow();
-        exit(0);
-    } else if (!strcmp(argv[1], "--sys-info")){
-        logger("Showing System Information.");
-        print_Specs();
-        exit(0);
-    } else if (!strcmp(argv[1], "--sql-test")){
-        logger("Starting SQL Test.");
-        testSQLConnection();
-        exit(0);
-    } else if (!strcmp(argv[1], "--no-version-check")){
-        VER_CHECK_ON_START = false;
-        logger("[INFO] Argument 'no-version-check' used.");
-    } else if (!strcmp(argv[1], "--dev-mode")){
-        VER_CHECK_ON_START = false;
-        DEV_MODE = true;
-        logger("[INFO] Starting in developer mode.");
-    } else if (!strcmp(argv[1], "--time-for-fun")){
-        FUN_CONTENT = true;
-        logger("[WARNING] It's time... TO PARTYY.");
-    } else {
-        printf("Argument unknown. Please use --help for more information.\n");
-        snprintf(buffer, sizeof(buffer), "[ERROR] Argument unknown. Given argument: %s", argv[1]);
-        logger(buffer);
-        exit(0);
-    }
-    }
-
-    if(VER_CHECK_ON_START){checkForUpdate(VERSION);} //Check for newer version of client
-
-    //If no startup arg is given, start command handler
-    int exit = 0;
-    char cmd[128];
-    logger("Starting Command Handler.");
-    while (!exit){
-        char cwp[255];
-        printf("\033[0;32m%s> \033[0m", getcwd(cwp, 255));
-        fgets(cmd, 128, stdin);
-        exit = commandHandler(cmd);
-    }
-    logger("Exiting Command Handler.");
-    printf("\n");
-    logger("Exiting.");
-    return 0;
-}
-
-
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkconfig.h>
+#include <gtk/gtk.h>
+#include <unistd.h>
+#include <linux/limits.h>
+
+#include "commands/help.h"
+#include "commands/show_dir.h"
+#include "commands/change_dir.h"
+#include "utils/gtk_test.h"
+#include "utils/sql_test.h"
+#include "etc/logo.h"
+#include "etc/man.h"
+#include "etc/math.h"
+#include "etc/your-reality.h"
+#include "utils/logger.h"
+#include "utils/sys_info.h"
+#include "utils/update_check.h"
+
+
+#define VERSION "0.2.5"
+
+bool VER_CHECK_ON_START = true;
+bool DEV_MODE = false;
+bool FUN_CONTENT = false;
+
+// Color Codes:
+// Reset:       \033[0m
+// Red:         \033[0;31m
+// Green:       \033[0;32m
+// Yellow:      \033[0;33m
+// Blue:        \033[0;34m
+// Magenta:     \033[0;35m
+// Cyan:        \033[0;36m
+// BoldRed:     \033[1;31m
+// BoldGreen:   \033[1;32m
+// BoldYellow:  \033[1;33m
+// BoldBlue:    \033[1;34m
+// BoldMagenta: \033[1;35m
+// BoldCyan:    \033[1;36m
+
+
+//Handles the commands
+int commandHandler(char *cmd){
+
+    char *token = strtok(cmd, " ");
+    int argc = 1;
+    char *arg[10];
+    int i = 0;
+    while( token != NULL ){
+        arg[i] = token;
+        token = strtok(NULL, " ");
+        if(token != NULL){
+            i++;
+            argc++;
+        }
+    }
+    char *p = arg[i];
+    p[strlen(p)-1] = 0;
+    arg[i] = p;
+
+    //Start to compare the command
+    if(!strcmp(arg[0], "help")){ 
+        printf("\033[1;34mcd \033[0;35m[dir]\033[0m      :   change directory\n");
+        printf("\033[1;34mls \033[0;35m[dir]\033[0m      :   show contents of directory\n");
+        printf("\033[1;34mhelp\033[0m          :   this help list\n");
+        printf("\033[1;34mman \033[0;35m[cmd]\033[0m     :   manual for the commands\n");
+        printf("\033[1;34mversion\033[0m       :   shows the version\n");
+        printf("\033[1;34mexit\033[0m          :   exit the program\n");
+        return 0;
+    } else if(!strcmp(arg[0], "version")){ 
+
+        printf("netbenixCMD (Version: \033[1;34m%s\033[0m)\n", VERSION);
+        printf("Author: \033[1;34m%s\033[0m\n", "netbenix");
+        printf("Github: \033[1;34mhttps://github.com/netbenix/netbenixCMD\033[0m\n");
+        logger("Showing program version.");
+        return 0;
+    } else if(!strcmp(arg[0], "exit")){
+        return 1;
+    } else if(!strcmp(arg[0], "ls")){
+        showDirectory(arg);
+        return 0;
+    } else if(!strcmp(arg[0], "cd")){
+        changeCurrentWorkDir(arg);
+        return 0;
+    } else if(!strcmp(arg[0], "man")){
+        showManEntry(arg);
+        return 0;
+    } else if(!strcmp(arg[0], "rainbow") && FUN_CONTENT){
+        while(1){              
+            printf("\033[0;31m#####");
+            printf("\033[0;32m#####");
+            printf("\033[0;33m#####");
+            printf("\033[0;34m#####");
+            printf("\033[0;35m#####");
+        }
+    } else if(!strcmp(arg[0], "your-reality") && FUN_CONTENT){
+        yourReality();
+    } else {
+        printf("Unknown command. Please use 'help' for more information.\n");
+        logger("User entered unknown command.");
+        return 0;
+    }
+}
+
+//Action starts here
+int main(int argc, char *argv[]){
+    char buffer[1024];
+    extern char loggerDirPath[PATH_MAX];
+    realpath("." , loggerDirPath);
+    logger("================================================");
+    snprintf(buffer, sizeof(buffer), "Starting netbenixCMD (Version: %s)", VERSION);
+    logger(buffer);
+    log_Specs(); //Log system specs
+    showLogo(); //Show the logo
+    logger("Logo Displayed.");
+    if(argc > 2){
+        printf("Too many arguments. Please use --help for more information.\n");
+        snprintf(buffer, sizeof(buffer), "[ERROR] Too many arguments. Argument count: %i", argc-1);
+        logger(buffer);
+    }
+
+    //Check the startup args
+    if(argc == 2){
+    if(!strcmp(argv[1], "--help")){
+        logger("Showing Help.");
+        outputHelp();
+        exit(0);
+    } else if (!strcmp(argv[1], "--gtk-test")){
+        logger("Stating GTK Test.");
+        createGTKTestWindow();
+        exit(0);
+    } else if (!strcmp(argv[1], "--sys-info")){
+        logger("Showing System Information.");
+        print_Specs();
+        exit(0);
+    } else if (!strcmp(argv[1], "--sql-test")){
+        logger("Starting SQL Test.");
+        testSQLConnection();
+        exit(0);
+    } else if (!strcmp(argv[1], "--no-version-check")){
+        VER_CHECK_ON_START = false;
+        logger("[INFO] Argument 'no-version-check' used.");
+    } else if (!strcmp(argv[1], "--dev-mode")){
+        VER_CHECK_ON_START = false;
+        DEV_MODE = true;
+        logger("[INFO] Starting in developer mode.");
+    } else if (!strcmp(argv[1], "--time-for-fun")){
+        FUN_CONTENT = true;
+        logger("[WARNING] It's time... TO PARTYY.");
+    } else {
+        printf("Argument unknown. Please use --help for more information.\n");
+        snprintf(buffer, sizeof(buffer), "[ERROR] Argument unknown. Given argument: %s", argv[1]);
+        logger(buffer);
+        exit(0);
+    }
+    }
+
+    if(VER_CHECK_ON_START){checkForUpdate(VERSION);} //Check for newer version of client
+
+    //If no startup arg is given, start command handler
+    int exit = 0;
+    char cmd[128];
+    logger("Starting Command Handler.");
+    while (!exit){
+        char cwp[255];
+        printf("\033[0;32m%s> \033[0m", getcwd(cwp, 255));
+        fgets(cmd, 128, stdin);
+        exit = commandHandler(cmd);
+    }
+    logger("Exiting Command Handler.");
+    printf("\n");
+    logger("Exiting.");
+    return 0;
+}
+
+

makefile

@@ -1,35 +1,36 @@
-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 -lm
-OBJ= main.o logo.o logger.o help.o sys_info.o gtk_test.o sql_test.o show_dir.o change_dir.o update_check.o man.o your-reality.o math_ext.o calc.o
-netbenixCMD: $(OBJ)
-	$(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS)
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
-logo.o: etc/logo.c
-	$(CC) $(CFLAGS) -c etc/logo.c
-logger.o: utils/logger.c
-	$(CC) $(CFLAGS) -c utils/logger.c
-help.o: commands/help.c
-	$(CC) $(CFLAGS) -c commands/help.c
-sys_info.o: utils/sys_info.c
-	$(CC) $(CFLAGS) $(ARGS) -c utils/sys_info.c
-gtk_test.o: utils/gtk_test.c
-	$(CC) $(CFLAGS) -c utils/gtk_test.c
-sql_test.o: utils/sql_test.c
-	$(CC) $(CFLAGS) -c utils/sql_test.c
-show_dir.o: commands/show_dir.c
-	$(CC) $(CFLAGS) -c commands/show_dir.c
-change_dir.o: commands/change_dir.c
-	$(CC) $(CFLAGS) -c commands/change_dir.c
-update_check.o: utils/update_check.c
-	$(CC) $(CFLAGS) -c utils/update_check.c
-man.o: etc/man.c
-	$(CC) $(CFLAGS) -c etc/man.c
-math_ext.o: etc/math_ext.c
-	$(CC) $(CFLAGS) -c etc/math_ext.c
-your-reality.o: etc/your-reality.c
-	$(CC) $(CFLAGS) -c etc/your-reality.c
-calc.o: utils/calc.c
+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 sys_info.o gtk_test.o sql_test.o show_dir.o change_dir.o update_check.o man.o your-reality.o math_ext.o calc.o
+
+netbenixCMD: $(OBJ)
+	$(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS)
+main.o: main.c
+	$(CC) $(CFLAGS) -c main.c
+logo.o: etc/logo.c
+	$(CC) $(CFLAGS) -c etc/logo.c
+logger.o: utils/logger.c
+	$(CC) $(CFLAGS) -c utils/logger.c
+help.o: commands/help.c
+	$(CC) $(CFLAGS) -c commands/help.c
+sys_info.o: utils/sys_info.c
+	$(CC) $(CFLAGS) $(ARGS) -c utils/sys_info.c
+gtk_test.o: utils/gtk_test.c
+	$(CC) $(CFLAGS) -c utils/gtk_test.c
+sql_test.o: utils/sql_test.c
+	$(CC) $(CFLAGS) -c utils/sql_test.c
+show_dir.o: commands/show_dir.c
+	$(CC) $(CFLAGS) -c commands/show_dir.c
+change_dir.o: commands/change_dir.c
+	$(CC) $(CFLAGS) -c commands/change_dir.c
+update_check.o: utils/update_check.c
+	$(CC) $(CFLAGS) -c utils/update_check.c
+man.o: etc/man.c
+	$(CC) $(CFLAGS) -c etc/man.c
+math.o: etc/math_ext.c
+	$(CC) $(CFLAGS) -c etc/math_ext.c
+your-reality.o: etc/your-reality.c
+	$(CC) $(CFLAGS) -c etc/your-reality.c
+calc.o: utils/calc.c
 	$(CC) $(CFLAGS) -c utils/calc.c