Merge pull request #149 from Bone-Project/dev_ashish

Fix #137
Bone-Project · Jan 12, 2017 · 9cfcf6e · 9cfcf6e
2 parents 8ee6ab8 + 4d866ae
commit 9cfcf6e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 32 deletions.
diff --git a/bin/boneshell/boneshell.c b/bin/boneshell/boneshell.c
@@ -49,6 +49,7 @@ int __found = 0;
 volatile bool exit_set__shell = false;
 volatile bool tab_multiple_opts = false;
 volatile bool tab_one_opt = false;
+volatile bool tab_zero_opt = false;
 bool executed_internally=false;
 
 void removeSpaces(char* source)
@@ -94,6 +95,7 @@ void loop_terminal()
     video_drivers[VGA_VIDEO_DRIVER_INDEX]->bg = BG__;
 
 
+    //continue_read:
     scank(true,true, "%s" , cmd_active.value);
 
     if(tab_multiple_opts==true)
@@ -108,6 +110,12 @@ void loop_terminal()
       executed_internally = true;
       removeSpaces (cmd_active.value);
     }
+    else if (tab_zero_opt == true)
+    {
+        key_handler_util_backspace();
+        tab_zero_opt = false;
+        scank (true, true, "%s", cmd_active.value + (strlen (cmd_active.value)));
+    }
 
 
     //removeSpaces(cmd_active.value);

diff --git a/include/apps/sh/shell.h b/include/apps/sh/shell.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-typedef enum 
+typedef enum
 {
   ROOT,
   USER
@@ -25,7 +25,7 @@ struct cmd_t
   char*  usage;
   char*  help;
   char*  invalid_use_msg;
-  exec_prv privilege; 
+  exec_prv privilege;
   struct cmd_opt_t** cmd_opts;
   int(*handler)(char* cmd);
 };
@@ -58,7 +58,8 @@ extern struct cmd_t *cmds[];
 extern volatile struct typed_cmd cmd_active;
 extern volatile uint32_t cmd_active_index;
 extern volatile bool tab_multiple_opts;
-extern volatile bool tab_one_opt;
+extern volatile bool tab_one_opt;
+extern volatile bool tab_zero_opt;
 volatile uint32_t shell_instance_cnt;
 
 #endif /*_APPS_TERM_TERMINAL_H_*/

diff --git a/platform/pc/drv/ps2/kbd/kbd.c b/platform/pc/drv/ps2/kbd/kbd.c
@@ -241,38 +241,42 @@ void key_handler_util_backspace()
 
  void key_handler_util_tab()
  {
-
-   printk("\n");
-   //char tab__ [1024];
-   int index_tab=0;
-   int num_cmds=0;
-   for(int i=0; cmds[i]; i++)
-   {
-     if(tab_util(buffer_scank, cmds[i]->name) == true)
-     {
-       num_cmds++;
-       for(int j=0; cmds[i]->name[j]; j++)
-       {
-         tab__[index_tab] = cmds[i]->name[j];
-         index_tab++;
+    int index_tab=0;
+    int num_cmds=0;
+    for(int i=0; cmds[i]; i++)
+    {
+        if(tab_util(buffer_scank, cmds[i]->name) == true)
+        {
+            num_cmds++;
+            for(int j=0; cmds[i]->name[j]; j++)
+            {
+                tab__[index_tab] = cmds[i]->name[j];
+                index_tab++;
+            }
+            for(int rep=0; rep<4; rep++)tab__[index_tab++] = ' ';
         }
-      for(int rep=0; rep<4; rep++)tab__[index_tab++] = ' ';
-     }
-   }
-   tab__[index_tab] = 0;
-   if(num_cmds==1)
-   {
-       for(int i = 0; tab__[i]; i ++) {
-          printk("%c", tab__[i]);
-          cmd_active.value [i] = tab__ [i];
+    }
+    tab__[index_tab] = 0;
+    if(num_cmds==1)
+    {
+        printk ("\n");
+        for(int i = 0; tab__[i]; i ++) {
+            printk("%c", tab__[i]);
+            cmd_active.value [i] = tab__ [i];
         }
         tab_one_opt=true;
-       return;
-   }
+        return;
+    }
 
-   for(int i=0; tab__[i]; i++)
-      printk("%c", tab__[i]);
-   tab_multiple_opts=true;
+    if (num_cmds > 1) {
+        tab_multiple_opts=true;
+        printk ("\n");
+        for(int i=0; tab__[i]; i++)
+            printk("%c", tab__[i]);
+    }
+    else {
+        tab_zero_opt = true;
+    }
 }
 
 
@@ -336,7 +340,7 @@ void key_handler()
                 key_handler_util_tab();
                 active_scank = false;
                 buffer_scank[index_scank] = 0;
-                if(print_scank == true) printk("\n");
+                if(print_scank == true && tab_zero_opt == false) printk("\n");
                 UP_KEY_ACTIVE = true; //Reset Up Key
                 TAB_PREVIOUS_VALUE_SET = true;
                 TAB_PREVIOUS_VALUE = buffer_scank;