From fae247f1dba77eacd9055ba074d99314fa64ee92 Mon Sep 17 00:00:00 2001
From: Justin Borodinsky <justin.borodinsky@gmail.com>
Date: Sat, 3 Jan 2015 14:41:23 -0500
Subject: [PATCH] add initial file STRINGS utf16 support

---
 Source/cmFileCommand.cxx | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 3c2dfa5..1af0e93 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -472,8 +472,12 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
   bool have_regex = false;
   bool newline_consume = false;
   bool hex_conversion_enabled = true;
-  bool utf8_encoding = false;
   int arg_mode = arg_none;
+  enum { encoding_none,
+         encoding_utf8,
+         encoding_utf16 };
+  int encoding = encoding_none;
+
   for(unsigned int i=3; i < args.size(); ++i)
     {
     if(args[i] == "LIMIT_INPUT")
@@ -599,7 +603,11 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       {
       if(args[i] == "UTF-8")
         {
-        utf8_encoding = true;
+        encoding = encoding_utf8;
+        }
+      else if(args[i] == "UTF-16")
+        {
+        encoding = encoding_utf16;
         }
       else
         {
@@ -647,6 +655,9 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
     return false;
     }
 
+  // If no BOM is found the stream is reset to the beginning
+  int bom_detected = cmsys::FStream::ReadBOM(fin);
+
   // Parse strings out of the file.
   int output_size = 0;
   std::vector<std::string> strings;
@@ -659,7 +670,30 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
 
     int c = fin.get();
 
-    if(c == '\r')
+    if(encoding == encoding_utf16)
+      {
+      int c1 = fin.get();
+#if (cmsys_CPU_ENDIAN_ID == cmsys_CPU_ENDIAN_ID_LITTLE)
+      if(bom_detected == cmsys::FStream::BOM_UTF16BE)
+#else
+      if(bom_detected == cmsys::FStream::BOM_UTF16LE)
+#endif
+        {
+        c = (c << 8) | c1;
+        }
+      else
+        {
+        c |= (c1 << 8);
+        }
+      if(c == L'\r')
+        {
+        continue;
+        }
+      wchar_t wstr[] = {static_cast<wchar_t>(c), 0};
+      current_str += cmsys::Encoding::ToNarrow(wstr);
+      }
+
+    else if(c == '\r')
       {
       // Ignore CR character to make output always have UNIX newlines.
       continue;
@@ -673,7 +707,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       // c is guaranteed to fit in char by the above if...
       current_str += static_cast<char>(c);
       }
-    else if(utf8_encoding)
+    else if(encoding == encoding_utf8)
       {
       // Check for UTF-8 encoded string (up to 4 octets)
       static const unsigned char utf8_check_table[3][2] =
-- 
2.1.1

From 66ce922ac49fe5de6d4811cb05f2ab154b2f5108 Mon Sep 17 00:00:00 2001
From: Justin Borodinsky <justin.borodinsky@gmail.com>
Date: Sun, 11 Jan 2015 14:33:36 -0500
Subject: [PATCH] file STRINGS UTF-16 and UTF-32 convertible to ASCII

---
 Source/cmFileCommand.cxx | 64 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 3c2dfa5..0a3ef02 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -472,7 +472,13 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
   bool have_regex = false;
   bool newline_consume = false;
   bool hex_conversion_enabled = true;
-  bool utf8_encoding = false;
+  enum { encoding_none = cmsys::FStream::BOM_None,
+         encoding_utf8 = cmsys::FStream::BOM_UTF8,
+         encoding_utf16le = cmsys::FStream::BOM_UTF16LE,
+         encoding_utf16be = cmsys::FStream::BOM_UTF16BE,
+         encoding_utf32le = cmsys::FStream::BOM_UTF32LE,
+         encoding_utf32be = cmsys::FStream::BOM_UTF32BE};
+  int encoding = encoding_none;
   int arg_mode = arg_none;
   for(unsigned int i=3; i < args.size(); ++i)
     {
@@ -599,7 +605,23 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       {
       if(args[i] == "UTF-8")
         {
-        utf8_encoding = true;
+        encoding = encoding_utf8;
+        }
+      else if(args[i] == "UTF-16LE")
+        {
+        encoding = encoding_utf16le;
+        }
+      else if(args[i] == "UTF-16BE")
+        {
+        encoding = encoding_utf16be;
+        }
+      else if(args[i] == "UTF-32LE")
+        {
+        encoding = encoding_utf32le;
+        }
+      else if(args[i] == "UTF-32BE")
+        {
+        encoding = encoding_utf32be;
         }
       else
         {
@@ -647,6 +669,23 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
     return false;
     }
 
+  //If BOM is found and encoding was not specified, use the BOM
+  int bom_found = cmsys::FStream::ReadBOM(fin);
+  if(encoding == encoding_none && bom_found != cmsys::FStream::BOM_None)
+    {
+    encoding = bom_found;
+    }
+
+  unsigned int bytes_rem = 0;
+  if(encoding == encoding_utf16le || encoding == encoding_utf16be)
+    {
+    bytes_rem = 1;
+    }
+  if(encoding == encoding_utf32le || encoding == encoding_utf32be)
+    {
+    bytes_rem = 3;
+    }
+
   // Parse strings out of the file.
   int output_size = 0;
   std::vector<std::string> strings;
@@ -658,6 +697,25 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
     std::string current_str;
 
     int c = fin.get();
+    for(unsigned int i=0; i<bytes_rem; ++i)
+      {
+      int c1 = fin.get();
+      if(!fin)
+        {
+        fin.putback(static_cast<char>(c1));
+        break;
+        }
+      c = (c << 8) | c1;
+      }
+    if(encoding == encoding_utf16le)
+      {
+      c = ((c & 0xFF) << 8) | ((c & 0xFF00) >> 8);
+      }
+    else if(encoding == encoding_utf32le)
+      {
+       c = (((c & 0xFF) << 24) | ((c & 0xFF00) << 8) |
+          ((c & 0xFF0000) >> 8) | ((c & 0xFF000000) >> 24));
+      }
 
     if(c == '\r')
       {
@@ -673,7 +731,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       // c is guaranteed to fit in char by the above if...
       current_str += static_cast<char>(c);
       }
-    else if(utf8_encoding)
+    else if(encoding == encoding_utf8)
       {
       // Check for UTF-8 encoded string (up to 4 octets)
       static const unsigned char utf8_check_table[3][2] =
-- 
2.1.4

From 14cda5e38aa27d3de2f13124e2d4d653fbef77af Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Tue, 13 Jan 2015 22:29:55 -0700
Subject: [PATCH] Add test for file(STRINGS) with UTF-16 and UTF-32 encodings.

---
 Tests/StringFileTest/CMakeLists.txt |  23 +++++++++++++++++++++++
 Tests/StringFileTest/UTF-16BE.txt   | Bin 0 -> 83 bytes
 Tests/StringFileTest/UTF-16LE.txt   | Bin 0 -> 83 bytes
 Tests/StringFileTest/UTF-32BE.txt   | Bin 0 -> 165 bytes
 Tests/StringFileTest/UTF-32LE.txt   | Bin 0 -> 165 bytes
 5 files changed, 23 insertions(+)
 create mode 100644 Tests/StringFileTest/UTF-16BE.txt
 create mode 100644 Tests/StringFileTest/UTF-16LE.txt
 create mode 100644 Tests/StringFileTest/UTF-32BE.txt
 create mode 100644 Tests/StringFileTest/UTF-32LE.txt

diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index faf3bc9..7a818cb 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -65,6 +65,29 @@ else()
     "file(STRINGS) incorrectly read from utf8 file [${infile_strings}]")
 endif()

+# check files with UTF-16 or UTF-32 content
+foreach(bit 16 32)
+  foreach(endian LE BE)
+    set(file_to_check UTF-${bit}${endian}.txt)
+    foreach(bit_check 16 32)
+      foreach(endian_check LE BE)
+        file(STRINGS ${file_to_check} str ENCODING UTF-${bit_check}${endian_check})
+        if("${bit}" STREQUAL "${bitcheck}")
+          if(NOT str MATCHES "Hello World")
+            message(SEND_ERROR
+              "file(STRINGS) incorrectly read from ${file_to_check} file [${str}]")
+          endif()
+        else()
+          if(NOT "${str}" STREQUAL "")
+            message(SEND_ERROR
+              "file(STRINGS) incorrectly read from ${file_to_check} file [${str}]")
+          endif()
+        endif()
+      endforeach()
+    endforeach()
+  endforeach()
+endforeach()
+
 # String test
 string(REGEX MATCH "[cC][mM][aA][kK][eE]" rmvar "CMake is great")
 string(REGEX MATCHALL "[cC][mM][aA][kK][eE]" rmallvar "CMake is better than cmake or CMake")
diff --git a/Tests/StringFileTest/UTF-16BE.txt b/Tests/StringFileTest/UTF-16BE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9d976bc640912c08d845b6400a57dec6532d0690
GIT binary patch
literal 83
zcmezOpTUD6l_3WR^BEKv!hvKFke$N7<)08)>nB#~!@$L2&*H#h!D7T>%HqVJz+wYr
LJ1}tN;L->H?642a

literal 0
HcmV?d00001

diff --git a/Tests/StringFileTest/UTF-16LE.txt b/Tests/StringFileTest/UTF-16LE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ebba8748bf4f8ca44583eafa0329105cc8798bf9
GIT binary patch
literal 83
zcmezW&x0YAAqNQa859`8fn*Voox;Gykl<e%Ddy)>%Ee&M;=p3TV#H#~;>4oBU;|`3
LuyExt;L->H_hApr

literal 0
HcmV?d00001

diff --git a/Tests/StringFileTest/UTF-32BE.txt b/Tests/StringFileTest/UTF-32BE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6725fbb45a40b4fbff6690c34d564d2c8e7353fa
GIT binary patch
literal 165
zcmZQz`1hZIfx!caQ-L@Kit~ZA0uYA-F^F9R#2~p8Am(CV@K0c1h^%E`@DpQTDD{De
mvDh;(us8s*1rQqnu_+Kc0p%2cv<(o0#DVe*Tp)u;vJe2f-4DzF

literal 0
HcmV?d00001

diff --git a/Tests/StringFileTest/UTF-32LE.txt b/Tests/StringFileTest/UTF-32LE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cf5102f58ac6a1d260fc95bc2a56d3c748b7b9ec
GIT binary patch
literal 165
zcmezWkAcC1fq@|vh;yJgA4n?zaX1iz*hN4Ll1l+%E+9_uXJDv}WMB~UV_@(pg^1a+
iFfcd(u>}wt0kJ6%I{~o*P`wS128n~@xj+VyY9RpTBoE90

literal 0
HcmV?d00001

-- 
1.9.3

From d2f31e5add4e88eb62a8132742573a1ed2a9c141 Mon Sep 17 00:00:00 2001
From: Justin Borodinsky <justin.borodinsky@gmail.com>
Date: Fri, 16 Jan 2015 19:39:28 -0500
Subject: [PATCH] Compare file STRINGS encodings

---
 Tests/StringFileTest/CMakeLists.txt |  24 ++++++++++++++++++++++++
 Tests/StringFileTest/UTF-16BE.txt   | Bin 0 -> 83 bytes
 Tests/StringFileTest/UTF-16LE.txt   | Bin 0 -> 83 bytes
 Tests/StringFileTest/UTF-32BE.txt   | Bin 0 -> 165 bytes
 Tests/StringFileTest/UTF-32LE.txt   | Bin 0 -> 165 bytes
 runstrings.sh                       |   8 ++++++++
 6 files changed, 32 insertions(+)
 create mode 100644 Tests/StringFileTest/UTF-16BE.txt
 create mode 100644 Tests/StringFileTest/UTF-16LE.txt
 create mode 100644 Tests/StringFileTest/UTF-32BE.txt
 create mode 100644 Tests/StringFileTest/UTF-32LE.txt
 create mode 100755 runstrings.sh

diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index faf3bc9..4640d05 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -65,6 +65,30 @@ else()
     "file(STRINGS) incorrectly read from utf8 file [${infile_strings}]")
 endif()
 
+# check files with UTF-16 or UTF-32 content
+foreach(bit 16 32)
+  foreach(endian LE BE)
+    set(file_to_check UTF-${bit}${endian}.txt)
+    foreach(bit_check 16 32)
+      foreach(endian_check LE BE)
+        file(STRINGS ${file_to_check} str ENCODING UTF-${bit_check}${endian_check} REGEX "....")
+        message("${file_to_check} as UTF-${bit_check}${endian_check}: ${str}")
+        if("${bit}" STREQUAL "${bit_check}")
+          if(NOT str MATCHES "Hello World")
+            #message(SEND_ERROR
+            #  "file(STRINGS) incorrectly read from ${file_to_check} file as UTF-${bit_check}${endian_check} [${str}]")
+          endif()
+        else()
+          if(NOT "${str}" STREQUAL "")
+            #message(SEND_ERROR
+            #  "file(STRINGS) incorrectly read from ${file_to_check} file as UTF-${bit_check}${endian_check} [${str}]")
+          endif()
+        endif()
+      endforeach()
+    endforeach()
+  endforeach()
+endforeach()
+
 # String test
 string(REGEX MATCH "[cC][mM][aA][kK][eE]" rmvar "CMake is great")
 string(REGEX MATCHALL "[cC][mM][aA][kK][eE]" rmallvar "CMake is better than cmake or CMake")
diff --git a/Tests/StringFileTest/UTF-16BE.txt b/Tests/StringFileTest/UTF-16BE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9d976bc640912c08d845b6400a57dec6532d0690
GIT binary patch
literal 83
zcmezOpTUD6l_3WR^BEKv!hvKFke$N7<)08)>nB#~!@$L2&*H#h!D7T>%HqVJz+wYr
LJ1}tN;L->H?642a

literal 0
HcmV?d00001

diff --git a/Tests/StringFileTest/UTF-16LE.txt b/Tests/StringFileTest/UTF-16LE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ebba8748bf4f8ca44583eafa0329105cc8798bf9
GIT binary patch
literal 83
zcmezW&x0YAAqNQa859`8fn*Voox;Gykl<e%Ddy)>%Ee&M;=p3TV#H#~;>4oBU;|`3
LuyExt;L->H_hApr

literal 0
HcmV?d00001

diff --git a/Tests/StringFileTest/UTF-32BE.txt b/Tests/StringFileTest/UTF-32BE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6725fbb45a40b4fbff6690c34d564d2c8e7353fa
GIT binary patch
literal 165
zcmZQz`1hZIfx!caQ-L@Kit~ZA0uYA-F^F9R#2~p8Am(CV@K0c1h^%E`@DpQTDD{De
mvDh;(us8s*1rQqnu_+Kc0p%2cv<(o0#DVe*Tp)u;vJe2f-4DzF

literal 0
HcmV?d00001

diff --git a/Tests/StringFileTest/UTF-32LE.txt b/Tests/StringFileTest/UTF-32LE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cf5102f58ac6a1d260fc95bc2a56d3c748b7b9ec
GIT binary patch
literal 165
zcmezWkAcC1fq@|vh;yJgA4n?zaX1iz*hN4Ll1l+%E+9_uXJDv}WMB~UV_@(pg^1a+
iFfcd(u>}wt0kJ6%I{~o*P`wS128n~@xj+VyY9RpTBoE90

literal 0
HcmV?d00001

diff --git a/runstrings.sh b/runstrings.sh
new file mode 100755
index 0000000..4800e8d
--- /dev/null
+++ b/runstrings.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for i in UTF-16LE UTF-16BE UTF-32LE UTF-32BE; do
+   for j in l b L B; do
+       str=$(strings -e ${j} `pwd`/Tests/StringFileTest/${i}.txt)
+       echo "${i}.txt as ${j}: ${str}"
+   done
+done 
-- 
2.1.4

From 84e5d2b80b6543c358f74a038ffd1efd8265ed63 Mon Sep 17 00:00:00 2001
From: Justin Borodinsky <justin.borodinsky@gmail.com>
Date: Fri, 16 Jan 2015 20:02:58 -0500
Subject: [PATCH 2/2] try2 - file STRINGS to strings comparison

---
 Tests/StringFileTest/CMakeLists.txt | 3 ++-
 runstrings.sh                       | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 runstrings.sh

diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 7a818cb..50a3c10 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -72,7 +72,8 @@ foreach(bit 16 32)
     foreach(bit_check 16 32)
       foreach(endian_check LE BE)
         file(STRINGS ${file_to_check} str ENCODING UTF-${bit_check}${endian_check})
-        if("${bit}" STREQUAL "${bitcheck}")
+        message("${file_to_check} as UTF-${bit_check}${endian_check}: ${str}")
+        if("${bit}" STREQUAL "${bit_check}")
           if(NOT str MATCHES "Hello World")
             message(SEND_ERROR
               "file(STRINGS) incorrectly read from ${file_to_check} file [${str}]")
diff --git a/runstrings.sh b/runstrings.sh
new file mode 100755
index 0000000..4800e8d
--- /dev/null
+++ b/runstrings.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for i in UTF-16LE UTF-16BE UTF-32LE UTF-32BE; do
+   for j in l b L B; do
+       str=$(strings -e ${j} `pwd`/Tests/StringFileTest/${i}.txt)
+       echo "${i}.txt as ${j}: ${str}"
+   done
+done 
-- 
2.1.4

From f1fe26be925d6cdaedc08ecae380cc94898da984 Mon Sep 17 00:00:00 2001
From: Justin Borodinsky <justin.borodinsky@gmail.com>
Date: Fri, 16 Jan 2015 20:13:01 -0500
Subject: [PATCH 2/2] try3 file STRINGS to strings comparison

---
 Tests/StringFileTest/CMakeLists.txt | 5 +++--
 runstrings.sh                       | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 runstrings.sh

diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 7a818cb..62989ce 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -71,8 +71,9 @@ foreach(bit 16 32)
     set(file_to_check UTF-${bit}${endian}.txt)
     foreach(bit_check 16 32)
       foreach(endian_check LE BE)
-        file(STRINGS ${file_to_check} str ENCODING UTF-${bit_check}${endian_check})
-        if("${bit}" STREQUAL "${bitcheck}")
+        file(STRINGS ${file_to_check} str ENCODING UTF-${bit_check}${endian_check} REGEX "....")
+        message("${file_to_check} as UTF-${bit_check}${endian_check}: ${str}")
+        if("${bit}" STREQUAL "${bit_check}")
           if(NOT str MATCHES "Hello World")
             message(SEND_ERROR
               "file(STRINGS) incorrectly read from ${file_to_check} file [${str}]")
diff --git a/runstrings.sh b/runstrings.sh
new file mode 100755
index 0000000..ccc5796
--- /dev/null
+++ b/runstrings.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for i in UTF-16LE UTF-16BE UTF-32LE UTF-32BE; do
+   for j in l b L B; do
+       str=$(strings -e ${j} `pwd`/Tests/StringFileTest/${i}.txt)
+       echo "${i}.txt as ${j}: ${str}"
+   done
+done 
+
-- 
2.1.4

From a4c591f7f373f1dc4f3629d60ab2ee8a465dab4c Mon Sep 17 00:00:00 2001
From: Justin Borodinsky <justin.borodinsky@gmail.com>
Date: Fri, 23 Jan 2015 20:43:36 -0500
Subject: [PATCH] StringFileTest: read files using same encoding.  Add tests
 for BOM use.  Remove runstrings.sh test script

---
 Tests/StringFileTest/CMakeLists.txt | 32 +++++++++++++++++---------------
 runstrings.sh                       |  9 ---------
 2 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100755 runstrings.sh

diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 62989ce..3998b7e 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -69,23 +69,25 @@ endif()
 foreach(bit 16 32)
   foreach(endian LE BE)
     set(file_to_check UTF-${bit}${endian}.txt)
-    foreach(bit_check 16 32)
-      foreach(endian_check LE BE)
-        file(STRINGS ${file_to_check} str ENCODING UTF-${bit_check}${endian_check} REGEX "....")
-        message("${file_to_check} as UTF-${bit_check}${endian_check}: ${str}")
-        if("${bit}" STREQUAL "${bit_check}")
-          if(NOT str MATCHES "Hello World")
-            message(SEND_ERROR
+    file(STRINGS ${file_to_check} str ENCODING UTF-${bit}${endian} REGEX "....")
+    message("${file_to_check} as UTF-${bit}${endian}: ${str}")
+    if(NOT str MATCHES "Hello World")
+        message(SEND_ERROR
               "file(STRINGS) incorrectly read from ${file_to_check} file [${str}]")
-          endif()
-        else()
-          if(NOT "${str}" STREQUAL "")
-            message(SEND_ERROR
+    endif()
+  endforeach()
+endforeach()
+
+# check files using BOM for encoding
+foreach(bit 16 32)
+  foreach(endian LE BE)
+    set(file_to_check UTF-${bit}${endian}.txt)
+    file(STRINGS ${file_to_check} str REGEX "....")
+    message("${file_to_check} : ${str}")
+    if(NOT str MATCHES "Hello World")
+        message(SEND_ERROR
               "file(STRINGS) incorrectly read from ${file_to_check} file [${str}]")
-          endif()
-        endif()
-      endforeach()
-    endforeach()
+    endif()
   endforeach()
 endforeach()
 
diff --git a/runstrings.sh b/runstrings.sh
deleted file mode 100755
index ccc5796..0000000
--- a/runstrings.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-for i in UTF-16LE UTF-16BE UTF-32LE UTF-32BE; do
-   for j in l b L B; do
-       str=$(strings -e ${j} `pwd`/Tests/StringFileTest/${i}.txt)
-       echo "${i}.txt as ${j}: ${str}"
-   done
-done 
-
-- 
2.1.4