Updated Manual

- added version manual
- added cd manual
This commit is contained in:
netbenix 2020-08-18 12:58:01 +02:00
parent d05ed9cd91
commit 5aa6890436
9 changed files with 168 additions and 122 deletions

3
.gitignore vendored
View file

@ -12,4 +12,5 @@ sys_info.o
show_dir.o show_dir.o
change_dir.o change_dir.o
update_check.o update_check.o
man.o man.o
your-reality.o

View file

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

View file

@ -1,7 +1,7 @@
#ifndef _MAN_H_ #ifndef _MAN_H_
#define _MAN_H_ #define _MAN_H_
void manEntry_ls(); void manEntry_ls();
void showManEntry(char *arg[]); void showManEntry(char *arg[]);
#endif #endif

38
etc/your-reality.c Normal file
View file

@ -0,0 +1,38 @@
#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");
}

6
etc/your-reality.h Normal file
View file

@ -0,0 +1,6 @@
#ifndef _YOUR_REALITY_H
#define _YOUR_REALITY_H
void yourReality();
#endif

21
main.c
View file

@ -15,6 +15,7 @@
#include "utils/sql_test.h" #include "utils/sql_test.h"
#include "etc/logo.h" #include "etc/logo.h"
#include "etc/man.h" #include "etc/man.h"
#include "etc/your-reality.h"
#include "utils/logger.h" #include "utils/logger.h"
#include "utils/sys_info.h" #include "utils/sys_info.h"
#include "utils/update_check.h" #include "utils/update_check.h"
@ -88,18 +89,16 @@ int commandHandler(char *cmd){
} else if(!strcmp(arg[0], "man")){ } else if(!strcmp(arg[0], "man")){
showManEntry(arg); showManEntry(arg);
return 0; return 0;
} else if(!strcmp(arg[0], "rainbow")){ } else if(!strcmp(arg[0], "rainbow") && FUN_CONTENT){
if(FUN_CONTENT){ while(1){
while(1){ printf("\033[0;31m#####");
printf("\033[0;31m#####"); printf("\033[0;32m#####");
printf("\033[0;32m#####"); printf("\033[0;33m#####");
printf("\033[0;33m#####"); printf("\033[0;34m#####");
printf("\033[0;34m#####"); printf("\033[0;35m#####");
printf("\033[0;35m#####");
}
} else {
return 0;
} }
} else if(!strcmp(arg[0], "your-reality") && FUN_CONTENT){
yourReality();
} else { } else {
printf("Unknown command. Please use 'help' for more information.\n"); printf("Unknown command. Please use 'help' for more information.\n");
logger("User entered unknown command."); logger("User entered unknown command.");

View file

@ -2,7 +2,7 @@ CC= gcc
ARGS= -export-dynamic -ansi -std=gnu99 ARGS= -export-dynamic -ansi -std=gnu99
CFLAGS= $(shell pkg-config --cflags gtk+-3.0) -I/usr/include/mysql 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 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 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
netbenixCMD: $(OBJ) netbenixCMD: $(OBJ)
$(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS) $(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS)
@ -28,3 +28,5 @@ update_check.o: utils/update_check.c
$(CC) $(CFLAGS) -c utils/update_check.c $(CC) $(CFLAGS) -c utils/update_check.c
man.o: etc/man.c man.o: etc/man.c
$(CC) $(CFLAGS) -c etc/man.c $(CC) $(CFLAGS) -c etc/man.c
your-reality.o: etc/your-reality.c
$(CC) $(CFLAGS) -c etc/your-reality.c

View file

@ -1,53 +1,53 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include "update_check.h" #include "update_check.h"
#include "logger.h" #include "logger.h"
#define SERVER_IP "127.0.0.1" #define SERVER_IP "127.0.0.1"
int checkForUpdate(char ver[10]){ int checkForUpdate(char ver[10]){
int sock; int sock;
struct sockaddr_in server; struct sockaddr_in server;
char server_reply[2000]; char server_reply[2000];
//Create socket //Create socket
sock = socket(AF_INET, SOCK_STREAM, 0); sock = socket(AF_INET, SOCK_STREAM, 0);
if( sock == -1){ if( sock == -1){
printf("Error while creating socket."); printf("Error while creating socket.");
logger("Error while creating socket"); logger("Error while creating socket");
} }
server.sin_addr.s_addr = inet_addr(SERVER_IP); //Set the IP address of the server server.sin_addr.s_addr = inet_addr(SERVER_IP); //Set the IP address of the server
server.sin_family = AF_INET; server.sin_family = AF_INET;
server.sin_port = htons( 34000 ); //Set the server port server.sin_port = htons( 34000 ); //Set the server port
//Connect to server //Connect to server
if(connect(sock, (struct sockaddr *)&server, sizeof(server)) < 0){ if(connect(sock, (struct sockaddr *)&server, sizeof(server)) < 0){
perror("Error. Connnection to update server failed."); perror("Error. Connnection to update server failed.");
logger("[ERROR] Connection to update server failed."); logger("[ERROR] Connection to update server failed.");
return 1; return 1;
} }
//Send message //Send message
if( send(sock, ver, strlen(ver), 0) < 0){ if( send(sock, ver, strlen(ver), 0) < 0){
puts("Error while communicating with server."); puts("Error while communicating with server.");
logger("[ERROR] Send to server failed."); logger("[ERROR] Send to server failed.");
} }
//Receive response //Receive response
if( recv(sock, server_reply, 2000, 0) < 0){ if( recv(sock, server_reply, 2000, 0) < 0){
puts("Error while communicating with server."); puts("Error while communicating with server.");
logger("[ERROR] Receive from server failed."); logger("[ERROR] Receive from server failed.");
} }
//Say that client outdated //Say that client outdated
if(!strcmp(server_reply, "VERSION_OUTDATED")){ if(!strcmp(server_reply, "VERSION_OUTDATED")){
printf("\033[0;31mYour client is outdated. Please update your client.\033[0m\n"); printf("\033[0;31mYour client is outdated. Please update your client.\033[0m\n");
logger("[WARNING] Client is outdated."); logger("[WARNING] Client is outdated.");
} }
//Say that client is up-to-date //Say that client is up-to-date
if(!strcmp(server_reply, "VERSION_OK")){ if(!strcmp(server_reply, "VERSION_OK")){
logger("[INFO] Client is up-to-date."); logger("[INFO] Client is up-to-date.");
} }
close(sock); //Close the socket close(sock); //Close the socket
return 0; return 0;
} }

View file

@ -1,6 +1,6 @@
#ifndef _UPDATE_CHECK_H_ #ifndef _UPDATE_CHECK_H_
#define _UPDATE_CHECK_H_ #define _UPDATE_CHECK_H_
int checkForUpdate(char ver[10]); int checkForUpdate(char ver[10]);
#endif #endif