From d7f555bf21ff330f1459cb31575bd3895725f653 Mon Sep 17 00:00:00 2001
From: elvis <elvisrossi@fastwebnet.it>
Date: Sun, 24 Apr 2022 13:01:13 +0200
Subject: [PATCH] compiling on linux

---
 Makefile      | 6 +++---
 lib/api/api.c | 9 ++++++---
 lib/api/api.h | 2 ++
 src/client.c  | 2 ++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 9515275..543caf5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CC               = gcc
 CFLAGS	        += -std=c99 -Wall -Werror -pedantic #-g
 INCDIR           = ./lib/utils ./lib/ini ./lib/threadpool ./src ./lib/log ./lib/api
 INCLUDES        := $(patsubst %,-I %,$(INCDIR))
-LDFLAGS	         = -L .
+LDFLAGS	         = -L . -lm
 OPTFLAGS         = #-O3
 LIBS             = -lpthread
 SOCKET           = ./cs_sock
@@ -66,7 +66,7 @@ $(OBJ_DIR)/server.o: server.c threadpool.h conn.h util.h serverWorker.h ini.h se
 	@echo $@
 
 $(BUILD_DIR)/server: $(OBJ_SERVER)
-	@$(CC) $(CFLAGS) $(OPTFLAGS) $(OPTFLAGS) $(LIBS) $(OBJ_SERVER) -o $(BUILD_DIR)/server
+	@$(CC) $(CFLAGS) $(OPTFLAGS) $(OPTFLAGS) $(LIBS) $(OBJ_SERVER) $(LDFLAGS) -o $(BUILD_DIR)/server
 	@echo $@
 
 
@@ -80,7 +80,7 @@ $(OBJ_DIR)/client.o: client.c api.h
 	@echo $@
 
 $(BUILD_DIR)/client: $(OBJ_CLIENT)
-	@$(CC) $(CFLAGS) $(OPTFLAGS) $(LIBS) $(OBJ_CLIENT) -o $(BUILD_DIR)/client
+	@$(CC) $(CFLAGS) $(OPTFLAGS) $(LIBS) $(OBJ_CLIENT) $(LDFLAGS) -o $(BUILD_DIR)/client
 	@echo $@
 
 
diff --git a/lib/api/api.c b/lib/api/api.c
index 8f82b70..8283672 100644
--- a/lib/api/api.c
+++ b/lib/api/api.c
@@ -1,3 +1,5 @@
+#define _POSIX_C_SOURCE 200809L
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -6,6 +8,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <time.h>
 #include <sys/un.h>
 #include <unistd.h>
 #include <math.h>
@@ -1431,7 +1434,7 @@ int storeFilesInDirectory(const char *dirname, int n, recivedFile_t *rf) {
 	return -1;
     }
     strcpy(basepath, dirname);
-    strlcat(basepath, "/", basepathlen);
+    strncat(basepath, "/", basepathlen);
 
     // for each file, create and write
     for(int i=0;i<n;++i) {
@@ -1442,7 +1445,7 @@ int storeFilesInDirectory(const char *dirname, int n, recivedFile_t *rf) {
 	    return -1;
 	}
 	strcpy(filename, basepath);
-	strlcat(filename, rf[i].path, basepathlen + rf[i].pathlen);
+	strncat(filename, rf[i].path, basepathlen + rf[i].pathlen);
 
 	int fdo;
 	if((fdo = open(filename, O_WRONLY | O_CREAT, 0666)) == -1) { // open
@@ -1527,7 +1530,7 @@ int addOpenFile(const char *pathname) {
 	return -1;
     }
 
-    strlcpy(new->filename, pathname, len);
+    strncpy(new->filename, pathname, len);
     new->next = NULL;
 
     if(openedFiles->f == NULL) {
diff --git a/lib/api/api.h b/lib/api/api.h
index 46c223a..c53b453 100644
--- a/lib/api/api.h
+++ b/lib/api/api.h
@@ -4,6 +4,8 @@
 
 #include <time.h>
 
+struct timespec;
+
 #define O_CREATE 1
 #define O_LOCK 2
 
diff --git a/src/client.c b/src/client.c
index 6a1e0a8..8d83a0d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,3 +1,5 @@
+#define _POSIX_C_SOURCE 200809L
+
 #include <ctype.h>
 #include <errno.h>
 #include <fts.h>