OSX support for creating and mounting ext3 using e2fsprogs and fuse-ext2

diff --git a/License.txt.h b/License.txt.h
new file mode 100644 (file)
index 0000000..acb638e
--- /dev/null
+++ b/License.txt.h
@@ -0,0 +1,2 @@
+10,66,83,68,32,50,45,67,108,97,117,115,101,32,76,105,99,101,110,115,101,10,10,67,111,112,121,114,105,103,104,116,32,40,99,41,32,50,48,49,54,44,32,97,100,111,117,98,108,101,52,50,47,109,114,110,64,115,100,102,46,111,114,103,10,65,108,108,32,114,105,103,104,116,115,32,114,101,115,101,114,118,101,100,46,10,104,116,116,112,58,47,47,109,114,110,46,115,105,120,98,105,116,46,111,114,103,10,10,82,101,100,105,115,116,114,105,98,117,116,105,111,110,32,97,110,100,32,117,115,101,32,105,110,32,115,111,117,114,99,101,32,97,110,100,32,98,105,110,97,114,121,32,102,111,114,109,115,44,32,119,105,116,104,32,111,114,32,119,105,116,104,111,117,116,10,109,111,100,105,102,105,99,97,116,105,111,110,44,32,97,114,101,32,112,101,114,109,105,116,116,101,100,32,112,114,111,118,105,100,101,100,32,116,104,97,116,32,116,104,101,32,102,111,108,108,111,119,105,110,103,32,99,111,110,100,105,116,105,111,110,115,32,97,114,101,32,109,101,116,58,10,10,42,32,82,101,100,105,115,116,114,105,98,117,116,105,111,110,115,32,111,102,32,115,111,117,114,99,101,32,99,111,100,101,32,109,117,115,116,32,114,101,116,97,105,110,32,116,104,101,32,97,98,111,118,101,32,99,111,112,121,114,105,103,104,116,32,110,111,116,105,99,101,44,32,116,104,105,115,10,32,32,108,105,115,116,32,111,102,32,99,111,110,100,105,116,105,111,110,115,32,97,110,100,32,116,104,101,32,102,111,108,108,111,119,105,110,103,32,100,105,115,99,108,97,105,109,101,114,46,10,10,42,32,82,101,100,105,115,116,114,105,98,117,116,105,111,110,115,32,105,110,32,98,105,110,97,114,121,32,102,111,114,109,32,109,117,115,116,32,114,101,112,114,111,100,117,99,101,32,116,104,101,32,97,98,111,118,101,32,99,111,112,121,114,105,103,104,116,32,110,111,116,105,99,101,44,10,32,32,116,104,105,115,32,108,105,115,116,32,111,102,32,99,111,110,100,105,116,105,111,110,115,32,97,110,100,32,116,104,101,32,102,111,108,108,111,119,105,110,103,32,100,105,115,99,108,97,105,109,101,114,32,105,110,32,116,104,101,32,100,111,99,117,109,101,110,116,97,116,105,111,110,10,32,32,97,110,100,47,111,114,32,111,116,104,101,114,32,109,97,116,101,114,105,97,108,115,32,112,114,111,118,105,100,101,100,32,119,105,116,104,32,116,104,101,32,100,105,115,116,114,105,98,117,116,105,111,110,46,10,10,84,72,73,83,32,83,79,70,84,87,65,82,69,32,73,83,32,80,82,79,86,73,68,69,68,32,66,89,32,84,72,69,32,67,79,80,89,82,73,71,72,84,32,72,79,76,68,69,82,83,32,65,78,68,32,67,79,78,84,82,73,66,85,84,79,82,83,32,34,65,83,32,73,83,34,10,65,78,68,32,65,78,89,32,69,88,80,82,69,83,83,32,79,82,32,73,77,80,76,73,69,68,32,87,65,82,82,65,78,84,73,69,83,44,32,73,78,67,76,85,68,73,78,71,44,32,66,85,84,32,78,79,84,32,76,73,77,73,84,69,68,32,84,79,44,32,84,72,69,10,73,77,80,76,73,69,68,32,87,65,82,82,65,78,84,73,69,83,32,79,70,32,77,69,82,67,72,65,78,84,65,66,73,76,73,84,89,32,65,78,68,32,70,73,84,78,69,83,83,32,70,79,82,32,65,32,80,65,82,84,73,67,85,76,65,82,32,80,85,82,80,79,83,69,32,65,82,69,10,68,73,83,67,76,65,73,77,69,68,46,32,73,78,32,78,79,32,69,86,69,78,84,32,83,72,65,76,76,32,84,72,69,32,67,79,80,89,82,73,71,72,84,32,72,79,76,68,69,82,32,79,82,32,67,79,78,84,82,73,66,85,84,79,82,83,32,66,69,32,76,73,65,66,76,69,10,70,79,82,32,65,78,89,32,68,73,82,69,67,84,44,32,73,78,68,73,82,69,67,84,44,32,73,78,67,73,68,69,78,84,65,76,44,32,83,80,69,67,73,65,76,44,32,69,88,69,77,80,76,65,82,89,44,32,79,82,32,67,79,78,83,69,81,85,69,78,84,73,65,76,10,68,65,77,65,71,69,83,32,40,73,78,67,76,85,68,73,78,71,44,32,66,85,84,32,78,79,84,32,76,73,77,73,84,69,68,32,84,79,44,32,80,82,79,67,85,82,69,77,69,78,84,32,79,70,32,83,85,66,83,84,73,84,85,84,69,32,71,79,79,68,83,32,79,82,10,83,69,82,86,73,67,69,83,59,32,76,79,83,83,32,79,70,32,85,83,69,44,32,68,65,84,65,44,32,79,82,32,80,82,79,70,73,84,83,59,32,79,82,32,66,85,83,73,78,69,83,83,32,73,78,84,69,82,82,85,80,84,73,79,78,41,32,72,79,87,69,86,69,82,10,67,65,85,83,69,68,32,65,78,68,32,79,78,32,65,78,89,32,84,72,69,79,82,89,32,79,70,32,76,73,65,66,73,76,73,84,89,44,32,87,72,69,84,72,69,82,32,73,78,32,67,79,78,84,82,65,67,84,44,32,83,84,82,73,67,84,32,76,73,65,66,73,76,73,84,89,44,10,79,82,32,84,79,82,84,32,40,73,78,67,76,85,68,73,78,71,32,78,69,71,76,73,71,69,78,67,69,32,79,82,32,79,84,72,69,82,87,73,83,69,41,32,65,82,73,83,73,78,71,32,73,78,32,65,78,89,32,87,65,89,32,79,85,84,32,79,70,32,84,72,69,32,85,83,69,10,79,70,32,84,72,73,83,32,83,79,70,84,87,65,82,69,44,32,69,86,69,78,32,73,70,32,65,68,86,73,83,69,68,32,79,70,32,84,72,69,32,80,79,83,83,73,66,73,76,73,84,89,32,79,70,32,83,85,67,72,32,68,65,77,65,71,69,46,10,10
+

diff --git a/Main/Forms/VolumeCreationWizard.cpp b/Main/Forms/VolumeCreationWizard.cpp
index 3fc249c..ab401f6 100644 (file)
--- a/Main/Forms/VolumeCreationWizard.cpp
+++ b/Main/Forms/VolumeCreationWizard.cpp
@@ -1,9 +1,12 @@
 /*
- Copyright (c) 2008-2010 nemesis Developers Association. All rights reserved.
+ Copyright (c) 2016 nemesis project/mrn@sdf.org. All rights reserved.
+ http://mrn.sixbit.org/
 
- Governed by the nemesis License 3.0 the full text of which is contained in
+ Governed by the BSD 2 Clause license, the full text of which is contained in
  the file License.txt included in nemesis binary and source code distribution
  packages.
+ Based on TrueCrypt 7.1a, which was governed by the TrueCrypt license, which
+ is also made available with nemesis.
 */
 
 #include "System.h"
@@ -418,7 +421,12 @@ namespace nemesis
                                switch (SelectedFilesystemType)
                                {
                                case VolumeCreationOptions::FilesystemType::Ext2:               fsFormatter = "mkfs.ext2"; break;
+#ifndef TC_MACOSX
                                case VolumeCreationOptions::FilesystemType::Ext3:               fsFormatter = "mkfs.ext3"; break;
+#endif
+#ifdef TC_MACOSX
+                               case VolumeCreationOptions::FilesystemType::Ext3:               fsFormatter = "/opt/gnu/sbin/mkfs.ext3"; break;
+#endif
                                case VolumeCreationOptions::FilesystemType::Ext4:               fsFormatter = "mkfs.ext4"; break;
                                case VolumeCreationOptions::FilesystemType::MacOsExt:   fsFormatter = "newfs_hfs"; break;
                                case VolumeCreationOptions::FilesystemType::UFS:                fsFormatter = "newfs" ; break;

diff --git a/Main/Forms/VolumeFormatOptionsWizardPage.cpp b/Main/Forms/VolumeFormatOptionsWizardPage.cpp
index 2602b19..5acee94 100644 (file)
--- a/Main/Forms/VolumeFormatOptionsWizardPage.cpp
+++ b/Main/Forms/VolumeFormatOptionsWizardPage.cpp
@@ -1,9 +1,12 @@
 /*
- Copyright (c) 2008-2010 nemesis Developers Association. All rights reserved.
+ Copyright (c) 2016 nemesis project/mrn@sdf.org. All rights reserved.
+ http://mrn.sixbit.org/
 
- Governed by the nemesis License 3.0 the full text of which is contained in
+ Governed by the BSD 2 Clause license, the full text of which is contained in
  the file License.txt included in nemesis binary and source code distribution
  packages.
+ Based on TrueCrypt 7.1a, which was governed by the TrueCrypt license, which
+ is also made available with nemesis.
 */
 
 #include "System.h"
@@ -32,6 +35,7 @@ namespace nemesis
                FilesystemTypeChoice->Append (L"Linux Ext4",            (void *) VolumeCreationOptions::FilesystemType::Ext4);
 #elif defined (TC_MACOSX)
                FilesystemTypeChoice->Append (L"Mac OS Extended",       (void *) VolumeCreationOptions::FilesystemType::MacOsExt);
+               FilesystemTypeChoice->Append (L"Linux Ext3",            (void *) VolumeCreationOptions::FilesystemType::Ext3);
 #elif defined (TC_FREEBSD) || defined (TC_SOLARIS)
 //             FilesystemTypeChoice->Append (L"UFS",                           (void *) VolumeCreationOptions::FilesystemType::UFS);
 //             FilesystemTypeChoice->Append (L"Linux Ext2",            (void *) VolumeCreationOptions::FilesystemType::Ext2);

diff --git a/Volume/Volume.cpp b/Volume/Volume.cpp
index 6f130f3..18a2431 100644 (file)
--- a/Volume/Volume.cpp
+++ b/Volume/Volume.cpp
@@ -1,9 +1,12 @@
 /*
- Copyright (c) 2008-2010 nemesis Developers Association. All rights reserved.
+ Copyright (c) 2016 nemesis project/mrn@sdf.org. All rights reserved.
+ http://mrn.sixbit.org/
 
- Governed by the nemesis License 3.0 the full text of which is contained in
+ Governed by the BSD 2 Clause license, the full text of which is contained in
  the file License.txt included in nemesis binary and source code distribution
  packages.
+ Based on TrueCrypt 7.1a, which was governed by the TrueCrypt license, which
+ is also made available with nemesis.
 */
 
 #ifndef TC_WINDOWS