Skip to content

Commit

Permalink
Merge pull request #161 from Bone-Project/dev3
Browse files Browse the repository at this point in the history
Control + D support #159
  • Loading branch information
double-fault authored Jan 16, 2017
2 parents d4232bd + 6d808e9 commit 49f2f69
Show file tree
Hide file tree
Showing 4 changed files with 138 additions and 97 deletions.
9 changes: 8 additions & 1 deletion bin/boneshell/boneshell.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
** @contributors:
** Amanuel Bogale <amanuel2> : start
** Ashish Ahuja <Fortunate-MAN>
**/

#include <stdio/stdio.h>
Expand All @@ -34,6 +35,7 @@
#include <drv/ps2/kbd/kbd.h>
#include <drv/cmos/rtc/rtc.h>
#include <../platform/pc/drv/ps2/kbd/kbd.c>
#include <var/cpu/cpu_info.h>

extern volatile bool TAB_PREVIOUS_VALUE_SET;
extern volatile char* TAB_PREVIOUS_VALUE;
Expand All @@ -50,6 +52,7 @@ volatile bool exit_set__shell = false;
volatile bool tab_multiple_opts = false;
volatile bool tab_one_opt = false;
volatile bool tab_zero_opt = false;
volatile bool exit_shell = false;
bool executed_internally=false;

void removeSpaces(char* source)
Expand All @@ -74,6 +77,7 @@ void loop_terminal()
printk ("%s release %s started at ", VAR_OSNAME, VAR_RELEASE);
start_time = rtc_get_time();
rtc_print_struct(start_time);
//__debug_print_cpu_info();
while(1)
{
start_shell:;
Expand Down Expand Up @@ -116,9 +120,12 @@ void loop_terminal()
scank (true, true, "%s", cmd_active.value + (strlen (cmd_active.value)));
}

if(strcmp(cmd_active.value, "exit")==0)
if(strcmp(cmd_active.value, "exit")==0 || exit_set__shell == true)
//if (exit_set__shell == true)
{
shell_instance_cnt--;
exit_set__shell = false;
strcpy (cmd_active.value, " ");
printk("Exited shell instance #%d\n",shell_instance_cnt+1);
goto end_shell;
}
Expand Down
1 change: 1 addition & 0 deletions include/bin/boneshell/boneshell.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <unistd/unistd.h>

extern struct cmd_t cmd_boneshell;
extern volatile bool exit_shell;

#endif /*_BIN_BONE_SHELL_H_*/

Expand Down
Loading

0 comments on commit 49f2f69

Please sign in to comment.