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

second attempt at landing fix for bug 157131 "nsIIOService mods in preparation for freezing" r=dougt sr=alecf

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@127379 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%netscape.com
2002-08-15 18:38:46 +00:00
parent 043f466d14
commit f4ac8b67b2
43 changed files with 470 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
mozilla/extensions/cookie/nsPermissions.cpp
View File

@@ -50,7 +50,7 @@
#include "nsVoidArray.h"
#include "prmem.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsIIOService.h"
#include "nsIURI.h"
#include "nsNetCID.h"
#include "nsTextFormatter.h"
#include "nsIObserverService.h"
@@ -213,14 +213,12 @@ Permission_Check(
/* see if we need to remember this decision */
if (rememberChecked) {
char * hostname2 = NULL;
/* ignore leading periods in host name */
const char * hostnameAfterDot = hostname;
while (hostnameAfterDot && (*hostnameAfterDot == '.')) {
hostnameAfterDot++;
}
CKutil_StrAllocCopy(hostname2, hostnameAfterDot);
Permission_AddHost(hostname2, permission, type, PR_TRUE);
Permission_AddHost(nsDependentCString(hostnameAfterDot), permission, type, PR_TRUE);
}
if (rememberChecked != permission_GetRememberChecked(type)) {
permission_SetRememberChecked(type, rememberChecked);
@@ -232,14 +230,12 @@ Permission_Check(
}
PUBLIC nsresult
Permission_AddHost(char * host, PRBool permission, PRInt32 type, PRBool save) {
Permission_AddHost(const nsAFlatCString & host, PRBool permission, PRInt32 type, PRBool save) {
/* create permission list if it does not yet exist */
if(!permission_list) {
permission_list = new nsVoidArray();
if(!permission_list) {
Recycle(host);
if(!permission_list)
return NS_ERROR_OUT_OF_MEMORY;
}
}
/* find existing entry for host */
@@ -250,14 +246,13 @@ Permission_AddHost(char * host, PRBool permission, PRInt32 type, PRBool save) {
for (i = 0; i < hostCount; ++i) {
hostStruct = NS_STATIC_CAST(permission_HostStruct*, permission_list->ElementAt(i));
if (hostStruct) {
if (PL_strcasecmp(host,hostStruct->host)==0) {
if (PL_strcasecmp(host.get(),hostStruct->host)==0) {
/* host found in list */
Recycle(host);
HostFound = PR_TRUE;
break;
#ifdef alphabetize
} else if (PL_strcasecmp(host, hostStruct->host) < 0) {
} else if (PL_strcasecmp(host.get(), hostStruct->host) < 0) {
/* need to insert new entry here */
break;
@@ -270,15 +265,12 @@ Permission_AddHost(char * host, PRBool permission, PRInt32 type, PRBool save) {
/* create a host structure for the host */
hostStruct = PR_NEW(permission_HostStruct);
if (!hostStruct) {
Recycle(host);
if (!hostStruct)
return NS_ERROR_FAILURE;
}
hostStruct->host = host;
hostStruct->host = ToNewCString(host);
hostStruct->permissionList = new nsVoidArray();
if(!hostStruct->permissionList) {
PR_Free(hostStruct);
Recycle(host);
return NS_ERROR_FAILURE;
}
@@ -323,7 +315,7 @@ Permission_AddHost(char * host, PRBool permission, PRInt32 type, PRBool save) {
}
PRIVATE void
permission_Unblock(char * host, PRInt32 type) {
permission_Unblock(const char * host, PRInt32 type) {
/* nothing to do if permission list does not exist */
if(!permission_list) {
@@ -465,7 +457,7 @@ PERMISSION_Read() {
if(!permission_list) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsAutoString buffer;
nsCAutoString buffer;
nsFileSpec dirSpec;
nsresult rv = CKutil_ProfileDirectory(dirSpec);
if (NS_FAILED(rv)) {
@@ -486,7 +478,7 @@ PERMISSION_Read() {
*/
while(CKutil_GetLine(strm,buffer) != -1) {
if ( !buffer.IsEmpty() ) {
PRUnichar firstChar = buffer.CharAt(0);
char firstChar = buffer.CharAt(0);
if (firstChar == '#' || firstChar == nsCRT::CR ||
firstChar == nsCRT::LF || firstChar == 0) {
continue;
@@ -506,10 +498,9 @@ PERMISSION_Read() {
hostIndex++;
}
nsAutoString host;
buffer.Mid(host, hostIndex, permissionIndex-hostIndex-1);
nsDependentCSubstring host(buffer, hostIndex, permissionIndex-hostIndex-1);
nsAutoString permissionString;
nsCAutoString permissionString;
for (;;) {
if (nextPermissionIndex == buffer.Length()+1) {
break;
@@ -517,6 +508,8 @@ PERMISSION_Read() {
if ((nextPermissionIndex=buffer.FindChar('\t', permissionIndex)+1) == 0) {
nextPermissionIndex = buffer.Length()+1;
}
// XXX would like to use nsDependentCSubstring to avoid this allocation,
// but it unfortunately doesn't provide the CharAt method.
buffer.Mid(permissionString, permissionIndex, nextPermissionIndex-permissionIndex-1);
permissionIndex = nextPermissionIndex;
@@ -540,13 +533,13 @@ PERMISSION_Read() {
* a host value of "@@@@" is a special code designating the
* state of the nag-box's checkmark
*/
if (host.Equals(NS_LITERAL_STRING("@@@@"))) {
if (host.Equals(NS_LITERAL_CSTRING("@@@@"))) {
if (!permissionString.IsEmpty()) {
permission_SetRememberChecked(type, permission);
}
} else {
if (!permissionString.IsEmpty()) {
rv = Permission_AddHost(ToNewCString(host), permission, type, PR_FALSE);
rv = Permission_AddHost(PromiseFlatCString(host), permission, type, PR_FALSE);
if (NS_FAILED(rv)) {
strm.close();
return rv;
@@ -640,7 +633,7 @@ permission_remove (PRInt32 hostNumber, PRInt32 type) {
}
PUBLIC void
PERMISSION_Remove(const char* host, PRInt32 type) {
PERMISSION_Remove(const nsACString & host, PRInt32 type) {
/* get to the indicated host in the list */
if (permission_list) {
@@ -651,7 +644,7 @@ PERMISSION_Remove(const char* host, PRInt32 type) {
hostStruct =
NS_STATIC_CAST(permission_HostStruct*, permission_list->ElementAt(hostCount));
NS_ASSERTION(hostStruct, "corrupt permission list");
if ((PL_strcmp(hostStruct->host, host) == 0)) {
if (host.Equals(hostStruct->host)) {
/* get to the indicated permission in the list */
PRInt32 typeCount = hostStruct->permissionList->Count();
@@ -709,17 +702,14 @@ PERMISSION_DeletePersistentUserData(void)
}
PUBLIC void
PERMISSION_Add(const char * objectURL, PRBool permission, PRInt32 type,
nsIIOService* ioService) {
if (!objectURL) {
PERMISSION_Add(nsIURI * objectURI, PRBool permission, PRInt32 type) {
if (!objectURI) {
return;
}
nsresult rv = NS_OK;
nsCAutoString host;
NS_ASSERTION(ioService, "IOService not available");
rv = ioService->ExtractUrlPart(nsDependentCString(objectURL),
nsIIOService::url_Host |
nsIIOService::url_Port, host);
nsCAutoString hostPort;
objectURI->GetHostPort(hostPort);
if (hostPort.IsEmpty())
return;
/*
* if permission is false, it will be added to the permission list
@@ -727,34 +717,32 @@ PERMISSION_Add(const char * objectURL, PRBool permission, PRInt32 type,
* true permission being added
*/
if (permission) {
char * hostPtr = (char *)host.get();
const char * hostPtr = hostPort.get();
while (PR_TRUE) {
permission_Unblock(hostPtr, type);
hostPtr = PL_strchr(hostPtr, '.');
if (!hostPtr) {
break;
}
hostPtr++; /* get passed the period */
hostPtr++; /* get past the period */
}
return;
}
Permission_AddHost(ToNewCString(host), permission, type, PR_TRUE);
Permission_AddHost(hostPort, permission, type, PR_TRUE);
}
PUBLIC void
PERMISSION_TestForBlocking(const char * objectURL, PRBool* blocked, PRInt32 type,
nsIIOService* ioService) {
if (!objectURL) {
PERMISSION_TestForBlocking(nsIURI * objectURI, PRBool* blocked, PRInt32 type) {
if (!objectURI) {
return;
}
nsresult rv = NS_OK;
nsCAutoString host;
NS_ASSERTION(ioService, "IOService not available");
rv = ioService->ExtractUrlPart(nsDependentCString(objectURL),
nsIIOService::url_Host |
nsIIOService::url_Port, host);
nsCAutoString hostPort;
objectURI->GetHostPort(hostPort);
if (hostPort.IsEmpty())
return;
const char * hostPtr = host.get();
const char * hostPtr = hostPort.get();
while (PR_TRUE) {
PRBool permission;
rv = permission_CheckFromList(hostPtr, permission, type);