Changeset 6939edb in mainline

Timestamp:

2011-06-11T19:40:17Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

28ee877e

Parents:

659e9473

Message:

Add more powerful tokenizer to bdsh

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• input.c (modified) (3 diffs)
• tok.c (added)
• tok.h (added)

uspace/app/bdsh/Makefile

@@ -58 +58 @@
         util.c \
         exec.c \
-        scli.c
+        scli.c \
+        tok.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/bdsh/input.c

@@ -50 +50 @@
 #include "errors.h"
 #include "exec.h"
+#include "tok.h"
 
 extern volatile unsigned int cli_quit;
@@ -56 +57 @@
 static tinput_t *tinput;
 
+/* Private helpers */
 static int run_command(char **, cliuser_t *);
 
@@ -64 +66 @@
 {
         char *cmd[WORD_MAX];
-        int n = 0;
         int rc = 0;
-        char *tmp;
+        tokenizer_t tok;
 
         if (NULL == usr->line)
                 return CL_EFAIL;
 
-        tmp = str_dup(usr->line);
-
-        cmd[n] = strtok(tmp, " ");
-        while (cmd[n] && n < WORD_MAX) {
-                cmd[++n] = strtok(NULL, " ");
+        rc = tok_init(&tok, usr->line, cmd, WORD_MAX);
+        if (rc != EOK) {
+                goto finit;
         }
-
+        
+        rc = tok_tokenize(&tok);
+        if (rc != EOK) {
+                goto finit;
+        }
+        
         rc = run_command(cmd, usr);
-
+        
+finit:
         if (NULL != usr->line) {
                 free(usr->line);
                 usr->line = (char *) NULL;
         }
-        if (NULL != tmp)
-                free(tmp);
+        tok_fini(&tok);
 
         return rc;