From 7ff483a96de207536ebc94c034affb415804fdfc Mon Sep 17 00:00:00 2001 From: "nhotta%netscape.com" Date: Wed, 10 May 2000 22:24:22 +0000 Subject: [PATCH] Changed to use _mbsrchr instead of strrchr to support double-byte characters on PC (the change is ifdef for XP_PC), check in for m_kato@ga2.so-net.ne.jp, r=ftang, bug 29546. git-svn-id: svn://10.0.0.236/trunk@69071 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsFileSpec.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mozilla/xpcom/io/nsFileSpec.cpp b/mozilla/xpcom/io/nsFileSpec.cpp index 3d16ec9e2cb..febdcc7429a 100644 --- a/mozilla/xpcom/io/nsFileSpec.cpp +++ b/mozilla/xpcom/io/nsFileSpec.cpp @@ -314,7 +314,12 @@ void nsSimpleCharString::LeafReplace(char inSeparator, const char* inLeafName) return; } char* chars = mData->mString; +#if defined(XP_PC) && !defined(XP_OS2) + // XXX OS/2 should use strrchr() of DBCS verison, too + char* lastSeparator = (char*) _mbsrchr((const unsigned char*) chars, inSeparator); +#else char* lastSeparator = strrchr(chars, inSeparator); +#endif int oldLength = Length(); PRBool trailingSeparator = (lastSeparator + 1 == chars + oldLength); if (trailingSeparator) @@ -322,7 +327,12 @@ void nsSimpleCharString::LeafReplace(char inSeparator, const char* inLeafName) char savedCh = *lastSeparator; char *savedLastSeparator = lastSeparator; *lastSeparator = '\0'; +#if defined(XP_PC) && !defined(XP_OS2) + // XXX OS/2 should use strrchr() of DBCS verison, too + lastSeparator = (char*) _mbsrchr((const unsigned char*) chars, inSeparator); +#else lastSeparator = strrchr(chars, inSeparator); +#endif *savedLastSeparator = savedCh; } if (lastSeparator)