0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

desktop: Fix enumerate_storage_devices() inaccuracy on Linux

Browse source 
Current Linux distributions tend to use udisks2 for storage device
management, which uses /run/media/USERNAME instead of /media for
gathering mount points. This commit makes this the first candidate for
enumeration of mount point collections.
This commit is contained in:
Iris Morelle 2023-05-23 01:53:15 -04:00
parent 9dfd434cdd
commit 3fc19d9e7b
No known key found for this signature in database
GPG key ID: BB9666228F278524
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.md
View file

@ -10,6 +10,8 @@
### Translations
### Units
### User interface
* Fix file dialogs (e.g. Save As dialog in the Map Editor) not listing /run/media/USER
as a possible file location on modern Linux distributions.
### WML Engine
### Miscellaneous and Bug Fixes

10
src/desktop/paths.cpp
View file

@ -106,7 +106,15 @@ void enumerate_storage_devices(std::vector<path_info>& res)
// reasoning here is that if any or all of them are non-empty, they are
// probably used for _something_ that might be of interest to the user (if not
// directly and actively controlled by the user themselves).
static const std::vector<std::string> candidates { "/media", "/mnt" };
// Note that the first candidate is actually /run/media/USERNAME -- we need
// to fetch the username at runtime from passwd to complete the path.
std::vector<std::string> candidates { "/media", "/mnt" };
// Fetch passwd entry for the effective user the current process runs as
if(const passwd* pw = getpwuid(geteuid()); pw && pw->pw_name && pw->pw_name[0]) {
candidates.emplace(candidates.begin(), "/run/media/");
candidates.front() += pw->pw_name;
}
for(const auto& mnt : candidates) {
bsys::error_code e;