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

Bug 276588 followup: fix absolute URIs of the form "firefox http://www.tld.com/" which regressed at some point during the review process. There was a reason for all that hacky code. r=glazou sr=bustage-fix

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@167942 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net
2005-01-18 13:09:08 +00:00
parent 19342ab71f
commit 2a8426d8bb
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
View File

@@ -389,18 +389,28 @@ nsCommandLine::ResolveURI(const nsAString& aArgument, nsIURI* *aResult)
nsCOMPtr<nsIIOService> io = do_GetIOService();
NS_ENSURE_TRUE(io, NS_ERROR_OUT_OF_MEMORY);
// First, pretend it's a file
nsCOMPtr<nsIFile> file;
rv = ResolveFile(aArgument, getter_AddRefs(file));
if (NS_SUCCEEDED(rv)) {
return io->NewFileURI(file, aResult);
NS_ConvertUTF16toUTF8 cargument(aArgument);
// If there appears to be a URI scheme at the beginning of the argument,
// it is not a file arg, don't even try.
nsCAutoString scheme;
rv = io->ExtractScheme(cargument, scheme);
if (NS_FAILED(rv)) {
// pretend it's an absolute file path
nsCOMPtr<nsIFile> file;
rv = ResolveFile(aArgument, getter_AddRefs(file));
if (NS_SUCCEEDED(rv)) {
return io->NewFileURI(file, aResult);
}
}
nsCOMPtr<nsIURI> workingDirURI;
rv = io->NewFileURI(mWorkingDir, getter_AddRefs(workingDirURI));
NS_ENSURE_SUCCESS(rv, rv);
return io->NewURI(NS_ConvertUTF16toUTF8(aArgument),
return io->NewURI(cargument,
nsnull,
workingDirURI,
aResult);