Changeset 9be9c4d in mainline for uspace/app/bdsh

Timestamp:

2011-07-13T19:54:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3e5c48c9

Parents:

026793d

Message:

Shell command and file-name completion.

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• compl.c (added)
• compl.h (added)
• config.h (modified) (1 diff)
• exec.c (modified) (4 diffs)
• exec.h (modified) (1 diff)
• input.c (modified) (4 diffs)
• scli.h (modified) (1 diff)

uspace/app/bdsh/Makefile

@@ -54 +54 @@
         cmds/mod_cmds.c \
         cmds/builtin_cmds.c \
+        compl.c \
         errors.c \
         input.c \

uspace/app/bdsh/config.h

@@ -40 +40 @@
 #endif
 
-/* Work around for getenv() */
-#define PATH "/srv:/app"
-#define PATH_DELIM ":"
-
 /* Used in many places */
 #define SMALL_BUFLEN 256

uspace/app/bdsh/exec.c

@@ -52 +52 @@
 static int try_access(const char *);
 
+const char *search_dir[] = { "app", "srv", NULL };
+
 /* work-around for access() */
 static int try_access(const char *f)
@@ -69 +71 @@
 static char *find_command(char *cmd)
 {
-        char *path_tok;
-        char *path[PATH_MAX];
-        int n = 0, i = 0;
-        size_t x = str_size(cmd) + 2;
+        size_t i;
 
         found = (char *)malloc(PATH_MAX);
@@ -81 +80 @@
         }
 
-        path_tok = str_dup(PATH);
-
-        /* Extract the PATH env to a path[] array */
-        path[n] = strtok(path_tok, PATH_DELIM);
-        while (NULL != path[n]) {
-                if ((str_size(path[n]) + x ) > PATH_MAX) {
-                        cli_error(CL_ENOTSUP,
-                                "Segment %d of path is too large, search ends at segment %d",
-                                n, n-1);
-                        break;
-                }
-                path[++n] = strtok(NULL, PATH_DELIM);
-        }
-
         /* We now have n places to look for the command */
-        for (i=0; path[i]; i++) {
+        for (i = 0; search_dir[i] != NULL; i++) {
                 memset(found, 0, sizeof(found));
-                snprintf(found, PATH_MAX, "%s/%s", path[i], cmd);
+                snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd);
                 if (-1 != try_access(found)) {
-                        free(path_tok);
                         return (char *) found;
                 }
@@ -106 +90 @@
 
         /* We didn't find it, just give it back as-is. */
-        free(path_tok);
         return (char *) cmd;
 }

uspace/app/bdsh/exec.h

@@ -33 +33 @@
 #include "scli.h"
 
+extern const char *search_dir[];
+
 extern unsigned int try_exec(char *, char **, iostate_t *);
 

uspace/app/bdsh/input.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +44 @@
 
 #include "config.h"
+#include "compl.h"
 #include "util.h"
 #include "scli.h"
@@ -226 +228 @@
         int rc;
         
-        console_flush(tinput->console);
-        console_set_style(tinput->console, STYLE_EMPHASIS);
-        printf("%s", usr->prompt);
-        console_flush(tinput->console);
-        console_set_style(tinput->console, STYLE_NORMAL);
+        tinput_set_prompt(tinput, usr->prompt);
 
         rc = tinput_read(tinput, &str);
@@ -263 +261 @@
         }
 
+        tinput_set_compl_ops(tinput, &compl_ops);
+
         return 0;
 }

uspace/app/bdsh/scli.h

@@ -32 +32 @@
 #include "config.h"
 #include <stdint.h>
+#include <stdio.h>
 
 typedef struct {