Changeset 87eba56 in mainline

Timestamp:

2021-08-10T21:11:01Z (3 years ago)

Author:

Manuele Conti <manuele.conti@…>

Children:

5ec0e42

Parents:

4518991

Message:

Fix tokenize command

Location:

uspace/app/bdsh

Files:

• input.c (modified) (2 diffs)
• tok.c (modified) (2 diffs)

uspace/app/bdsh/input.c

@@ -193 +193 @@
 
         cmd_argc = tokens_length;
+        unsigned wait_from = 0;
+        unsigned wait_to = 0;
         for (i = 0, pipe_count = 0; i < tokens_length; i++) {
                 switch (tokens[i].type) {
@@ -202 +204 @@
 
                 case TOKTYPE_RDIN:
-                        redir_from = tokens[i + 1].text;
+                        wait_from = 1;
                         cmd_argc = i;
                         break;
 
                 case TOKTYPE_RDOU:
-                        redir_to = tokens[i + 1].text;
+                        wait_to = 1;
                         cmd_argc = i;
+                        break;
+
+                case TOKTYPE_TEXT:
+                        if (wait_from) {
+                                redir_from = tokens[i].text;
+                                wait_from = 0;
+                        }
+                        if (wait_to) {
+                                redir_to = tokens[i].text;
+                                wait_to = 0;
+                        }
                         break;
 

uspace/app/bdsh/tok.c

@@ -152 +152 @@
                                 return rc;
                         }
-                        tok_get_char(tok);
+
                         rc = tok_push_token(tok);
                         if (rc != EOK) {
@@ -171 +171 @@
                                 return rc;
                         }
-                        tok_get_char(tok);
+
                         rc = tok_push_token(tok);
                         if (rc != EOK) {