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

Bug 38887. Fix import of IE bookmarks, patch courtesy m_kato@ga2.so-net.ne.jp (Makoto Kato). r=rjc

Browse Source
This commit is contained in:
waterson%netscape.com 2000-05-25 06:43:01 +00:00
parent 370f6ffba7
commit 61b8da1f41
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rdf/datasource/src/nsFileSystemDataSource.cpp
View File

@ -1134,21 +1134,26 @@ FileSystemDataSource::GetFolderList(nsIRDFResource *source, PRBool allowHidden,
if (hiddenFlag == PR_TRUE) continue;
}
PRUnichar *leafUni = nsnull;
if (NS_FAILED(rv = aFile->GetUnicodeLeafName(&leafUni)))
break;
if (!leafUni) break;
nsAutoString fullURI;
fullURI.AssignWithConversion(parentURI);
if (fullURI.Last() != PRUnichar('/'))
{
fullURI.Append(PRUnichar('/'));
}
nsAutoString leaf(leafUni);
Recycle(leafUni);
leafUni = nsnull;
// XXX We should use nsIFile::GetUnicodeLeafName().
// But currently mozilla's xpcom/io is not unicode normalization.
// And URI cannot use UTF-8 (On RFC2396, URI should use UTF-8)
// So, we uses nsIFile::GetLeafName() for performance...
char *leafStr = nsnull;
if (NS_FAILED(rv = aFile->GetLeafName(&leafStr)))
break;
if (!leafStr) break;
nsCAutoString fullURI;
fullURI.Assign(parentURI);
if (fullURI.Last() != '/')
{
fullURI.Append('/');
}
nsCAutoString leaf(leafStr);
Recycle(leafStr);
leafStr = nsnull;
// we need to escape this leaf name;
// for now, let's just hack it and encode spaces and slashes
@ -1156,12 +1161,12 @@ FileSystemDataSource::GetFolderList(nsIRDFResource *source, PRBool allowHidden,
while ((aOffset = leaf.FindChar(' ')) >= 0)
{
leaf.Cut((PRUint32)aOffset, 1);
leaf.InsertWithConversion("%20", (PRUint32)aOffset);
leaf.Insert("%20", (PRUint32)aOffset);
}
while ((aOffset = leaf.FindChar('/')) >= 0)
{
leaf.Cut((PRUint32)aOffset, 1);
leaf.InsertWithConversion("%2F", (PRUint32)aOffset);
leaf.Insert("%2F", (PRUint32)aOffset);
}
// append the encoded name
@ -1178,7 +1183,7 @@ FileSystemDataSource::GetFolderList(nsIRDFResource *source, PRBool allowHidden,
}
nsCOMPtr<nsIRDFResource> fileRes;
gRDFService->GetUnicodeResource(fullURI.GetUnicode(), getter_AddRefs(fileRes));
gRDFService->GetResource(fullURI.GetBuffer(), getter_AddRefs(fileRes));
nameArray->AppendElement(fileRes);