Changes in / [b781cc49:53afa639] in mainline

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• cmds/modules/alias/alias.c (deleted)
• cmds/modules/alias/alias.h (deleted)
• cmds/modules/alias/alias_def.inc (deleted)
• cmds/modules/alias/entry.h (deleted)
• cmds/modules/modules.c (modified) (2 diffs)
• cmds/modules/modules.h (modified) (1 diff)
• cmds/modules/unalias/entry.h (deleted)
• cmds/modules/unalias/unalias.c (deleted)
• cmds/modules/unalias/unalias.h (deleted)
• cmds/modules/unalias/unalias_def.inc (deleted)
• compl.c (modified) (6 diffs)
• config.h (modified) (1 diff)
• input.c (modified) (6 diffs)
• scli.c (modified) (5 diffs)
• scli.h (modified) (3 diffs)

uspace/app/bdsh/Makefile

@@ -36 +36 @@
         cmds/modules/module_aliases.c \
         cmds/modules/modules.c \
-        cmds/modules/alias/alias.c \
-        cmds/modules/unalias/unalias.c \
         cmds/modules/help/help.c \
         cmds/modules/mkdir/mkdir.c \

uspace/app/bdsh/cmds/modules/modules.c

@@ -63 +63 @@
 #include "echo/entry.h"
 #include "cmp/entry.h"
-#include "alias/entry.h"
-#include "unalias/entry.h"
 
 /*
@@ -90 +88 @@
 #include "echo/echo_def.inc"
 #include "cmp/cmp_def.inc"
-#include "alias/alias_def.inc"
-#include "unalias/unalias_def.inc"
 
         { NULL, NULL, NULL, NULL }

uspace/app/bdsh/cmds/modules/modules.h

@@ -31 +31 @@
 
 #include "../cmds.h"
+#include "modules.h"
 
 extern module_t modules[];

uspace/app/bdsh/compl.c

@@ -35 +35 @@
 #include <vfs/vfs.h>
 #include <str.h>
-#include <adt/odict.h>
-
-#include "scli.h"
+
 #include "cmds/cmds.h"
 #include "compl.h"
@@ -65 +63 @@
         /** Length of string prefix (number of characters) */
         size_t prefix_len;
-
-        /* Pointer to the current alias */
-        odlink_t *alias_link;
 
         /** Pointer inside list of modules */
@@ -248 +243 @@
         } else if (cs->is_command) {
                 /* Command without path */
-                cs->alias_link = odict_first(&alias_dict);
                 cs->module = modules;
                 cs->builtin = builtins;
@@ -327 +321 @@
         }
 
-        /* Alias */
-        if (cs->alias_link != NULL) {
-                while (*compl == NULL && cs->alias_link != NULL) {
-                        alias_t *data = odict_get_instance(cs->alias_link, alias_t, odict);
-                        if (compl_match_prefix(cs, data->name)) {
-                                asprintf(compl, "%s ", data->name);
+        /* Modules */
+        if (cs->module != NULL) {
+                while (*compl == NULL && cs->module->name != NULL) {
+                        if (compl_match_prefix(cs, cs->module->name)) {
+                                asprintf(compl, "%s ", cs->module->name);
                                 cs->last_compl = *compl;
                                 if (*compl == NULL)
                                         return ENOMEM;
-                        }
-                        cs->alias_link = odict_next(cs->alias_link, &alias_dict);
-                }
-        }
-
-        /* Modules */
-        if (cs->module != NULL) {
-                while (*compl == NULL && cs->module->name != NULL) {
-                        /* prevents multiple listing of an overriden cmd */
-                        if (compl_match_prefix(cs, cs->module->name)) {
-                                odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)cs->module->name, NULL);
-                                if (alias_link == NULL) {
-                                        asprintf(compl, "%s ", cs->module->name);
-                                        cs->last_compl = *compl;
-                                        if (*compl == NULL)
-                                                return ENOMEM;
-                                }
                         }
                         cs->module++;
@@ -362 +338 @@
                 while (*compl == NULL && cs->builtin->name != NULL) {
                         if (compl_match_prefix(cs, cs->builtin->name)) {
-                                /* prevents multiple listing of an overriden cmd */
-                                odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)cs->module->name, NULL);
-                                if (alias_link == NULL) {
-                                        asprintf(compl, "%s ", cs->builtin->name);
-                                        cs->last_compl = *compl;
-                                        if (*compl == NULL)
-                                                return ENOMEM;
-                                }
+                                asprintf(compl, "%s ", cs->builtin->name);
+                                cs->last_compl = *compl;
+                                if (*compl == NULL)
+                                        return ENOMEM;
                         }
                         cs->builtin++;
@@ -417 +389 @@
                                 free(ent_path);
 
-                                /* prevents multiple listing of an overriden cmd */
-                                if (cs->is_command && !ent_stat.is_directory) {
-                                        odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)dent->d_name, NULL);
-                                        if (alias_link != NULL) {
-                                                continue;
-                                        }
-                                }
-
                                 asprintf(compl, "%s%c", dent->d_name,
                                     ent_stat.is_directory ? '/' : ' ');

uspace/app/bdsh/config.h

@@ -42 +42 @@
 #endif
 
-/* define maximal nested aliases */
-#ifndef HUBS_MAX
-#define HUBS_MAX 20
-#endif
-
 /* Used in many places */
 #define SMALL_BUFLEN 256

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)
 {

uspace/app/bdsh/scli.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Tim Post
- * Copyright (c) 2018 Matthieu Riolo
  * All rights reserved.
  *
@@ -32 +31 @@
 #include <stddef.h>
 #include <str.h>
-#include <adt/odict.h>
 #include "config.h"
 #include "scli.h"
@@ -44 +42 @@
 static iostate_t *iostate;
 static iostate_t stdiostate;
-
-odict_t alias_dict;
 
 /*
@@ -59 +55 @@
  */
 const char *progname = PACKAGE_NAME;
-
-static int alias_cmp(void *a, void *b)
-{
-        return str_cmp((char *)a, (char *)b);
-}
-
-static void *alias_key(odlink_t *odlink)
-{
-        return (void *)odict_get_instance(odlink, alias_t, odict)->name;
-}
 
 /* These are not exposed, even to builtins */
@@ -122 +108 @@
         iostate = &stdiostate;
 
-        odict_initialize(&alias_dict, alias_key, alias_cmp);
-
         if (cli_init(&usr))
                 exit(EXIT_FAILURE);

uspace/app/bdsh/scli.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Tim Post
- * Copyright (c) 2018 Matthieu Riolo
  * All rights reserved.
  *
@@ -35 +34 @@
 #include <stdint.h>
 #include <stdio.h>
-#include <types/adt/odict.h>
 
 typedef struct {
@@ -56 +54 @@
 extern void set_iostate(iostate_t *);
 
-extern odict_t alias_dict;
-
-typedef struct {
-        odlink_t odict;
-        char *name;
-        char *value;
-} alias_t;
-
 #endif