Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed to use _mbsrchr instead of strrchr to support double-byte characters on PC (the change is ifdef for XP_PC),

Browse Source 
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
This commit is contained in:
nhotta%netscape.com
2000-05-10 22:24:22 +00:00
parent 908bc40427
commit 7ff483a96d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/xpcom/io/nsFileSpec.cpp
View File

@@ -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)