Changeset e2ea8d7e in mainline for uspace/app/bdsh/scli.c

Timestamp:

2008-08-27T05:36:12Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

1b4b7b6

Parents:

b510d52

Message:

Housekeeping list, complete lingering things before they get forgotten:

• cli_*() now sets a global cli_errno, error functions cleaned up
• Finish internal cli_*() functions in util.c
• Don't expose cli_init() or cli_finit()
• Get rid of unused globals
• Don't set globals in commands themselves
• Update README files
• Fix stale comments

File:

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

uspace/app/bdsh/scli.c

@@ -43 +43 @@
 static cliuser_t usr;
 
-/* Modified by the 'quit' module, which is compiled before this */
-extern unsigned int cli_quit;
-
-/* Globals that are modified during start-up that modules/builtins should
- * be aware of. */
+/* Globals that are modified during start-up that modules/builtins
+ * should be aware of. */
+volatile unsigned int cli_quit = 0;
 volatile unsigned int cli_interactive = 1;
 volatile unsigned int cli_verbocity = 1;
@@ -55 +53 @@
 const char *progname = PACKAGE_NAME;
 
+/* These are not exposed, even to builtins */
+static int cli_init(cliuser_t *usr);
+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 */
+ * and updates the current working directory, formats the prompt
+ * string */
 unsigned int cli_set_prompt(cliuser_t *usr)
 {
@@ -78 +81 @@
                 snprintf(usr->cwd, PATH_MAX, "(unknown)");
 
-        snprintf(usr->prompt,
-                        PATH_MAX,
-                        "%s # ",
-                        usr->cwd);
+        if (1 < cli_psprintf(&usr->prompt, "%s # ", usr->cwd)) {
+                cli_error(cli_errno, "Failed to set prompt");
+                return 1;
+        }
 
         return 0;
 }
 
-int cli_init(cliuser_t *usr)
+/* Constructor */
+static int cli_init(cliuser_t *usr)
 {
         usr->line = (char *) NULL;
@@ -99 +103 @@
 
 /* Destructor */
-void cli_finit(cliuser_t *usr)
+static void cli_finit(cliuser_t *usr)
 {
         if (NULL != usr->line)