From 13273c5d4ff79b7343bf5c8428493b65f0bffb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laure=CE=B7t?= <laurentfainsin@protonmail.com>
Date: Sat, 24 Apr 2021 19:53:12 +0200
Subject: [PATCH] save avant suppression des jumps

---
 minishell   | Bin 33632 -> 33736 bytes
 minishell.c |  26 ++++++++++++++++++++++++--
 test.sh     |   4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/minishell b/minishell
index b5bc3d75c5c973824720fea8c2ab22c5df1fba38..9ffc9d8bec1702c77a5e3701a10d6245303aefbd 100755
GIT binary patch
delta 3425
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
bt@Fhh>-kX({CuQ!zIoMF16Ri#+mrtf-ILo~

delta 3003
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

diff --git a/minishell.c b/minishell.c
index 623c806..fa4e1e2 100644
--- a/minishell.c
+++ b/minishell.c
@@ -56,6 +56,11 @@ void handler_sigchld(int sig_num)
                 printf("[%d] %d done: %s\n", job->id, job->pid, job->cmd);
                 supprimer(&jobs, job->pid);
             }
+            else if (wait_code == 9) // SIGKILL
+            {
+                printf("[%d] %d killed: %s\n", job->id, job->pid, job->cmd);
+                supprimer(&jobs, job->pid);
+            }
 
             if (prompting)
             {
@@ -170,13 +175,14 @@ int main(int argc, char *argv[])
             cell *job;
             if (cmd->seq[0][1] == NULL)
             { // no id
-                fprintf(stderr, "ERROR: fg id error\n");
+                fprintf(stderr, "ERROR: id missing\n");
                 continue;
             }
             else
             { // id specified
                 job = trouver_id(&jobs, atoi(cmd->seq[0][1]));
             }
+            //if (job->state == 1) // créer state bidule
             kill(job->pid, SIGCONT);
             pause();
             continue;
@@ -186,7 +192,7 @@ int main(int argc, char *argv[])
             cell *job;
             if (cmd->seq[0][1] == NULL)
             { // no id
-                fprintf(stderr, "ERROR: fg id error\n");
+                fprintf(stderr, "ERROR: id missing\n");
                 continue;
             }
             else
@@ -198,6 +204,22 @@ int main(int argc, char *argv[])
             attendre(job->pid);
             continue;
         }
+        else if (!strcmp(cmd->seq[0][0], "stop"))
+        { // "stop"
+            cell *job;
+            if (cmd->seq[0][1] == NULL)
+            { // no id
+                fprintf(stderr, "ERROR: id missing\n");
+                continue;
+            }
+            else
+            { // id specified
+                job = trouver_id(&jobs, atoi(cmd->seq[0][1]));
+            }
+            kill(job->pid, SIGSTOP);
+            pause();
+            continue;
+        }
         else if (!strcmp(cmd->seq[0][0], "pid"))
         { // "pid"
             printf("pid=%d\n", getpid());
diff --git a/test.sh b/test.sh
index fe779ba..1f268a0 100644
--- a/test.sh
+++ b/test.sh
@@ -1,2 +1,2 @@
-sleep 3
-printf "\n\n\n\n bonjour \n\n\n\n"
\ No newline at end of file
+sleep 2
+printf "\n\n --- bonjour --- \n\n"
\ No newline at end of file