Changeset e28175d in mainline for uspace/app/bdsh/scli.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• uspace/app/bdsh/scli.c (modified) (5 diffs)

uspace/app/bdsh/scli.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2018 Matthieu Riolo
  * All rights reserved.
  *
@@ -31 +32 @@
 #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 +59 @@
  */
 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 */
@@ -108 +122 @@
         iostate = &stdiostate;
 
+        odict_initialize(&alias_dict, alias_key, alias_cmp);
+
         if (cli_init(&usr))
                 exit(EXIT_FAILURE);