X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..8fb33d38a40ca0d377aa543a401d34309514e542:/src/xbt/xbt_os_file.cpp

diff --git a/src/xbt/xbt_os_file.cpp b/src/xbt/xbt_os_file.cpp
index ce487f4ebd..229ac5ee64 100644
--- a/src/xbt/xbt_os_file.cpp
+++ b/src/xbt/xbt_os_file.cpp
@@ -1,6 +1,6 @@
 /* xbt_os_file.cpp -- portable interface to file-related functions          */
 
-/* Copyright (c) 2017-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2020. 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. */
@@ -14,35 +14,36 @@
 #endif
 
 #if HAVE_UNISTD_H
+#include <array>
+#include <cerrno>
 #include <unistd.h>
 #endif
 
 #include <cstring>
-#include <errno.h>
 #include <libgen.h> /* POSIX dirname */
 
 simgrid::xbt::Path::Path()
 {
 #if HAVE_UNISTD_H
-  char buffer[2048];
-  char* ret = getcwd(buffer, 2048);
-  xbt_assert(ret == buffer, "Error during getcwd: %s", strerror(errno));
-  path_ = std::string(buffer);
+  std::array<char, 2048> buffer;
+  const char* cwd = getcwd(buffer.data(), 2048);
+  xbt_assert(cwd != nullptr, "Error during getcwd: %s", strerror(errno));
+  path_ = std::string(cwd);
 #else
   path_ = std::string(".");
 #endif
 }
 
-std::string simgrid::xbt::Path::get_dir_name()
+std::string simgrid::xbt::Path::get_dir_name() const
 {
   std::string p(path_);
-  char *res = dirname(&p[0]);
+  const char* res = dirname(&p[0]);
   return std::string(res, strlen(res));
 }
 
-std::string simgrid::xbt::Path::get_base_name()
+std::string simgrid::xbt::Path::get_base_name() const
 {
   std::string p(path_);
-  char *res = basename(&p[0]);
+  const char* res = basename(&p[0]);
   return std::string(res, strlen(res));
 }