Changeset 86ffa27f in mainline for uspace/app/bdsh

Timestamp:

2011-08-07T11:21:44Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• cmds/modules/cp/cp.c (modified) (2 diffs)
• cmds/modules/ls/ls.c (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) (5 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/cmds/modules/cp/cp.c

@@ -71 +71 @@
         size_t blen, int vb)
 {
-        int fd1, fd2, bytes = 0;
-        off64_t total = 0;
+        int fd1, fd2, bytes;
+        off64_t total;
         int64_t copied = 0;
         char *buff = NULL;
@@ -104 +104 @@
         }
 
-        for (;;) {
-                ssize_t res;
-                size_t written = 0;
-
-                bytes = read(fd1, buff, blen);
-                if (bytes <= 0)
+        while ((bytes = read_all(fd1, buff, blen)) > 0) {
+                if ((bytes = write_all(fd2, buff, bytes)) < 0)
                         break;
                 copied += bytes;
-                res = bytes;
-                do {
-                        /*
-                         * Theoretically, it may not be enough to call write()
-                         * only once. Also the previous read() may have
-                         * returned less data than requested.
-                         */
-                        bytes = write(fd2, buff + written, res);
-                        if (bytes < 0)
-                                goto err;
-                        written += bytes;
-                        res -= bytes;
-                } while (res > 0);
-
-                /* TODO: re-insert assert() once this is stand alone,
-                 * removed as abort() exits the entire shell
-                 */
-                if (res != 0) {
-                        printf("\n%zd more bytes than actually exist were copied\n", res);
-                        goto err;
-                }
         }
 
         if (bytes < 0) {
-err:
                 printf("\nError copying %s, (%d)\n", src, bytes);
                 copied = bytes;

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -169 +169 @@
                 
                 /* fill the name field */
-                tosort[nbdirs].name = (char *) malloc(str_length(dp->d_name) + 1);
+                tosort[nbdirs].name = (char *) malloc(str_size(dp->d_name) + 1);
                 if (!tosort[nbdirs].name) {
                         cli_error(CL_ENOMEM, "ls: failed to scan %s", d);
                         goto out;
                 }
-                
-                str_cpy(tosort[nbdirs].name, str_length(dp->d_name) + 1, dp->d_name);
+
+                str_cpy(tosort[nbdirs].name, str_size(dp->d_name) + 1, dp->d_name);
                 len = snprintf(buff, PATH_MAX - 1, "%s/%s", d, tosort[nbdirs].name);
                 buff[len] = '\0';

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"
@@ -168 +170 @@
         }
         
-        rc = run_command(cmd, usr, &new_iostate);
+        rc = run_command(actual_cmd, usr, &new_iostate);
         
 finit_with_files:
@@ -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 {