cmd completed

marie-j · Nov 14, 2015 · b6f5996 · b6f5996
1 parent cbce1ec
commit b6f5996
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/cmd.c b/cmd.c
@@ -231,14 +231,16 @@ void do_kill(char **argv) {
 
 /* do_exit - Execute the builtin exit command */
 void do_exit() {
-    printf("do_exit : To be implemented\n");
-
-    return;
+    if (verbose) {
+        printf("Exiting \n");
+    }
+    exit(EXIT_SUCCESS);
 }
 
 /* do_jobs - Execute the builtin fg command */
 void do_jobs() {
-    printf("do_jobs : To be implemented\n");
-
-    return;
+    if (verbose) {
+        printf("Current jobs in the foreground process\n");
+    }
+    jobs_listjobs();
 }
diff --git a/cmd.o b/cmd.o
diff --git a/jobs.c b/jobs.c
@@ -75,7 +75,7 @@ int jobs_deletejob(pid_t pid) {
     for (i = 0; i < MAXJOBS; i++) {
         if (jobs[i].jb_pid == pid) {
             jobs_clearjob(&jobs[i]);
-            nextjid = jobs_maxjid(jobs) + 1;
+            nextjid = jobs_maxjid() + 1;
             return 1;
         }
     }
@@ -160,7 +160,7 @@ void jobs_listjobs() {
             default:
                 printf("listjobs: Internal error: job[%d].state=%d ", i, jobs[i].jb_state);
             }
-            printf("%s", jobs[i].jb_cmdline);
+            printf("%s\n", jobs[i].jb_cmdline);
         }
     }
 }
diff --git a/jobs.o b/jobs.o
diff --git a/pipe.c b/pipe.c
@@ -1,6 +1,7 @@
 /* mshell - a job manager */
 
 #include <stdio.h>
+#include <string.h>
 #include "pipe.h"
 
 void do_pipe(char *cmds[MAXCMDS][MAXARGS], int nbcmd, int bg) {

diff --git a/pipe.o b/pipe.o
diff --git a/sighandlers.o b/sighandlers.o