Tasks till trace03 and added todo.org
TuDatTr
parent
cf88f9601d
commit
1540d090d7
3
Makefile
3
Makefile
|
|
@ -7,7 +7,8 @@ TSH = ./tsh
|
||||||
TSHREF = ./tshref
|
TSHREF = ./tshref
|
||||||
TSHARGS = "-p"
|
TSHARGS = "-p"
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CFLAGS = -Wall -O2
|
# CFLAGS = -Wall -O2
|
||||||
|
CFLAGS = -Wall -O0 -g3
|
||||||
FILES = $(TSH) ./myspin ./mysplit ./mystop ./myint
|
FILES = $(TSH) ./myspin ./mysplit ./mystop ./myint
|
||||||
|
|
||||||
all: $(FILES)
|
all: $(FILES)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
Testcases:
|
||||||
|
|
||||||
|
- [x] trace01.txt - Properly terminate on EOF.
|
||||||
|
- [x] trace02.txt - Process builtin quit command.
|
||||||
|
- [x] trace03.txt - Run a foreground job.
|
||||||
|
- [ ] trace04.txt - Run a background job.
|
||||||
|
- [ ] trace05.txt - Process jobs builtin command.
|
||||||
|
- [ ] trace06.txt - Forward SIGINT to foreground job.
|
||||||
|
- [ ] trace07.txt - Forward SIGINT only to foreground job.
|
||||||
|
- [ ] trace08.txt - Forward SIGTSTP only to foreground job.
|
||||||
|
- [ ] trace09.txt - Process bg builtin command
|
||||||
|
- [ ] trace10.txt - Process fg builtin command.
|
||||||
|
- [ ] trace11.txt - Forward SIGINT to every process in foreground process group
|
||||||
|
- [ ] trace12.txt - Forward SIGTSTP to every process in foreground process group
|
||||||
|
- [ ] trace13.txt - Restart every stopped process in process group
|
||||||
|
- [ ] trace14.txt - Simple error handling
|
||||||
|
- [ ] trace15.txt - Putting it all together
|
||||||
473
tsh.c
473
tsh.c
|
|
@ -43,10 +43,10 @@ int nextjid = 1; /* next job ID to allocate */
|
||||||
char sbuf[MAXLINE]; /* for composing sprintf messages */
|
char sbuf[MAXLINE]; /* for composing sprintf messages */
|
||||||
|
|
||||||
struct job_t { /* The job struct */
|
struct job_t { /* The job struct */
|
||||||
pid_t pid; /* job PID */
|
pid_t pid; /* job PID */
|
||||||
int jid; /* job ID [1, 2, ...] */
|
int jid; /* job ID [1, 2, ...] */
|
||||||
int state; /* UNDEF, BG, FG, or ST */
|
int state; /* UNDEF, BG, FG, or ST */
|
||||||
char cmdline[MAXLINE]; /* command line */
|
char cmdline[MAXLINE]; /* command line */
|
||||||
};
|
};
|
||||||
struct job_t jobs[MAXJOBS]; /* The job list */
|
struct job_t jobs[MAXJOBS]; /* The job list */
|
||||||
/* End global variables */
|
/* End global variables */
|
||||||
|
|
@ -90,66 +90,66 @@ handler_t *Signal(int signum, handler_t *handler);
|
||||||
*/
|
*/
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
char c;
|
char c;
|
||||||
char cmdline[MAXLINE];
|
char cmdline[MAXLINE];
|
||||||
int emit_prompt = 1; /* emit prompt (default) */
|
int emit_prompt = 1; /* emit prompt (default) */
|
||||||
|
|
||||||
/* Redirect stderr to stdout (so that driver will get all output
|
/* Redirect stderr to stdout (so that driver will get all output
|
||||||
* on the pipe connected to stdout) */
|
* on the pipe connected to stdout) */
|
||||||
dup2(1, 2);
|
dup2(1, 2);
|
||||||
|
|
||||||
/* Parse the command line */
|
/* Parse the command line */
|
||||||
while ((c = getopt(argc, argv, "hvp")) != EOF) {
|
while ((c = getopt(argc, argv, "hvp")) != EOF) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'h': /* print help message */
|
case 'h': /* print help message */
|
||||||
usage();
|
usage();
|
||||||
break;
|
break;
|
||||||
case 'v': /* emit additional diagnostic info */
|
case 'v': /* emit additional diagnostic info */
|
||||||
verbose = 1;
|
verbose = 1;
|
||||||
break;
|
break;
|
||||||
case 'p': /* don't print a prompt */
|
case 'p': /* don't print a prompt */
|
||||||
emit_prompt = 0; /* handy for automatic testing */
|
emit_prompt = 0; /* handy for automatic testing */
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
usage();
|
usage();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Install the signal handlers */
|
||||||
|
|
||||||
|
/* These are the ones you will need to implement */
|
||||||
|
Signal(SIGINT, sigint_handler); /* ctrl-c */
|
||||||
|
Signal(SIGTSTP, sigtstp_handler); /* ctrl-z */
|
||||||
|
Signal(SIGCHLD, sigchld_handler); /* Terminated or stopped child */
|
||||||
|
|
||||||
|
/* This one provides a clean way to kill the shell */
|
||||||
|
Signal(SIGQUIT, sigquit_handler);
|
||||||
|
|
||||||
|
/* Initialize the job list */
|
||||||
|
initjobs(jobs);
|
||||||
|
|
||||||
|
/* Execute the shell's read/eval loop */
|
||||||
|
while (1) {
|
||||||
|
|
||||||
|
/* Read command line */
|
||||||
|
if (emit_prompt) {
|
||||||
|
printf("%s", prompt);
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
if ((fgets(cmdline, MAXLINE, stdin) == NULL) && ferror(stdin))
|
||||||
|
app_error("fgets error");
|
||||||
|
if (feof(stdin)) { /* End of file (ctrl-d) */
|
||||||
|
fflush(stdout);
|
||||||
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Install the signal handlers */
|
/* Evaluate the command line */
|
||||||
|
eval(cmdline);
|
||||||
|
fflush(stdout);
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
|
||||||
/* These are the ones you will need to implement */
|
exit(0); /* control never reaches here */
|
||||||
Signal(SIGINT, sigint_handler); /* ctrl-c */
|
|
||||||
Signal(SIGTSTP, sigtstp_handler); /* ctrl-z */
|
|
||||||
Signal(SIGCHLD, sigchld_handler); /* Terminated or stopped child */
|
|
||||||
|
|
||||||
/* This one provides a clean way to kill the shell */
|
|
||||||
Signal(SIGQUIT, sigquit_handler);
|
|
||||||
|
|
||||||
/* Initialize the job list */
|
|
||||||
initjobs(jobs);
|
|
||||||
|
|
||||||
/* Execute the shell's read/eval loop */
|
|
||||||
while (1) {
|
|
||||||
|
|
||||||
/* Read command line */
|
|
||||||
if (emit_prompt) {
|
|
||||||
printf("%s", prompt);
|
|
||||||
fflush(stdout);
|
|
||||||
}
|
|
||||||
if ((fgets(cmdline, MAXLINE, stdin) == NULL) && ferror(stdin))
|
|
||||||
app_error("fgets error");
|
|
||||||
if (feof(stdin)) { /* End of file (ctrl-d) */
|
|
||||||
fflush(stdout);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Evaluate the command line */
|
|
||||||
eval(cmdline);
|
|
||||||
fflush(stdout);
|
|
||||||
fflush(stdout);
|
|
||||||
}
|
|
||||||
|
|
||||||
exit(0); /* control never reaches here */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -162,10 +162,32 @@ int main(int argc, char **argv)
|
||||||
* each child process must have a unique process group ID so that our
|
* each child process must have a unique process group ID so that our
|
||||||
* background children don't receive SIGINT (SIGTSTP) from the kernel
|
* background children don't receive SIGINT (SIGTSTP) from the kernel
|
||||||
* when we type ctrl-c (ctrl-z) at the keyboard.
|
* when we type ctrl-c (ctrl-z) at the keyboard.
|
||||||
*/
|
*/
|
||||||
void eval(char *cmdline)
|
void eval(char *cmdline)
|
||||||
{
|
{
|
||||||
return;
|
char *argv[MAXARGS]; // Save flags for process
|
||||||
|
int bg = parseline(cmdline, argv); // See whether cmd is back or foreground and parse cmdline
|
||||||
|
struct job_t *job;
|
||||||
|
if (!builtin_cmd(argv)) { // if cmdline is not a builtin
|
||||||
|
int pid = fork(); // fork process
|
||||||
|
if (pid == 0) { // Child Process
|
||||||
|
if (execve(argv[0], argv, environ) != 0) { // if exec failed
|
||||||
|
printf("Command not found.\n");
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
exit(0);
|
||||||
|
} else { // Parent Process
|
||||||
|
wait(NULL);
|
||||||
|
if (bg) {
|
||||||
|
addjob(jobs, pid, BG, cmdline);
|
||||||
|
job = getjobpid(jobs, pid);
|
||||||
|
printf("[%d] (%d) %s", job->jid, pid, cmdline);
|
||||||
|
} else {
|
||||||
|
addjob(jobs, pid, FG, cmdline);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -177,52 +199,52 @@ void eval(char *cmdline)
|
||||||
*/
|
*/
|
||||||
int parseline(const char *cmdline, char **argv)
|
int parseline(const char *cmdline, char **argv)
|
||||||
{
|
{
|
||||||
static char array[MAXLINE]; /* holds local copy of command line */
|
static char array[MAXLINE]; /* holds local copy of command line */
|
||||||
char *buf = array; /* ptr that traverses command line */
|
char *buf = array; /* ptr that traverses command line */
|
||||||
char *delim; /* points to first space delimiter */
|
char *delim; /* points to first space delimiter */
|
||||||
int argc; /* number of args */
|
int argc; /* number of args */
|
||||||
int bg; /* background job? */
|
int bg; /* background job? */
|
||||||
|
|
||||||
strcpy(buf, cmdline);
|
strcpy(buf, cmdline);
|
||||||
buf[strlen(buf)-1] = ' '; /* replace trailing '\n' with space */
|
buf[strlen(buf)-1] = ' '; /* replace trailing '\n' with space */
|
||||||
while (*buf && (*buf == ' ')) /* ignore leading spaces */
|
while (*buf && (*buf == ' ')) /* ignore leading spaces */
|
||||||
buf++;
|
buf++;
|
||||||
|
|
||||||
|
/* Build the argv list */
|
||||||
|
argc = 0;
|
||||||
|
if (*buf == '\'') {
|
||||||
|
buf++;
|
||||||
|
delim = strchr(buf, '\'');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
delim = strchr(buf, ' ');
|
||||||
|
}
|
||||||
|
|
||||||
|
while (delim) {
|
||||||
|
argv[argc++] = buf;
|
||||||
|
*delim = '\0';
|
||||||
|
buf = delim + 1;
|
||||||
|
while (*buf && (*buf == ' ')) /* ignore spaces */
|
||||||
|
buf++;
|
||||||
|
|
||||||
/* Build the argv list */
|
|
||||||
argc = 0;
|
|
||||||
if (*buf == '\'') {
|
if (*buf == '\'') {
|
||||||
buf++;
|
buf++;
|
||||||
delim = strchr(buf, '\'');
|
delim = strchr(buf, '\'');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
delim = strchr(buf, ' ');
|
delim = strchr(buf, ' ');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
argv[argc] = NULL;
|
||||||
|
|
||||||
while (delim) {
|
if (argc == 0) /* ignore blank line */
|
||||||
argv[argc++] = buf;
|
return 1;
|
||||||
*delim = '\0';
|
|
||||||
buf = delim + 1;
|
|
||||||
while (*buf && (*buf == ' ')) /* ignore spaces */
|
|
||||||
buf++;
|
|
||||||
|
|
||||||
if (*buf == '\'') {
|
/* should the job run in the background? */
|
||||||
buf++;
|
if ((bg = (*argv[argc-1] == '&')) != 0) {
|
||||||
delim = strchr(buf, '\'');
|
argv[--argc] = NULL;
|
||||||
}
|
}
|
||||||
else {
|
return bg;
|
||||||
delim = strchr(buf, ' ');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
argv[argc] = NULL;
|
|
||||||
|
|
||||||
if (argc == 0) /* ignore blank line */
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
/* should the job run in the background? */
|
|
||||||
if ((bg = (*argv[argc-1] == '&')) != 0) {
|
|
||||||
argv[--argc] = NULL;
|
|
||||||
}
|
|
||||||
return bg;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -231,7 +253,16 @@ int parseline(const char *cmdline, char **argv)
|
||||||
*/
|
*/
|
||||||
int builtin_cmd(char **argv)
|
int builtin_cmd(char **argv)
|
||||||
{
|
{
|
||||||
return 0; /* not a builtin command */
|
if (!strcmp(argv[0], "quit")) {
|
||||||
|
exit(0);
|
||||||
|
} else if (!strcmp(argv[0], "jobs")) {
|
||||||
|
listjobs(jobs);
|
||||||
|
return 1;
|
||||||
|
} else if (!strcmp(argv[0], "bg") || !strcmp(argv[0], "fg")) {
|
||||||
|
do_bgfg(argv);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0; /* not a builtin command */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -239,7 +270,27 @@ int builtin_cmd(char **argv)
|
||||||
*/
|
*/
|
||||||
void do_bgfg(char **argv)
|
void do_bgfg(char **argv)
|
||||||
{
|
{
|
||||||
return;
|
// struct job_t* job;
|
||||||
|
// if (argv[1][0] == '%') { // if job is chosing via jid
|
||||||
|
// printf("jid: %s", &argv[1][1]);
|
||||||
|
// job = getjobjid(jobs, atoi(&argv[1][1]));
|
||||||
|
// } else { // if job is chosing via pid
|
||||||
|
// printf("pid: %s", argv[1]);
|
||||||
|
// job = getjobpid(jobs, atoi(argv[1]));
|
||||||
|
// }
|
||||||
|
|
||||||
|
// if (job != NULL) {
|
||||||
|
// if (!strcmp(argv[0], "bg")) { // Do this if bg
|
||||||
|
// if (job->state == ST) {
|
||||||
|
// job->state = BG;
|
||||||
|
// }
|
||||||
|
// } else { // Do this if fg
|
||||||
|
// if (job->state == ST || job->state == BG) {
|
||||||
|
// job->state = FG;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -247,7 +298,10 @@ void do_bgfg(char **argv)
|
||||||
*/
|
*/
|
||||||
void waitfg(pid_t pid)
|
void waitfg(pid_t pid)
|
||||||
{
|
{
|
||||||
return;
|
// while (pid == fgpid(jobs)) {
|
||||||
|
// sleep(1);
|
||||||
|
// }
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************
|
/*****************
|
||||||
|
|
@ -263,7 +317,8 @@ void waitfg(pid_t pid)
|
||||||
*/
|
*/
|
||||||
void sigchld_handler(int sig)
|
void sigchld_handler(int sig)
|
||||||
{
|
{
|
||||||
return;
|
deletejob(jobs, fgpid(jobs));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -273,7 +328,7 @@ void sigchld_handler(int sig)
|
||||||
*/
|
*/
|
||||||
void sigint_handler(int sig)
|
void sigint_handler(int sig)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -283,7 +338,7 @@ void sigint_handler(int sig)
|
||||||
*/
|
*/
|
||||||
void sigtstp_handler(int sig)
|
void sigtstp_handler(int sig)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
|
|
@ -296,149 +351,149 @@ void sigtstp_handler(int sig)
|
||||||
|
|
||||||
/* clearjob - Clear the entries in a job struct */
|
/* clearjob - Clear the entries in a job struct */
|
||||||
void clearjob(struct job_t *job) {
|
void clearjob(struct job_t *job) {
|
||||||
job->pid = 0;
|
job->pid = 0;
|
||||||
job->jid = 0;
|
job->jid = 0;
|
||||||
job->state = UNDEF;
|
job->state = UNDEF;
|
||||||
job->cmdline[0] = '\0';
|
job->cmdline[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
/* initjobs - Initialize the job list */
|
/* initjobs - Initialize the job list */
|
||||||
void initjobs(struct job_t *jobs) {
|
void initjobs(struct job_t *jobs) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < MAXJOBS; i++)
|
for (i = 0; i < MAXJOBS; i++)
|
||||||
clearjob(&jobs[i]);
|
clearjob(&jobs[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* maxjid - Returns largest allocated job ID */
|
/* maxjid - Returns largest allocated job ID */
|
||||||
int maxjid(struct job_t *jobs)
|
int maxjid(struct job_t *jobs)
|
||||||
{
|
{
|
||||||
int i, max=0;
|
int i, max=0;
|
||||||
|
|
||||||
for (i = 0; i < MAXJOBS; i++)
|
for (i = 0; i < MAXJOBS; i++)
|
||||||
if (jobs[i].jid > max)
|
if (jobs[i].jid > max)
|
||||||
max = jobs[i].jid;
|
max = jobs[i].jid;
|
||||||
return max;
|
return max;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* addjob - Add a job to the job list */
|
/* addjob - Add a job to the job list */
|
||||||
int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline)
|
int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (pid < 1)
|
if (pid < 1)
|
||||||
return 0;
|
|
||||||
|
|
||||||
for (i = 0; i < MAXJOBS; i++) {
|
|
||||||
if (jobs[i].pid == 0) {
|
|
||||||
jobs[i].pid = pid;
|
|
||||||
jobs[i].state = state;
|
|
||||||
jobs[i].jid = nextjid++;
|
|
||||||
if (nextjid > MAXJOBS)
|
|
||||||
nextjid = 1;
|
|
||||||
strcpy(jobs[i].cmdline, cmdline);
|
|
||||||
if(verbose){
|
|
||||||
printf("Added job [%d] %d %s\n", jobs[i].jid, jobs[i].pid, jobs[i].cmdline);
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
printf("Tried to create too many jobs\n");
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
for (i = 0; i < MAXJOBS; i++) {
|
||||||
|
if (jobs[i].pid == 0) {
|
||||||
|
jobs[i].pid = pid;
|
||||||
|
jobs[i].state = state;
|
||||||
|
jobs[i].jid = nextjid++;
|
||||||
|
if (nextjid > MAXJOBS)
|
||||||
|
nextjid = 1;
|
||||||
|
strcpy(jobs[i].cmdline, cmdline);
|
||||||
|
if(verbose){
|
||||||
|
printf("Added job [%d] %d %s\n", jobs[i].jid, jobs[i].pid, jobs[i].cmdline);
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
printf("Tried to create too many jobs\n");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* deletejob - Delete a job whose PID=pid from the job list */
|
/* deletejob - Delete a job whose PID=pid from the job list */
|
||||||
int deletejob(struct job_t *jobs, pid_t pid)
|
int deletejob(struct job_t *jobs, pid_t pid)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (pid < 1)
|
if (pid < 1)
|
||||||
return 0;
|
|
||||||
|
|
||||||
for (i = 0; i < MAXJOBS; i++) {
|
|
||||||
if (jobs[i].pid == pid) {
|
|
||||||
clearjob(&jobs[i]);
|
|
||||||
nextjid = maxjid(jobs)+1;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
for (i = 0; i < MAXJOBS; i++) {
|
||||||
|
if (jobs[i].pid == pid) {
|
||||||
|
clearjob(&jobs[i]);
|
||||||
|
nextjid = maxjid(jobs)+1;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* fgpid - Return PID of current foreground job, 0 if no such job */
|
/* fgpid - Return PID of current foreground job, 0 if no such job */
|
||||||
pid_t fgpid(struct job_t *jobs) {
|
pid_t fgpid(struct job_t *jobs) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < MAXJOBS; i++)
|
for (i = 0; i < MAXJOBS; i++)
|
||||||
if (jobs[i].state == FG)
|
if (jobs[i].state == FG)
|
||||||
return jobs[i].pid;
|
return jobs[i].pid;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* getjobpid - Find a job (by PID) on the job list */
|
/* getjobpid - Find a job (by PID) on the job list */
|
||||||
struct job_t *getjobpid(struct job_t *jobs, pid_t pid) {
|
struct job_t *getjobpid(struct job_t *jobs, pid_t pid) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (pid < 1)
|
if (pid < 1)
|
||||||
return NULL;
|
|
||||||
for (i = 0; i < MAXJOBS; i++)
|
|
||||||
if (jobs[i].pid == pid)
|
|
||||||
return &jobs[i];
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
for (i = 0; i < MAXJOBS; i++)
|
||||||
|
if (jobs[i].pid == pid)
|
||||||
|
return &jobs[i];
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* getjobjid - Find a job (by JID) on the job list */
|
/* getjobjid - Find a job (by JID) on the job list */
|
||||||
struct job_t *getjobjid(struct job_t *jobs, int jid)
|
struct job_t *getjobjid(struct job_t *jobs, int jid)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (jid < 1)
|
if (jid < 1)
|
||||||
return NULL;
|
|
||||||
for (i = 0; i < MAXJOBS; i++)
|
|
||||||
if (jobs[i].jid == jid)
|
|
||||||
return &jobs[i];
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
for (i = 0; i < MAXJOBS; i++)
|
||||||
|
if (jobs[i].jid == jid)
|
||||||
|
return &jobs[i];
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* pid2jid - Map process ID to job ID */
|
/* pid2jid - Map process ID to job ID */
|
||||||
int pid2jid(pid_t pid)
|
int pid2jid(pid_t pid)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (pid < 1)
|
if (pid < 1)
|
||||||
return 0;
|
|
||||||
for (i = 0; i < MAXJOBS; i++)
|
|
||||||
if (jobs[i].pid == pid) {
|
|
||||||
return jobs[i].jid;
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
|
for (i = 0; i < MAXJOBS; i++)
|
||||||
|
if (jobs[i].pid == pid) {
|
||||||
|
return jobs[i].jid;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* listjobs - Print the job list */
|
/* listjobs - Print the job list */
|
||||||
void listjobs(struct job_t *jobs)
|
void listjobs(struct job_t *jobs)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < MAXJOBS; i++) {
|
for (i = 0; i < MAXJOBS; i++) {
|
||||||
if (jobs[i].pid != 0) {
|
if (jobs[i].pid != 0) {
|
||||||
printf("[%d] (%d) ", jobs[i].jid, jobs[i].pid);
|
printf("[%d] (%d) ", jobs[i].jid, jobs[i].pid);
|
||||||
switch (jobs[i].state) {
|
switch (jobs[i].state) {
|
||||||
case BG:
|
case BG:
|
||||||
printf("Running ");
|
printf("Running ");
|
||||||
break;
|
break;
|
||||||
case FG:
|
case FG:
|
||||||
printf("Foreground ");
|
printf("Foreground ");
|
||||||
break;
|
break;
|
||||||
case ST:
|
case ST:
|
||||||
printf("Stopped ");
|
printf("Stopped ");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
printf("listjobs: Internal error: job[%d].state=%d ",
|
printf("listjobs: Internal error: job[%d].state=%d ",
|
||||||
i, jobs[i].state);
|
i, jobs[i].state);
|
||||||
}
|
}
|
||||||
printf("%s", jobs[i].cmdline);
|
printf("%s", jobs[i].cmdline);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/******************************
|
/******************************
|
||||||
* end job list helper routines
|
* end job list helper routines
|
||||||
|
|
@ -454,11 +509,11 @@ void listjobs(struct job_t *jobs)
|
||||||
*/
|
*/
|
||||||
void usage(void)
|
void usage(void)
|
||||||
{
|
{
|
||||||
printf("Usage: shell [-hvp]\n");
|
printf("Usage: shell [-hvp]\n");
|
||||||
printf(" -h print this message\n");
|
printf(" -h print this message\n");
|
||||||
printf(" -v print additional diagnostic information\n");
|
printf(" -v print additional diagnostic information\n");
|
||||||
printf(" -p do not emit a command prompt\n");
|
printf(" -p do not emit a command prompt\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -466,8 +521,8 @@ void usage(void)
|
||||||
*/
|
*/
|
||||||
void unix_error(char *msg)
|
void unix_error(char *msg)
|
||||||
{
|
{
|
||||||
fprintf(stdout, "%s: %s\n", msg, strerror(errno));
|
fprintf(stdout, "%s: %s\n", msg, strerror(errno));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -475,8 +530,8 @@ void unix_error(char *msg)
|
||||||
*/
|
*/
|
||||||
void app_error(char *msg)
|
void app_error(char *msg)
|
||||||
{
|
{
|
||||||
fprintf(stdout, "%s\n", msg);
|
fprintf(stdout, "%s\n", msg);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -484,15 +539,15 @@ void app_error(char *msg)
|
||||||
*/
|
*/
|
||||||
handler_t *Signal(int signum, handler_t *handler)
|
handler_t *Signal(int signum, handler_t *handler)
|
||||||
{
|
{
|
||||||
struct sigaction action, old_action;
|
struct sigaction action, old_action;
|
||||||
|
|
||||||
action.sa_handler = handler;
|
action.sa_handler = handler;
|
||||||
sigemptyset(&action.sa_mask); /* block sigs of type being handled */
|
sigemptyset(&action.sa_mask); /* block sigs of type being handled */
|
||||||
action.sa_flags = SA_RESTART; /* restart syscalls if possible */
|
action.sa_flags = SA_RESTART; /* restart syscalls if possible */
|
||||||
|
|
||||||
if (sigaction(signum, &action, &old_action) < 0)
|
if (sigaction(signum, &action, &old_action) < 0)
|
||||||
unix_error("Signal error");
|
unix_error("Signal error");
|
||||||
return (old_action.sa_handler);
|
return (old_action.sa_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -501,8 +556,8 @@ handler_t *Signal(int signum, handler_t *handler)
|
||||||
*/
|
*/
|
||||||
void sigquit_handler(int sig)
|
void sigquit_handler(int sig)
|
||||||
{
|
{
|
||||||
printf("Terminating after receipt of SIGQUIT signal\n");
|
printf("Terminating after receipt of SIGQUIT signal\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue