Changeset 88944695 in mainline

Timestamp:

2008-08-28T08:32:06Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

a56f4b2

Parents:

69145dae

Message:

More house cleaning, don't expose beyond what's needed

Location:

uspace/app/bdsh

Files:

• exec.c (modified) (2 diffs)
• exec.h (modified) (1 diff)
• input.c (modified) (5 diffs)
• input.h (modified) (1 diff)
• scli.h (modified) (1 diff)

uspace/app/bdsh/exec.c

@@ -49 +49 @@
 char *found;
 
+static char *find_command(char *);
+static unsigned int try_access(const char *);
+
 /* work-around for access() */
-unsigned int try_access(const char *f)
+static unsigned int try_access(const char *f)
 {
         int fd;
@@ -64 +67 @@
 /* Returns the full path of "cmd" if cmd is found, else just hand back
  * cmd as it was presented */
-char *find_command(char *cmd)
+static char *find_command(char *cmd)
 {
         char *path_tok;

uspace/app/bdsh/exec.h

@@ -4 +4 @@
 #include <task.h>
 
-extern char *find_command(char *);
 extern unsigned int try_exec(char *, char **);
-extern unsigned int try_access(const char *);
-
 #endif

uspace/app/bdsh/input.c

@@ -44 +44 @@
 extern volatile unsigned int cli_interactive;
 
+/* Not exposed in input.h */
+static void cli_restricted(char *);
+static void read_line(char *, int);
+
 /* More than a macro than anything */
-void cli_restricted(char *cmd)
+static void cli_restricted(char *cmd)
 {
         printf("%s is not available in %s mode\n", cmd,
@@ -82 +86 @@
         }
 
-        /* Check what kind of command argv[0] might be, TODO: move this to
-         * a function */
+        /* Its a builtin command */
         if ((i = (is_builtin(cmd[0]))) > -1) {
+                /* Its not available in this mode, see what try_exec() thinks */
                 if (builtin_is_restricted(i)) {
                                 rc = try_exec(cmd[0], cmd);
                                 if (rc)
+                                        /* No external matching it could be found, tell the
+                                         * user that the command does exist, but is not
+                                         * available in this mode. */
                                         cli_restricted(cmd[0]);
                                 goto finit;
                 }
+                /* Its a builtin, its available, run it */
                 rc = run_builtin(i, cmd, usr);
                 goto finit;
+        /* We repeat the same dance for modules */
         } else if ((i = (is_module(cmd[0]))) > -1) {
                 if (module_is_restricted(i)) {
@@ -103 +112 @@
                 goto finit;
         } else {
+                /* Its not a module or builtin, restricted or otherwise.
+                 * See what try_exec() thinks of it and just pass its return
+                 * value back to the caller */
                 rc = try_exec(cmd[0], cmd);
                 goto finit;
@@ -119 +131 @@
 
 /* Borrowed from Jiri Svoboda's 'cli' uspace app */
-void read_line(char *buffer, int n)
+static void read_line(char *buffer, int n)
 {
         char c;
@@ -145 +157 @@
 }
 
+/* TODO:
+ * Implement something like editline() / readline(), if even
+ * just for command history and making arrows work. */
 void get_input(cliuser_t *usr)
 {

uspace/app/bdsh/input.h

@@ -5 +5 @@
 
 /* prototypes */
+
+extern void get_input(cliuser_t *);
 extern int tok_input(cliuser_t *);
-extern void get_input(cliuser_t *);
-extern void cli_restricted(char *);
-extern void read_line(char *, int);
 
 #endif

uspace/app/bdsh/scli.h

@@ -11 +11 @@
         char *cwd;
         char *prompt;
-        uint64_t lasterr;
+        int lasterr;
 } cliuser_t;