- xbt_dynar_foreach (storage_, cursor, mnt) {
- XBT_DEBUG("See '%s'", mnt.name);
- file_mount_name = (char*)xbt_malloc((strlen(mnt.name) + 1));
- strncpy(file_mount_name, fullpath, strlen(mnt.name) + 1);
- file_mount_name[strlen(mnt.name)] = '\0';
-
- if (!strcmp(file_mount_name, mnt.name) &&
- strlen(mnt.name) > longest_prefix_length) { /* The current mount name is found in the full path and is
- bigger than the previous*/
- longest_prefix_length = strlen(mnt.name);
- st = static_cast<simgrid::surf::Storage*>(mnt.storage);
+ for (auto mnt : storage_) {
+ XBT_DEBUG("See '%s'", mnt.first.c_str());
+ std::string file_mount_name = std::string(fullpath).substr(0, mnt.first.size());
+
+ if (file_mount_name == mnt.first && mnt.first.length() > longest_prefix_length) {
+ /* The current mount name is found in the full path and is bigger than the previous*/
+ longest_prefix_length = mnt.first.length();
+ st = mnt.second;