Changeset 0c4f46a in mainline for uspace/app/bdsh/util.c

Timestamp:

2008-08-30T15:05:54Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

42a0607

Parents:

43e02a6

Message:

Let 'cd' invoke cli_set_prompt(), no need to do it in every iteration of the main loop.

File:

• uspace/app/bdsh/util.c (modified) (1 diff)

uspace/app/bdsh/util.c

@@ -248 +248 @@
 }
 
+/* (re)allocates memory to store the current working directory, gets
+ * and updates the current working directory, formats the prompt
+ * string */
+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) {
+                cli_error(CL_ENOMEM, "Can not allocate cwd");
+                cli_errno = CL_ENOMEM;
+                return 1;
+        }
+        memset(usr->cwd, 0, sizeof(usr->cwd));
+
+        usr->cwd = getcwd(usr->cwd, PATH_MAX - 1);
+
+        if (NULL == usr->cwd)
+                snprintf(usr->cwd, PATH_MAX, "(unknown)");
+
+        if (1 < cli_psprintf(&usr->prompt, "%s # ", usr->cwd)) {
+                cli_error(cli_errno, "Failed to set prompt");
+                return 1;
+        }
+
+        return 0;
+}
+
+