Changeset ae45201 in mainline for uspace/app/bdsh/input.c

Timestamp:

2011-06-11T21:32:54Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

6ea9a1d

Parents:

28ee877e

Message:

Allow redirecting output of tasks to file in bdsh

File:

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

uspace/app/bdsh/input.c

@@ -58 +58 @@
 
 /* Private helpers */
-static int run_command(char **, cliuser_t *);
+static int run_command(char **, cliuser_t *, FILE **);
+static void print_pipe_usage(void);
 
 /* Tokenizes input from console, sees if the first word is a built-in, if so
@@ -68 +69 @@
         int rc = 0;
         tokenizer_t tok;
+        int i, pipe_count, processed_pipes;
+        int pipe_pos[2];
+        char **actual_cmd;
+        char *redir_from = NULL;
+        char *redir_to = NULL;
 
         if (NULL == usr->line)
@@ -82 +88 @@
         }
         
-        rc = run_command(cmd, usr);
+        /* 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
+         */
+        int cmd_length = 0;
+        for (i = 0, pipe_count = 0; cmd[i] != NULL; i++, cmd_length++) {
+                if (cmd[i][0] == '|') {
+                        if (pipe_count >= 2) {
+                                print_pipe_usage();
+                                rc = ENOTSUP;
+                                goto finit;
+                        }
+                        pipe_pos[pipe_count] = i;
+                        pipe_count++;
+                }
+        }
+        
+        actual_cmd = cmd;
+        processed_pipes = 0;
+        
+        /* Check if the first part (from <file> |) is present */
+        if (pipe_count > 0 && pipe_pos[0] == 2 && str_cmp(cmd[0], "from") == 0) {
+                /* Ignore the first three tokens (from, file, pipe) and set from */
+                redir_from = cmd[1];
+                actual_cmd = cmd + 3;
+                processed_pipes++;
+        }
+        
+        /* Check if the second part (| to <file>) is present */
+        if ((pipe_count - processed_pipes) > 0 &&
+            pipe_pos[processed_pipes] == cmd_length - 3 &&
+            str_cmp(cmd[cmd_length-2], "to") == 0) {
+                /* Ignore the last three tokens (pipe, to, file) and set to */
+                redir_to = cmd[cmd_length-1];
+                cmd[cmd_length-3] = NULL;
+                cmd_length -= 3;
+                processed_pipes++;
+        }
+        
+        if (processed_pipes != pipe_count) {
+                print_pipe_usage();
+                rc = ENOTSUP;
+                goto finit;
+        }
+        
+        if (actual_cmd[0] == NULL) {
+                print_pipe_usage();
+                rc = ENOTSUP;
+                goto finit;
+        }
+        
+        FILE *files[4];
+        files[0] = stdin;
+        files[1] = stdout;
+        files[2] = stderr;
+        files[3] = 0;
+        
+        if (redir_from) {
+                FILE *from = fopen(redir_from, "r");
+                if (from == NULL) {
+                        printf("Cannot open file %s\n", redir_from);
+                        rc = errno;
+                        goto finit;
+                }
+                files[0] = from;
+        }
+        
+        if (redir_to) {
+                FILE *to = fopen(redir_to, "w");
+                if (to == NULL) {
+                        printf("Cannot open file %s\n", redir_to);
+                        rc = errno;
+                        goto finit;
+                }
+                files[1] = to;
+        }
+        
+        rc = run_command(cmd, usr, files);
         
 finit:
@@ -94 +178 @@
 }
 
-int run_command(char **cmd, cliuser_t *usr)
+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, FILE *files[])
 {
         int id = 0;
@@ -114 +208 @@
 
         /* See what try_exec thinks of it */
-        return try_exec(cmd[0], cmd);
+        return try_exec(cmd[0], cmd, files);
 }