From: Nick Clifton <nickc@redhat.com>
Date: Tue, 16 Dec 2003 11:10:42 +0000 (+0000)
Subject: Only skip one instance of each prefix character, if they are present.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87cc7031acb7cc7a3b69dcfd79c3d71aa57fe477;p=binutils-gdb.git

Only skip one instance of each prefix character, if they are present.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bb4c9ce908e..4b354be12f3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-16  Eric Youngdale  <eric@mkssoftware.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* peicode.h (pe_ILF_build_a_bfd): Only skip one instance of each
+	prefix character, if they are present.
+
 2003-12-15  Dmitry Semyonov  <Dmitry.Semyonov@oktet.ru>
 	    Nick Clifton  <nickc@redhat.com>
 
diff --git a/bfd/peicode.h b/bfd/peicode.h
index 41fcbbcb652..41445e592c3 100644
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -902,10 +902,40 @@ pe_ILF_build_a_bfd (bfd *           abfd,
       symbol = symbol_name;
 
       if (import_name_type != IMPORT_NAME)
-	/* Skip any prefix in symbol_name.  */
-	while (*symbol == '@' || * symbol == '?' || * symbol == '_')
-	  ++ symbol;
-
+	{
+	  bfd_boolean skipped_leading_underscore = FALSE;
+	  bfd_boolean skipped_leading_at = FALSE;
+	  bfd_boolean skipped_leading_question_mark = FALSE;
+	  bfd_boolean check_again;
+	  
+	  /* Skip any prefix in symbol_name.  */
+	  -- symbol;
+	  do
+	    {
+	      check_again = FALSE;
+	      ++ symbol;
+
+	      switch (*symbol)
+		{
+		case '@':
+		  if (! skipped_leading_at)
+		    check_again = skipped_leading_at = TRUE;
+		  break;
+		case '?':
+		  if (! skipped_leading_question_mark)
+		    check_again = skipped_leading_question_mark = TRUE;
+		  break;
+		case '_':
+		  if (! skipped_leading_underscore)
+		    check_again = skipped_leading_underscore = TRUE;
+		  break;
+		default:
+		  break;
+		}
+	    }
+	  while (check_again);
+	}
+      
       if (import_name_type == IMPORT_NAME_UNDECORATE)
 	{
 	  /* Truncate at the first '@'  */