Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

supplimental fix for #43015 / #121122. wcyeh@zydas.com.tw points out that

Browse Source 
certain directory names (like "1234") don't come with a trailing slash
where most others do.  r/sr=bienvenu a=asa.
This commit is contained in:
sspitzer%netscape.com 2002-09-10 06:32:51 +00:00
parent a79325f4fd
commit 963006dcea
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/src/windows/nsFilePicker.cpp
View File

@ -450,7 +450,12 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *aReturnVal)
// This format enables the Explorer-style dialog boxes // This format enables the Explorer-style dialog boxes
// to return long file names that include spaces. // to return long file names that include spaces.
char *current = fileBuffer; char *current = fileBuffer;
const char *dirName = current;
nsCAutoString dirName(current);
// sometimes dirName contains a trailing slash
// and sometimes it doesn't.
if (current[dirName.Length() - 1] != '\\')
dirName += '\\';
while (current && *current && *(current + strlen(current) + 1)) { while (current && *current && *(current + strlen(current) + 1)) {
current = current + strlen(current) + 1; current = current + strlen(current) + 1;
@ -458,8 +463,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *aReturnVal)
nsCOMPtr<nsILocalFile> file = do_CreateInstance("@mozilla.org/file/local;1", &rv); nsCOMPtr<nsILocalFile> file = do_CreateInstance("@mozilla.org/file/local;1", &rv);
NS_ENSURE_SUCCESS(rv,rv); NS_ENSURE_SUCCESS(rv,rv);
// dirName contains a trailing slash rv = file->InitWithNativePath(dirName + nsDependentCString(current));
rv = file->InitWithNativePath(nsDependentCString(dirName) + nsDependentCString(current));
NS_ENSURE_SUCCESS(rv,rv); NS_ENSURE_SUCCESS(rv,rv);
rv = mFiles->AppendElement(file); rv = mFiles->AppendElement(file);