Changes in uspace/app/bdsh/input.c [79ae36dd:b48d046] in mainline

File:

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

uspace/app/bdsh/input.c

@@ -1 @@
-/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
  *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the original program's authors nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -45 +45 @@
 
 #include "config.h"
+#include "compl.h"
 #include "util.h"
 #include "scli.h"
@@ -50 +51 @@
 #include "errors.h"
 #include "exec.h"
+#include "tok.h"
 
 extern volatile unsigned int cli_quit;
@@ -55 +57 @@
 /** Text input field. */
 static tinput_t *tinput;
+
+/* Private helpers */
+static int run_command(char **, cliuser_t *, iostate_t *);
+static void print_pipe_usage(void);
 
 /* Tokenizes input from console, sees if the first word is a built-in, if so
  * invokes the built-in entry point (a[0]) passing all arguments in a[] to
  * the handler */
-int tok_input(cliuser_t *usr)
-{
+int process_input(cliuser_t *usr)
+{
+        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens == NULL)
+                return ENOMEM;
+        
         char *cmd[WORD_MAX];
-        int n = 0, i = 0;
         int rc = 0;
-        char *tmp;
-
-        if (NULL == usr->line)
+        tokenizer_t tok;
+        unsigned int i, pipe_count, processed_pipes;
+        unsigned int pipe_pos[2];
+        char *redir_from = NULL;
+        char *redir_to = NULL;
+
+        if (usr->line == NULL) {
+                free(tokens);
                 return CL_EFAIL;
-
-        tmp = str_dup(usr->line);
-
-        cmd[n] = strtok(tmp, " ");
-        while (cmd[n] && n < WORD_MAX) {
-                cmd[++n] = strtok(NULL, " ");
-        }
-
-        /* We have rubbish */
-        if (NULL == cmd[0]) {
-                rc = CL_ENOENT;
-                goto finit;
-        }
-
-        /* Its a builtin command ? */
-        if ((i = (is_builtin(cmd[0]))) > -1) {
-                rc = run_builtin(i, cmd, usr);
-                goto finit;
-        /* Its a module ? */
-        } else if ((i = (is_module(cmd[0]))) > -1) {
-                rc = run_module(i, cmd);
-                goto finit;
-        }
-
-        /* See what try_exec thinks of it */
-        rc = try_exec(cmd[0], cmd);
-
+        }
+
+        rc = tok_init(&tok, usr->line, tokens, WORD_MAX);
+        if (rc != EOK) {
+                goto finit;
+        }
+        
+        size_t tokens_length;
+        rc = tok_tokenize(&tok, &tokens_length);
+        if (rc != EOK) {
+                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>]
+         * 
+         * First find the pipes and check that there are no more
+         */
+        for (i = 0, pipe_count = 0; i < tokens_length; i++) {
+                if (tokens[i].type == TOKTYPE_PIPE) {
+                        if (pipe_count >= 2) {
+                                print_pipe_usage();
+                                rc = ENOTSUP;
+                                goto finit;
+                        }
+                        pipe_pos[pipe_count] = i;
+                        pipe_count++;
+                }
+        }
+        
+        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) {
+                /* Ignore the first three tokens (from, file, pipe) and set from */
+                redir_from = tokens[2].text;
+                cmd_token_start = pipe_pos[0]+1;
+                processed_pipes++;
+        }
+        
+        /* Check if the second part (| to <file>) is present */
+        if ((pipe_count - processed_pipes) > 0 &&
+            (pipe_pos[processed_pipes] == tokens_length - 4 ||
+            (pipe_pos[processed_pipes] == tokens_length - 5 &&
+            tokens[tokens_length-4].type == TOKTYPE_SPACE )) &&
+            str_cmp(tokens[tokens_length-3].text, "to") == 0) {
+                /* Ignore the last three tokens (pipe, to, file) and set to */
+                redir_to = tokens[tokens_length-1].text;
+                cmd_token_end = pipe_pos[processed_pipes];
+                processed_pipes++;
+        }
+        
+        if (processed_pipes != pipe_count) {
+                print_pipe_usage();
+                rc = ENOTSUP;
+                goto finit;
+        }
+        
+        /* Convert tokens of the command to string array */
+        unsigned int cmd_pos = 0;
+        for (i = cmd_token_start; i < cmd_token_end; i++) {
+                if (tokens[i].type != TOKTYPE_SPACE) {
+                        cmd[cmd_pos++] = tokens[i].text;
+                }
+        }
+        cmd[cmd_pos++] = NULL;
+        
+        if (cmd[0] == NULL) {
+                print_pipe_usage();
+                rc = ENOTSUP;
+                goto finit;
+        }
+        
+        iostate_t new_iostate = {
+                .stdin = stdin,
+                .stdout = stdout,
+                .stderr = stderr
+        };
+        
+        FILE *from = NULL;
+        FILE *to = NULL;
+        
+        if (redir_from) {
+                from = fopen(redir_from, "r");
+                if (from == NULL) {
+                        printf("Cannot open file %s\n", redir_from);
+                        rc = errno;
+                        goto finit_with_files;
+                }
+                new_iostate.stdin = from;
+        }
+        
+        
+        if (redir_to) {
+                to = fopen(redir_to, "w");
+                if (to == NULL) {
+                        printf("Cannot open file %s\n", redir_to);
+                        rc = errno;
+                        goto finit_with_files;
+                }
+                new_iostate.stdout = to;
+        }
+        
+        rc = run_command(cmd, usr, &new_iostate);
+        
+finit_with_files:
+        if (from != NULL) {
+                fclose(from);
+        }
+        if (to != NULL) {
+                fclose(to);
+        }
+        
 finit:
         if (NULL != usr->line) {
@@ -100 +212 @@
                 usr->line = (char *) NULL;
         }
-        if (NULL != tmp)
-                free(tmp);
+        tok_fini(&tok);
+        free(tokens);
 
         return rc;
+}
+
+void print_pipe_usage()
+{
+        printf("Invalid syntax!\n");
+        printf("Usage of redirection (pipes in the future):\n");
+        printf("from filename | command ...\n");
+        printf("from filename | command ... | to filename\n");
+        printf("command ... | to filename\n");
+        
+}
+
+int run_command(char **cmd, cliuser_t *usr, iostate_t *new_iostate)
+{
+        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) {
+                return run_module(id, cmd, new_iostate);
+        }
+
+        /* See what try_exec thinks of it */
+        return try_exec(cmd[0], cmd, new_iostate);
 }
 
@@ -111 +256 @@
         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);
@@ -148 +289 @@
         }
 
+        tinput_set_compl_ops(tinput, &compl_ops);
+
         return 0;
 }