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

Bug 58533 - Can't open files with a '/' in name by double-clicking in Finder. r=rjc/sr=sfraser/a=asa

Browse Source
This commit is contained in:
ccarlen%netscape.com 2002-03-22 15:03:17 +00:00
parent 47d9c4055c
commit 5ac940d43c
2 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xpfe/appshell/src/nsCommandLineServiceMac.cpp
View File

@ -52,7 +52,6 @@
#include "nsIURL.h"
#include "nsIServiceManager.h"
#include "nsNetCID.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#include "nsIWebShellWindow.h"
#include "nsIWebShell.h"
#include "nsIDOMWindow.h"
@ -194,11 +193,21 @@ nsresult nsMacCommandLine::AddToCommandLine(const char* inOptionString, const FS
//----------------------------------------------------------------------------------------
{
// Convert the filespec to a URL
nsFileSpec nsspec(inFileSpec);
nsFileURL fileAsURL(nsspec);
FSSpec nonConstSpec = inFileSpec;
nsCOMPtr<nsILocalFileMac> inFile;
nsresult rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile));
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID));
if (!ioService)
return NS_ERROR_FAILURE;
nsCAutoString specBuf;
rv = ioService->GetURLSpecFromFile(inFile, specBuf);
if (NS_FAILED(rv))
return rv;
mTempArgsString.Append(" ");
AddToCommandLine(inOptionString);
AddToCommandLine(fileAsURL.GetAsString());
AddToCommandLine(inOptionString);
AddToCommandLine(specBuf.get());
return NS_OK;
}
@ -267,10 +276,21 @@ OSErr nsMacCommandLine::HandleOpenOneDoc(const FSSpec& inFileSpec, OSType inFile
return AddToCommandLine("-url", inFileSpec);
}
// Final case: we're not just starting up. How do we handle this?
nsFileSpec fileSpec(inFileSpec);
nsFileURL fileURL(fileSpec);
nsString urlString; urlString.AssignWithConversion(fileURL.GetURLString());
nsresult rv;
FSSpec nonConstSpec = inFileSpec;
nsCOMPtr<nsILocalFileMac> inFile;
rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile));
if (NS_FAILED(rv))
return errAEEventNotHandled;
nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID));
if (!ioService)
return errAEEventNotHandled;
nsCAutoString specBuf;
rv = ioService->GetURLSpecFromFile(inFile, specBuf);
if (NS_FAILED(rv))
return errAEEventNotHandled;
nsAutoString urlString;
CopyASCIItoUCS2(specBuf, urlString);
rv = OpenWindow( "chrome://navigator/content", urlString.get() );
if (NS_FAILED(rv))
return errAEEventNotHandled;

36
xpfe/components/startup/src/nsCommandLineServiceMac.cpp
View File

@ -52,7 +52,6 @@
#include "nsIURL.h"
#include "nsIServiceManager.h"
#include "nsNetCID.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#include "nsIWebShellWindow.h"
#include "nsIWebShell.h"
#include "nsIDOMWindow.h"
@ -194,11 +193,21 @@ nsresult nsMacCommandLine::AddToCommandLine(const char* inOptionString, const FS
//----------------------------------------------------------------------------------------
{
// Convert the filespec to a URL
nsFileSpec nsspec(inFileSpec);
nsFileURL fileAsURL(nsspec);
FSSpec nonConstSpec = inFileSpec;
nsCOMPtr<nsILocalFileMac> inFile;
nsresult rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile));
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID));
if (!ioService)
return NS_ERROR_FAILURE;
nsCAutoString specBuf;
rv = ioService->GetURLSpecFromFile(inFile, specBuf);
if (NS_FAILED(rv))
return rv;
mTempArgsString.Append(" ");
AddToCommandLine(inOptionString);
AddToCommandLine(fileAsURL.GetAsString());
AddToCommandLine(inOptionString);
AddToCommandLine(specBuf.get());
return NS_OK;
}
@ -267,10 +276,21 @@ OSErr nsMacCommandLine::HandleOpenOneDoc(const FSSpec& inFileSpec, OSType inFile
return AddToCommandLine("-url", inFileSpec);
}
// Final case: we're not just starting up. How do we handle this?
nsFileSpec fileSpec(inFileSpec);
nsFileURL fileURL(fileSpec);
nsString urlString; urlString.AssignWithConversion(fileURL.GetURLString());
nsresult rv;
FSSpec nonConstSpec = inFileSpec;
nsCOMPtr<nsILocalFileMac> inFile;
rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile));
if (NS_FAILED(rv))
return errAEEventNotHandled;
nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID));
if (!ioService)
return errAEEventNotHandled;
nsCAutoString specBuf;
rv = ioService->GetURLSpecFromFile(inFile, specBuf);
if (NS_FAILED(rv))
return errAEEventNotHandled;
nsAutoString urlString;
CopyASCIItoUCS2(specBuf, urlString);
rv = OpenWindow( "chrome://navigator/content", urlString.get() );
if (NS_FAILED(rv))
return errAEEventNotHandled;