From 2c2ce03fbdd1cfa56210d39289357472fcf8b07b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 26 Jan 2009 15:52:55 +0000 Subject: [PATCH] PR 9766 * dlltool.c (xlate): When strip text after the @ sign, look for the last one not the first one. --- binutils/ChangeLog | 6 ++++++ binutils/dlltool.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c549b9f978..ececdb058d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2009-01-26 Nick Clifton + + PR 9766 + * dlltool.c (xlate): When strip text after the @ sign, look for + the last one not the first one. + 2009-01-16 Alan Modra * configure.in (commonbfdlib): Delete. diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 2c3aa6dc2f..a24a55255f 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -2131,8 +2131,9 @@ xlate (const char *name) char *p; name += lead_at; - p = strchr (name, '@'); - if (p) + /* PR 9766: Look for the last @ sign in the name. */ + p = strrchr (name, '@'); + if (p && ISDIGIT (p[1])) *p = 0; } return name; -- 2.34.1