liliesh/netbenixCMD
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/netbenix/netbenixCMD into dev

Browse source 
# Conflicts:
#	.gitignore
#	etc/man.c
#	etc/your-reality.c
#	etc/your-reality.h
#	main.c
#	makefile
This commit is contained in:
netbenix 2020-11-19 12:35:12 +01:00
commit 9caca5a4fb
9 changed files with 176 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -13,5 +13,8 @@ show_dir.o
change_dir.o
update_check.o
man.o
<<<<<<< HEAD
math.o
=======
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
your-reality.o

49
etc/man.c
View file

@ -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
}

12
etc/man.h
View file

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

41
etc/your-reality.c
View file

@ -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

8
etc/your-reality.h
View file

@ -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

7
main.c
View file

@ -15,14 +15,17 @@
#include "utils/sql_test.h"
#include "etc/logo.h"
#include "etc/man.h"
<<<<<<< HEAD
#include "etc/math.h"
=======
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
#include "etc/your-reality.h"
#include "utils/logger.h"
#include "utils/sys_info.h"
#include "utils/update_check.h"
#define VERSION "0.2.4"
#define VERSION "0.2.5"
bool VER_CHECK_ON_START = true;
bool DEV_MODE = false;
@ -149,7 +152,7 @@ int main(int argc, char *argv[]){
VER_CHECK_ON_START = false;
DEV_MODE = true;
logger("[INFO] Starting in developer mode.");
} else if (!strcmp(argv[1], "--time-to-have-fun")){
} else if (!strcmp(argv[1], "--time-for-fun")){
FUN_CONTENT = true;
logger("[WARNING] It's time... TO PARTYY.");
} else {

7
makefile
View file

@ -2,7 +2,11 @@ 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
<<<<<<< HEAD
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.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
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
netbenixCMD: $(OBJ)
$(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS)
@ -28,7 +32,10 @@ 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
<<<<<<< HEAD
math.o: etc/math.c
$(CC) $(CFLAGS) -c etc/math.c
=======
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
your-reality.o: etc/your-reality.c
$(CC) $(CFLAGS) -c etc/your-reality.c

104
utils/update_check.c
View file

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

10
utils/update_check.h
View file

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