Changeset 46288ee in mainline

Timestamp:

2019-06-26T17:51:50Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

b781cc49

Parents:

e62f8e3

Message:

Improvement alias/unlias according to feedback

This commit will change the behaviour of unalias
when a not existing aliasname is given. The command
will newly return CMD_FAILURE and print a failure message.
Existings aliases will be deleted.

When updating an existing alias with the command alias,
then the old data structure will only be freed when
str_dup did not fail. This will prevent the data
of being corrupted in case of a memory failure.

Location:

uspace/app/bdsh/cmds/modules

Files:

• alias/alias.c (modified) (1 diff)
• unalias/unalias.c (modified) (3 diffs)

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

@@ -72 +72 @@
                 /* update existing value */
                 alias_t *data = odict_get_instance(alias_link, alias_t, odict);
-                free(data->value);
-                data->value = str_dup(value);
+                char *dup_value = str_dup(value);
 
-                if (data->value == NULL) {
+                if (dup_value == NULL) {
                         cli_error(CL_ENOMEM, "%s: failing to allocate memory for value\n", cmdname);
                         return ENOMEM;
                 }
+
+                free(data->value);
+                data->value = dup_value;
         } else {
                 /* add new value */

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

@@ -92 +92 @@
         }
 
+        int rc = CMD_SUCCESS;
         size_t i;
         for (i = 1; argv[i] != NULL; i++) {
@@ -98 +99 @@
                 if (alias_link == NULL) {
                         cli_error(CL_ENOENT, "%s: No alias '%s' found\n", cmdname, argv[i]);
+                        rc = CMD_FAILURE;
                 } else {
                         free_alias(alias_link);
@@ -103 +105 @@
         }
 
-        return CMD_SUCCESS;
+        return rc;
 }