Index: uspace/app/bdsh/util.c
===================================================================
--- uspace/app/bdsh/util.c	(revision 50cfa6cd85f434dea3072039821d26b5943f656d)
+++ uspace/app/bdsh/util.c	(revision ba6232bd2f369399badb59f84271dac603f8e975)
@@ -54,12 +54,4 @@
 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,11 +60,9 @@
 		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);