diff --git a/CMakeLists.txt b/CMakeLists.txt index 631feb3..a77025c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) #64 bits MESSAGE( STATUS "64 bits" ) set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread") - set(CMAKE_C_FLAGS_RELEASE "-DLINUX -D_POSIX_SOURCE -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread") + set(CMAKE_C_FLAGS_RELEASE "-DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread") set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -Wall -Wextra -ggdb -DLINUX -Dlinux -D_REENTRANT -malign-double -pthread") set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -Wall -Wextra -fPIC -DLINUX -Dlinux -D_REENTRANT -malign-double -pthread -O3 -DNDEBUG") set(USRLIB_DIR "/usr/lib64/:/usr/local/lib64/") @@ -32,7 +32,7 @@ if (EXISTS "/usr/include/tirpc") include_directories("/usr/include/tirpc") endif() -if (EXISTS "/usr/lib64/libtirpc.so") +if (EXISTS "/usr/lib/x86_64-linux-gnu/libtirpc.so") set (TIRPC "tirpc") else() set (TIRPC "") diff --git a/src/DDClientLibC/INCLUDE/DD.h b/src/DDClientLibC/INCLUDE/DD.h index 646ce63..a60b9cf 100755 --- a/src/DDClientLibC/INCLUDE/DD.h +++ b/src/DDClientLibC/INCLUDE/DD.h @@ -141,3 +141,5 @@ extern int DD_AddDataSet(char *DataSetName, char *RemSetID, char *BaseName); #define DD_FLOAT 2 #define DD_DOUBLE 3 #define DD_CHAR 0 + +int GetSocket(); diff --git a/src/DDClientLibCpp/DD_client.cc b/src/DDClientLibCpp/DD_client.cc index dbe2f94..e6ce837 100644 --- a/src/DDClientLibCpp/DD_client.cc +++ b/src/DDClientLibCpp/DD_client.cc @@ -203,8 +203,16 @@ int DD_Client::GetSocket() exit(1); } - fgets(RemSerName, PATHLENGTH-1, resfile); - fgets(line, PATHLENGTH-1, resfile); + char *r = fgets(RemSerName, PATHLENGTH-1, resfile); + if (r == NULL) { + fprintf(stderr,"Cannot load server name in resource file\n"); + exit(1); + } + r = fgets(line, PATHLENGTH-1, resfile); + if (r == NULL) { + fprintf(stderr,"Cannot load port in resource file\n"); + exit(1); + } fclose(resfile); RemSerName[strlen(RemSerName)-1] = '\0'; diff --git a/src/TOOLS/COMMON/DD_Access_cl.c b/src/TOOLS/COMMON/DD_Access_cl.c index 516b09a..53256ec 100755 --- a/src/TOOLS/COMMON/DD_Access_cl.c +++ b/src/TOOLS/COMMON/DD_Access_cl.c @@ -26,7 +26,7 @@ extern int SocketID; /* The socket is defined in DD_client.c */ /*================= FUNCTIONS ================================*/ /*------------------------ LoginRequest -------------------------------*/ -LoginRequest(char *UserPasswd, char *DDUserName, char *Host) +int LoginRequest(char *UserPasswd, char *DDUserName, char *Host) { static caddr_t buf = NULL; static XDR xdrs; diff --git a/src/TOOLS/DDCheckUser/DD_Check.c b/src/TOOLS/DDCheckUser/DD_Check.c index e25f7c4..504bb33 100755 --- a/src/TOOLS/DDCheckUser/DD_Check.c +++ b/src/TOOLS/DDCheckUser/DD_Check.c @@ -12,9 +12,11 @@ #include #include #include +#include + #include -main (int argc, char *argv[]) +int main (int argc, char *argv[]) /* * LocalID - the Unix ID if user, invoking this program * LogName - the DD login name for specific user diff --git a/src/TOOLS/DDHtmlLogin/DD_htmllogin.c b/src/TOOLS/DDHtmlLogin/DD_htmllogin.c index d534af5..654bb1d 100755 --- a/src/TOOLS/DDHtmlLogin/DD_htmllogin.c +++ b/src/TOOLS/DDHtmlLogin/DD_htmllogin.c @@ -25,7 +25,7 @@ /*=========== Global Variables ===============================*/ -main (int argc, char *argv[]) +int main (int argc, char *argv[]) { int length; char HostName[MAXHOSTLENGTH]; -- libgit2 0.21.2