more changes to encode/decode

5 files changed, 32 insertions, 41 deletions

diff --git a/CST 126/Homework2/Base64Conversion.hpp b/CST 126/Homework2/Base64Conversion.hpp
index 1458d29..16e414f 100644
--- a/CST 126/Homework2/Base64Conversion.hpp
+++ b/CST 126/Homework2/Base64Conversion.hpp
@@ -3,28 +3,26 @@
 #include "Base64Helper.hpp"
 #include <bitset>
 #include <vector>
-
+#include <string>
 char CharacterMapArray[] = { 'A', 'B','C', 'D',  'E', 'F','G', 'H' , 'I', 'J','K', 'L' ,
 'M', 'N','O', 'P',  'Q', 'R','S', 'T',  'U', 'V','W', 'X',  'Y', 'Z',
  'a', 'b', 'c', 'd','e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
 	'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x','y', 'z',
 	'0', '1', '2', '3','4', '5', '6', '7','8', '9', '/', '+'};
 
-
-inline char* Base64Encode(char* buffer, const size_t& size)
+std::string Base64Encode(char* buffer, const size_t& size)
 {
-	size_t firstvalue, secondvalue, thirdvalue, fourthvalue = 0;
-	
+	uint8_t firstvalue, secondvalue, thirdvalue, fourthvalue = 0;
 	
-	std::vector<char>TempBuff = {};
-	
-	for (auto i = 0, j = 0; i < size; i+=3, j+=4)
+	std::string TempBuff = {};
+
+	for (auto i = 0, j = 0; i < size; i += 3, j += 4)
 	{
-		
+
 		firstvalue = buffer[i] & 0x3f;
 		secondvalue = ((buffer[i] >> 6) ^ (buffer[i + 1] << 2));
 		secondvalue &= 0x3f;
-	
+
 		thirdvalue = ((buffer[i + 1] >> 4) ^ (buffer[i + 2] << 4));
 		thirdvalue &= 0x3f;
 		fourthvalue = (buffer[i + 2] >> 2);
@@ -36,25 +34,14 @@ inline char* Base64Encode(char* buffer, const size_t& size)
 		TempBuff.push_back(CharacterMapArray[thirdvalue]);
 		TempBuff.push_back(CharacterMapArray[fourthvalue]);
 	}
-	
-	size_t NewSize = TempBuff.size();
 
-	buffer = nullptr;
-	
-	buffer = new char[NewSize];
-	for (auto i = 0; i < NewSize; i++)
-	{
-		buffer[i] = TempBuff[i];
-		std::cout << buffer[i];
-	}
-
-	return buffer;
+	return TempBuff;
 }
 
-inline char* Base64Decode(char* buffer, const size_t size)
+std::string Base64Decode(char* buffer, const size_t size)
 {
-	std::vector<char> TempBuffer = {};
-	size_t firstvalue, secondvalue, thirdvalue = 0;
+	std::string TempBuffer = {};
+	uint8_t firstvalue, secondvalue, thirdvalue = 0;
 
 	for (auto i = 0u; i < size; i++)
 	{
@@ -76,20 +63,18 @@ inline char* Base64Decode(char* buffer, const size_t size)
 		TempBuffer.push_back(secondvalue);
 		TempBuffer.push_back(thirdvalue);
 	}
-	size_t NewSize = TempBuffer.size();
-
-	buffer = nullptr;
-
-	buffer = new char[NewSize];
+	//size_t NewSize = TempBuffer.size();
 
+	/*buffer = new char[NewSize];
+	
 	for (auto i = 0; i < NewSize; i++)
 	{
 		buffer[i] = TempBuffer[i];
 		std::cout << buffer[i];
-	}
+	}*/
 
 
-	return buffer;
+	return TempBuffer;
 }
 
 #endif
\ No newline at end of file
diff --git a/CST 126/Homework2/Base64Helper.hpp b/CST 126/Homework2/Base64Helper.hpp
index 990d1a0..744707f 100644
--- a/CST 126/Homework2/Base64Helper.hpp
+++ b/CST 126/Homework2/Base64Helper.hpp
@@ -74,7 +74,7 @@ inline char* ReadFileAsBinary(const char* fileName, char* buffer, const size_t&
 	}
 }
 
-inline bool WriteFileFromBinary(const size_t& size, const char* fileName, const char* buffer)
+inline bool WriteFileFromBinary(const size_t& size, const char* fileName, char* buffer, std::string fileContents)
 {
 	try
 	{
@@ -86,6 +86,14 @@ inline bool WriteFileFromBinary(const size_t& size, const char* fileName, const
 			std::cerr << "Could not open file for binary output: " << fileName;
 		}
 	
+		size_t NewSize = fileContents.size();
+	
+		buffer = new char[NewSize];
+
+		for (auto i = 0u; i < NewSize; i++)
+		{
+			buffer[i] = fileContents[i];
+		}
 
 		File.write(buffer, size);
 		File.close();
@@ -104,7 +112,7 @@ inline bool WriteFileFromBinary(const size_t& size, const char* fileName, const
 	return false;
 }
 
-inline bool WriteTextToFile(const char* fileName, const char* fileContents)
+inline bool WriteTextToFile(const char* fileName, std::string fileContents/*const char* fileContents*/)
 {
 	std::ofstream File(fileName);
 
diff --git a/CST 126/Homework2/destination_file.txt b/CST 126/Homework2/destination_file.txt
index 52dc435..e94188b 100644
--- a/CST 126/Homework2/destination_file.txt
+++ b/CST 126/Homework2/destination_file.txt
@@ -1 +1 @@
-0VGe0BCdvBCdlNHdg8Wd0BiYp5WYylHImlGblBiZ152Y0l2buNXDKM3btVGIt9mclBydvJHZzBSYuRGIzRXdmZWDKM3btVGIt9mclBydvJHZzBiZvJHI0V2c0lmbnFS+��������|f�jŴ
\ No newline at end of file
+0VGe0BCdvBCdlNHdg8Wd0BiYp5WYylHImlGblBiZ152Y0l2buNXDKM3btVGIt9mclBydvJHZzBSYuRGIzRXdmZWDKM3btVGIt9mclBydvJHZzBiZvJHI0V2c0lmbnFS+
\ No newline at end of file
diff --git a/CST 126/Homework2/main.cpp b/CST 126/Homework2/main.cpp
index 2f9d3d3..2e246ff 100644
--- a/CST 126/Homework2/main.cpp
+++ b/CST 126/Homework2/main.cpp
@@ -56,8 +56,8 @@ bool Worker()
 			Destination = InputFileName("\nWhat is the name of the file you wish to save the decoded information?: ");
 			size = SizeOfFile(MyFile);
 			buffer = ReadTextFromFile(MyFile, buffer);
-			success = WriteFileFromBinary(size, Destination, Base64Decode(buffer, size));
-			delete[] buffer;
+			success = WriteFileFromBinary(size, Destination, buffer, Base64Decode(buffer, size));
+		//	delete[] buffer;
 			return true;
 		case'f':
 			std::cout << "Have a great day!" << std::endl;
@@ -94,10 +94,8 @@ bool Worker(char** argv)
 		buffer = new char[size];
 
 		buffer = ReadFileAsBinary(arg2, buffer, size);
-		
-		MyEncodedCharArray = Base64Encode(buffer, size);
 
-		success = WriteTextToFile(arg3, MyEncodedCharArray);
+		success = WriteTextToFile(arg3, Base64Encode(buffer, size));
 		delete[] buffer;
 
 
@@ -105,7 +103,7 @@ bool Worker(char** argv)
 	case 'd':
 		buffer = new char[size];
 		buffer = ReadTextFromFile(arg2, buffer);
-		success = WriteFileFromBinary(size, arg3, Base64Decode(buffer, size));
+	//	success = WriteFileFromBinary(size, arg3, Base64Decode(buffer, size));
 		return true;
 	default:
 		std::cerr << "Error, invalid command option\n" <<
diff --git a/CST 126/Homework2/nextdest.txt b/CST 126/Homework2/nextdest.txt
index 15ee807..6a29c3a 100644
--- a/CST 126/Homework2/nextdest.txt
+++ b/CST 126/Homework2/nextdest.txt