diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/shell.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/shell.c b/src/shell.c index f6f88d9..5fb18bc 100644 --- a/src/shell.c +++ b/src/shell.c | |||
| @@ -55,7 +55,7 @@ exec_args(int c, char **v) | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | void | 57 | void |
| 58 | launch(bool prompt) | 58 | launch(bool batchmode) |
| 59 | { | 59 | { |
| 60 | int i, shell_argc; | 60 | int i, shell_argc; |
| 61 | char line[MAXLINELEN], **shell_argv; | 61 | char line[MAXLINELEN], **shell_argv; |
| @@ -64,18 +64,27 @@ launch(bool prompt) | |||
| 64 | for (i = 0; i < MAXNTOKENS; i++) | 64 | for (i = 0; i < MAXNTOKENS; i++) |
| 65 | shell_argv[i] = malloc((MAXTOKENLEN+1) * sizeof(char)); | 65 | shell_argv[i] = malloc((MAXTOKENLEN+1) * sizeof(char)); |
| 66 | 66 | ||
| 67 | if (prompt) { | 67 | if (!batchmode) { |
| 68 | fprintf(stderr, "Welcome to Nissy "VERSION".\n" | 68 | fprintf(stderr, "Welcome to Nissy "VERSION".\n" |
| 69 | "Type \"commands\" for a list of commands.\n"); | 69 | "Type \"commands\" for a list of commands.\n"); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | while (true) { | 72 | while (true) { |
| 73 | if (prompt) { | 73 | if (!batchmode) { |
| 74 | fprintf(stdout, "nissy-# "); | 74 | fprintf(stdout, "nissy-# "); |
| 75 | } | 75 | } |
| 76 | |||
| 76 | if (fgets(line, MAXLINELEN, stdin) == NULL) | 77 | if (fgets(line, MAXLINELEN, stdin) == NULL) |
| 77 | break; | 78 | break; |
| 79 | |||
| 80 | if (batchmode) { | ||
| 81 | printf(">>>\n" | ||
| 82 | ">>> Executing command: %s" | ||
| 83 | ">>>\n", line); | ||
| 84 | } | ||
| 85 | |||
| 78 | shell_argc = parseline(line, shell_argv); | 86 | shell_argc = parseline(line, shell_argv); |
| 87 | |||
| 79 | if (shell_argc > 0) | 88 | if (shell_argc > 0) |
| 80 | exec_args(shell_argc, shell_argv); | 89 | exec_args(shell_argc, shell_argv); |
| 81 | } | 90 | } |
| @@ -90,12 +99,12 @@ main(int argc, char *argv[]) | |||
| 90 | { | 99 | { |
| 91 | if (argc > 1) { | 100 | if (argc > 1) { |
| 92 | if (!strcmp(argv[1], "-b")) { | 101 | if (!strcmp(argv[1], "-b")) { |
| 93 | launch(false); | 102 | launch(true); |
| 94 | } else { | 103 | } else { |
| 95 | exec_args(argc-1, &argv[1]); | 104 | exec_args(argc-1, &argv[1]); |
| 96 | } | 105 | } |
| 97 | } else { | 106 | } else { |
| 98 | launch(true); | 107 | launch(false); |
| 99 | } | 108 | } |
| 100 | 109 | ||
| 101 | return 0; | 110 | return 0; |
