commit 1

README.md

@@ -1,3 +1,3 @@
 # Elaborato_SO
 
-Lore ghei
+Lore super shei

inc/semaphore.h

@@ -1,12 +0,0 @@
-#ifndef SEMAPHORE_H
-#define SEMAPHORE_H
-
-union semun {
-    int val;
-    struct semid_ds * buf;
-    unsigned short * array;
-};
-
-void semOp (int semid, short sem_num, short sem_op);
-
-#endif

inc/server.h

@@ -1,13 +1,8 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-typedef struct input {
-    int collums;
-    int rows;
-    char player1Token;
-    char player2token;
-} input_t;
+#include <structures.h>
 
-input_t check_input(int argc, char *argv[]);
+input_server_t check_input(int argc, char *argv[]);
 
 #endif

src/F4Server.c

@@ -2,11 +2,12 @@
 #include <sys/ipc.h>
 
 #include <../inc/server.h>
+#include <../inc/structures.h>
 
 #define KEYFILE "../src/F4server"
 
 int main(int argc, char *argv[]){
-    input_t input = check_input(argc, argv);
+    input_server_t input = check_input(argc, argv);
 
     key_t shmkey = ftok(KEYFILE, 'a');
 

src/semaphore.c

@@ -1,6 +1,6 @@
 #include <sys/sem.h>
 
-#include <../inc/semaphore.h>
+#include <../inc/custom_sem.h>
 #include <../inc/errExit.h>
 
 void semOp(int semid, short sem_num, short sem_op) {

src/server.c

@@ -4,7 +4,7 @@
 #include <../inc/server.h>
 #include <../inc/errExit.h>
 
-input_t check_input(int argc, char *argv[]){
+input_server_t check_input(int argc, char *argv[]){
     if (argc < 5) {
         printf("\033[92m<Help>\033[39m Arguments:\n1) number of collums\n2) number of rows\n3) player one token\n4) player two token\n");
         exit(EXIT_SUCCESS);
@@ -12,7 +12,7 @@ input_t check_input(int argc, char *argv[]){
         errExitMsg("To many arguments");
     }
 
-    input_t input = {
+    input_server_t input = {
         .collums = atoi(argv[1]),
         .rows = atoi(argv[2]),
         .player1Token = argv[3][0],