s/HAVE_SENDFILE/SG_HAVE_SENDFILE/

[simgrid.git] / src / smpi / internals / smpi_global.cpp

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 4aea1a5..c337d3e 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */

 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */


@@ -37,7 +37,7 @@
 # define HAVE_WORKING_MMAP 1
 #endif
 
 # define HAVE_WORKING_MMAP 1
 #endif
 

-#if HAVE_SENDFILE
+#if SG_HAVE_SENDFILE

 #include <sys/sendfile.h>
 #endif
 
 #include <sys/sendfile.h>
 #endif
 


@@ -498,7 +498,7 @@ static void smpi_copy_file(std::string src, std::string target, off_t fdin_size)
 
   XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast<intmax_t>(fdin_size), target.c_str());
   bool slow_copy = true;
 
   XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast<intmax_t>(fdin_size), target.c_str());
   bool slow_copy = true;

-#if HAVE_SENDFILE
+#if SG_HAVE_SENDFILE

   ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size);
   if (sent_size == fdin_size)
     slow_copy = false;
   ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size);
   if (sent_size == fdin_size)
     slow_copy = false;


@@ -563,7 +563,7 @@ static void smpi_init_privatization_dlopen(const std::string& executable)
       void* libhandle = dlopen(libname.c_str(), RTLD_LAZY);
       // get library name from path
       char fullpath[512] = {'\0'};
       void* libhandle = dlopen(libname.c_str(), RTLD_LAZY);
       // get library name from path
       char fullpath[512] = {'\0'};

-      strcpy(fullpath, libname.c_str());
+      strncpy(fullpath, libname.c_str(), 511);

 #if not defined(__APPLE__)
       int ret = dl_iterate_phdr(visit_libs, fullpath);
       if (ret == 0)
 #if not defined(__APPLE__)
       int ret = dl_iterate_phdr(visit_libs, fullpath);
       if (ret == 0)