boh

src/F4Server.c

@@ -4,14 +4,11 @@
 #include <server.h>
 #include <structures.h>
 
-#define KEYFILE "../src/F4server"
 
 int main(int argc, char *argv[]){
     input_server_t input = check_input(argc, argv);
 
-    key_t shmkey = ftok(KEYFILE, 'a');
-
-    int shmid = getShm(shmkey, sizeof(int) * input.collums * input.rows);
+    int shmid = getShmid();
 
     return 0;
 }

src/server.c

@@ -1,12 +1,17 @@
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <ctype.h>
 #include <server.h>
 #include <errExit.h>
 
 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");
+        printf("\033[92m<Help>\033[39m ./F4Server ROW COL PLAYER1 PLAYER2\n"
+               "\t- ROW \t\tnumber of rows\n"
+               "\t- COL \t\tnumber of rows\n"
+               "\t- PLAYER1 \tplayer one token\n"
+               "\t- PLAYER2 \tplayer two token\n"
+               );
         exit(EXIT_SUCCESS);
     } else if (argc > 5) {
         errExitMsg("To many arguments");
@@ -16,15 +21,15 @@ input_server_t check_input(int argc, char *argv[]){
         .collums = atoi(argv[1]),
         .rows = atoi(argv[2]),
         .player1Token = argv[3][0],
-        .player2token = argv[4][0]
+        .player2Token = argv[4][0]
     };
 
     if (input.collums<5 || input.rows<5) {
         errExitMsg("To few rows or collums");
     }
 
-    if (input.player1Token == NULL || input.player2token == NULL) {
-        errExitMsg("Invalid player names");
+    if (!isprint(input.player1Token) || !isprint(input.player2Token)) {
+        errExitMsg("Invalid player token");
     }
 
     return input;