diff options
Diffstat (limited to 'sh.c')
-rw-r--r-- | sh.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -207,12 +207,12 @@ static int builtin_fg_bg(struct job *cmd, struct jobSet *jobList) | |||
207 | 207 | ||
208 | if (!jobList->head) { | 208 | if (!jobList->head) { |
209 | if (!cmd->progs[0].argv[1] || cmd->progs[0].argv[2]) { | 209 | if (!cmd->progs[0].argv[1] || cmd->progs[0].argv[2]) { |
210 | fprintf(stderr, "%s: exactly one argument is expected\n", | 210 | errorMsg("%s: exactly one argument is expected\n", |
211 | cmd->progs[0].argv[0]); | 211 | cmd->progs[0].argv[0]); |
212 | return FALSE; | 212 | return FALSE; |
213 | } | 213 | } |
214 | if (sscanf(cmd->progs[0].argv[1], "%%%d", &jobNum) != 1) { | 214 | if (sscanf(cmd->progs[0].argv[1], "%%%d", &jobNum) != 1) { |
215 | fprintf(stderr, "%s: bad argument '%s'\n", | 215 | errorMsg("%s: bad argument '%s'\n", |
216 | cmd->progs[0].argv[0], cmd->progs[0].argv[1]); | 216 | cmd->progs[0].argv[0], cmd->progs[0].argv[1]); |
217 | return FALSE; | 217 | return FALSE; |
218 | for (job = jobList->head; job; job = job->next) { | 218 | for (job = jobList->head; job; job = job->next) { |
@@ -226,7 +226,7 @@ static int builtin_fg_bg(struct job *cmd, struct jobSet *jobList) | |||
226 | } | 226 | } |
227 | 227 | ||
228 | if (!job) { | 228 | if (!job) { |
229 | fprintf(stderr, "%s: unknown job %d\n", | 229 | errorMsg("%s: unknown job %d\n", |
230 | cmd->progs[0].argv[0], jobNum); | 230 | cmd->progs[0].argv[0], jobNum); |
231 | return FALSE; | 231 | return FALSE; |
232 | } | 232 | } |
@@ -519,7 +519,7 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr, | |||
519 | 519 | ||
520 | rc = glob(prog->argv[argc - 1], flags, NULL, &prog->globResult); | 520 | rc = glob(prog->argv[argc - 1], flags, NULL, &prog->globResult); |
521 | if (rc == GLOB_NOSPACE) { | 521 | if (rc == GLOB_NOSPACE) { |
522 | fprintf(stderr, "out of space during glob operation\n"); | 522 | errorMsg("out of space during glob operation\n"); |
523 | return; | 523 | return; |
524 | } else if (rc == GLOB_NOMATCH || | 524 | } else if (rc == GLOB_NOMATCH || |
525 | (!rc && (prog->globResult.gl_pathc - i) == 1 && | 525 | (!rc && (prog->globResult.gl_pathc - i) == 1 && |
@@ -607,7 +607,7 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi | |||
607 | if (*src == '\\') { | 607 | if (*src == '\\') { |
608 | src++; | 608 | src++; |
609 | if (!*src) { | 609 | if (!*src) { |
610 | fprintf(stderr, "character expected after \\\n"); | 610 | errorMsg("character expected after \\\n"); |
611 | freeJob(job); | 611 | freeJob(job); |
612 | return 1; | 612 | return 1; |
613 | } | 613 | } |
@@ -686,7 +686,7 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi | |||
686 | chptr++; | 686 | chptr++; |
687 | 687 | ||
688 | if (!*chptr) { | 688 | if (!*chptr) { |
689 | fprintf(stderr, "file name expected after %c\n", *src); | 689 | errorMsg("file name expected after %c\n", *src); |
690 | freeJob(job); | 690 | freeJob(job); |
691 | job->numProgs=0; | 691 | job->numProgs=0; |
692 | return 1; | 692 | return 1; |
@@ -705,7 +705,7 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi | |||
705 | if (*prog->argv[argc]) | 705 | if (*prog->argv[argc]) |
706 | argc++; | 706 | argc++; |
707 | if (!argc) { | 707 | if (!argc) { |
708 | fprintf(stderr, "empty command in pipe1.\n"); | 708 | errorMsg("empty command in pipe1\n"); |
709 | freeJob(job); | 709 | freeJob(job); |
710 | job->numProgs=0; | 710 | job->numProgs=0; |
711 | return 1; | 711 | return 1; |
@@ -731,7 +731,7 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi | |||
731 | src++; | 731 | src++; |
732 | 732 | ||
733 | if (!*src) { | 733 | if (!*src) { |
734 | fprintf(stderr, "empty command in pipe2\n"); | 734 | errorMsg("empty command in pipe2\n"); |
735 | freeJob(job); | 735 | freeJob(job); |
736 | job->numProgs=0; | 736 | job->numProgs=0; |
737 | return 1; | 737 | return 1; |
@@ -750,7 +750,7 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi | |||
750 | case '\\': | 750 | case '\\': |
751 | src++; | 751 | src++; |
752 | if (!*src) { | 752 | if (!*src) { |
753 | fprintf(stderr, "character expected after \\\n"); | 753 | errorMsg("character expected after \\\n"); |
754 | freeJob(job); | 754 | freeJob(job); |
755 | return 1; | 755 | return 1; |
756 | } | 756 | } |
@@ -965,7 +965,7 @@ static int setupRedirections(struct childProgram *prog) | |||
965 | if (openfd < 0) { | 965 | if (openfd < 0) { |
966 | /* this could get lost if stderr has been redirected, but | 966 | /* this could get lost if stderr has been redirected, but |
967 | bash and ash both lose it as well (though zsh doesn't!) */ | 967 | bash and ash both lose it as well (though zsh doesn't!) */ |
968 | fprintf(stderr, "error opening %s: %s\n", redir->filename, | 968 | errorMsg("error opening %s: %s\n", redir->filename, |
969 | strerror(errno)); | 969 | strerror(errno)); |
970 | return 1; | 970 | return 1; |
971 | } | 971 | } |