From ee260a610d3b72775749630529040254001d0d7f Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <slococo@itba.edu.ar>
Date: Tue, 9 Nov 2021 23:50:10 -0300
Subject: [PATCH] Update Makefile and create src folder

---
 Makefile                       | 27 ++++++++++-----------------
 error.h => include/error.h     |  3 +++
 master.h => include/master.h   | 15 +++++++++++++++
 shr_mem.h => include/shr_mem.h | 13 +++++++++++++
 siglib.h => include/siglib.h   |  6 ++++++
 slave.h => include/slave.h     |  9 +++++++++
 include/view.h                 | 21 +++++++++++++++++++++
 error.c => src/error.c         |  9 +++------
 master.c => src/master.c       | 22 +++-------------------
 shr_mem.c => src/shr_mem.c     | 20 +++-----------------
 siglib.c => src/siglib.c       | 13 +++----------
 slave.c => src/slave.c         | 16 +++-------------
 view.c => src/view.c           | 16 +++-------------
 view.h                         | 10 ----------
 14 files changed, 95 insertions(+), 105 deletions(-)
 rename error.h => include/error.h (69%)
 rename master.h => include/master.h (63%)
 rename shr_mem.h => include/shr_mem.h (68%)
 rename siglib.h => include/siglib.h (72%)
 rename slave.h => include/slave.h (54%)
 create mode 100644 include/view.h
 rename error.c => src/error.c (52%)
 rename master.c => src/master.c (92%)
 rename shr_mem.c => src/shr_mem.c (87%)
 rename siglib.c => src/siglib.c (84%)
 rename slave.c => src/slave.c (86%)
 rename view.c => src/view.c (79%)
 delete mode 100644 view.h

diff --git a/Makefile b/Makefile
index 3881ea6..8ccaf19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,19 @@
 CC = gcc
 CCFLAGS = -Wall -std=c99 -pedantic -g
 
-OBJECTS = master.o error.o slave.o shr_mem.o view.o siglib.o solve view
+OBJECTS = solve view slave.o
+SOLVE_SRC = src/master.c src/error.c src/shr_mem.c src/siglib.c
+VIEW_SRC = src/view.c src/error.c src/shr_mem.c src/siglib.c
+SLAVE_SRC = src/slave.c src/error.c
 
 all: $(OBJECTS)
 
-master.o: master.c error.h
-	$(CC) $(CCFLAGS) -c master.c
-error.o: error.c error.h
-	$(CC) $(CCFLAGS) -c error.c
-slave.o: slave.c error.o
-	$(CC) $(CCFLAGS) slave.c -o slave.o error.o
-shr_mem.o: shr_mem.c error.h
-	$(CC) $(CCFLAGS) -c shr_mem.c
-view.o: view.c
-	$(CC) $(CCFLAGS) -c view.c
-siglib.o: siglib.c
-	$(CC) $(CCFLAGS) -c siglib.c
-solve: master.o error.o shr_mem.o siglib.o
-	$(CC) $(CCFLAGS) -o solve master.o error.o shr_mem.o siglib.o -lm -lrt -lpthread
-view: view.o error.o shr_mem.o siglib.o
-	$(CC) $(CCFLAGS) -o view view.o error.o shr_mem.o siglib.o -lrt -lpthread
+solve: $(SOLVE_SRC)
+	$(CC) $(CCFLAGS) -o solve $(SOLVE_SRC) -lm -lrt -lpthread
+view: $(VIEW_SRC)
+	$(CC) $(CCFLAGS) -o view $(VIEW_SRC) -lrt -lpthread
+slave.o: $(SLAVE_SRC)
+	$(CC) $(CCFLAGS) -o slave.o $(SLAVE_SRC)
 
 clean:
 	rm -rf $(OBJECTS)
diff --git a/error.h b/include/error.h
similarity index 69%
rename from error.h
rename to include/error.h
index a234059..7c44512 100644
--- a/error.h
+++ b/include/error.h
@@ -1,6 +1,9 @@
 #ifndef ERRORS_H
 #define ERRORS_H
 
+#include <stdio.h>
+#include <stdlib.h>
+
 void printError(char * string);
 void printSystemError(char * string);
 
diff --git a/master.h b/include/master.h
similarity index 63%
rename from master.h
rename to include/master.h
index 14c9984..826a27b 100644
--- a/master.h
+++ b/include/master.h
@@ -1,6 +1,21 @@
 #ifndef MASTER_H
 #define MASTER_H
 
+#define _SVID_SOURCE 1
+#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200112L
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include "error.h"
+#include "shr_mem.h"
+#include <math.h>
+#include "siglib.h"
+
 #define MAX_SLAVES 500
 #define MAX_SIZE 300
 #define MAX_PATH_SIZE 100
diff --git a/shr_mem.h b/include/shr_mem.h
similarity index 68%
rename from shr_mem.h
rename to include/shr_mem.h
index 61679ea..70e085b 100644
--- a/shr_mem.h
+++ b/include/shr_mem.h
@@ -1,6 +1,19 @@
 #ifndef SHR_MEM
 #define SHR_MEM
 
+#define _SVID_SOURCE 1
+#define _POSIX_C_SOURCE 200112L
+
+#include <sys/shm.h>
+#include <semaphore.h>
+#include <fcntl.h>
+#include <string.h>
+#include "error.h"
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+
 #define SHM_NAME "/BottlerSHM"
 #define SEM_EMPTY_NAME "/EmptySEM"
 #define SEM_OPEN_NAME "/OpenSEM"
diff --git a/siglib.h b/include/siglib.h
similarity index 72%
rename from siglib.h
rename to include/siglib.h
index 06f4bf8..442836f 100644
--- a/siglib.h
+++ b/include/siglib.h
@@ -1,6 +1,12 @@
 #ifndef SIGLIB_H
 #define SIGLIB_H
 
+#define _POSIX_C_SOURCE 200112L
+
+#include <signal.h>
+#include "error.h"
+#include <unistd.h>
+
 #define SIGSTART SIGUSR1
 #define SIGEND SIGUSR2
 
diff --git a/slave.h b/include/slave.h
similarity index 54%
rename from slave.h
rename to include/slave.h
index 62e5a06..6ac310e 100644
--- a/slave.h
+++ b/include/slave.h
@@ -1,6 +1,15 @@
 #ifndef SLAVE_H
 #define SLAVE_H
 
+#define _POSIX_C_SOURCE 200112L
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include "error.h"
+
 #define MAX_SIZE 300
 #define COMMAND_MAX_SIZE 400
 
diff --git a/include/view.h b/include/view.h
new file mode 100644
index 0000000..09d8115
--- /dev/null
+++ b/include/view.h
@@ -0,0 +1,21 @@
+#ifndef VIEW_H
+#define VIEW_H
+
+#define _SVID_SOURCE 1
+#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200112L
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "error.h"
+#include "shr_mem.h"
+#include "siglib.h"
+
+#define MAX_SIZE 300
+#define MAX_AMOUNT_SIZE 10
+#define MAX_PID_SIZE 10
+#define MAX_PATH_SIZE 100
+#define MAX_OUTPUT_SIZE (200 + MAX_PATH_SIZE)
+
+#endif
\ No newline at end of file
diff --git a/error.c b/src/error.c
similarity index 52%
rename from error.c
rename to src/error.c
index aa4e0fc..e73839e 100644
--- a/error.c
+++ b/src/error.c
@@ -1,9 +1,6 @@
-/*
-This is a personal academic project. Dear PVS-Studio, please check it.
-PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-*/
-#include <stdio.h>
-#include <stdlib.h>
+// This is a personal academic project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+#include "../include/error.h"
 
 void printError(char * string) {
     fprintf(stderr, "%s", string);
diff --git a/master.c b/src/master.c
similarity index 92%
rename from master.c
rename to src/master.c
index 4d7a4a6..7a2fbe3 100644
--- a/master.c
+++ b/src/master.c
@@ -1,22 +1,6 @@
-/*
-This is a personal academic project. Dear PVS-Studio, please check it.
-PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-*/
-#define _SVID_SOURCE 1
-#define _XOPEN_SOURCE 500
-#define _POSIX_C_SOURCE 2
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#include "error.h"
-#include "shr_mem.h"
-#include <math.h>
-#include "master.h"
-#include "siglib.h"
+// This is a personal academic project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+#include "../include/master.h"
 
 static char viewLinked = 0;
 int slaveNum;
diff --git a/shr_mem.c b/src/shr_mem.c
similarity index 87%
rename from shr_mem.c
rename to src/shr_mem.c
index 200c675..341365e 100644
--- a/shr_mem.c
+++ b/src/shr_mem.c
@@ -1,20 +1,6 @@
-/*
-This is a personal academic project. Dear PVS-Studio, please check it.
-PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-*/
-#define _SVID_SOURCE 1
-#define _POSIX_C_SOURCE 200112L
-
-#include <sys/shm.h>
-#include <semaphore.h>
-#include <fcntl.h>
-#include <string.h>
-#include "error.h"
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include "shr_mem.h"
+// This is a personal academic project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+#include "../include/shr_mem.h"
 
 sem_t * semEmpty = NULL;
 sem_t * semOpen = NULL;
diff --git a/siglib.c b/src/siglib.c
similarity index 84%
rename from siglib.c
rename to src/siglib.c
index e7eaf26..b97e4eb 100644
--- a/siglib.c
+++ b/src/siglib.c
@@ -1,13 +1,6 @@
-/*
-This is a personal academic project. Dear PVS-Studio, please check it.
-PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-*/
-#define _POSIX_C_SOURCE 200112L
-
-#include "siglib.h"
-#include <signal.h>
-#include "error.h"
-#include <unistd.h>
+// This is a personal academic project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+#include "../include/siglib.h"
 
 void addSignalHandler(void (*changeViewFlag)()) {
     struct sigaction sigAct = {{0}};
diff --git a/slave.c b/src/slave.c
similarity index 86%
rename from slave.c
rename to src/slave.c
index edfa66a..ddb113e 100644
--- a/slave.c
+++ b/src/slave.c
@@ -1,16 +1,6 @@
-/*
-This is a personal academic project. Dear PVS-Studio, please check it.
-PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-*/
-#define _POSIX_C_SOURCE 2
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include "error.h"
-#include "slave.h"
+// This is a personal academic project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+#include "../include/slave.h"
 
 int main(int argc, char *argv[]) {
     if (setvbuf(stdout, NULL, _IONBF, 0) != 0)
diff --git a/view.c b/src/view.c
similarity index 79%
rename from view.c
rename to src/view.c
index 373a688..63c733a 100644
--- a/view.c
+++ b/src/view.c
@@ -1,16 +1,6 @@
-/*
-This is a personal academic project. Dear PVS-Studio, please check it.
-PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-*/
-#define _POSIX_C_SOURCE 200112L
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "error.h"
-#include "shr_mem.h"
-#include "siglib.h"
-#include "view.h"
+// This is a personal academic project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+#include "../include/view.h"
 
 int main(int argc, char * argv[]) {
     char amount[MAX_AMOUNT_SIZE] = {0};
diff --git a/view.h b/view.h
deleted file mode 100644
index 102b76b..0000000
--- a/view.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef VIEW_H
-#define VIEW_H
-
-#define MAX_SIZE 300
-#define MAX_AMOUNT_SIZE 10
-#define MAX_PID_SIZE 10
-#define MAX_PATH_SIZE 100
-#define MAX_OUTPUT_SIZE (200 + MAX_PATH_SIZE)
-
-#endif
\ No newline at end of file