elvis/progettoso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiling on linux

Browse Source
This commit is contained in:
elvis
2022-04-24 13:01:13 +02:00
parent 9eaf9cdd49
commit d7f555bf21
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -2,7 +2,7 @@ CC = gcc
CFLAGS += -std=c99 -Wall -Werror -pedantic #-g CFLAGS += -std=c99 -Wall -Werror -pedantic #-g
INCDIR = ./lib/utils ./lib/ini ./lib/threadpool ./src ./lib/log ./lib/api INCDIR = ./lib/utils ./lib/ini ./lib/threadpool ./src ./lib/log ./lib/api
INCLUDES := $(patsubst %,-I %,$(INCDIR)) INCLUDES := $(patsubst %,-I %,$(INCDIR))
LDFLAGS = -L . LDFLAGS = -L . -lm
OPTFLAGS = #-O3 OPTFLAGS = #-O3
LIBS = -lpthread LIBS = -lpthread
SOCKET = ./cs_sock 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 $@ @echo $@
$(BUILD_DIR)/server: $(OBJ_SERVER) $(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 $@ @echo $@
@ -80,7 +80,7 @@ $(OBJ_DIR)/client.o: client.c api.h
@echo $@ @echo $@
$(BUILD_DIR)/client: $(OBJ_CLIENT) $(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 $@ @echo $@

9
lib/api/api.c
View File

@ -1,3 +1,5 @@
#define _POSIX_C_SOURCE 200809L
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
@ -6,6 +8,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>
#include <math.h> #include <math.h>
@ -1431,7 +1434,7 @@ int storeFilesInDirectory(const char *dirname, int n, recivedFile_t *rf) {
return -1; return -1;
} }
strcpy(basepath, dirname); strcpy(basepath, dirname);
strlcat(basepath, "/", basepathlen); strncat(basepath, "/", basepathlen);
// for each file, create and write // for each file, create and write
for(int i=0;i<n;++i) { for(int i=0;i<n;++i) {
@ -1442,7 +1445,7 @@ int storeFilesInDirectory(const char *dirname, int n, recivedFile_t *rf) {
return -1; return -1;
} }
strcpy(filename, basepath); strcpy(filename, basepath);
strlcat(filename, rf[i].path, basepathlen + rf[i].pathlen); strncat(filename, rf[i].path, basepathlen + rf[i].pathlen);
int fdo; int fdo;
if((fdo = open(filename, O_WRONLY | O_CREAT, 0666)) == -1) { // open if((fdo = open(filename, O_WRONLY | O_CREAT, 0666)) == -1) { // open
@ -1527,7 +1530,7 @@ int addOpenFile(const char *pathname) {
return -1; return -1;
} }
strlcpy(new->filename, pathname, len); strncpy(new->filename, pathname, len);
new->next = NULL; new->next = NULL;
if(openedFiles->f == NULL) { if(openedFiles->f == NULL) {

2
lib/api/api.h
View File

@ -4,6 +4,8 @@
#include <time.h> #include <time.h>
struct timespec;
#define O_CREATE 1 #define O_CREATE 1
#define O_LOCK 2 #define O_LOCK 2

2
src/client.c
View File

@ -1,3 +1,5 @@
#define _POSIX_C_SOURCE 200809L
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fts.h> #include <fts.h>