summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init/init.c83
1 files changed, 9 insertions, 74 deletions
diff --git a/init/init.c b/init/init.c
index a87930b..0f660d6 100644
--- a/init/init.c
+++ b/init/init.c
@@ -17,12 +17,10 @@ int run_start(char* _prog, char* _args[])
if( pid < 0 )
return 1;
- else if (pid == 0)
- {
- //wait(0);
+ else if (pid > 0)
return 0;
- }
+
setsid();
if(fork())
exit(0);
@@ -39,27 +37,12 @@ int run_start(char* _prog, char* _args[])
//Need NULL as last arg!!
int run_stdio(char* _prog, const char* _args[])
{
- int fork_pipe_out[2];
- int fork_pipe_in [2];
pid_t pid;
-
- if(pipe(fork_pipe_out) == -1)
- return 1;
-
- if(pipe(fork_pipe_in) == -1)
- return 1;
-
if((pid = fork()) == -1)
return 2;
if (pid == 0)
{
- //replace STDIO
- dup2(fork_pipe_out[1], STDOUT_FILENO);
- dup2(fork_pipe_in [0], STDIN_FILENO );
- close (fork_pipe_out[0]);
- close (fork_pipe_in [1]);
-
execv(_prog, _args);
//Error handling
@@ -70,46 +53,9 @@ int run_stdio(char* _prog, const char* _args[])
}
else
{
- close(fork_pipe_out[1]);
- close(fork_pipe_in [0]);
-
- int ret;
- struct pollfd fds[2];
- fds[0].fd = STDIN_FILENO;
- fds[0].events = POLLIN;
-
- fds[1].fd = fork_pipe_out[0];
- fds[1].events = POLLIN;
-
- while(1)//Check for data while pipe is open
- {
- int timeout = 1; //Timeout msecs
- ret = poll(fds, 2, timeout);
-
- if(ret < 0)
- break;
- else if (ret == 0)
- continue;
-
-
- int nbytes;
- char buffer[256];
-
- if(fds[0].revents & POLLIN) //STDIN_FILENO
- {
- nbytes = read(STDIN_FILENO, buffer, sizeof(buffer));
- write(fork_pipe_in[1], buffer, nbytes);
- //write(fork_pipe_in[1], "\n", 1);
-
- }
- if(fds[1].revents & POLLIN) //PIPE
- {
- nbytes = read(fork_pipe_out[0], buffer, sizeof(buffer));
- write(STDOUT_FILENO, buffer, nbytes);
- //write(STDOUT_FILENO, "\n", 1);
- }
- }
- wait(0);
+ int status;
+ waitpid(pid, &status, 0);
+ return 0;
}
}
@@ -126,22 +72,11 @@ int exists(const char *fname)
int main(int argc, char* argv[])
{
- printf("MegumInit explosion!\n");
-
- //char* arg[] = {"/bin/bash" ,(char*)0};
-
- //run_start(arg[0], arg);
+ printf("MegumInit\n");
+ printf("(∩ಠ益[+])⊃━☆゚Explosion!\n\n");
- char* arg2[] = {"/bin/toybox", "echo", "/test.asdf", NULL};
-
- run_start(arg2[0], arg2);
-
- sleep(2);
-
- printf("%i\n", exists("/test.asdf"));
- printf("\nEND\n");
-
- sleep(99999);
+ char* arg2[] = {"/bin/toybox", "cat", "meg.txt", NULL};
+ run_stdio(arg2[0], arg2);
return 0;
}