VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2017-11-28 21:56:20 (GMT)
committerGitHub <noreply@github.com>2017-11-28 21:56:20 (GMT)
commitc5e48c56c933d723a3bba3dde27028057951ce19 (patch)
tree4dc54a7bf23499f49ac4ee4e35a23fba3744a300
parentf53eb8e260d174153bb3fc24ff1fff7966dcfbee (diff)
parent49f9516c9e7976d78eefc8f4230bb1ebd330e71d (diff)
downloadVeraCrypt-c5e48c56c933d723a3bba3dde27028057951ce19.zip
VeraCrypt-c5e48c56c933d723a3bba3dde27028057951ce19.tar.gz
Merge pull request #243 from gv5470/patch-233-pr
Linux: autodetect host drive name using sysfs (closes #233)
-rw-r--r--src/Platform/Unix/FilesystemPath.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
index c7bfece..5841edf 100644
--- a/src/Platform/Unix/FilesystemPath.cpp
+++ b/src/Platform/Unix/FilesystemPath.cpp
@@ -72,6 +72,29 @@ namespace VeraCrypt
path = StringConverter::StripTrailingNumber (StringConverter::ToSingle (Path));
+ // If simply removing trailing number didn't produce a valid drive name, try to use sysfs to get the right one
+ if (!path.IsDevice()) {
+ struct stat st;
+
+ if(stat (StringConverter::ToSingle (Path).c_str (), &st) == 0) {
+ const long maxPathLength = pathconf ("/", _PC_PATH_MAX);
+
+ if(maxPathLength != -1) {
+ string linkPathName ("/sys/dev/block/");
+ linkPathName += StringConverter::ToSingle (major (st.st_rdev)) + string (":") + StringConverter::ToSingle (minor (st.st_rdev));
+
+ char linkTargetPath[maxPathLength+1] = "";
+
+ if(readlink(linkPathName.c_str (), linkTargetPath, sizeof (linkTargetPath)) != -1) {
+ const string targetPathStr (linkTargetPath);
+ const size_t lastSlashPos = targetPathStr.find_last_of ('/');
+ const size_t secondLastSlashPos = targetPathStr.find_last_of ('/', lastSlashPos-1);
+ path = string ("/dev/") + targetPathStr.substr (secondLastSlashPos+1, lastSlashPos-secondLastSlashPos-1);
+ }
+ }
+ }
+ }
+
#elif defined (TC_MACOSX)
string pathStr = StringConverter::StripTrailingNumber (StringConverter::ToSingle (Path));