Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 02:58:02 -06:00
Code Activity

Replace TrueCrypt from Linux/MacOSX mount point names

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-06-07 21:31:10 +02:00
parent 0c95ed3691
commit be4ca4bac6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Unix/CoreUnix.cpp
View File

@@ -205,7 +205,7 @@ namespace TrueCrypt
string CoreUnix::GetDefaultMountPointPrefix () const string CoreUnix::GetDefaultMountPointPrefix () const
{ {
const char *envPrefix = getenv ("TRUECRYPT_MOUNT_PREFIX"); const char *envPrefix = getenv ("VERACRYPT_MOUNT_PREFIX");
if (envPrefix && !string (envPrefix).empty()) if (envPrefix && !string (envPrefix).empty())
return envPrefix; return envPrefix;
@@ -215,7 +215,7 @@ namespace TrueCrypt
if (FilesystemPath ("/mnt").IsDirectory()) if (FilesystemPath ("/mnt").IsDirectory())
return "/mnt/veracrypt"; return "/mnt/veracrypt";
return GetTempDirectory() + "/truecrypt_mnt"; return GetTempDirectory() + "/veracrypt_mnt";
} }
uint32 CoreUnix::GetDeviceSectorSize (const DevicePath &devicePath) const uint32 CoreUnix::GetDeviceSectorSize (const DevicePath &devicePath) const

2
src/Core/Unix/CoreUnix.h
View File

@@ -51,7 +51,7 @@ namespace TrueCrypt
virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); } virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); }
virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) const; virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) const;
virtual string GetDefaultMountPointPrefix () const; virtual string GetDefaultMountPointPrefix () const;
virtual string GetFuseMountDirPrefix () const { return ".truecrypt_aux_mnt"; } virtual string GetFuseMountDirPrefix () const { return ".veracrypt_aux_mnt"; }
virtual MountedFilesystemList GetMountedFilesystems (const DevicePath &devicePath = DevicePath(), const DirectoryPath &mountPoint = DirectoryPath()) const = 0; virtual MountedFilesystemList GetMountedFilesystems (const DevicePath &devicePath = DevicePath(), const DirectoryPath &mountPoint = DirectoryPath()) const = 0;
virtual uid_t GetRealUserId () const; virtual uid_t GetRealUserId () const;
virtual gid_t GetRealGroupId () const; virtual gid_t GetRealGroupId () const;

4
src/Main/UserInterface.cpp
View File

@@ -1236,7 +1236,7 @@ namespace TrueCrypt
"veracrypt -t -c\n" "veracrypt -t -c\n"
"\n" "\n"
"Mount a volume:\n" "Mount a volume:\n"
"veracrypt volume.tc /media/truecrypt1\n" "veracrypt volume.hc /media/veracrypt1\n"
"\n" "\n"
"Mount a volume as read-only, using keyfiles:\n" "Mount a volume as read-only, using keyfiles:\n"
"veracrypt -m ro -k keyfile1,keyfile2 volume.tc\n" "veracrypt -m ro -k keyfile1,keyfile2 volume.tc\n"
@@ -1245,7 +1245,7 @@ namespace TrueCrypt
"veracrypt --filesystem=none volume.tc\n" "veracrypt --filesystem=none volume.tc\n"
"\n" "\n"
"Mount a volume prompting only for its password:\n" "Mount a volume prompting only for its password:\n"
"veracrypt -t -k \"\" --protect-hidden=no volume.tc /media/truecrypt1\n" "veracrypt -t -k \"\" --protect-hidden=no volume.hc /media/veracrypt1\n"
"\n" "\n"
"Dismount a volume:\n" "Dismount a volume:\n"
"veracrypt -d volume.tc\n" "veracrypt -d volume.tc\n"

2
src/Platform/Unix/File.cpp
View File

@@ -39,7 +39,7 @@ namespace TrueCrypt
static void TraceFileOperation (int fileHandle, FilePath filePath, bool write, uint64 length, int64 position = -1) static void TraceFileOperation (int fileHandle, FilePath filePath, bool write, uint64 length, int64 position = -1)
{ {
string path = filePath; string path = filePath;
if (path.empty() || path.find ("truecrypt_aux_mnt") != string::npos) if (path.empty() || path.find ("veracrypt_aux_mnt") != string::npos)
return; return;
stringstream s; stringstream s;