Changes in uspace/app/bdsh/input.c [e62f8e3:09ab0a9a] in mainline

File:

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

uspace/app/bdsh/input.c

@@ -3 +3 @@
  * Copyright (c) 2011 Jiri Svoboda
  * Copyright (c) 2011 Martin Sucha
- * Copyright (c) 2018 Matthieu Riolo
  * All rights reserved.
  *
@@ -44 +43 @@
 #include <stdbool.h>
 #include <tinput.h>
-#include <adt/odict.h>
-#include <adt/list.h>
 
 #include "config.h"
@@ -65 +62 @@
 static void print_pipe_usage(void);
 
-typedef struct {
-        link_t alias_hup_link;
-        alias_t *alias;
-} alias_hup_t;
-
-static bool find_alias_hup(alias_t *alias, list_t *alias_hups)
-{
-        list_foreach(*alias_hups, alias_hup_link, alias_hup_t, link) {
-                if (alias == link->alias) {
-                        return true;
-                }
-        }
-
-        return false;
-}
-
 /*
  * Tokenizes input from console, sees if the first word is a built-in, if so
@@ -86 +67 @@
  * the handler
  */
-static errno_t process_input_nohup(cliuser_t *usr, list_t *alias_hups, size_t count_executed_hups)
-{
-        if (count_executed_hups >= HUBS_MAX) {
-                cli_error(CL_EFAIL, "%s: maximal alias hubs reached\n", PACKAGE_NAME);
-                return ELIMIT;
-        }
-
+errno_t process_input(cliuser_t *usr)
+{
         token_t *tokens_buf = calloc(WORD_MAX, sizeof(token_t));
         if (tokens_buf == NULL)
@@ -195 +171 @@
         }
 
-        /* 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);
-                /* check if the alias already has been resolved once */
-                if (!find_alias_hup(data, alias_hups)) {
-                        alias_hup_t *hup = (alias_hup_t *)calloc(1, sizeof(alias_hup_t));
-                        if (hup == NULL) {
-                                cli_error(CL_EFAIL, "%s: cannot allocate alias structure\n", PACKAGE_NAME);
-                                rc = ENOMEM;
-                                goto finit;
-                        }
-
-                        hup->alias = data;
-                        list_append(&hup->alias_hup_link, alias_hups);
-
-                        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_length);
-                        if (usr->line == NULL) {
-                                cli_error(CL_EFAIL, "%s: cannot allocate input structure\n", PACKAGE_NAME);
-                                rc = ENOMEM;
-                                goto finit;
-                        }
-
-                        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 */
-                        rc = process_input_nohup(usr, alias_hups, count_executed_hups + 1);
-                        usr->line = oldLine;
-                        goto finit;
-                }
-        }
-
         iostate_t new_iostate = {
                 .stdin = stdin,
@@ -299 +225 @@
 }
 
-errno_t process_input(cliuser_t *usr)
-{
-        list_t alias_hups;
-        list_initialize(&alias_hups);
-
-        errno_t rc = process_input_nohup(usr, &alias_hups, 0);
-
-        list_foreach_safe(alias_hups, cur_link, next_link) {
-                alias_hup_t *cur_item = list_get_instance(cur_link, alias_hup_t, alias_hup_link);
-                free(cur_item);
-        }
-
-        return rc;
-}
-
 void print_pipe_usage(void)
 {