From 0f2b0f291965bf09a624f3ecc230fe5062d402a7 Mon Sep 17 00:00:00 2001
From: Jakub Adamski <Laptop@Linux>
Date: Fri, 18 Jan 2019 21:41:24 +0100
Subject: [PATCH] final1

---
 Microshell/help                   |  13 ++++++++++++-
 Microshell/katalogz/plik1.txt     |   2 --
 Microshell/katalogz/test/test.txt |   1 -
 Microshell/microshell             | Bin 18160 -> 18160 bytes
 Microshell/microshell.c           |  27 ++++++++++++++++++++++-----
 5 files changed, 34 insertions(+), 9 deletions(-)
 delete mode 100644 Microshell/katalogz/plik1.txt
 delete mode 100644 Microshell/katalogz/test/test.txt

diff --git a/Microshell/help b/Microshell/help
index 1391faa..67960f9 100644
--- a/Microshell/help
+++ b/Microshell/help
@@ -19,7 +19,18 @@ spath:
 	help - shows help page
 	0 - turns off displaying current directory
 	1 - turns on displaying current directory
-PATH commands
+showtree:
+	help - shows help page
+	no argument - shows tree of current directory
+	one argument - shows tree of directory in argument
+showps:
+	help - shows help page
+	prints all process names ond pids
+mycp: 
+	help - shows help page
+	with 2 arguments - copyies file from first argument to 
+	file in second argument
+PATH commands:
 	if you want colors use 
 	for example ls --color
 
diff --git a/Microshell/katalogz/plik1.txt b/Microshell/katalogz/plik1.txt
deleted file mode 100644
index a832ddb..0000000
--- a/Microshell/katalogz/plik1.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-To jest plik1.txt
-jajajajaj
diff --git a/Microshell/katalogz/test/test.txt b/Microshell/katalogz/test/test.txt
deleted file mode 100644
index 1210b79..0000000
--- a/Microshell/katalogz/test/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-testtt
diff --git a/Microshell/microshell b/Microshell/microshell
index 42429d026ad3236fca36299fd1a07c473d697278..5d8ddcfb56ba92ccd1ccaa739336b9bb8d6076ea 100755
GIT binary patch
delta 3222
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
HeUtq!V~0LU

delta 2540
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

diff --git a/Microshell/microshell.c b/Microshell/microshell.c
index d04e3f1..ac2c38f 100644
--- a/Microshell/microshell.c
+++ b/Microshell/microshell.c
@@ -87,7 +87,7 @@ void help (char **argv){
 void exe (char **argv){
 	if (fork() == 0){
 		execvp(argv[0], argv);
-		perror("execvp");
+		perror("Comand execution error");
 		exit(EXIT_FAILURE);
 	}
 	else
@@ -102,7 +102,7 @@ void ptab (int ile){
 
 void tree (char **argv, char * directory){
 	if (argv[1] != NULL && argv[2] != NULL){
-		printf("Too many arguments\nshowtree takes no arguments \nor exacly 1 argument for desired directory\n");
+		printf("Too many arguments\n");
 		return;
 	}
 	else{
@@ -113,12 +113,16 @@ void tree (char **argv, char * directory){
 			int tab = 0;
 
 			if (argv[1] != NULL && argv[2] == NULL){ /*jeden argument*/
+				if (!strcmp(argv[1], "help")){
+					printf("Showtree prints catalog and file structure\ntakes no arguments \nor exacly 1 argument for desired directory\n");
+					exit(0);
+				}
 				cd(argv);
 				getcwd(ndr, sizeof(ndr));
 			}
 			else
 				strcpy(ndr, directory);
-			printf("Content of: %s\n", ndr);
+			printf("Content of: %s\n\n", ndr);
 
 			if ((d = opendir(ndr)) != NULL){ /*wchodzimy do katalogu*/
 				while ((ent = readdir(d)) != NULL){ /*czytamy zawartosc*/
@@ -156,11 +160,16 @@ void tree (char **argv, char * directory){
 
 void mycp (char **argv){
 	if (argv[1] == NULL || argv[2] == NULL){
-		printf("Add arguments\n");
+		if(argv[1] != NULL && argv[2] == NULL)
+			if (!strcmp(argv[1], "help")){
+				printf("Needs exacly 2 arguments\ncopyies file from first argument to file in second argument\n");
+				return;
+			}
+		printf("Add arguments\nfor more info type 'mycp help'\n");
 		return;
 	}
 	else if (argv[3] != NULL){
-		printf("Too many arguments\n");
+		printf("Too many arguments\nfor more info type 'mycp help'\n");
 		return;
 	}
 	else{
@@ -190,6 +199,14 @@ void mycp (char **argv){
 }
 
 void myps (char **argv){
+	if (argv[1] != NULL){
+		if(!strcmp(argv[1], "help")){
+			printf("Showps prints all prosess and pids\ntakes no arguments\n");
+		}
+		else
+			printf("Type 'showps help'\n");
+		return;
+	}
 	if (fork() == 0){
 		if (chdir("/proc") != 0){
 			perror("cant open /proc");