Prefer to use emplace_back.

[simgrid.git] / src / xbt / xbt_os_file.cpp

diff --git a/src/xbt/xbt_os_file.cpp b/src/xbt/xbt_os_file.cpp
index 334c9b35b5f06d8fc3e46137f38ee735598501f9..4316ee43676cf0ab3abadeeab2f41da1689ec6b4 100644 (file)
--- a/src/xbt/xbt_os_file.cpp
+++ b/src/xbt/xbt_os_file.cpp
@@ -1,11 +1,12 @@
 /* xbt_os_file.cpp -- portable interface to file-related functions          */
 
-/* Copyright (c) 2017-2018. 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. */
 
 #include "src/internal_config.h"
+#include "xbt/asserts.h"
 #include "xbt/file.hpp" /* this module */
 
 #ifdef _WIN32
@@ -16,6 +17,7 @@
 #include <unistd.h>
 #endif
 
+#include <cerrno>
 #include <cstring>
 #include <libgen.h> /* POSIX dirname */
 
@@ -23,23 +25,24 @@ simgrid::xbt::Path::Path()
 {
 #if HAVE_UNISTD_H
   char buffer[2048];
-  getcwd(buffer, 2048);
+  const char* ret = getcwd(buffer, 2048);
+  xbt_assert(ret == buffer, "Error during getcwd: %s", strerror(errno));
   path_ = std::string(buffer);
 #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));
 }