745466 - initWithPath fails for "~"

Status: RESOLVED FIXED

(Core :: XPCOM, defect)

Description

[Asaf Romano (gone)]

initWithPath("~/Downloads") - works.
initWithPath("~/Downloads/") - works.
initWithPath("~/") - works.
initWithPath("~") - does not work.

Comment 1

[Asaf Romano (gone)]

Attachment: patch + test

Comment 2

[Asaf Romano (gone)]

This is necessary for bug 710259 (for importing the Downloads folder if it's set to the user's home folder).

Comment 3

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 615066 [details] [diff] [review]
patch + test

r=me, but this needs a separate sr

Comment 4

[Asaf Romano (gone)]

Comment on attachment 615066 [details] [diff] [review]
patch + test

Thanks Boris.

>-    if (Substring(filePath, 0, 2).EqualsLiteral("~/")) {
>+    if (filePath.Equals("~") || Substring(filePath, 0, 2).EqualsLiteral("~/")) {
>         nsCOMPtr<nsIFile> homeDir;
>         nsCAutoString homePath;
>         if (NS_FAILED(NS_GetSpecialDirectory(NS_OS_HOME_DIR,
>                                              getter_AddRefs(homeDir))) ||
>             NS_FAILED(homeDir->GetNativePath(homePath))) {
>             return NS_ERROR_FAILURE;
>         }
>-        
>-        mPath = homePath + Substring(filePath, 1, filePath.Length() - 1);
>+ 
>+        mPath = homePath;
>+        if (filePath.Length() > 1)
>+          mPath.Append(Substring(filePath, 1, filePath.Length() - 1));
>     } else {


That shoukd have been > 2 (or could have been, it does not hurt as it is now).

Comment 5

[Asaf Romano (gone)]

http://hg.mozilla.org/integration/mozilla-inbound/rev/0d48714f4773

Comment 6

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/0d48714f4773

Comment 7

[Marco Bonardo [:mak]]

and the follow-up
https://hg.mozilla.org/mozilla-central/rev/296b90f063d5