diff --git a/MakeFileGeneric b/MakeFileGeneric index 6fc3640..37c2260 100644 --- a/MakeFileGeneric +++ b/MakeFileGeneric @@ -5,8 +5,8 @@ OUTPATH=./build/ SOURCE_MODULES_PATH=./library/ #FOR DEBUG PURPOSE -#CFLAGS=-c -Wall -I. -g -O0 -CFLAGS=-c -Wall -I. +CFLAGS=-c -Wall -I. -g -O0 +#CFLAGS=-c -Wall -I. OPTIMIZATION=-O3 HEADERS=-I LIBPATH=./build/modules/ diff --git a/build/Debug/GNU-Linux/ftpData.o b/build/Debug/GNU-Linux/ftpData.o index cd0e915..151e4b2 100644 Binary files a/build/Debug/GNU-Linux/ftpData.o and b/build/Debug/GNU-Linux/ftpData.o differ diff --git a/build/Debug/GNU-Linux/ftpServer.o b/build/Debug/GNU-Linux/ftpServer.o index 47fe446..7bee97b 100644 Binary files a/build/Debug/GNU-Linux/ftpServer.o and b/build/Debug/GNU-Linux/ftpServer.o differ diff --git a/build/Debug/GNU-Linux/library/configRead.o b/build/Debug/GNU-Linux/library/configRead.o deleted file mode 100644 index 729e8a4..0000000 Binary files a/build/Debug/GNU-Linux/library/configRead.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/configRead.o.d b/build/Debug/GNU-Linux/library/configRead.o.d deleted file mode 100644 index 18058fc..0000000 --- a/build/Debug/GNU-Linux/library/configRead.o.d +++ /dev/null @@ -1,23 +0,0 @@ -build/Debug/GNU-Linux/library/configRead.o: library/configRead.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/configRead.h library/dynamicVectors.h \ - library/../ftpData.h library/../library/dynamicVectors.h \ - library/fileManagement.h library/daemon.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/configRead.h: - -library/dynamicVectors.h: - -library/../ftpData.h: - -library/../library/dynamicVectors.h: - -library/fileManagement.h: - -library/daemon.h: diff --git a/build/Debug/GNU-Linux/library/connection.o b/build/Debug/GNU-Linux/library/connection.o deleted file mode 100644 index 7befb1a..0000000 Binary files a/build/Debug/GNU-Linux/library/connection.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/connection.o.d b/build/Debug/GNU-Linux/library/connection.o.d deleted file mode 100644 index 9cfe267..0000000 --- a/build/Debug/GNU-Linux/library/connection.o.d +++ /dev/null @@ -1,16 +0,0 @@ -build/Debug/GNU-Linux/library/connection.o: library/connection.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/../ftpData.h \ - library/../library/dynamicVectors.h library/connection.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/../ftpData.h: - -library/../library/dynamicVectors.h: - -library/connection.h: diff --git a/build/Debug/GNU-Linux/library/daemon.o b/build/Debug/GNU-Linux/library/daemon.o deleted file mode 100644 index c233c0f..0000000 Binary files a/build/Debug/GNU-Linux/library/daemon.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/daemon.o.d b/build/Debug/GNU-Linux/library/daemon.o.d deleted file mode 100644 index 87c2092..0000000 --- a/build/Debug/GNU-Linux/library/daemon.o.d +++ /dev/null @@ -1,11 +0,0 @@ -build/Debug/GNU-Linux/library/daemon.o: library/daemon.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/fileManagement.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/fileManagement.h: diff --git a/build/Debug/GNU-Linux/library/dynamicVectors.o b/build/Debug/GNU-Linux/library/dynamicVectors.o deleted file mode 100644 index b1fe279..0000000 Binary files a/build/Debug/GNU-Linux/library/dynamicVectors.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/dynamicVectors.o.d b/build/Debug/GNU-Linux/library/dynamicVectors.o.d deleted file mode 100644 index a02322d..0000000 --- a/build/Debug/GNU-Linux/library/dynamicVectors.o.d +++ /dev/null @@ -1,11 +0,0 @@ -build/Debug/GNU-Linux/library/dynamicVectors.o: library/dynamicVectors.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/dynamicVectors.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/dynamicVectors.h: diff --git a/build/Debug/GNU-Linux/library/fileManagement.o b/build/Debug/GNU-Linux/library/fileManagement.o deleted file mode 100644 index 5ecefd3..0000000 Binary files a/build/Debug/GNU-Linux/library/fileManagement.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/fileManagement.o.d b/build/Debug/GNU-Linux/library/fileManagement.o.d deleted file mode 100644 index 78e7134..0000000 --- a/build/Debug/GNU-Linux/library/fileManagement.o.d +++ /dev/null @@ -1,14 +0,0 @@ -build/Debug/GNU-Linux/library/fileManagement.o: library/fileManagement.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: diff --git a/build/Debug/GNU-Linux/library/logFunctions.o b/build/Debug/GNU-Linux/library/logFunctions.o deleted file mode 100644 index 6b5f61c..0000000 Binary files a/build/Debug/GNU-Linux/library/logFunctions.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/logFunctions.o.d b/build/Debug/GNU-Linux/library/logFunctions.o.d deleted file mode 100644 index e52d825..0000000 --- a/build/Debug/GNU-Linux/library/logFunctions.o.d +++ /dev/null @@ -1,11 +0,0 @@ -build/Debug/GNU-Linux/library/logFunctions.o: library/logFunctions.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/logFunctions.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/logFunctions.h: diff --git a/build/Debug/GNU-Linux/library/openSsl.o b/build/Debug/GNU-Linux/library/openSsl.o deleted file mode 100644 index fd26f74..0000000 Binary files a/build/Debug/GNU-Linux/library/openSsl.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/openSsl.o.d b/build/Debug/GNU-Linux/library/openSsl.o.d deleted file mode 100644 index 894f475..0000000 --- a/build/Debug/GNU-Linux/library/openSsl.o.d +++ /dev/null @@ -1,11 +0,0 @@ -build/Debug/GNU-Linux/library/openSsl.o: library/openSsl.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/openSsl.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/openSsl.h: diff --git a/build/Debug/GNU-Linux/library/signals.o b/build/Debug/GNU-Linux/library/signals.o deleted file mode 100644 index 78c4af6..0000000 Binary files a/build/Debug/GNU-Linux/library/signals.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/library/signals.o.d b/build/Debug/GNU-Linux/library/signals.o.d deleted file mode 100644 index ff9cc4d..0000000 --- a/build/Debug/GNU-Linux/library/signals.o.d +++ /dev/null @@ -1,11 +0,0 @@ -build/Debug/GNU-Linux/library/signals.o: library/signals.c \ - library/dynamicVectors.h library/fileManagement.h \ - library/dynamicVectors.h library/../ftpServer.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/../ftpServer.h: diff --git a/build/Debug/GNU-Linux/uFTP.o b/build/Debug/GNU-Linux/uFTP.o deleted file mode 100644 index 63c9847..0000000 Binary files a/build/Debug/GNU-Linux/uFTP.o and /dev/null differ diff --git a/build/Debug/GNU-Linux/uFTP.o.d b/build/Debug/GNU-Linux/uFTP.o.d deleted file mode 100644 index 2e331b6..0000000 --- a/build/Debug/GNU-Linux/uFTP.o.d +++ /dev/null @@ -1,10 +0,0 @@ -build/Debug/GNU-Linux/uFTP.o: uFTP.c library/dynamicVectors.h \ - library/fileManagement.h library/dynamicVectors.h ftpServer.h - -library/dynamicVectors.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -ftpServer.h: diff --git a/build/Release/GNU-Linux/ftpCommandElaborate.o.d b/build/Release/GNU-Linux/ftpCommandElaborate.o.d deleted file mode 100644 index 89264c2..0000000 --- a/build/Release/GNU-Linux/ftpCommandElaborate.o.d +++ /dev/null @@ -1,22 +0,0 @@ -build/Release/GNU-Linux/ftpCommandElaborate.o: ftpCommandElaborate.c \ - ftpData.h library/dynamicVectors.h ftpServer.h library/logFunctions.h \ - library/fileManagement.h library/dynamicVectors.h library/configRead.h \ - library/../ftpData.h ftpCommandsElaborate.h - -ftpData.h: - -library/dynamicVectors.h: - -ftpServer.h: - -library/logFunctions.h: - -library/fileManagement.h: - -library/dynamicVectors.h: - -library/configRead.h: - -library/../ftpData.h: - -ftpCommandsElaborate.h: diff --git a/build/modules/configRead.o b/build/modules/configRead.o index 9ced74b..92b9178 100644 Binary files a/build/modules/configRead.o and b/build/modules/configRead.o differ diff --git a/build/modules/connection.o b/build/modules/connection.o index b08f37c..f4a3196 100644 Binary files a/build/modules/connection.o and b/build/modules/connection.o differ diff --git a/build/modules/daemon.o b/build/modules/daemon.o index caf4c95..1ac5dd6 100644 Binary files a/build/modules/daemon.o and b/build/modules/daemon.o differ diff --git a/build/modules/dynamicVectors.o b/build/modules/dynamicVectors.o index 485add8..8c121dc 100644 Binary files a/build/modules/dynamicVectors.o and b/build/modules/dynamicVectors.o differ diff --git a/build/modules/fileManagement.o b/build/modules/fileManagement.o index 889c7ef..c3c96e2 100644 Binary files a/build/modules/fileManagement.o and b/build/modules/fileManagement.o differ diff --git a/build/modules/ftpCommandElaborate.o b/build/modules/ftpCommandElaborate.o index c843584..5127fdc 100644 Binary files a/build/modules/ftpCommandElaborate.o and b/build/modules/ftpCommandElaborate.o differ diff --git a/build/modules/ftpData.o b/build/modules/ftpData.o index 2879bd9..4af5cea 100644 Binary files a/build/modules/ftpData.o and b/build/modules/ftpData.o differ diff --git a/build/modules/ftpServer.o b/build/modules/ftpServer.o index b6a0803..048cbd0 100644 Binary files a/build/modules/ftpServer.o and b/build/modules/ftpServer.o differ diff --git a/build/modules/logFunctions.o b/build/modules/logFunctions.o index ca9f615..a8ef6e7 100644 Binary files a/build/modules/logFunctions.o and b/build/modules/logFunctions.o differ diff --git a/build/modules/openSsl.o b/build/modules/openSsl.o index bbe6008..8881265 100644 Binary files a/build/modules/openSsl.o and b/build/modules/openSsl.o differ diff --git a/build/modules/signals.o b/build/modules/signals.o index 43358f4..5106668 100644 Binary files a/build/modules/signals.o and b/build/modules/signals.o differ diff --git a/build/uFTP b/build/uFTP index 8d9ca31..68bb49d 100755 Binary files a/build/uFTP and b/build/uFTP differ diff --git a/dist/Debug/GNU-Linux/uftp b/dist/Debug/GNU-Linux/uftp new file mode 100755 index 0000000..7ae5b3a Binary files /dev/null and b/dist/Debug/GNU-Linux/uftp differ diff --git a/ftpData.c b/ftpData.c index 0c95c2c..bfc2af7 100644 --- a/ftpData.c +++ b/ftpData.c @@ -597,7 +597,7 @@ void resetWorkerData(workerDataType *workerData, int isInitialization) void resetClientData(clientDataType *clientData, int isInitialization) { - if (isInitialization != 0) + if (isInitialization != 1) { if (clientData->workerData.threadIsAlive == 1) { @@ -607,7 +607,7 @@ void resetClientData(clientDataType *clientData, int isInitialization) } else { - void *pReturn; + void *pReturn = NULL; pthread_join(clientData->workerData.workerThread, &pReturn); } } diff --git a/ftpData.h b/ftpData.h index 1f2e34a..5588dd8 100644 --- a/ftpData.h +++ b/ftpData.h @@ -252,6 +252,7 @@ void resetWorkerData(workerDataType *pasvData, int isInitialization); void resetClientData(clientDataType *clientData, int isInitialization); int compareStringCaseInsensitive(char *stringIn, char* stringRef, int stringLenght); int isCharInString(char *theString, int stringLen, char theChar); +void destroyConfigurationVectorElement(void * data); #ifdef __cplusplus } #endif diff --git a/ftpServer.c b/ftpServer.c index 66b59e4..65ac266 100644 --- a/ftpServer.c +++ b/ftpServer.c @@ -328,9 +328,6 @@ void runFtpServer(void) { printf("\nHello uFTP server v%s starting..\n", UFTP_SERVER_VERSION); - - - /* Needed for Select*/ static int processingSock = 0, returnCode = 0; diff --git a/library/configRead.c b/library/configRead.c index e584bfd..f693182 100644 --- a/library/configRead.c +++ b/library/configRead.c @@ -40,6 +40,12 @@ static int parseConfigurationFile(ftpParameters_DataType *ftpParameters, DYNV_Ve static int searchParameter(char *name, DYNV_VectorGenericDataType *parametersVector); static int readConfigurationFile(char *path, DYNV_VectorGenericDataType *parametersVector); +void destroyConfigurationVectorElement(void * data) +{ + free( ((parameter_DataType *) data)->value); + free( ((parameter_DataType *) data)->name); +} + /* Public Functions */ int searchUser(char *name, DYNV_VectorGenericDataType *usersVector) { @@ -66,18 +72,14 @@ void configurationRead(ftpParameters_DataType *ftpParameters) if (FILE_IsFile(LOCAL_CONFIGURATION_FILENAME) == 1) { printf("\nReading configuration from \n -> %s \n", LOCAL_CONFIGURATION_FILENAME); - returnCode = readConfigurationFile(LOCAL_CONFIGURATION_FILENAME, &configParameters); - printf("\nDONE\n"); } else if (FILE_IsFile(DEFAULT_CONFIGURATION_FILENAME) == 1) { printf("\nReading configuration from \n -> %s\n", DEFAULT_CONFIGURATION_FILENAME); - returnCode = readConfigurationFile(DEFAULT_CONFIGURATION_FILENAME, &configParameters); - printf("\nDONE\n"); } @@ -92,6 +94,9 @@ void configurationRead(ftpParameters_DataType *ftpParameters) exit(1); } + + DYNV_VectorGeneric_Destroy(&configParameters, destroyConfigurationVectorElement); + return; } diff --git a/library/signals.c b/library/signals.c index 9c14041..62b35ca 100644 --- a/library/signals.c +++ b/library/signals.c @@ -56,7 +56,7 @@ static void ignore_sigpipe(void) } } -void onUftpClose(void) +void onUftpClose(int sig) { printf("\nuFTP exit()\n"); deallocateMemory(); diff --git a/library/signals.h b/library/signals.h index a25d1ef..792e6da 100644 --- a/library/signals.h +++ b/library/signals.h @@ -31,7 +31,7 @@ extern "C" { void signalHandlerInstall(void); void signal_callback_handler(int signum); -void onUftpClose(void); +void onUftpClose(int sig); #ifdef __cplusplus } diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk index b6f2d0e..6b82ede 100644 --- a/nbproject/Makefile-Debug.mk +++ b/nbproject/Makefile-Debug.mk @@ -50,7 +50,7 @@ OBJECTFILES= \ # C Compiler Flags -CFLAGS=-pthread +CFLAGS= # CC Compiler Flags CCFLAGS= @@ -63,7 +63,7 @@ FFLAGS= ASFLAGS= # Link Libraries and Options -LDLIBSOPTIONS= +LDLIBSOPTIONS=-lpthread `pkg-config --libs libcrypto` `pkg-config --libs libssl` `pkg-config --libs openssl` # Build Targets .build-conf: ${BUILD_SUBPROJECTS} @@ -71,67 +71,67 @@ LDLIBSOPTIONS= ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/uftp: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} - ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/uftp ${OBJECTFILES} ${LDLIBSOPTIONS} + gcc -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/uftp ${OBJECTFILES} ${LDLIBSOPTIONS} ${OBJECTDIR}/ftpCommandElaborate.o: ftpCommandElaborate.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/ftpCommandElaborate.o ftpCommandElaborate.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/ftpCommandElaborate.o ftpCommandElaborate.c ${OBJECTDIR}/ftpData.o: ftpData.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/ftpData.o ftpData.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/ftpData.o ftpData.c ${OBJECTDIR}/ftpServer.o: ftpServer.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/ftpServer.o ftpServer.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/ftpServer.o ftpServer.c ${OBJECTDIR}/library/configRead.o: library/configRead.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/configRead.o library/configRead.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/configRead.o library/configRead.c ${OBJECTDIR}/library/connection.o: library/connection.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/connection.o library/connection.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/connection.o library/connection.c ${OBJECTDIR}/library/daemon.o: library/daemon.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/daemon.o library/daemon.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/daemon.o library/daemon.c ${OBJECTDIR}/library/dynamicVectors.o: library/dynamicVectors.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/dynamicVectors.o library/dynamicVectors.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/dynamicVectors.o library/dynamicVectors.c ${OBJECTDIR}/library/fileManagement.o: library/fileManagement.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/fileManagement.o library/fileManagement.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/fileManagement.o library/fileManagement.c ${OBJECTDIR}/library/logFunctions.o: library/logFunctions.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/logFunctions.o library/logFunctions.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/logFunctions.o library/logFunctions.c ${OBJECTDIR}/library/openSsl.o: library/openSsl.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/openSsl.o library/openSsl.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/openSsl.o library/openSsl.c ${OBJECTDIR}/library/signals.o: library/signals.c ${MKDIR} -p ${OBJECTDIR}/library ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/signals.o library/signals.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/library/signals.o library/signals.c ${OBJECTDIR}/uFTP.o: uFTP.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.c) -g -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/uFTP.o uFTP.c + $(COMPILE.c) -g -Wall -D_LARGEFILE64_SOURCE -Ilibrary -include library/dynamicVectors.h -include library/fileManagement.h `pkg-config --cflags libcrypto` `pkg-config --cflags libssl` `pkg-config --cflags openssl` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/uFTP.o uFTP.c # Subprojects .build-subprojects: diff --git a/nbproject/Makefile-Release.mk b/nbproject/Makefile-Release.mk index e660c80..7da7d52 100644 --- a/nbproject/Makefile-Release.mk +++ b/nbproject/Makefile-Release.mk @@ -50,7 +50,7 @@ OBJECTFILES= \ # C Compiler Flags -CFLAGS= +CFLAGS=-pthread -ssl -crypto # CC Compiler Flags CCFLAGS= diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 4b31e1b..9c09f8c 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -54,6 +54,7 @@ displayName="Important Files" projectFiles="false" kind="IMPORTANT_FILES_FOLDER"> + MakeFileGeneric Makefile @@ -64,7 +65,7 @@ - default + GNU|GNU true false @@ -78,11 +79,20 @@ library/dynamicVectors.h library/fileManagement.h - -pthread _LARGEFILE64_SOURCE + 2 + + gcc + + PosixThreads + `pkg-config --libs libcrypto` + `pkg-config --libs libssl` + `pkg-config --libs openssl` + + @@ -150,6 +160,7 @@ 5 + -pthread -ssl -crypto 5 diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 942cc37..91ae145 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -7,19 +7,7 @@ - file:/home/ugo/NetBeansProjects/uFTP/library/signals.c - file:/home/ugo/NetBeansProjects/uFTP/library/signals.h - file:/home/ugo/NetBeansProjects/uFTP/ftpServer.c - file:/home/ugo/NetBeansProjects/uFTP/uFTP.c file:/home/ugo/NetBeansProjects/uFTP/MakeFileGeneric - file:/home/ugo/NetBeansProjects/uFTP/ftpServer.h - file:/home/ugo/NetBeansProjects/uFTP/library/openSsl.c - file:/home/ugo/NetBeansProjects/uFTP/ftpData.h - file:/home/ugo/NetBeansProjects/uFTP/library/configRead.c - file:/home/ugo/NetBeansProjects/uFTP/ftpCommandsElaborate.h - file:/home/ugo/NetBeansProjects/uFTP/ftpData.c - file:/home/ugo/NetBeansProjects/uFTP/library/openSsl.h - file:/home/ugo/NetBeansProjects/uFTP/ftpCommandElaborate.c