Changeset 08bd04c in mainline

Timestamp:

2018-11-30T05:48:10Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

02c6dcc

Parents:

598e3a7

Message:

some formatting issue; making alias more robust for the unexpected; correcting help message

File:

• uspace/app/bdsh/cmds/modules/alias/alias.c (modified) (4 diffs)

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

@@ -63 +63 @@
                 free(data->value);
                 data->value = str_dup(value);
-
-                printf("%s: update value ", cmdname);
-        }else {
+        } else {
                 //add new value
                 alias_t* data = (alias_t*)calloc(1, sizeof(alias_t));
@@ -72 +70 @@
 
                 odict_insert(&data->odict, &alias_dict, NULL);
-
-
-                printf("%s: insert value ", cmdname);
         }
-
-        printf(alias_format, name, value);
 }
 
@@ -87 +80 @@
 void help_cmd_alias(unsigned int level)
 {
-        printf("Set a new alias with \"alias hex='cat --hex'\". Display an alias with \"alias hex\". List all alias by passing no argument.\n");
+        printf("`%s' sets an alias, displays an alias or lists all aliases\n", cmdname);
         return;
 }
@@ -103 +96 @@
         size_t i;
         for (i = 1; argv[i] != NULL; i++) {
-                char* pos;
-                if ((pos = str_chr(argv[i], '=')) != NULL) {
-                        argv[i][pos - argv[i]] = '\0';
-                        set_alias(argv[i], pos + 1);
-                }else {
-                        if(!print_alias(argv[i])) {
+                char* name = str_dup(argv[i]);
+                char* value;
+                if ((value = str_chr(name, '=')) != NULL) {
+                        name[value - name] = '\0';
+                        set_alias(name, value + 1);
+                } else {
+                        if(!print_alias(name)) {
+                                free(name);
                                 return CMD_FAILURE;
                         }
                 }
+
+                free(name);
         }