Changeset ba6232b in mainline

Timestamp:

2009-07-15T20:11:04Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aa7954f

Parents:

bf5443d

Message:

Fix a couple of memory leaks and an improper use of sizeof().

File:

• uspace/app/bdsh/util.c (modified) (2 diffs)

uspace/app/bdsh/util.c

@@ -54 +54 @@
 unsigned int cli_set_prompt(cliuser_t *usr)
 {
-        usr->prompt = (char *) realloc(usr->prompt, PATH_MAX);
-        if (NULL == usr->prompt) {
-                cli_error(CL_ENOMEM, "Can not allocate prompt");
-                cli_errno = CL_ENOMEM;
-                return 1;
-        }
-        memset(usr->prompt, 0, sizeof(usr->prompt));
-
         usr->cwd = (char *) realloc(usr->cwd, PATH_MAX);
         if (NULL == usr->cwd) {
@@ -68 +60 @@
                 return 1;
         }
-        memset(usr->cwd, 0, sizeof(usr->cwd));
-
-        usr->cwd = getcwd(usr->cwd, PATH_MAX - 1);
-
-        if (NULL == usr->cwd)
+        if (!getcwd(usr->cwd, PATH_MAX)) 
                 snprintf(usr->cwd, PATH_MAX, "(unknown)");
 
+        if (usr->prompt)
+                free(usr->prompt);
         asprintf(&usr->prompt, "%s # ", usr->cwd);