diff options
Diffstat (limited to 'sh.c')
-rw-r--r-- | sh.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -850,7 +850,7 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg) | |||
850 | #endif | 850 | #endif |
851 | 851 | ||
852 | execvp(newJob.progs[i].argv[0], newJob.progs[i].argv); | 852 | execvp(newJob.progs[i].argv[0], newJob.progs[i].argv); |
853 | fatalError("sh: %s: %s\n", newJob.progs[i].argv[0], | 853 | fatalError("%s: %s\n", newJob.progs[i].argv[0], |
854 | strerror(errno)); | 854 | strerror(errno)); |
855 | } | 855 | } |
856 | 856 | ||
@@ -1043,7 +1043,7 @@ int shell_main(int argc, char **argv) | |||
1043 | /* initialize the cwd */ | 1043 | /* initialize the cwd */ |
1044 | cwd = (char *) calloc(BUFSIZ, sizeof(char)); | 1044 | cwd = (char *) calloc(BUFSIZ, sizeof(char)); |
1045 | if (cwd == 0) { | 1045 | if (cwd == 0) { |
1046 | fatalError("sh: out of memory\n"); | 1046 | fatalError("out of memory\n"); |
1047 | } | 1047 | } |
1048 | getcwd(cwd, sizeof(char)*BUFSIZ); | 1048 | getcwd(cwd, sizeof(char)*BUFSIZ); |
1049 | 1049 | ||
@@ -1065,7 +1065,7 @@ int shell_main(int argc, char **argv) | |||
1065 | int i; | 1065 | int i; |
1066 | local_pending_command = (char *) calloc(BUFSIZ, sizeof(char)); | 1066 | local_pending_command = (char *) calloc(BUFSIZ, sizeof(char)); |
1067 | if (local_pending_command == 0) { | 1067 | if (local_pending_command == 0) { |
1068 | fatalError("sh: out of memory\n"); | 1068 | fatalError("out of memory\n"); |
1069 | } | 1069 | } |
1070 | for(i=2; i<argc; i++) | 1070 | for(i=2; i<argc; i++) |
1071 | { | 1071 | { |
@@ -1073,7 +1073,7 @@ int shell_main(int argc, char **argv) | |||
1073 | local_pending_command = realloc(local_pending_command, | 1073 | local_pending_command = realloc(local_pending_command, |
1074 | strlen(local_pending_command) + strlen(argv[i])); | 1074 | strlen(local_pending_command) + strlen(argv[i])); |
1075 | if (local_pending_command==NULL) | 1075 | if (local_pending_command==NULL) |
1076 | fatalError("sh: commands for -c option too long\n"); | 1076 | fatalError("commands for -c option too long\n"); |
1077 | } | 1077 | } |
1078 | strcat(local_pending_command, argv[i]); | 1078 | strcat(local_pending_command, argv[i]); |
1079 | if ( (i + 1) < argc) | 1079 | if ( (i + 1) < argc) |
@@ -1088,7 +1088,7 @@ int shell_main(int argc, char **argv) | |||
1088 | else { | 1088 | else { |
1089 | input = fopen(argv[1], "r"); | 1089 | input = fopen(argv[1], "r"); |
1090 | if (!input) { | 1090 | if (!input) { |
1091 | fatalError("sh: Couldn't open file '%s': %s\n", argv[1], | 1091 | fatalError("Couldn't open file '%s': %s\n", argv[1], |
1092 | strerror(errno)); | 1092 | strerror(errno)); |
1093 | } | 1093 | } |
1094 | } | 1094 | } |