Patched.

Patched possible future bugs.

Author: NerdOfCode

Bin/cmd_src/time.c Bin/cmd_src/date.cBin/cmd_src/time.c renamed to Bin/cmd_src/date.c

@@ -1,12 +1,12 @@
 #include <stdio.h>
 #include <time.h>
 
-int main( void ){
+int main( int argc, char *argv[] ){
 
 	time_t current_time;
 	time(&current_time);
 
-	printf("The local time is: %s\n",ctime(&current_time));
+	printf("The local time is: %s",ctime(&current_time));
 
 	return 0;
 }

Bin/cmd_src/nano.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+#Call the global_bash_var file
+location="/etc/Restricted-Shell/"
+source "${location}Src/global_bash_var"
+
+#Check if system has dependencies
+
+readlink_status=$(which readlink)
+
+if [[ $? != 0 ]]
+then
+	echo -e "${RED_TEXT}Error: 2001${RESET}"
+	exit -1
+fi
+
+path="$(readlink -f $1)"
+
+if [[ "$path" =~ "$DEFAULT_LOCATION"* ]]
+then
+	echo -e "${RED_TEXT}Error: 1004${RESET}"
+	exit -1
+fi
+
+rnano_status=$(which rnano)
+
+if [[ ! -z $rnano_status ]]
+then
+	rnano $1
+else
+	nano $1
+fi

Bin/cmd_src/version.c

@@ -0,0 +1,13 @@
+#include <stdio.h>
+#include "../../Src/globals.h"
+
+//This program is in its own file due to the fact of increased modularity and the easier use of 
+//implying restrictions on it.
+//Not to mention the improvements in small memory use and smaller CPU use
+
+int main(void){
+
+	printf("Latest: v."LATEST_VERSION "\n");
+
+	return 0;
+}

Bin/ls

@@ -1,2 +1,2 @@
 #!/bin/bash
-ls "$@"
+ls $@

Bin/version

@@ -1,35 +1,35 @@
-all: shell commands
+C=	gcc
+
+all: clean shell commands clone_bash
+
+clean:
+#Remove all binaries and also ignore error of trying to "rm" a directory
+	-rm Bin/*
 
 shell:
 	rm -f Src/shell~
 
-	gcc -std=gnu11 -o Src/shell Src/shell.c
+	$C -std=gnu11 -o Src/shell Src/shell.c
 
 commands:
 
-	rm -f Bin/test~
-	rm -f Bin/clear~
-	rm -f Bin/pwd~
-	rm -f Bin/cd~
-	rm -f Bin/rm~
-	rm -f Bin/whoami~
-	rm -f Bin/hostname~
-	rm -f Bin/time~
-	rm -f Bin/flags~
-	rm -f Bin/history~
-	rm -f Bin/alias~
-	rm -f Bin/mkdir~
-
-	gcc -o Bin/test Bin/cmd_src/test.c 
-	gcc -o Bin/clear Bin/cmd_src/clear.c
-	gcc -o Bin/pwd Bin/cmd_src/pwd.c 
-	gcc -o Bin/cd Bin/cmd_src/cd.c
-	gcc -o Bin/rm Bin/cmd_src/rm.c 
-	gcc -o Bin/whoami Bin/cmd_src/whoami.c
-	gcc -o Bin/hostname Bin/cmd_src/hostname.c
-	gcc -o Bin/time Bin/cmd_src/time.c
-	gcc -o Bin/flags Bin/cmd_src/flags.c
-	gcc -o Bin/history Bin/cmd_src/history.c
-	gcc -o Bin/alias Bin/cmd_src/alias.c
-	gcc -o Bin/mkdir Bin/cmd_src/mkdir.c
+	$C -o Bin/test Bin/cmd_src/test.c 
+	$C -o Bin/clear Bin/cmd_src/clear.c
+	$C -o Bin/pwd Bin/cmd_src/pwd.c 
+	$C -o Bin/cd Bin/cmd_src/cd.c
+	$C -o Bin/rm Bin/cmd_src/rm.c 
+	$C -o Bin/whoami Bin/cmd_src/whoami.c
+	$C -o Bin/hostname Bin/cmd_src/hostname.c
+	$C -o Bin/date Bin/cmd_src/date.c
+	$C -o Bin/flags Bin/cmd_src/flags.c
+	$C -o Bin/history Bin/cmd_src/history.c
+	$C -o Bin/alias Bin/cmd_src/alias.c
+	$C -o Bin/mkdir Bin/cmd_src/mkdir.c
+	$C -o Bin/version Bin/cmd_src/version.c
 
+clone_bash:
+	cp -f Bin/cmd_src/ls.sh Bin/ls
+	cp -f Bin/cmd_src/nano.sh Bin/nano
+#Make copied shell script executable
+	chmod 755 Bin/ls
+	chmod 755 Bin/nano

Makefile

@@ -7,7 +7,7 @@
 DEFAULT_LOCATION="/etc/Restricted-Shell/"
 
 #Define last-updated date
-LAST_UPDATED="9/24/18"
+LAST_UPDATED="10/28/18"
 
 #Define colors for color-coating output
 RED_TEXT='\033[0;31m'

Src/global_bash_var

@@ -17,16 +17,23 @@
         *specific language governing permissions and limitations
         *under the License.
 
-
+	NerdOfCode Copyrighted 2018
 */
 
-//EDIT BELOW:
+//Value Conventions:
+// 	On v. Off
+//	On --> 1
+//	Off --> 0
+
+#define TRUE 1
+#define FALSE 0
 
 //Used for displaying debug info for specific functions and commands (Experimental)
 #define DEBUG 0
 
 //Used for User-command logging
-#define LOGGING 1
+//Default:0
+#define LOGGING 0
 
 //Used for storing users commands to a specific file in their home directory
 //Such as aliases
@@ -50,9 +57,10 @@
 //Use 43m for background shading
 #define RESET "\x1B[0m"
 
+#define LATEST_VERSION "0.011"
+
 //Warning: If you're considering changing the below...
 //Make sure to adjust the Bin/nano file... Thank you!
-
 //Default Directory of Shell
 #define DEFAULT_LOCATION "/etc/Restricted-Shell/"
 
@@ -66,11 +74,8 @@
 //Default path to command Bin
 #define CMD_BIN DEFAULT_LOCATION"Bin/"
 
-#define TRUE 1
-#define FALSE 0
-
-
 //Platform detection
+//On the wish list for now :)
 #if defined(__linux__)
 	#define HOSTNAME "USER"
 #endif

Src/globals.h

@@ -17,14 +17,12 @@
 	*under the License.
 
 
-
-
 	#######################################################################################
 	Author: NerdOfCode
 	Tested on: Ubuntu Server 16.04
 	Status: Working --> ^^^
 	License: Apache-2.0
-	Updated on: 9/29/18
+	Updated on: 10/28/18
 	#######################################################################################
 
 	#########################################################
@@ -83,10 +81,10 @@ int main ( int argc, char argv[64] ){
 	//Test if user is allowed to use pwd and if allowed show the working directory
 	//Also test if user is allowed to use hostname and whomai
 	char *pwd_test;
-	int return_pwd_test_value;
+	short int return_pwd_test_value;
 
 	char *whoami_test;
-	int return_whoami_test_value;
+	short int return_whoami_test_value;
 
 	pwd_test = malloc(64 * sizeof(char));
 	strcat(pwd_test,CMD_BIN);
@@ -162,8 +160,8 @@ int main ( int argc, char argv[64] ){
 		memset(pwd_test,0,sizeof(pwd_test));
 		memset(whoami_test,0,sizeof(whoami_test));
 
-		//TODO
-		log_command(input);
+		if(LOGGING)
+			log_command(input);
 
 		//Not a good idea for case specific things, will need to make its own function for better use
 
@@ -203,9 +201,17 @@ void change_to_home_dir( void ){
 	//TODO
         //Create a better method for the following
         //Assume users directory is /home/logged_in_user
+	
+	//For chdir() return code
+	short int return_status = 0;
+
         char current_user_home[64] = "/home/";
         strcat(current_user_home,logged_in_user);
-        chdir(current_user_home);
+        return_status = chdir(current_user_home);
+
+	if(return_status != 0)
+		puts(RED_TEXT"Error: 1005"RESET);
+
 }
 
 int start_up( void ){
@@ -289,9 +295,8 @@ void commands(){
 	puts("flags");
 	puts("history");
 	puts("rm");
-	puts("time");
+	puts("date");
         puts("mkdir");
-	puts("");
 
 }
 

Src/shell.c

@@ -180,9 +180,10 @@ then
 				sed -i "s|${DEFAULT_LOCATION}|${location}|g" run.sh
 				sed -i "s|${DEFAULT_LOCATION}|${location}|g" Src/globals.h
 				sed -i "s|${DEFAULT_LOCATION}|${location}|g" Src/global_bash_var
-				sed -i "s|${DEFAULT_LOCATION}|${location}|g" Bin/nano
+				sed -i "s|${DEFAULT_LOCATION}|${location}|g" Bin/cmd_src/nano.sh
 				break
 			else
+				#
 				continue
 			fi
 		fi