/[cvs]/joko/Uni/BSArch/03/win32/min_shell.c
ViewVC logotype

Diff of /joko/Uni/BSArch/03/win32/min_shell.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.10 by joko, Fri Jun 16 00:06:11 2006 UTC revision 1.15 by joko, Fri Jun 16 19:48:14 2006 UTC
# Line 7  Line 7 
7    
8  #include "min_shell.h"  #include "min_shell.h"
9    
   
 #define MAX_COMMAND_LENGTH 1024  
   
10  int main(int argc, char * argv[]) {  int main(int argc, char * argv[]) {
11        
12    // interactive mode with prompt    // interactive mode with prompt
13    if (argc == 1) {    if (argc == 1) {
14      //printf("No arguments given.");      fprintf(stderr, "Welcome to mini shell. Have fun!\n");
15      //exit(EXIT_FAILURE);      run_commands(stdin, "> ");
     char filename[255] = "abc\0";  
     BOOL background = 0;  
     os_start_process(filename, background);  
16    }    }
17        
18    // scripting mode    // scripting mode
19    if (argc == 2) {    if (argc == 2) {
20      FILE * script = fopen(argv[1], "r");      FILE * script = fopen(argv[1], "r");
21      run_commands(script);      run_commands(script, "");
22      fclose(script);      fclose(script);
23    }    }
24  }  }
25    
26  void run_commands(FILE * fp) {  void run_commands(FILE * fp, char * prompt) {
27        
28    char command[MAX_COMMAND_LENGTH];    char command[MAX_COMMAND_LENGTH];
29        
30      // echo first prompt
31      fprintf(stdout, "%s", prompt);
32    while (fgets(command, MAX_COMMAND_LENGTH, fp)) {    while (fgets(command, MAX_COMMAND_LENGTH, fp)) {
33      int command_length;      char *command_ptr = command;
34            
35      // strip newlines      // strip newlines
36      chomp(command);      chomp(command_ptr);
37        
38        // trim whitespace
39        trim(&command_ptr);
40            
41      // ... and action      // ... and action
42      dispatch_command(command);      if (strlen(command_ptr))
43          dispatch_command(command_ptr);
44        
45        // echo prompt after executing shell command
46        fprintf(stdout, "%s", prompt);
47    }    }
48        
49  }  }
# Line 59  void dispatch_command(char * command) { Line 62  void dispatch_command(char * command) {
62            
63      // "calculate" shell command ...      // "calculate" shell command ...
64      shell_command = command + 1;      shell_command = command + 1;
65      printf("shell command: %s\n", shell_command);      //printf("shell command: %s\n", shell_command);
66            
67      // ... and dispatch it      // ... and dispatch it
68            
69      // wait      // wait
70      if (strcmp(shell_command, "wait") == 0) {      if (strcmp(shell_command, "wait") == 0) {
71        // TODO        // TODO
72          os_wait_for_processes();
73            
74      // exit      // exit
75      } else if (strcmp(shell_command, "exit") == 0) {      } else if (strcmp(shell_command, "exit") == 0) {
# Line 78  void dispatch_command(char * command) { Line 82  void dispatch_command(char * command) {
82        
83    // run program: background or foreground?    // run program: background or foreground?
84    } else {    } else {
85      printf("running: %s\n", command);      //printf("running: %s\n", command);
86      command_length = strlen(command);      command_length = strlen(command);
87      if (command[command_length-1] == '&') {      if (command[command_length-1] == '&' && command[command_length-2] == ' ') {
88        command[command_length-1] = '\0';        command[command_length-1] = '\0';
89          command[command_length-2] = '\0';
90        background = TRUE;        background = TRUE;
91      }      }
92            
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.15
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed