Changes in uspace/app/bdsh/input.c [a35b458:1b20da0] in mainline

File:

• uspace/app/bdsh/input.c (modified) (16 diffs)

uspace/app/bdsh/input.c

@@ -71 +71 @@
                 return ENOMEM;
         token_t *tokens = tokens_buf;
-
+        
         char *cmd[WORD_MAX];
         errno_t rc = EOK;
@@ -89 +89 @@
                 goto finit;
         }
-
+        
         size_t tokens_length;
         rc = tok_tokenize(&tok, &tokens_length);
@@ -95 +95 @@
                 goto finit;
         }
-
+        
         if (tokens_length > 0 && tokens[0].type == TOKTYPE_SPACE) {
                 tokens++;
                 tokens_length--;
         }
-
+        
         if (tokens_length > 0 && tokens[tokens_length-1].type == TOKTYPE_SPACE) {
                 tokens_length--;
         }
-
+        
         /* Until full support for pipes is implemented, allow for a simple case:
          * [from <file> |] command [| to <file>]
@@ -121 +121 @@
                 }
         }
-
+        
         unsigned int cmd_token_start = 0;
         unsigned int cmd_token_end = tokens_length;
-
+        
         processed_pipes = 0;
-
+        
         /* Check if the first part (from <file> |) is present */
         if (pipe_count > 0 && (pipe_pos[0] == 3 || pipe_pos[0] == 4) && str_cmp(tokens[0].text, "from") == 0) {
@@ -134 +134 @@
                 processed_pipes++;
         }
-
+        
         /* Check if the second part (| to <file>) is present */
         if ((pipe_count - processed_pipes) > 0 &&
@@ -146 +146 @@
                 processed_pipes++;
         }
-
+        
         if (processed_pipes != pipe_count) {
                 print_pipe_usage();
@@ -152 +152 @@
                 goto finit;
         }
-
+        
         /* Convert tokens of the command to string array */
         unsigned int cmd_pos = 0;
@@ -161 +161 @@
         }
         cmd[cmd_pos++] = NULL;
-
+        
         if (cmd[0] == NULL) {
                 print_pipe_usage();
@@ -167 +167 @@
                 goto finit;
         }
-
+        
         iostate_t new_iostate = {
                 .stdin = stdin,
@@ -173 +173 @@
                 .stderr = stderr
         };
-
+        
         FILE *from = NULL;
         FILE *to = NULL;
-
+        
         if (redir_from) {
                 from = fopen(redir_from, "r");
@@ -186 +186 @@
                 new_iostate.stdin = from;
         }
-
-
+        
+        
         if (redir_to) {
                 to = fopen(redir_to, "w");
@@ -203 +203 @@
                 rc = EINVAL;
         }
-
+        
 finit_with_files:
         if (from != NULL) {
@@ -211 +211 @@
                 fclose(to);
         }
-
+        
 finit:
         if (NULL != usr->line) {
@@ -230 +230 @@
         printf("from filename | command ... | to filename\n");
         printf("command ... | to filename\n");
-
+        
 }
 
@@ -236 +236 @@
 {
         int id = 0;
-
+        
         /* We have rubbish */
         if (NULL == cmd[0]) {
                 return CL_ENOENT;
         }
-
+        
         /* Is it a builtin command ? */
         if ((id = (is_builtin(cmd[0]))) > -1) {
                 return run_builtin(id, cmd, usr, new_iostate);
         }
-
+        
         /* Is it a module ? */
         if ((id = (is_module(cmd[0]))) > -1) {
@@ -260 +260 @@
         char *str;
         errno_t rc;
-
+        
         tinput_set_prompt(tinput, usr->prompt);