From 4b0cff4e8593f786e3ce31693bc1783f570c8a03 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <slococo@itba.edu.ar>
Date: Mon, 13 Sep 2021 23:46:06 -0300
Subject: [PATCH] Make last changes...

Co-authored-by: Juan Barmasch <jbarmasch@itba.edu.ar>
Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>
---
 master.c | 23 +++++++++++++++--------
 siglib.c |  1 -
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/master.c b/master.c
index 805b481..4d7a4a6 100644
--- a/master.c
+++ b/master.c
@@ -32,20 +32,16 @@ int main(int argc, char *argv[]) {
     slaveNum = (slaveNum == 0 ? 1 : slaveNum);
     slaveNum = (slaveNum < MAX_SLAVES ? slaveNum : MAX_SLAVES);
 
-    FILE * outputFile;
-    if ((outputFile = fopen(OUTPUT_NAME, "w")) == NULL)
-        printSystemError("fopen() -- ERROR");
-
-    char * shmPointer, * shmStart;
-    int totalSize = (argc - 1) * MAX_OUTPUT_SIZE;
-    int shmFd;
-
     printf("%d\n%d\n", argc - 1, getpid());
 
     addSignalHandler(changeViewFlag);
     sleep(5);
     blockSignal();
 
+    char * shmPointer, * shmStart;
+    int totalSize = (argc - 1) * MAX_OUTPUT_SIZE;
+    int shmFd;
+
     if (viewLinked) {
         shmFd = createShm(totalSize);
         mapShm(&shmPointer, totalSize, shmFd);
@@ -60,6 +56,10 @@ int main(int argc, char *argv[]) {
         sendTask(argv[tasks], pipesInput, j++);
     }
 
+    FILE * outputFile;
+    if ((outputFile = fopen(OUTPUT_NAME, "w")) == NULL)
+        printSystemError("fopen() -- ERROR");
+
     fd_set pipesOutputSet;
     FD_ZERO(&pipesOutputSet);
 
@@ -170,6 +170,13 @@ void createPipesAndSlaves(int pipesOutput[slaveNum][2], int pipesInput[slaveNum]
             if (close(pipesInput[i][0]) < 0)
                 printSystemError("close() -- ERROR");
 
+            for (int j = 0; j < i; j++) {
+                if (close(pipesInput[j][1]) < 0)
+                    printSystemError("close() -- ERROR");
+                if (close(pipesOutput[j][0]) < 0)
+                    printSystemError("close() -- ERROR");
+            }
+
 	        char * params[] = {"slave.o", NULL};
             if (execv("slave.o", params) < 0)
                 printSystemError("execv() -- ERROR");
diff --git a/siglib.c b/siglib.c
index 52094e5..e7eaf26 100644
--- a/siglib.c
+++ b/siglib.c
@@ -8,7 +8,6 @@ PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include <signal.h>
 #include "error.h"
 #include <unistd.h>
-#include <stdio.h>
 
 void addSignalHandler(void (*changeViewFlag)()) {
     struct sigaction sigAct = {{0}};