Changeset 60c332e in mainline

Timestamp:

2018-11-30T01:11:36Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

4bf08aa5

Parents:

c483fca

Message:

adding basic logic for cmd alias

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• cmds/modules/alias/alias.c (added)
• cmds/modules/alias/alias.h (added)
• cmds/modules/alias/alias_def.inc (added)
• cmds/modules/alias/entry.h (added)
• cmds/modules/modules.h (modified) (2 diffs)
• scli.c (modified) (4 diffs)
• scli.h (modified) (2 diffs)

uspace/app/bdsh/Makefile

@@ -34 +34 @@
 
 SOURCES = \
+        cmds/modules/alias/alias.c \
         cmds/modules/help/help.c \
         cmds/modules/mkdir/mkdir.c \

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

@@ -65 +65 @@
 #include "echo/entry.h"
 #include "cmp/entry.h"
+#include "alias/entry.h"
 
 /*
@@ -90 +91 @@
 #include "echo/echo_def.inc"
 #include "cmp/cmp_def.inc"
+#include "alias/alias_def.inc"
 
         { NULL, NULL, NULL, NULL }

uspace/app/bdsh/scli.c

@@ -31 +31 @@
 #include <stddef.h>
 #include <str.h>
+#include <adt/odict.h>
+
 #include "config.h"
 #include "scli.h"
@@ -42 +44 @@
 static iostate_t *iostate;
 static iostate_t stdiostate;
+
+
+odict_t alias_dict;
 
 /*
@@ -55 +60 @@
  */
 const char *progname = PACKAGE_NAME;
+
+static int alias_cmp(void* a, void* b) {
+        return str_cmp((char*)a, (char*)b);
+}
+
 
 /* These are not exposed, even to builtins */
@@ -108 +118 @@
         iostate = &stdiostate;
 
+
+        odict_initialize(&alias_dict, alias_key, alias_cmp);
+
         if (cli_init(&usr))
                 exit(EXIT_FAILURE);

uspace/app/bdsh/scli.h

@@ -34 +34 @@
 #include <stdint.h>
 #include <stdio.h>
+#include <types/adt/odict.h>
+
+
 
 typedef struct {
@@ -54 +57 @@
 extern void set_iostate(iostate_t *);
 
+
+extern odict_t alias_dict;
+
+extern void* alias_key(odlink_t *odlink);
+
+typedef struct {
+        odlink_t odict;
+        char* name;
+        char* value;
+} alias_t;
+
+
 #endif