Changeset 95c675b in mainline for uspace/app/bdsh/cmds/builtin_cmds.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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.

Message:

Merge mainline

File:

• uspace/app/bdsh/cmds/builtin_cmds.c (modified) (1 diff)

uspace/app/bdsh/cmds/builtin_cmds.c

@@ -79 +79 @@
                 return (char *)NULL;
 
-        for(i=0; builtin_aliases[i] != NULL; i++) {
+        for(i=0; builtin_aliases[i] != NULL; i+=2) {
                 if (!str_cmp(builtin_aliases[i], command))
-                        return (char *)builtin_aliases[++i];
-                i++;
+                        return (char *)builtin_aliases[i+1];
         }