Fix bad confict resolution

* Repairs linux build

1 files changed, 0 insertions, 71 deletions

diff --git a/src/system.c b/src/system.c
index 895ed8a..773f9d7 100644
--- a/src/system.c
+++ b/src/system.c
@@ -13,77 +13,6 @@ int shell(struct Process *proc, char *args) {
     return system(cmd);
 }
 #else
-int shell(struct Process *proc, char *args[]) {
-    FILE *fp_out, *fp_err;
-    pid_t pid;
-    pid_t status;
-    status = 0;
-    errno = 0;
-
-    pid = fork();
-    if (pid == -1) {
-        fprintf(stderr, "fork failed\n");
-        exit(1);
-    } else if (pid == 0) {
-        int retval;
-        if (proc != NULL) {
-            if (strlen(proc->standard_output)) {
-                fp_out = freopen(proc->standard_output, "w+", stdout);
-            }
-
-            if (strlen(proc->standard_error)) {
-                fp_err = freopen(proc->standard_error, "w+", stderr);
-            }
-
-            if (proc->redirect_stderr) {
-                if (fp_err) {
-                    fclose(fp_err);
-                    fclose(stderr);
-                }
-                dup2(fileno(stdout), fileno(stderr));
-            }
-        }
-
-        retval = execv(args[0], args);
-        fprintf(stderr, "# executing: ");
-        for (size_t x = 0; args[x] != NULL; x++) {
-            fprintf(stderr, "%s ", args[x]);
-        }
-
-        if (proc != NULL && strlen(proc->standard_output)) {
-            fflush(fp_out);
-            fclose(fp_out);
-            fflush(stdout);
-            fclose(stdout);
-        }
-        if (proc != NULL && strlen(proc->standard_error)) {
-            fflush(fp_err);
-            fclose(fp_err);
-            fflush(stderr);
-            fclose(stderr);
-        }
-        exit(retval);
-    } else {
-        if (waitpid(pid, &status, WUNTRACED) > 0) {
-            if (WIFEXITED(status) && WEXITSTATUS(status)) {
-                if (WEXITSTATUS(status) == 127) {
-                    fprintf(stderr, "execv failed\n");
-                }
-            } else if (WIFSIGNALED(status))  {
-                fprintf(stderr, "signal received: %d\n", WIFSIGNALED(status));
-            }
-        } else {
-            fprintf(stderr, "waitpid() failed\n");
-        }
-    }
-
-
-    if (proc != NULL) {
-        proc->returncode = status;
-    }
-    return WEXITSTATUS(status);
-}
-
 int shell(struct Process *proc, char *args) {
     FILE *fp_out = NULL;
     FILE *fp_err = NULL;