Changeset c56a3eb in mainline

Timestamp:

2019-03-02T15:22:12Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

1c481ee

Parents:

951e451

git-author:

Matthieu Riolo <matthieu.riolo@…> (2018-12-29 18:28:21)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-03-02 15:22:12)

Message:

correcting find_command() which returns allocated strings

The old version of find_command() relied on a global variable called
'found'. This variable had to be released after every call on
find_command(). The old version did this immediatly after the call.

The code directly implied that this has to be changed with the following
comment:
'FIXME: Just have find_command() return an allocated string'

This commit removes the global variable, changes the implementation
of find_command() to return an allocated string and adds/removes
certain str_dup() calls to match the new implementation

File:

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

uspace/app/bdsh/exec.c

@@ -47 +47 @@
 #include "errors.h"
 
-/* FIXME: Just have find_command() return an allocated string */
-static char *found;
-
 static char *find_command(char *);
 static int try_access(const char *);
@@ -74 +71 @@
 static char *find_command(char *cmd)
 {
-        size_t i;
-
-        found = (char *)malloc(PATH_MAX);
-
         /* The user has specified a full or relative path, just give it back. */
         if (-1 != try_access(cmd)) {
-                return (char *) cmd;
+                return str_dup(cmd);
         }
 
+        char *found = (char *)malloc(PATH_MAX);
         /* We now have n places to look for the command */
+        size_t i;
         for (i = 0; search_dir[i] != NULL; i++) {
                 memset(found, 0, PATH_MAX);
@@ -91 +86 @@
                 }
         }
+        free(found);
 
         /* We didn't find it, just give it back as-is. */
-        return (char *) cmd;
+        return str_dup(cmd);
 }
 
@@ -107 +103 @@
         FILE *files[3];
 
-        tmp = str_dup(find_command(cmd));
-        free(found);
+        tmp = find_command(cmd);
 
         files[0] = io->stdin;