VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-06-07 21:31:10 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 23:19:24 +0100
commitbe4ca4bac6db00538d1990ca865b55ecf2357926 (patch)
treeb777d73393966b1a727efaa9cd07a1ba15961bed
parent0c95ed36910c4f5cb08da45fac1930afcb25c565 (diff)
downloadVeraCrypt-be4ca4bac6db00538d1990ca865b55ecf2357926.tar.gz
VeraCrypt-be4ca4bac6db00538d1990ca865b55ecf2357926.zip
Replace TrueCrypt from Linux/MacOSX mount point names
-rw-r--r--src/Core/Unix/CoreUnix.cpp4
-rw-r--r--src/Core/Unix/CoreUnix.h2
-rw-r--r--src/Main/UserInterface.cpp4
-rw-r--r--src/Platform/Unix/File.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Core/Unix/CoreUnix.cpp b/src/Core/Unix/CoreUnix.cpp
index 41ebe969..975c8401 100644
--- a/src/Core/Unix/CoreUnix.cpp
+++ b/src/Core/Unix/CoreUnix.cpp
@@ -205,7 +205,7 @@ namespace TrueCrypt
string CoreUnix::GetDefaultMountPointPrefix () const
{
- const char *envPrefix = getenv ("TRUECRYPT_MOUNT_PREFIX");
+ const char *envPrefix = getenv ("VERACRYPT_MOUNT_PREFIX");
if (envPrefix && !string (envPrefix).empty())
return envPrefix;
@@ -215,7 +215,7 @@ namespace TrueCrypt
if (FilesystemPath ("/mnt").IsDirectory())
return "/mnt/veracrypt";
- return GetTempDirectory() + "/truecrypt_mnt";
+ return GetTempDirectory() + "/veracrypt_mnt";
}
uint32 CoreUnix::GetDeviceSectorSize (const DevicePath &devicePath) const
diff --git a/src/Core/Unix/CoreUnix.h b/src/Core/Unix/CoreUnix.h
index 1d7152fb..b8e4cc54 100644
--- a/src/Core/Unix/CoreUnix.h
+++ b/src/Core/Unix/CoreUnix.h
@@ -51,7 +51,7 @@ namespace TrueCrypt
virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); }
virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) 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 uid_t GetRealUserId () const;
virtual gid_t GetRealGroupId () const;
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 168a35ae..47663c2d 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -1236,7 +1236,7 @@ namespace TrueCrypt
"veracrypt -t -c\n"
"\n"
"Mount a volume:\n"
- "veracrypt volume.tc /media/truecrypt1\n"
+ "veracrypt volume.hc /media/veracrypt1\n"
"\n"
"Mount a volume as read-only, using keyfiles:\n"
"veracrypt -m ro -k keyfile1,keyfile2 volume.tc\n"
@@ -1245,7 +1245,7 @@ namespace TrueCrypt
"veracrypt --filesystem=none volume.tc\n"
"\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"
"Dismount a volume:\n"
"veracrypt -d volume.tc\n"
diff --git a/src/Platform/Unix/File.cpp b/src/Platform/Unix/File.cpp
index d69cb1df..fd64eb2a 100644
--- a/src/Platform/Unix/File.cpp
+++ b/src/Platform/Unix/File.cpp
@@ -39,7 +39,7 @@ namespace TrueCrypt
static void TraceFileOperation (int fileHandle, FilePath filePath, bool write, uint64 length, int64 position = -1)
{
string path = filePath;
- if (path.empty() || path.find ("truecrypt_aux_mnt") != string::npos)
+ if (path.empty() || path.find ("veracrypt_aux_mnt") != string::npos)
return;
stringstream s;