From: Nick Clifton <nickc@redhat.com>
Date: Fri, 9 Nov 2018 12:51:46 +0000 (+0000)
Subject: oops - add missing piece of previous delta
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dcd9adc5cbac756507eb5da65a4f9cf3edb8fc93;p=binutils-gdb.git

oops - add missing piece of previous delta
---

diff --git a/binutils/strings.c b/binutils/strings.c
index eac7292dab8..e1fecc09326 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -661,7 +661,43 @@ print_strings (const char *filename, FILE *stream, file_ptr address,
 	  if (c == EOF)
 	    break;
 	  if (! STRING_ISGRAPHIC (c))
-	    break;
+	    {
+	      if (encoding_bytes > 1)
+		{
+		  /* In case of multibyte encodings rewind using magic buffer.  */
+		  if (magiccount == 0)
+		    {
+		      /* If no magic buffer exists: use memory of c.  */
+		      switch (encoding)
+			{
+			default:
+			  break;
+			case 'b':
+			  c = c & 0xff;
+			  magiccount += 1;
+			  break;
+			case 'l':
+			case 'L':
+			  c = c >> 8;
+			  magiccount += (encoding_bytes -1);
+			  break;
+			case 'B':
+			  c = (( c & 0xff0000) >> 16) | ( c & 0xff00)
+			    | (( c & 0xff) << 16);
+			  magiccount += 3;
+			  break;
+			}
+		      magic = (char *) &c;
+		    }
+		  else
+		    {
+		      /* If magic buffer exists: rewind.  */
+		      magic = magic - (encoding_bytes -1);
+		    }
+		  address = address - (encoding_bytes -1);
+		}
+	      break;
+	    }
 	  putchar (c);
 	}