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

fix for #10583

Browse Source 
for non-UNIX platforms, we need to convert the native path to a UNIX style
path before converting the 4.x URI to a 5.0 URI.
otherwise, we'd convert mailbox:C:\\program files\\netscape\\users\\sspitzer\\mail\\aaa\\bbb to mailbox://nobody@Local Mail/aaa\\bbb, instead of mailbox://nobody@Local Mail/aaa/bbb


git-svn-id: svn://10.0.0.236/trunk@48544 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com 1999-09-21 07:46:48 +00:00
parent 0a21c97f68
commit e97796cb2a
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mozilla/mailnews/base/src/nsMsgAccountManager.cpp
View File

@ -41,6 +41,7 @@
#include "nsMsgUtils.h"
#include "nsSpecialSystemDirectory.h"
#include "nsIFileLocator.h"
#include "nsIFileSpec.h"
#include "nsFileLocations.h"
#include "nsIURL.h"
#include "nsISmtpService.h"
@ -1522,9 +1523,45 @@ nsMsgAccountManager::Convert4XUri(const char *old_uri, char **new_uri)
#ifdef DEBUG_ACCOUNTMANAGER
printf("turn %s into %s/%s/(%s - %s)\n",old_uri,MAILBOX_SCHEMA,usernameAtHostname,old_uri + MAILBOX_SCHEMA_LENGTH,mail_directory_value);
#endif
// turn a native path into a unix style path.
// unix is already correct, so just skip over the schema
#ifdef XP_UNIX
// the extra -1 is because in 4.x, we had this:
// mailbox:<PATH> instead of mailbox:/<PATH>
char *old_uri_unix_style = old_uri + MAILBOX_SCHEMA_LENGTH -1;
char *mail_directory_value_unix_style = mail_directory_value;
#else
nsCOMPtr <nsIFileSpec> spec;
char *old_uri_unix_style = nsnull;
char *mail_directory_value_unix_style = nsnull;
rv = NS_NewFileSpec(getter_AddRefs(spec));
if (NS_FAILED(rv)) return rv;
// the extra -1 is because in 4.x, we had this:
// mailbox:<PATH> instead of mailbox:/<PATH>
*new_uri = PR_smprintf("%s/%s/%s",MAILBOX_SCHEMA,usernameAtHostname,old_uri + MAILBOX_SCHEMA_LENGTH + PL_strlen(mail_directory_value) -1);
rv=spec->SetNativePath(old_uri + MAILBOX_SCHEMA_LENGTH -1);
if (NS_FAILED(rv)) return rv;
rv=spec->GetUnixStyleFilePath(&old_uri_unix_style);
if (NS_FAILED(rv)) return rv;
rv=spec->SetNativePath(mail_directory_value);
if (NS_FAILED(rv)) return rv;
rv=spec->GetUnixStyleFilePath(&mail_directory_value_unix_style);
if (NS_FAILED(rv)) return rv;
#endif /* XP_UNIX */
#ifdef DEBUG_ACCOUNTMANAGER
printf ("uri: %s -> %s\n", old_uri, old_uri_unix_style);
printf ("mail_directory: %s -> %s\n", mail_directory_value, mail_directory_value_unix_style);
#endif
*new_uri = PR_smprintf("%s/%s/%s",MAILBOX_SCHEMA,usernameAtHostname,old_uri_unix_style + MAILBOX_SCHEMA_LENGTH + PL_strlen(mail_directory_value_unix_style) -1);
PR_FREEIF(old_uri_unix_style);
PR_FREEIF(mail_directory_value_unix_style);
}
else {
#ifdef DEBUG_ACCOUNTMANAGER