Feature/background

Makefile

@@ -1,6 +1,6 @@
 CC=gcc
 CFLAGS=-g -Wall
-OBJS=main.o command_line.o get_token.o is_redirection.o is_pipe.o change_directory.o process_pipe.o
+OBJS=main.o command_line.o get_token.o is_redirection.o is_pipe.o change_directory.o process_pipe.o background.o
 TARGET=minishell
 
 $(TARGET): $(OBJS)
@@ -13,3 +13,4 @@ is_redirection.o: header.h is_redirection.c
 is_pipe.o: header.h is_pipe.c
 change_directory.o: header.h change_directory.c
 process_pipe.o: header.h process_pipe.c
+background.o: header.h background.c

background.c

@@ -0,0 +1,65 @@
+#include "header.h"
+
+int cnt;
+int current_cnt;
+int largest_num;
+char command[512];
+char current_command[512];
+
+void handle_signal (int sig)
+{
+ cnt = cnt - 1;
+}
+
+void background(char **arg, int index)
+{
+
+ if(cnt==0)
+ {
+ current_cnt = ++cnt;
+ largest_num = current_cnt;
+ }
+ else
+ {
+ current_cnt = ++largest_num;
+ ++cnt;
+ }
+
+ memset(command,0,sizeof(command));
+ for(int i = 0 ; i < index ; i++)
+ {
+ strcat(command,arg[i]);
+ strcat(command," ");
+ }
+ strcpy(current_command,command);
+
+
+ int ppid = getpid();
+ int pid1 = fork();
+ int pstatus = 0;
+ int ppstatus = 0;
+
+ signal(SIGUSR1,handle_signal);
+
+ if(pid1==0)
+ {
+ int pid2 = fork();
+ if(pid2==0)
+ {
+ execvp(*arg,arg);
+ }
+ else
+ {
+ printf("\n[%d] %d\n",current_cnt,pid2);
+ waitpid(pid2,&pstatus,WUNTRACED);
+ kill(ppid,SIGUSR1);
+ printf("[%d] Done \t\t\t %s\n",current_cnt,current_command);
+ kill(getpid(),SIGKILL);
+ } 
+ }
+ else
+ {
+ waitpid(pid1,&ppstatus,WNOHANG);
+ }
+
+}

command_line.c

@@ -5,6 +5,7 @@ bool command_line()
  char *arg[1024];
  bool flag_pipe = false;
  bool flag_redirection = false;
+ bool flag_background = false;
  int type = 0;
  int index = 0;
  int how = 0;
@@ -13,10 +14,12 @@ bool command_line()
  tok = tokens;
  ptr = input;
  type = get_token(&arg[index++]);
- while (type != 1)
+ while (type != EOL)
  {
  type = get_token(&arg[index]);
- if(type==2)
+ if(type == AMPERSAND)
+ flag_background = true;
+ if(type == ARG)
  index++;
  }
  arg[index] = NULL;
@@ -36,6 +39,8 @@ bool command_line()
  ;
  else if (flag_pipe)
  process_pipe(arg, index, how);
+ else if (flag_background)
+ background(arg, index);
  else
  {
  int pid = fork();

header.h

@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <signal.h>
 
 // 상수 및 매크로 정의부
 #define AMPERSAND 0
@@ -33,5 +34,6 @@ bool is_pipe(char **arg, int size);
 bool is_redirection(char **arg, int size);
 bool command_line(void);
 void process_pipe(char **arg, int narg, int how);
+void background(char **arg, int index);
 
 #endif