Enhance the strings program so that it can display multibyte strings.

	* strings.c (print_strings): Check for multibyte encodings.
	* binutils-all/strings-1.bin: New file.  Test binary for string decoding.
	* testsuite/binutils-all/strings.exp: New file.  Test the strings program.
	* testsuite/config/default.exp (STRINGS): Define if not provided
	by the environment.
	(STRINGSFLAGS): Likewise.

3 files changed, 47 insertions, 0 deletions

diff --git a/binutils/testsuite/binutils-all/strings-1.bin b/binutils/testsuite/binutils-all/strings-1.bin
new file mode 100755
index 0000000..569be85
--- /dev/null
+++ b/binutils/testsuite/binutils-all/strings-1.bin
diff --git a/binutils/testsuite/binutils-all/strings.exp b/binutils/testsuite/binutils-all/strings.exp
new file mode 100644
index 0000000..c4bbf69
--- /dev/null
+++ b/binutils/testsuite/binutils-all/strings.exp
@@ -0,0 +1,41 @@
+#   Copyright (C) 2018 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+proc test_multibyte {testfile} {
+    global STRINGS
+    global STRINGSFLAGS
+    
+    set testname "strings: decoding little-endian multibyte strings"
+    set got [binutils_run $STRINGS "$STRINGSFLAGS --encoding=l $testfile"]
+
+    set want "String1"
+    if ![regexp $want $got] then {
+	fail "$testname [String1]"
+	return
+    }
+
+    set want "tring2"
+    if ![regexp $want $got] then {
+	fail "$testname [tring2]"
+	return
+    }
+
+    pass $testname
+}
+
+test_multibyte $srcdir/$subdir/strings-1.bin
+
+
diff --git a/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp
index 1bfe72e..b34e45c 100644
--- a/binutils/testsuite/config/default.exp
+++ b/binutils/testsuite/config/default.exp
@@ -63,6 +63,12 @@ if ![info exists OBJCOPYFLAGS] then {
 if ![info exists AR] then {
     set AR [findfile $base_dir/ar]
 }
+if ![info exists STRINGS] then {
+    set STRINGS [findfile $base_dir/strings]
+}
+if ![info exists STRINGSFLAGS] then {
+    set STRINGSFLAGS ""
+}
 if ![info exists STRIP] then {
     set STRIP [findfile $base_dir/strip-new $base_dir/strip-new [transform strip]]
 }