Changeset 0d0f1a8 in mainline

Timestamp:

2019-06-23T17:30:02Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

e62f8e3

Parents:

aa3ca1e

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-06-22 16:06:39)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-06-23 17:30:02)

Message:

Unalias prints out warning when an alias could not be found
but proceeds to delete the other given aliases. Also the flag
-a will be treated differentially. In the old version the flag
could have been given with other alias names for deletion. The new
version will now separate those two cases. Either the flag -a is given
or names for deletion are given.

File:

• uspace/app/bdsh/cmds/modules/unalias/unalias.c (modified) (3 diffs)

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

@@ -58 +58 @@
         } else {
                 help_cmd_unalias(HELP_SHORT);
-                printf("Usage: `%s' [-a] name [name ...]'\n\n"
+                printf("Usage: `%s' -a'\n"
+                    "`%s' name [name ...]'\n\n"
                     "If no parameters are given it will display this help message.\n"
                     "If the flag -a is given, all existing aliases will be removed.\n"
                     "If one or multiple parameters are given, then those aliases will be removed.\n",
-                    cmdname);
+                    cmdname, cmdname);
         }
 }
@@ -75 +76 @@
         }
 
-        size_t i;
         odlink_t *alias_link;
 
-        for (i = 1; argv[i] != NULL; i++) {
-                if (str_cmp(argv[i], "-a") == 0) {
+        unsigned int argc = cli_count_args(argv);
+        if (argc == 2) {
+                if (str_cmp(argv[1], "-a") == 0) {
                         alias_link = odict_first(&alias_dict);
                         while (alias_link != NULL) {
@@ -89 +90 @@
                         return CMD_SUCCESS;
                 }
+        }
 
+        size_t i;
+        for (i = 1; argv[i] != NULL; i++) {
                 alias_link = odict_find_eq(&alias_dict, (void *)argv[i], NULL);
 
                 if (alias_link == NULL) {
                         cli_error(CL_ENOENT, "%s: No alias '%s' found\n", cmdname, argv[i]);
-                        return CMD_FAILURE;
+                } else {
+                        free_alias(alias_link);
                 }
-
-                free_alias(alias_link);
         }