8 files changed, 268 insertions, 74 deletions
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp
index 0ae246c6..0be53bd6 100644
--- a/src/Main/CommandLineInterface.cpp
+++ b/src/Main/CommandLineInterface.cpp
@@ -574,40 +574,45 @@ namespace VeraCrypt
 
 		if (parser.Found (L"size", &str))
 		{
-			uint64 multiplier;
-			wxChar lastChar = str [str.Length () - 1];
-			if (lastChar >= wxT('0') && lastChar <= wxT('9'))
-				multiplier = 1;
-			else if (lastChar == wxT('K') || lastChar == wxT('k'))
-				multiplier = BYTES_PER_KB;
-			else if (lastChar == wxT('M') || lastChar == wxT('m'))
-				multiplier = BYTES_PER_MB;
-			else if (lastChar == wxT('G') || lastChar == wxT('g'))
-				multiplier = BYTES_PER_GB;
-			else if (lastChar == wxT('T') || lastChar == wxT('t'))
-				multiplier = BYTES_PER_TB;
-			else
-				throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str);
-
-			// remove suffix if present
-			if (multiplier != 1)
-				str.RemoveLast ();
-			// check that we only have digits in the string
-			size_t index = str.find_first_not_of (wxT("0123456789"));
-			if (index != (size_t) wxNOT_FOUND)
+			if (str.CmpNoCase (wxT("max")) == 0)
 			{
-				// restore last characater for error display
-				if (multiplier != 1)
-					str += lastChar;
-				throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str);
+				ArgSize = (uint64) -1; // indicator of maximum available size
 			}
-			try
-			{
-				ArgSize = multiplier * StringConverter::ToUInt64 (wstring (str));
-			}
-			catch (...)
+			else
 			{
-				throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str);
+				uint64 multiplier;
+				wxString originalStr = str;
+				size_t index = str.find_first_not_of (wxT("0123456789"));
+				if (index == 0)
+				{
+					throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str);
+				}
+				else if (index != (size_t) wxNOT_FOUND)
+				{
+					wxString sizeSuffix = str.Mid(index);
+					if (sizeSuffix.CmpNoCase(wxT("K")) == 0 || sizeSuffix.CmpNoCase(wxT("KiB")) == 0)
+						multiplier = BYTES_PER_KB;
+					else if (sizeSuffix.CmpNoCase(wxT("M")) == 0 || sizeSuffix.CmpNoCase(wxT("MiB")) == 0)
+						multiplier = BYTES_PER_MB;
+					else if (sizeSuffix.CmpNoCase(wxT("G")) == 0 || sizeSuffix.CmpNoCase(wxT("GiB")) == 0)
+						multiplier = BYTES_PER_GB;
+					else if (sizeSuffix.CmpNoCase(wxT("T")) == 0 || sizeSuffix.CmpNoCase(wxT("TiB")) == 0)
+						multiplier = BYTES_PER_TB;
+					else
+						throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str);
+
+					str = str.Left (index);
+				}
+				else
+					multiplier = 1;
+				try
+				{
+					ArgSize = multiplier * StringConverter::ToUInt64 (wstring (str));
+				}
+				catch (...)
+				{
+					throw_err (LangString["PARAMETER_INCORRECT"] + L": " + originalStr);
+				}
 			}
 		}
 
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 0af3e2a6..d281febc 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -3625,6 +3625,12 @@ VolumeSizeWizardPageBase::VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID
 	
 	bSizer99->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
 	
+	UseAllFreeSpaceCheckBox = new wxCheckBox( this, wxID_ANY, _("IDC_USE_ALL_FREE_SPACE"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer99->Add( UseAllFreeSpaceCheckBox, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizer99->Add( 0, 0, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
+	
 	FreeSpaceStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	FreeSpaceStaticText->Wrap( -1 );
 	
@@ -3649,6 +3655,7 @@ VolumeSizeWizardPageBase::VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID
 	// Connect Events
 	VolumeSizeTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizeTextChanged ), NULL, this );
 	VolumeSizePrefixChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizePrefixSelected ), NULL, this );
+	UseAllFreeSpaceCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnUseAllFreeSpaceCheckBoxClick ), NULL, this );
 }
 
 VolumeSizeWizardPageBase::~VolumeSizeWizardPageBase()
@@ -3656,6 +3663,7 @@ VolumeSizeWizardPageBase::~VolumeSizeWizardPageBase()
 	// Disconnect Events
 	VolumeSizeTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizeTextChanged ), NULL, this );
 	VolumeSizePrefixChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizePrefixSelected ), NULL, this );
+	UseAllFreeSpaceCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnUseAllFreeSpaceCheckBoxClick ), NULL, this );
 	
 }
 
diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h
index 3ea89763..b1756876 100644
--- a/src/Main/Forms/Forms.h
+++ b/src/Main/Forms/Forms.h
@@ -1063,12 +1063,14 @@ namespace VeraCrypt
 		protected:
 			wxTextCtrl* VolumeSizeTextCtrl;
 			wxChoice* VolumeSizePrefixChoice;
+			wxCheckBox* UseAllFreeSpaceCheckBox;
 			wxStaticText* FreeSpaceStaticText;
 			wxStaticText* InfoStaticText;
 			
 			// Virtual event handlers, overide them in your derived class
 			virtual void OnVolumeSizeTextChanged( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnVolumeSizePrefixSelected( wxCommandEvent& event ) { event.Skip(); }
+			virtual void OnUseAllFreeSpaceCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
 			
 		
 		public:
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp
index 927a60b9..24689fcf 100644
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -29553,6 +29553,104 @@
                             <property name="border">5</property>
                             <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
+                            <object class="wxCheckBox" expanded="0">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="checked">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">IDC_USE_ALL_FREE_SPACE</property>
+                                <property name="max_size"></property>
+                                <property name="maximize_button">0</property>
+                                <property name="maximum_size"></property>
+                                <property name="min_size"></property>
+                                <property name="minimize_button">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="moveable">1</property>
+                                <property name="name">UseAllFreeSpaceCheckBox</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass">; forward_declare</property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnCheckBox">OnUseAllFreeSpaceCheckBoxClick</event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxBOTTOM|wxEXPAND|wxTOP</property>
+                            <property name="proportion">0</property>
+                            <object class="spacer" expanded="0">
+                                <property name="height">0</property>
+                                <property name="permission">protected</property>
+                                <property name="width">0</property>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">0</property>
                             <object class="wxStaticText" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
diff --git a/src/Main/Forms/VolumeSizeWizardPage.cpp b/src/Main/Forms/VolumeSizeWizardPage.cpp
index 47d73983..61427ea5 100644
--- a/src/Main/Forms/VolumeSizeWizardPage.cpp
+++ b/src/Main/Forms/VolumeSizeWizardPage.cpp
@@ -24,9 +24,10 @@ namespace VeraCrypt
 		SectorSize (sectorSize),
 		AvailableDiskSpace (0)
 	{
-		VolumeSizePrefixChoice->Append (LangString["KB"], reinterpret_cast <void *> (1024));
-		VolumeSizePrefixChoice->Append (LangString["MB"], reinterpret_cast <void *> (1024 * 1024));
-		VolumeSizePrefixChoice->Append (LangString["GB"], reinterpret_cast <void *> (1024 * 1024 * 1024));
+		VolumeSizePrefixChoice->Append (LangString["KB"], reinterpret_cast <void *> (1));
+		VolumeSizePrefixChoice->Append (LangString["MB"], reinterpret_cast <void *> (2));
+		VolumeSizePrefixChoice->Append (LangString["GB"], reinterpret_cast <void *> (3));
+		VolumeSizePrefixChoice->Append (LangString["TB"], reinterpret_cast <void *> (4));
 		VolumeSizePrefixChoice->Select (Prefix::MB);
 
 		wxLongLong diskSpace = 0;
@@ -34,6 +35,7 @@ namespace VeraCrypt
 		{
 			VolumeSizeTextCtrl->Disable();
 			VolumeSizeTextCtrl->SetValue (L"");
+			UseAllFreeSpaceCheckBox->Disable();
 		}
 		else
 		{
@@ -74,13 +76,25 @@ namespace VeraCrypt
 	uint64 VolumeSizeWizardPage::GetVolumeSize () const
 	{
 		uint64 prefixMult = 1;
-		int selection = VolumeSizePrefixChoice->GetSelection();
-		if (selection == wxNOT_FOUND)
-			return 0;
-
-		prefixMult = reinterpret_cast <uint64> (VolumeSizePrefixChoice->GetClientData (selection));
+		uint64 val;
+		if (UseAllFreeSpaceCheckBox->IsChecked ())
+		{
+			val = AvailableDiskSpace;
+		}
+		else
+		{
+			int selection = VolumeSizePrefixChoice->GetSelection();
+			if (selection == wxNOT_FOUND)
+				return 0;
 
-		uint64 val = StringConverter::ToUInt64 (wstring (VolumeSizeTextCtrl->GetValue()));
+			uint64 counter = reinterpret_cast <uint64> (VolumeSizePrefixChoice->GetClientData (selection));
+			while (counter)
+			{
+				prefixMult *= 1024;
+				counter--;
+			}
+			val = StringConverter::ToUInt64 (wstring(VolumeSizeTextCtrl->GetValue()));
+		}
 		if (val <= 0x7fffFFFFffffFFFFull / prefixMult)
 		{
 			val *= prefixMult;
@@ -98,7 +112,7 @@ namespace VeraCrypt
 
 	bool VolumeSizeWizardPage::IsValid ()
 	{
-		if (!VolumeSizeTextCtrl->GetValue().empty() && Validate())
+		if ((!VolumeSizeTextCtrl->GetValue().empty() || UseAllFreeSpaceCheckBox->IsChecked ()) && Validate())
 		{
 			try
 			{
@@ -126,7 +140,12 @@ namespace VeraCrypt
 			return;
 		}
 
-		if (size % (1024 * 1024 * 1024) == 0)
+		if (size % (1024ULL * 1024ULL * 1024ULL * 1024ULL) == 0)
+		{
+			size /= 1024ULL * 1024ULL * 1024ULL * 1024ULL;
+			VolumeSizePrefixChoice->Select (Prefix::TB);
+		}
+		else if (size % (1024 * 1024 * 1024) == 0)
 		{
 			size /= 1024 * 1024 * 1024;
 			VolumeSizePrefixChoice->Select (Prefix::GB);
@@ -144,4 +163,21 @@ namespace VeraCrypt
 
 		VolumeSizeTextCtrl->SetValue (StringConverter::FromNumber (size));
 	}
+
+	void VolumeSizeWizardPage::OnUseAllFreeSpaceCheckBoxClick( wxCommandEvent& event )
+	{
+		if (UseAllFreeSpaceCheckBox->IsChecked ())
+		{
+			VolumeSizePrefixChoice->Select (Prefix::MB);
+			VolumeSizeTextCtrl->SetValue (L"");
+			VolumeSizePrefixChoice->Disable();
+			VolumeSizeTextCtrl->Disable();
+		}
+		else
+		{
+			VolumeSizePrefixChoice->Enable();
+			VolumeSizeTextCtrl->SetValue (L"");
+			VolumeSizeTextCtrl->Enable();
+		}
+	}
 }
diff --git a/src/Main/Forms/VolumeSizeWizardPage.h b/src/Main/Forms/VolumeSizeWizardPage.h
index aac41f99..754bd691 100644
--- a/src/Main/Forms/VolumeSizeWizardPage.h
+++ b/src/Main/Forms/VolumeSizeWizardPage.h
@@ -37,13 +37,15 @@ namespace VeraCrypt
 			{
 				KB = 0,
 				MB,
-				GB
+				GB,
+				TB
 			};
 		};
 
 		void OnBrowseButtonClick (wxCommandEvent& event);
 		void OnVolumeSizePrefixSelected (wxCommandEvent& event) { PageUpdatedEvent.Raise(); }
 		void OnVolumeSizeTextChanged (wxCommandEvent& event) { PageUpdatedEvent.Raise(); }
+		void OnUseAllFreeSpaceCheckBoxClick( wxCommandEvent& event );
 
 		uint64 MaxVolumeSize;
 		bool MaxVolumeSizeValid;
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index 2cacbb1b..7233b8b6 100644
--- a/src/Main/TextUserInterface.cpp
+++ b/src/Main/TextUserInterface.cpp
@@ -646,6 +646,29 @@ namespace VeraCrypt
 		}
 		else
 		{
+			uint64 AvailableDiskSpace = 0;
+			wxLongLong diskSpace = 0;
+			if (wxGetDiskSpace (wxFileName (wstring (options->Path)).GetPath(), nullptr, &diskSpace))
+			{
+				AvailableDiskSpace = (uint64) diskSpace.GetValue ();
+				if (maxVolumeSize > AvailableDiskSpace)
+					maxVolumeSize = AvailableDiskSpace;
+			}
+
+			if (options->Size == (uint64) (-1))
+			{
+				if (AvailableDiskSpace)
+				{
+					// caller requesting maximum size
+					// we use maxVolumeSize because it is guaranteed to be less of equal to AvailableDiskSpace
+					options->Size = maxVolumeSize;
+				}
+				else
+				{
+					throw_err (_("Failed to get available disk space on the selected target."));
+				}
+			}
+
 			options->Quick = false;
 
 			uint32 sectorSizeRem = options->Size % options->SectorSize;
@@ -657,43 +680,62 @@ namespace VeraCrypt
 				if (Preferences.NonInteractive)
 					throw MissingArgument (SRC_POS);
 
-				wstring sizeStr = AskString (options->Type == VolumeType::Hidden ? _("\nEnter hidden volume size (sizeK/size[M]/sizeG): ") : _("\nEnter volume size (sizeK/size[M]/sizeG): "));
 				uint64 multiplier = 1024 * 1024;
-
-				if (sizeStr.find (L"K") != string::npos)
-				{
-					multiplier = 1024;
-					sizeStr.resize (sizeStr.size() - 1);
-				}
-				else if (sizeStr.find (L"M") != string::npos)
+				wxString sizeStr = AskString (options->Type == VolumeType::Hidden ? _("\nEnter hidden volume size (sizeK/size[M]/sizeG/sizeT/max): ") : _("\nEnter volume size (sizeK/size[M]/sizeG.sizeT/max): "));
+				if (sizeStr.CmpNoCase(wxT("max")) == 0)
 				{
-					sizeStr.resize (sizeStr.size() - 1);
-				}
-				else if (sizeStr.find (L"G") != string::npos)
-				{
-					multiplier = 1024 * 1024 * 1024;
-					sizeStr.resize (sizeStr.size() - 1);
+					multiplier = 1;
+					if (AvailableDiskSpace)
+					{
+						// caller requesting maximum size
+						// we use maxVolumeSize because it is guaranteed to be less of equal to AvailableDiskSpace
+						options->Size = maxVolumeSize;
+					}
+					else
+					{
+						throw_err (_("Failed to get available disk space on the selected target."));
+					}
 				}
-				else if (sizeStr.find (L"T") != string::npos)
+				else
 				{
-					multiplier = (uint64) 1024 * 1024 * 1024 * 1024;
-					sizeStr.resize (sizeStr.size() - 1);
-				}
+					multiplier = 1024 * 1024;
+					size_t index = sizeStr.find_first_not_of (wxT("0123456789"));
+					if (index == 0)
+					{
+						continue;
+					}
+					else if (index != (size_t) wxNOT_FOUND)
+					{
+						wxString sizeSuffix = sizeStr.Mid(index);
+						if (sizeSuffix.CmpNoCase(wxT("K")) == 0 || sizeSuffix.CmpNoCase(wxT("KiB")) == 0)
+							multiplier = BYTES_PER_KB;
+						else if (sizeSuffix.CmpNoCase(wxT("M")) == 0 || sizeSuffix.CmpNoCase(wxT("MiB")) == 0)
+							multiplier = BYTES_PER_MB;
+						else if (sizeSuffix.CmpNoCase(wxT("G")) == 0 || sizeSuffix.CmpNoCase(wxT("GiB")) == 0)
+							multiplier = BYTES_PER_GB;
+						else if (sizeSuffix.CmpNoCase(wxT("T")) == 0 || sizeSuffix.CmpNoCase(wxT("TiB")) == 0)
+							multiplier = BYTES_PER_TB;
+						else
+							continue;
 
-				try
-				{
-					options->Size = StringConverter::ToUInt64 (sizeStr);
-					options->Size *= multiplier;
+						sizeStr = sizeStr.Left (index);
+					}
 
-					sectorSizeRem = options->Size % options->SectorSize;
-					if (sectorSizeRem != 0)
-						options->Size += options->SectorSize - sectorSizeRem;
-				}
-				catch (...)
-				{
-					options->Size = 0;
-					continue;
+					try
+					{
+						options->Size = StringConverter::ToUInt64 (wstring(sizeStr));
+					}
+					catch (...)
+					{
+						options->Size = 0;
+						continue;
+					}
 				}
+				options->Size *= multiplier;
+
+				sectorSizeRem = options->Size % options->SectorSize;
+				if (sectorSizeRem != 0)
+					options->Size += options->SectorSize - sectorSizeRem;
 
 				if (options->Size < minVolumeSize)
 				{
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index b4bfe836..d0e2f9a1 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -1270,10 +1270,11 @@ namespace VeraCrypt
 					"--slot=SLOT\n"
 					" Use specified slot number when mounting, dismounting, or listing a volume.\n"
 					"\n"
-					"--size=SIZE[K|M|G|T]\n"
+					"--size=SIZE[K|KiB|M|MiB|G|GiB|T|TiB] or --size=max\n"
 					" Use specified size when creating a new volume. If no suffix is indicated,\n"
 					" then SIZE is interpreted in bytes. Suffixes K, M, G or T can be used to\n"
 					" indicate a value in KiB, MiB, GiB or TiB respectively.\n"
+					" If max is specified, the new volume will use all available free disk space.\n"
 					"\n"
 					"-t, --text\n"
 					" Use text user interface. Graphical user interface is used by default if\n"