From: Ulf Carlsson <ulfc@engr.sgi.com>
Date: Wed, 14 Jun 2000 04:58:50 +0000 (+0000)
Subject: 2000-06-13  Ulf Carlsson  <ulfc@engr.sgi.com>
X-Git-Tag: readline-pre-41-import~197
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c06ae4f232e6e2b3d3062ffc5bce2b4477cb388a;p=platform%2Fupstream%2Fbinutils.git

2000-06-13  Ulf Carlsson  <ulfc@engr.sgi.com>

	* macro.c (getstring): Make it possible to escape the quote
	character.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f305b25..98e8ec1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-13  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* macro.c (getstring): Make it possible to escape the quote
+	character.
+
 Tue Jun 13 20:58:28 2000  Catherine Moore <clm@redhat.com>
 
 	* config/tc-hppa.c (pa_export): Weak symbols can be global.
diff --git a/gas/macro.c b/gas/macro.c
index df01bc5..3a0b612 100644
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -304,14 +304,25 @@ getstring (idx, in, acc)
       else if (in->ptr[idx] == '"' || in->ptr[idx] == '\'')
 	{
 	  char tchar = in->ptr[idx];
+	  int escaped = 0;
 	  idx++;
 	  while (idx < in->len)
 	    {
+	      if (in->ptr[idx-1] == '\\')
+		escaped ^= 1;
+	      else
+		escaped = 0;
+
 	      if (macro_alternate && in->ptr[idx] == '!')
 		{
 		  idx++  ;
 		  sb_add_char (acc, in->ptr[idx++]);
 		}
+	      else if (escaped && in->ptr[idx] == tchar)
+		{
+		  sb_add_char (acc, tchar);
+		  idx++;
+		}
 	      else
 		{
 		  if (in->ptr[idx] == tchar)