File tree 2 files changed +6
-3
lines changed
2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -201,10 +201,13 @@ std::string fileutl_parse_name_in_pathname(std::string const &file_pathname)
201
201
return file_pathname.substr (fileutl_parse_last_dir_pos (file_pathname));
202
202
}
203
203
204
- std::string fileutl_parse_extension_in_pathname (std::string const &pathname)
204
+ std::string fileutl_parse_extension_in_pathname (const std::string &pathname)
205
205
{
206
206
const std::size_t idx=pathname.find_last_of (' .' );
207
- return idx==std::string::npos ? std::string (" " ) : pathname.substr (idx);
207
+ const std::size_t slash_idx=pathname.find_last_of (' /' );
208
+ return
209
+ idx==std::string::npos || (slash_idx!=std::string::npos && idx<slash_idx) ?
210
+ std::string () : pathname.substr (idx);
208
211
}
209
212
210
213
std::string fileutl_parse_path_in_pathname (std::string const &file_pathname)
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ uint64_t fileutl_file_size(std::string const &file_pathname);
35
35
36
36
std::string fileutl_parse_name_in_pathname (std::string const &file_pathname);
37
37
38
- std::string fileutl_parse_extension_in_pathname (std::string const &pathname);
38
+ std::string fileutl_parse_extension_in_pathname (const std::string &pathname);
39
39
40
40
std::string fileutl_parse_path_in_pathname (std::string const &file_pathname);
41
41
You can’t perform that action at this time.
0 commit comments