Changeset 55e35a22 in mainline

Timestamp:

2018-11-30T04:19:33Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

229d114e

Parents:

4bf08aa5

Message:

implementing cmd replaces for alias

File:

• uspace/app/bdsh/input.c (modified) (3 diffs)

uspace/app/bdsh/input.c

@@ -43 +43 @@
 #include <stdbool.h>
 #include <tinput.h>
+#include <adt/odict.h>
 
 #include "config.h"
@@ -173 +174 @@
 
 
-        /* test if the passed cmd is an alias 
-        odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)&v, NULL);
-        e = odict_get_instance(alias_link, test_entry_t, alias_dict);
-        if() {
+        /* test if the passed cmd is an alias */
+        odlink_t* alias_link = odict_find_eq(&alias_dict, (void*)cmd[0], NULL);
+        if (alias_link != NULL) {
+                alias_t* data = odict_get_instance(alias_link, alias_t, odict);
                 char* oldLine = usr->line;
-
+                
+
+                const size_t input_length = str_size(usr->line) - str_size(cmd[0]) + str_size(data->value) + 1;
+                usr->line = (char*)malloc(INPUT_MAX * sizeof(char));
+                usr->line[0] = '\0';
+
+                unsigned int cmd_replace_index = cmd_token_start;
+                for (i = 0; i < tokens_length; i++) {
+                        if(i == cmd_replace_index) {
+                                //if there is a pipe symbol than cmd_token_start will point at the SPACE after the pipe symbol
+                                if(tokens[i].type == TOKTYPE_SPACE) {
+                                        cmd_replace_index++;
+                                        str_append(usr->line, input_length, tokens[i].text);
+                                        continue;
+                                }
+
+                                str_append(usr->line, input_length, data->value);
+                        }else {
+                                str_append(usr->line, input_length, tokens[i].text);
+                        }
+                }
 
                 //reprocess input after string replace
@@ -185 +206 @@
                 goto finit;
         }
-        
-        */