Fixed issue #14: Allow generated code to only use octal representation for non-printable characters

Author: end2endzone

CHANGES

@@ -5,6 +5,7 @@ Changes for 2.0:
 * New feature: Command line --quiet to not output any message to standard output.
 * New feature: Command line --baseclass to change the default name of the interface which is File
 * Fixed issue  #5: Remove the concept of segment
+* Fixed issue #14: Allow generated code to only use octal representation for non-printable characters
 * Fixed issue #16: Implement a --namespace argument
 * Fixed issue #17: Implement a --help and --h
 * Fixed issue #19: Add NSIS as a prerequisite in README and INSTALL

src/ArrayGenerator.cpp

@@ -96,7 +96,7 @@ namespace bin2cpp
         }
 
         //output
-        fprintf(cpp, "        %s", toCppCharactersArray(buffer, readSize).c_str());
+        fprintf(cpp, "        %s", cppencoder::toCppCharactersArray(buffer, readSize).c_str());
         numLinePrinted++;
       }
 

src/SegmentGenerator.cpp

@@ -94,7 +94,7 @@ namespace bin2cpp
         continue; //nothing to output if nothing was read
 
       //output
-      fprintf(cpp, "      mBuffer.append(\"%s\", %d);\n", toCppString(buffer, readSize).c_str(), readSize);
+      fprintf(cpp, "      mBuffer.append(\"%s\", %d);\n", cppencoder::toOctString(buffer, readSize, false).c_str(), readSize);
     }
     delete[] buffer;
     buffer = NULL;

src/StringGenerator.cpp

@@ -96,7 +96,7 @@ namespace bin2cpp
         }
 
         //output
-        fprintf(cpp, "        \"%s\"", toCppString(buffer, readSize).c_str());
+        fprintf(cpp, "        \"%s\"", cppencoder::toOctString(buffer, readSize, false).c_str());
         numLinePrinted++;
       }
 

src/common.cpp

@@ -230,34 +230,6 @@ namespace bin2cpp
     return BINCPP_VERSION;
   }
 
-  void toHexString(unsigned char c, unsigned char & c1, unsigned char & c2)
-  {
-    static const char * hexCharacters = "0123456789abcdef";
-    c1 = hexCharacters[c/16];
-    c2 = hexCharacters[c%16];
-  }
-
-  void toOctString(unsigned char c, unsigned char & c1, unsigned char & c2, unsigned char & c3)
-  {
-    static const char * octCharacters = "01234567";
-    c3 = octCharacters[c%8];
-    c /= 8;
-    c2 = octCharacters[c%8];
-    c /= 8;
-    c1 = octCharacters[c];
-  }
-
-  bool isPrintableCharacter(const char c)
-  {
-    if (c == 39) // character ' must be escaped with \' which is not supported right now
-      return false;
-    if (c == 92) // character \ must be escaped with \\ which is not supported right now
-      return false;
-    if (c >= 32 && c<= 126)
-      return true;
-    return false;
-  }
-
   std::string getParentPath(const std::string & iPath)
   {
     std::string parent;
@@ -276,42 +248,6 @@ namespace bin2cpp
 
   void splitPath(const std::string & iPath, std::string & oFolder, std::string & oFilename)
   {
-    //char separator = getPathSeparator();
-
-    ////reset everything
-    //oFilename = "";
-    //oFolder = "";
-
-    ////start from the end and capture each character into oFilename
-    //bool wDumpingInFilename = true;
-    //for(int i = iPath.size() - 1; i >= 0; i--)
-    //{
-    //  char c = iPath[i];
-    //  if (c == separator && wDumpingInFilename)
-    //  {
-    //    wDumpingInFilename = false;
-    //  }
-
-    //  //decide where the character will be dumped
-    //  std::string * wDestination = NULL;
-    //  if (wDumpingInFilename)
-    //  {
-    //    wDestination = &oFilename;
-    //  }
-    //  else
-    //  {
-    //    wDestination = &oFolder;
-    //  }
-
-    //  //dump c into destination string
-    //  wDestination->insert(0, 1, c);
-    //}
-
-    //if (oFolder.size() == 0)
-    //{
-    //  oFolder = std::string(".") + separator;
-    //}
-
     oFolder = "";
     oFilename = "";
 

src/common.h

@@ -74,34 +74,6 @@ namespace bin2cpp
   */
   const char * getVersionString();
 
-  ///<summary>
-  ///Converts a single byte character to the two characters representing this byte in hexadicimal.
-  ///For instance, toHexString(64, c1, c2) assigns c1='4' and c2='0'
-  ///</summary>
-  ///<param name="c">The input byte value</param>
-  ///<param name="c1">The first  character of the hexadecimal string.</param>
-  ///<param name="c2">The second character of the hexadecimal string.</param>
-  ///<return>The the two characters representing the hexadecimal value of c.<return>
-  void toHexString(unsigned char c, unsigned char & c1, unsigned char & c2);
-
-  ///<summary>
-  ///Converts a single byte character to the 3 characters representing this byte in octal.
-  ///For instance, toOctString(83, c1, c2, c3) assigns c1='1', c2='2' and c3='3'
-  ///</summary>
-  ///<param name="c">The input byte value</param>
-  ///<param name="c1">The first  character of the octal string.</param>
-  ///<param name="c2">The second character of the octal string.</param>
-  ///<param name="c3">The third  character of the octal string.</param>
-  ///<return>The the two characters representing the hexadecimal value of c.<return>
-  void toOctString(unsigned char c, unsigned char & c1, unsigned char & c2, unsigned char & c3);
-
-  ///<summary>
-  ///Returns true if the given character is printable to a console.
-  ///</summary>
-  ///<param name="c">The input character value</param>
-  ///<return>Returns true if the given character is printable to a console.<return>
-  bool isPrintableCharacter(const char c);
-
   ///<summary>
   ///Returns the parent element of a path. For files, returns the file's directory. For folders, returns the parent path
   ///</summary>