X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=lash.c;h=9b3435304926289db4301c2ccd7c781a7e63361c;hb=bf181b9338152759fd56c8009e9a962a84808e7c;hp=2d6bfb52697f75b410446e166aba5b6c01b5dd33;hpb=b54833cde0dfde26ad7c2d3a6cda9d7ff2dfe9ba;p=oweals%2Fbusybox.git diff --git a/lash.c b/lash.c index 2d6bfb526..9b3435304 100644 --- a/lash.c +++ b/lash.c @@ -89,65 +89,62 @@ struct builtInCommand { int (*function) (struct job *, struct jobSet * jobList); /* function ptr */ }; -/* Some function prototypes */ -static int shell_cd(struct job *cmd, struct jobSet *junk); -static int shell_env(struct job *dummy, struct jobSet *junk); -static int shell_exit(struct job *cmd, struct jobSet *junk); -static int shell_fg_bg(struct job *cmd, struct jobSet *jobList); -static int shell_help(struct job *cmd, struct jobSet *junk); -static int shell_jobs(struct job *dummy, struct jobSet *jobList); -static int shell_pwd(struct job *dummy, struct jobSet *junk); -static int shell_export(struct job *cmd, struct jobSet *junk); -static int shell_source(struct job *cmd, struct jobSet *jobList); -static int shell_unset(struct job *cmd, struct jobSet *junk); -static int shell_read(struct job *cmd, struct jobSet *junk); - +/* function prototypes for builtins */ +static int builtin_cd(struct job *cmd, struct jobSet *junk); +static int builtin_env(struct job *dummy, struct jobSet *junk); +static int builtin_exit(struct job *cmd, struct jobSet *junk); +static int builtin_fg_bg(struct job *cmd, struct jobSet *jobList); +static int builtin_help(struct job *cmd, struct jobSet *junk); +static int builtin_jobs(struct job *dummy, struct jobSet *jobList); +static int builtin_pwd(struct job *dummy, struct jobSet *junk); +static int builtin_export(struct job *cmd, struct jobSet *junk); +static int builtin_source(struct job *cmd, struct jobSet *jobList); +static int builtin_unset(struct job *cmd, struct jobSet *junk); +static int builtin_read(struct job *cmd, struct jobSet *junk); + + +/* function prototypes for shell stuff */ static void checkJobs(struct jobSet *jobList); static int getCommand(FILE * source, char *command); -static int parseCommand(char **commandPtr, struct job *job, int *isBg); +static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobList, int *isBg); static int setupRedirections(struct childProgram *prog); -static int runCommand(struct job newJob, struct jobSet *jobList, int inBg); +static int runCommand(struct job *newJob, struct jobSet *jobList, int inBg); static int busy_loop(FILE * input); -/* Table of built-in functions */ +/* Table of built-in functions (these are non-forking builtins, meaning they + * can change global variables in the parent shell process but they will not + * work with pipes and redirects; 'unset foo | whatever' will not work) */ static struct builtInCommand bltins[] = { - {"bg", "Resume a job in the background", "bg [%%job]", shell_fg_bg}, - {"cd", "Change working directory", "cd [dir]", shell_cd}, - {"exit", "Exit from shell()", "exit", shell_exit}, - {"fg", "Bring job into the foreground", "fg [%%job]", shell_fg_bg}, - {"jobs", "Lists the active jobs", "jobs", shell_jobs}, - {"export", "Set environment variable", "export [VAR=value]", shell_export}, - {"unset", "Unset environment variable", "unset VAR", shell_unset}, - {"read", "Input environment variable", "read [VAR]", shell_read}, + {"bg", "Resume a job in the background", "bg [%%job]", builtin_fg_bg}, + {"cd", "Change working directory", "cd [dir]", builtin_cd}, + {"exit", "Exit from shell()", "exit", builtin_exit}, + {"fg", "Bring job into the foreground", "fg [%%job]", builtin_fg_bg}, + {"jobs", "Lists the active jobs", "jobs", builtin_jobs}, + {"export", "Set environment variable", "export [VAR=value]", builtin_export}, + {"unset", "Unset environment variable", "unset VAR", builtin_unset}, + {"read", "Input environment variable", "read [VAR]", builtin_read}, {NULL, NULL, NULL, NULL} }; -/* Table of built-in functions */ +/* Table of forking built-in functions (things that fork cannot change global + * variables in the parent process, such as the current working directory) */ static struct builtInCommand bltins_forking[] = { - {"env", "Print all environment variables", "env", shell_env}, - {"pwd", "Print current directory", "pwd", shell_pwd}, - {".", "Source-in and run commands in a file", ". filename", shell_source}, - {"help", "List shell built-in commands", "help", shell_help}, + {"env", "Print all environment variables", "env", builtin_env}, + {"pwd", "Print current directory", "pwd", builtin_pwd}, + {".", "Source-in and run commands in a file", ". filename", builtin_source}, + {"help", "List shell built-in commands", "help", builtin_help}, {NULL, NULL, NULL, NULL} }; -static const char shell_usage[] = - "sh [FILE]...\n" - " or: sh -c command [args]...\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nlash: The BusyBox command interpreter (shell).\n\n" -#endif - ; - static char *prompt = "# "; static char *cwd = NULL; static char *local_pending_command = NULL; #ifdef BB_FEATURE_SH_COMMAND_EDITING -void win_changed(int sig) +void win_changed(int junk) { - struct winsize win = { 0, 0 }; + struct winsize win = { 0, 0, 0, 0 }; ioctl(0, TIOCGWINSZ, &win); if (win.ws_col > 0) { cmdedit_setwidth( win.ws_col - 1); @@ -157,7 +154,7 @@ void win_changed(int sig) /* built-in 'cd ' handler */ -static int shell_cd(struct job *cmd, struct jobSet *junk) +static int builtin_cd(struct job *cmd, struct jobSet *junk) { char *newdir; @@ -175,7 +172,7 @@ static int shell_cd(struct job *cmd, struct jobSet *junk) } /* built-in 'env' handler */ -static int shell_env(struct job *dummy, struct jobSet *junk) +static int builtin_env(struct job *dummy, struct jobSet *junk) { char **e; @@ -186,7 +183,7 @@ static int shell_env(struct job *dummy, struct jobSet *junk) } /* built-in 'exit' handler */ -static int shell_exit(struct job *cmd, struct jobSet *junk) +static int builtin_exit(struct job *cmd, struct jobSet *junk) { if (!cmd->progs[0].argv[1] == 1) exit TRUE; @@ -195,19 +192,19 @@ static int shell_exit(struct job *cmd, struct jobSet *junk) } /* built-in 'fg' and 'bg' handler */ -static int shell_fg_bg(struct job *cmd, struct jobSet *jobList) +static int builtin_fg_bg(struct job *cmd, struct jobSet *jobList) { int i, jobNum; struct job *job=NULL; if (!jobList->head) { if (!cmd->progs[0].argv[1] || cmd->progs[0].argv[2]) { - fprintf(stderr, "%s: exactly one argument is expected\n", + errorMsg("%s: exactly one argument is expected\n", cmd->progs[0].argv[0]); return FALSE; } if (sscanf(cmd->progs[0].argv[1], "%%%d", &jobNum) != 1) { - fprintf(stderr, "%s: bad argument '%s'\n", + errorMsg("%s: bad argument '%s'\n", cmd->progs[0].argv[0], cmd->progs[0].argv[1]); return FALSE; for (job = jobList->head; job; job = job->next) { @@ -221,7 +218,7 @@ static int shell_fg_bg(struct job *cmd, struct jobSet *jobList) } if (!job) { - fprintf(stderr, "%s: unknown job %d\n", + errorMsg("%s: unknown job %d\n", cmd->progs[0].argv[0], jobNum); return FALSE; } @@ -246,7 +243,7 @@ static int shell_fg_bg(struct job *cmd, struct jobSet *jobList) } /* built-in 'help' handler */ -static int shell_help(struct job *cmd, struct jobSet *junk) +static int builtin_help(struct job *dummy, struct jobSet *junk) { struct builtInCommand *x; @@ -263,7 +260,7 @@ static int shell_help(struct job *cmd, struct jobSet *junk) } /* built-in 'jobs' handler */ -static int shell_jobs(struct job *dummy, struct jobSet *jobList) +static int builtin_jobs(struct job *dummy, struct jobSet *jobList) { struct job *job; char *statusString; @@ -281,7 +278,7 @@ static int shell_jobs(struct job *dummy, struct jobSet *jobList) /* built-in 'pwd' handler */ -static int shell_pwd(struct job *dummy, struct jobSet *junk) +static int builtin_pwd(struct job *dummy, struct jobSet *junk) { getcwd(cwd, sizeof(cwd)); fprintf(stdout, "%s\n", cwd); @@ -289,12 +286,12 @@ static int shell_pwd(struct job *dummy, struct jobSet *junk) } /* built-in 'export VAR=value' handler */ -static int shell_export(struct job *cmd, struct jobSet *junk) +static int builtin_export(struct job *cmd, struct jobSet *junk) { int res; if (!cmd->progs[0].argv[1] == 1) { - return (shell_env(cmd, junk)); + return (builtin_env(cmd, junk)); } res = putenv(cmd->progs[0].argv[1]); if (res) @@ -303,7 +300,7 @@ static int shell_export(struct job *cmd, struct jobSet *junk) } /* built-in 'read VAR' handler */ -static int shell_read(struct job *cmd, struct jobSet *junk) +static int builtin_read(struct job *cmd, struct jobSet *junk) { int res = 0, len, newlen; char *s; @@ -337,7 +334,7 @@ static int shell_read(struct job *cmd, struct jobSet *junk) } /* Built-in '.' handler (read-in and execute commands from file) */ -static int shell_source(struct job *cmd, struct jobSet *junk) +static int builtin_source(struct job *cmd, struct jobSet *junk) { FILE *input; int status; @@ -358,7 +355,7 @@ static int shell_source(struct job *cmd, struct jobSet *junk) } /* built-in 'unset VAR' handler */ -static int shell_unset(struct job *cmd, struct jobSet *junk) +static int builtin_unset(struct job *cmd, struct jobSet *junk) { if (!cmd->progs[0].argv[1] == 1) { fprintf(stdout, "unset: parameter required.\n"); @@ -384,6 +381,7 @@ static void freeJob(struct job *cmd) if (cmd->text) free(cmd->text); free(cmd->cmdBuf); + memset(cmd, 0, sizeof(struct job)); } /* remove a job from the jobList */ @@ -466,7 +464,7 @@ static int getCommand(FILE * source, char *command) char *promptStr; len=fprintf(stdout, "%s %s", cwd, prompt); fflush(stdout); - promptStr=(char*)malloc(sizeof(char)*(len+1)); + promptStr=(char*)xmalloc(sizeof(char)*(len+1)); sprintf(promptStr, "%s %s", cwd, prompt); cmdedit_read_input(promptStr, command); free( promptStr); @@ -513,7 +511,7 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr, rc = glob(prog->argv[argc - 1], flags, NULL, &prog->globResult); if (rc == GLOB_NOSPACE) { - fprintf(stderr, "out of space during glob operation\n"); + errorMsg("out of space during glob operation\n"); return; } else if (rc == GLOB_NOMATCH || (!rc && (prog->globResult.gl_pathc - i) == 1 && @@ -545,7 +543,7 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr, the beginning of the next command (if the original command had more then one job associated with it) or NULL if no more commands are present. */ -static int parseCommand(char **commandPtr, struct job *job, int *isBg) +static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobList, int *isBg) { char *command; char *returnCommand = NULL; @@ -564,14 +562,13 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) /* this handles empty lines or leading '#' characters */ if (!**commandPtr || (**commandPtr == '#')) { - job->numProgs = 0; - *commandPtr = NULL; + job->numProgs=0; return 0; } *isBg = 0; job->numProgs = 1; - job->progs = malloc(sizeof(*job->progs)); + job->progs = xmalloc(sizeof(*job->progs)); /* We set the argv elements to point inside of this string. The memory is freed by freeJob(). Allocate twice the original @@ -590,7 +587,7 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) prog->isStopped = 0; argvAlloced = 5; - prog->argv = malloc(sizeof(*prog->argv) * argvAlloced); + prog->argv = xmalloc(sizeof(*prog->argv) * argvAlloced); prog->argv[0] = job->cmdBuf; buf = command; @@ -602,7 +599,7 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) if (*src == '\\') { src++; if (!*src) { - fprintf(stderr, "character expected after \\\n"); + errorMsg("character expected after \\\n"); freeJob(job); return 1; } @@ -681,8 +678,9 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) chptr++; if (!*chptr) { - fprintf(stderr, "file name expected after %c\n", *src); + errorMsg("file name expected after %c\n", *src); freeJob(job); + job->numProgs=0; return 1; } @@ -699,8 +697,9 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) if (*prog->argv[argc]) argc++; if (!argc) { - fprintf(stderr, "empty command in pipe\n"); + errorMsg("empty command in pipe1\n"); freeJob(job); + job->numProgs=0; return 1; } prog->argv[argc] = NULL; @@ -716,7 +715,7 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) argc = 0; argvAlloced = 5; - prog->argv = malloc(sizeof(*prog->argv) * argvAlloced); + prog->argv = xmalloc(sizeof(*prog->argv) * argvAlloced); prog->argv[0] = ++buf; src++; @@ -724,7 +723,9 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) src++; if (!*src) { - fprintf(stderr, "empty command in pipe\n"); + errorMsg("empty command in pipe2\n"); + freeJob(job); + job->numProgs=0; return 1; } src--; /* we'll ++ it at the end of the loop */ @@ -741,13 +742,40 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) case '\\': src++; if (!*src) { + errorMsg("character expected after \\\n"); freeJob(job); - fprintf(stderr, "character expected after \\\n"); return 1; } if (*src == '*' || *src == '[' || *src == ']' || *src == '?') *buf++ = '\\'; /* fallthrough */ + case '`': + /* Exec a backtick-ed command */ + { + char* newcmd=NULL; + char* ptr=NULL; + struct job newJob; + + ptr=strchr(++src, '`'); + if (ptr==NULL) { + fprintf(stderr, "Unmatched '`' in command\n"); + freeJob(job); + return 1; + } + + newcmd = xmalloc(1+ptr-src); + snprintf(newcmd, 1+ptr-src, src); + + if (!parseCommand(&newcmd, &newJob, jobList, isBg) && + newJob.numProgs) { + runCommand(&newJob, jobList, *isBg); + } + + /* Clip out the the backticked command from the string */ + memmove(--src, ptr, strlen(ptr)+1); + free(newcmd); + } + break; default: *buf++ = *src; } @@ -766,12 +794,12 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) prog->argv[argc] = NULL; if (!returnCommand) { - job->text = malloc(strlen(*commandPtr) + 1); + job->text = xmalloc(strlen(*commandPtr) + 1); strcpy(job->text, *commandPtr); } else { /* This leaves any trailing spaces, which is a bit sloppy */ count = returnCommand - *commandPtr; - job->text = malloc(count + 1); + job->text = xmalloc(count + 1); strncpy(job->text, *commandPtr, count); job->text[count] = '\0'; } @@ -782,7 +810,7 @@ static int parseCommand(char **commandPtr, struct job *job, int *isBg) } -static int runCommand(struct job newJob, struct jobSet *jobList, int inBg) +static int runCommand(struct job *newJob, struct jobSet *jobList, int inBg) { struct job *job; int i; @@ -795,22 +823,22 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg) nextin = 0, nextout = 1; - for (i = 0; i < newJob.numProgs; i++) { - if ((i + 1) < newJob.numProgs) { + for (i = 0; i < newJob->numProgs; i++) { + if ((i + 1) < newJob->numProgs) { pipe(pipefds); nextout = pipefds[1]; } else { nextout = 1; } - /* Match any built-ins here */ + /* Check if the command matches any non-forking builtins */ for (x = bltins; x->cmd; x++) { - if (!strcmp(newJob.progs[i].argv[0], x->cmd)) { - return (x->function(&newJob, jobList)); + if (!strcmp(newJob->progs[i].argv[0], x->cmd)) { + return (x->function(newJob, jobList)); } } - if (!(newJob.progs[i].pid = fork())) { + if (!(newJob->progs[i].pid = fork())) { signal(SIGTTOU, SIG_DFL); if (nextin != 0) { @@ -824,35 +852,37 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg) } /* explicit redirections override pipes */ - setupRedirections(newJob.progs + i); + setupRedirections(newJob->progs + i); - /* Match any built-ins here */ + /* Check if the command matches any of the other builtins */ for (x = bltins_forking; x->cmd; x++) { - if (!strcmp(newJob.progs[i].argv[0], x->cmd)) { - exit (x->function(&newJob, jobList)); + if (!strcmp(newJob->progs[i].argv[0], x->cmd)) { + exit (x->function(newJob, jobList)); } } #ifdef BB_FEATURE_SH_STANDALONE_SHELL - /* Handle busybox internals here */ + /* Check if the command matches any busybox internal commands here */ + /* TODO: Add matching when paths are appended (i.e. 'cat' currently + * works, but '/bin/cat' doesn't ) */ while (a->name != 0) { - if (strcmp(newJob.progs[i].argv[0], a->name) == 0) { + if (strcmp(newJob->progs[i].argv[0], a->name) == 0) { int argc; - char** argv=newJob.progs[i].argv; + char** argv=newJob->progs[i].argv; for(argc=0;*argv!=NULL; argv++, argc++); - exit((*(a->main)) (argc, newJob.progs[i].argv)); + exit((*(a->main)) (argc, newJob->progs[i].argv)); } a++; } #endif - execvp(newJob.progs[i].argv[0], newJob.progs[i].argv); - fatalError("sh: %s: %s\n", newJob.progs[i].argv[0], + execvp(newJob->progs[i].argv[0], newJob->progs[i].argv); + fatalError("%s: %s\n", newJob->progs[i].argv[0], strerror(errno)); } /* put our child in the process group whose leader is the first process in this pipe */ - setpgid(newJob.progs[i].pid, newJob.progs[0].pid); + setpgid(newJob->progs[i].pid, newJob->progs[0].pid); if (nextin != 0) close(nextin); @@ -864,24 +894,24 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg) nextin = pipefds[0]; } - newJob.pgrp = newJob.progs[0].pid; + newJob->pgrp = newJob->progs[0].pid; /* find the ID for the job to use */ - newJob.jobId = 1; + newJob->jobId = 1; for (job = jobList->head; job; job = job->next) - if (job->jobId >= newJob.jobId) - newJob.jobId = job->jobId + 1; + if (job->jobId >= newJob->jobId) + newJob->jobId = job->jobId + 1; /* add the job to the list of running jobs */ if (!jobList->head) { - job = jobList->head = malloc(sizeof(*job)); + job = jobList->head = xmalloc(sizeof(*job)); } else { for (job = jobList->head; job->next; job = job->next); - job->next = malloc(sizeof(*job)); + job->next = xmalloc(sizeof(*job)); job = job->next; } - *job = newJob; + *job = *newJob; job->next = NULL; job->runningProgs = job->numProgs; job->stoppedProgs = 0; @@ -890,13 +920,13 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg) /* we don't wait for background jobs to return -- append it to the list of backgrounded jobs and leave it alone */ printf("[%d] %d\n", job->jobId, - newJob.progs[newJob.numProgs - 1].pid); + newJob->progs[newJob->numProgs - 1].pid); } else { jobList->fg = job; /* move the new process group into the foreground */ /* suppress messages when run from /linuxrc mag@sysgo.de */ - if (tcsetpgrp(0, newJob.pgrp) && errno != ENOTTY) + if (tcsetpgrp(0, newJob->pgrp) && errno != ENOTTY) perror("tcsetpgrp"); } @@ -927,7 +957,7 @@ static int setupRedirections(struct childProgram *prog) if (openfd < 0) { /* this could get lost if stderr has been redirected, but bash and ash both lose it as well (though zsh doesn't!) */ - fprintf(stderr, "error opening %s: %s\n", redir->filename, + errorMsg("error opening %s: %s\n", redir->filename, strerror(errno)); return 1; } @@ -975,9 +1005,11 @@ static int busy_loop(FILE * input) nextCommand = command; } - if (!parseCommand(&nextCommand, &newJob, &inBg) && + if (!parseCommand(&nextCommand, &newJob, &jobList, &inBg) && newJob.numProgs) { - runCommand(newJob, &jobList, inBg); + runCommand(&newJob, &jobList, inBg); + } else { + nextCommand=NULL; } } else { /* a job is running in the foreground; wait for it */ @@ -1020,10 +1052,6 @@ static int busy_loop(FILE * input) } free(command); - /* return controlling TTY back to parent process group before exiting */ - if (tcsetpgrp(0, parent_pgrp)) - perror("tcsetpgrp"); - /* return controlling TTY back to parent process group before exiting */ if (tcsetpgrp(0, parent_pgrp)) perror("tcsetpgrp"); @@ -1043,7 +1071,7 @@ int shell_main(int argc, char **argv) /* initialize the cwd */ cwd = (char *) calloc(BUFSIZ, sizeof(char)); if (cwd == 0) { - fatalError("sh: out of memory\n"); + fatalError("out of memory\n"); } getcwd(cwd, sizeof(char)*BUFSIZ); @@ -1054,7 +1082,7 @@ int shell_main(int argc, char **argv) #endif //if (argv[0] && argv[0][0] == '-') { - // shell_source("/etc/profile"); + // builtin_source("/etc/profile"); //} if (argc < 2) { @@ -1065,7 +1093,7 @@ int shell_main(int argc, char **argv) int i; local_pending_command = (char *) calloc(BUFSIZ, sizeof(char)); if (local_pending_command == 0) { - fatalError("sh: out of memory\n"); + fatalError("out of memory\n"); } for(i=2; i