Changeset 81bc309 in mainline for uspace/app/bdsh/input.c

Timestamp:

2011-08-20T17:03:29Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

c8f70eb

Parents:

c916dfc

Message:

batch command rewritten as builtin command.

File:

• uspace/app/bdsh/input.c (modified) (1 diff)

uspace/app/bdsh/input.c

@@ -193 +193 @@
         }
 
-        if (str_cmp(cmd[0], "batch") == 0 && cmd[1] != NULL) {
-                FILE *batch = fopen(cmd[1], "r");
-                if (batch == NULL) {
-                        printf("Cannot open file %s\n", cmd[1]);
-                        rc = errno;
-                } else {
-                        cliuser_t fusr;
-                        fusr.name = usr->name;
-                        fusr.cwd = usr->cwd;
-                        fusr.prompt = usr->prompt;
-                        fusr.line = malloc(INPUT_MAX + 1);
-                        char *cur = fusr.line;
-                        char *end = fusr.line + INPUT_MAX;
-                        int c = fgetc(batch);
-                        while (fusr.line != NULL) {
-                                if (c == '\n' || c == EOF || cur == end) {
-                                        *cur = '\0';
-                                        if (cur == fusr.line) {
-                                                /* skip empty line */
-                                                rc = 0;
-                                                free(cur);
-                                        } else {
-                                                printf(">%s\n", fusr.line);
-                                                rc = process_input(&fusr);
-                                                /* fusr->line was freed by process_input() */
-                                        }
-                                        if (rc == 0 && c != EOF) {
-                                                fusr.line = malloc(INPUT_MAX + 1);
-                                                cur = fusr.line;
-                                                end = fusr.line + INPUT_MAX;
-                                        } else {
-                                                break;
-                                        }
-                                } else {
-                                        *cur++ = c;
-                                }
-                                c = fgetc(batch);
-                        }
-                        fclose(batch);
-                }
-        } else {
-                rc = run_command(cmd, usr, &new_iostate);
-        }
+        rc = run_command(cmd, usr, &new_iostate);
         
 finit_with_files: