Changeset 0c4f46a in mainline

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.

Location:

uspace/app/bdsh

Files:

• cmds/builtins/cd/cd.c (modified) (1 diff)
• scli.c (modified) (2 diffs)
• scli.h (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (2 diffs)

uspace/app/bdsh/cmds/builtins/cd/cd.c

@@ -87 +87 @@
 
         if (rc == 0) {
+                cli_set_prompt(usr);
                 return CMD_SUCCESS;
         } else {

uspace/app/bdsh/scli.c

@@ -57 +57 @@
 static void cli_finit(cliuser_t *usr);
 
-/* (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");
-                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");
-                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;
-}
-
 /* Constructor */
 static int cli_init(cliuser_t *usr)
@@ -125 +93 @@
 
         while (!cli_quit) {
-                cli_set_prompt(&usr);
                 get_input(&usr);
                 if (NULL != usr.line) {

uspace/app/bdsh/scli.h

@@ -14 +14 @@
 } cliuser_t;
 
-extern unsigned int cli_set_prompt(cliuser_t *usr);
-
 #endif

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;
+}
+
+

uspace/app/bdsh/util.h

@@ -1 +1 @@
 #ifndef UTIL_H
 #define UTIL_H
+
+#include "scli.h"
 
 /* Internal string handlers */
@@ -8 +10 @@
 extern char * cli_strtok_r(char *, const char *, char **);
 extern char * cli_strtok(char *, const char *);
+
+/* Utility functions */
 extern unsigned int cli_count_args(char **);
+extern unsigned int cli_set_prompt(cliuser_t *usr);
 
 #endif