Changeset 4518991 in mainline

Timestamp:

2021-08-10T14:20:22Z (3 years ago)

Author:

Manuele Conti <manuele.conti@…>

Children:

87eba56

Parents:

3d36920e

Message:

Complete alias support

File:

• uspace/app/bdsh/input.c (modified) (4 diffs)

uspace/app/bdsh/input.c

@@ -91 +91 @@
                 *data = odict_get_instance(alias_link, alias_t, odict);
                 /* check if the alias already has been resolved once */
-                if (!find_alias_hup(*data, alias_hups)) {
+                if (! find_alias_hup(*data, alias_hups)) {
                         alias_hup_t *hup = (alias_hup_t *)calloc(1, sizeof(alias_hup_t));
                         if (hup == NULL) {
@@ -111 +111 @@
         errno_t rc = EOK;
         const size_t input_length = str_size(*line) - str_size(cmd[0]) + str_size(data->value) + 1;
-        *line = (char *)malloc(input_length);
-        if (*line == NULL) {
+        char *newline = (char *)malloc(input_length);
+        if (newline == NULL) {
                 cli_error(CL_EFAIL, "%s: cannot allocate input structure\n", PACKAGE_NAME);
                 rc = ENOMEM;
@@ -118 +118 @@
         }
 
-        *line[0] = '\0';
+        newline[0] = '\0';
 
         unsigned int cmd_replace_index = tokens_start;
@@ -130 +130 @@
                         }
 
-                        str_append(*line, input_length, data->value);
+                        str_append(newline, input_length, data->value);
                 } else {
-                        str_append(*line, input_length, tokens[i].text);
-                }
-        }
-
+                        str_append(newline, input_length, tokens[i].text);
+                }
+        }
+
+        *line = newline;
 exit:
         return rc;