This commit was manufactured by cvs2svn to create branch 'CVS'.

git-svn-id: svn://10.0.0.236/branches/CVS@50735 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/psm-glue/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-# 
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src res
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/extensions/psm-glue/makefile.win

@@ -1,27 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = public src res
-
-include <$(DEPTH)\config\rules.mak>

mozilla/extensions/psm-glue/public/MANIFEST

@@ -1,4 +0,0 @@
-nsIPSMComponent.idl
-nsIPSMUIHandler.idl
-nsISecureBrowserUI.idl
-nsISSLSocketProvider.idl

mozilla/extensions/psm-glue/public/Makefile.in

@@ -1,45 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Hubbie Shaw
-#   Doug Turner <dougt@netscape.com>
-#   Terry Hayes <thayes@netscape.com>
-# 
-
-MODULE = psmglue
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS = \
-	nsIPSMComponent.idl \
-	nsIPSMUIHandler.idl \
-	nsISecureBrowserUI.idl \
-    nsIPSMSocketInfo.idl \
-	nsISSLSocketProvider.idl \
-	nsISecretDecoderRing.idl \
-	$(NULL)
-
-PREF_JS_EXPORTS	= $(srcdir)/psm-glue.js
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/psm-glue/public/makefile.win

@@ -1,53 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Hubbie Shaw
-#   Doug Turner <dougt@netscape.com>
-#   Terry Hayes <thayes@netscape.com>
-#
-
-MODULE = psmglue
-
-DEPTH=..\..\..
-IGNORE_MANIFEST=1
-
-DLLNAME       = psmglue
-PDBFILE       = $(DLLNAME).pdb
-MAPFILE       = $(DLLNAME).map
-DLL           = .\$(OBJDIR)\$(DLLNAME).dll
-MAKE_OBJ_TYPE = DLL
-
-include <$(DEPTH)/config/config.mak>
-
-XPIDL_INCLUDES=-I$(DEPTH)\..\mozilla\dist\idl
-
-XPIDLSRCS= \
-    .\nsIPSMComponent.idl \
-    .\nsIPSMUIHandler.idl \
-    .\nsISecureBrowserUI.idl \
-    .\nsISSLSocketProvider.idl \
-    .\nsIPSMSocketInfo.idl \
-    .\nsISecretDecoderRing.idl \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install::
-    $(MAKE_INSTALL) .\psm-glue.js $(DIST)\bin\defaults\pref

mozilla/extensions/psm-glue/public/nsIPSMComponent.idl

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Mitch Stoltz <mstoltz@netscape.com>
-*/
-
-#include "nsISupports.idl"
-interface nsIPrincipal;
-
-%{C++
-#include "cmtcmn.h"
-%}
-
-[ptr] native nsCMTControlStar(CMT_CONTROL);
-
-[scriptable, uuid(9e482670-5412-11d3-bbc8-0000861d1237)]
-interface nsIPSMComponent : nsISupports 
-{
-
-  [noscript] nsCMTControlStar getControlConnection( );
-
-  /**
-   *  Display the Security Advisor.  PickledStatus and hostName can be null. 
-   *  If they are, the "Selected Info" dialog will be empty.
-   */
-
-  void displaySecurityAdvisor(in string pickledStatus, in string hostName);
-
-  /**
-   *  This will send PSM all preferences that we know about.
-   */
-  void passPrefs();
-};
-
-%{C++
-#define PSM_COMPONENT_PROGID "component://netscape/psm"
-#define PSM_COMPONENT_CLASSNAME "Mozilla PSM Component"
-%}
-

mozilla/extensions/psm-glue/public/nsIPSMSocketInfo.idl

@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "nsISupports.idl"
-
-%{C++
-#include "cmtcmn.h"
-#include "nsPSMShimLayer.h"
-%}
-
-[ptr] native psmtControlStar(CMT_CONTROL);
-[ptr] native cmSocketStar(CMSocket);
-[ptr] native nsFileDescStar(PRFileDesc);
-
-[noscript, uuid(deeb8dfc-fb7a-11d3-ac84-00c04fa0d26b)]
-interface nsIPSMSocketInfo : nsISupports {
-    
-    readonly attribute string           hostName;
-    readonly attribute PRInt32          hostPort;
-    
-    readonly attribute string           proxyName;
-    readonly attribute PRInt32          proxyPort;
-
-    readonly attribute psmtControlStar  controlPtr;
-    readonly attribute cmSocketStar     socketPtr;
-    readonly attribute nsFileDescStar   fileDescPtr;
-    
-    void getPickledStatus(out charPtr pickledStatus);
-};
-

mozilla/extensions/psm-glue/public/nsIPSMUIHandler.idl

@@ -1,36 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc.  Portions created by Netscape are
- * Copyright (C) 1999, Mozilla.  All Rights Reserved.
- * 
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(d92be9b0-601b-11d3-8c4a-000064657374)]
-interface nsIPSMUIHandler : nsISupports
-{
-    void DisplayURI(in long width, in long height, in PRBool modal, in string urlStr);
-    void PromptForFile(in wstring prompt, in string fileRegEx, in boolean shouldFileExist, out string outFile);
-};
-
-%{C++
-#define PSM_UI_HANLDER_PROGID "component://netscape/psm/ui"
-#define PSM_UI_HANLDER_CLASSNAME "Mozilla PSM UI Handler"
-%}

mozilla/extensions/psm-glue/public/nsISSLSocketProvider.idl

@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "nsISocketProvider.idl"
-
-[noscript, uuid(856a93d0-5415-11d3-bbc8-0000861d1237)]
-interface nsISSLSocketProvider : nsISocketProvider {
-};
-
-%{C++
-#define NS_ISSLSOCKETPROVIDER_PROGID     NS_NETWORK_SOCKET_PROGID_PREFIX "ssl"
-#define NS_ISSLSOCKETPROVIDER_CLASSNAME  "Mozilla SSL Socket Provider Component"
-
-%}

mozilla/extensions/psm-glue/public/nsISecretDecoderRing.idl

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  thayes@netscape.com
- *
- */
-
-#include "nsISupports.idl"
-
-/* Buffer type - for storing 8-bit octet values */
-[ptr] native buffer(unsigned char);
-
-[scriptable, uuid(0EC80360-075C-11d4-9FD4-00C04F1B83D8)]
-interface nsISecretDecoderRing: nsISupports {
-
-  /* Encrypt a buffer - callable only from C++ */
-  [noscript] long encrypt(in buffer data, in long dataLen, out buffer result);
-
-  /* Decrypt a buffer - callable only from C++ */
-  [noscript] long decrypt(in buffer data, in long dataLen, out buffer result);
-
-  /* Encrypt nul-terminated string to BASE64 output */
-  string encryptString(in string text);
-
-  /* Decrypt BASE64 input to nul-terminated string output */
-  /* There is no check for embedded nul values in the decrypted output */
-  string decryptString(in string crypt);
-
-  /* Prompt the user to change the password on the SDR key */
-  void changePassword();
-
-  /* Logout of the security device that protects the SDR key */
-  void logout();
-};
-
-/*
- * Configuration interface for the Secret Decoder Ring
- *  - this interface allows setting the window that will be
- *    used as parent for dialog windows (such as password prompts)
- */
-[scriptable, uuid(01D8C0F0-0CCC-11d4-9FDD-000064657374)]
-interface nsISecretDecoderRingConfig: nsISupports {
-  void setWindow(in nsISupports w);
-};
-
-

mozilla/extensions/psm-glue/public/nsISecureBrowserUI.idl

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "nsISupports.idl"
-
-interface nsIDOMWindow;
-interface nsIDOMElement;
-
-[scriptable, uuid(081e31e0-a144-11d3-8c7c-00609792278c)]
-interface nsSecureBrowserUI : nsISupports
-{
-	void init(in nsIDOMWindow window, in nsIDOMElement button);
-    void displayPageInfoUI();
-};
-
-%{C++
-#define NS_SECURE_BROWSER_UI_PROGID "component://netscape/secure_browser_ui"
-#define NS_SECURE_BROWSER_UI_CLASSNAME "Mozilla Secure Browser UI Handler"
-
-#define NS_SECURE_BROWSER_UI_CID \
-{ 0x10fe7ea0, 0xa10a, 0x11d3, {0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
-
-%}

mozilla/extensions/psm-glue/public/psm-glue.js

@@ -1,11 +0,0 @@
-pref("general.useragent.security",       "U");
-
-pref("security.enable_ssl2",             true);
-pref("security.enable_ssl3",             true);
-pref("security.default_personal_cert",   "Select Automatically");
-pref("security.ask_for_password",        0);
-pref("security.password_lifetime",       30);
-pref("security.warn_entering_secure",    true);
-pref("security.warn_leaving_secure",     true);
-pref("security.warn_viewing_mixed",      true);
-pref("security.warn_submit_insecure",    true);

mozilla/extensions/psm-glue/res/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-# 
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= content locale
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/extensions/psm-glue/res/content/MANIFEST

@@ -1,3 +0,0 @@
-securityOverlay.xul
-securityUI.js
-PSMTaskMenu.xul

mozilla/extensions/psm-glue/res/content/Makefile.in

@@ -1,38 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-# 
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-COMMUNICATOR_CONTENT_DIR = $(DIST)/bin/chrome/packages/core/communicator/content/
-COMMUNICATOR_EXPORT_CONTENT = \
-  $(srcdir)/securityOverlay.xul \
-  $(srcdir)/securityUI.js       \
-  $(srcdir)/PSMTaskMenu.xul \
-  $(NULL)
-
-install::
-	$(INSTALL) $(COMMUNICATOR_EXPORT_CONTENT) $(COMMUNICATOR_CONTENT_DIR)

mozilla/extensions/psm-glue/res/content/PSMTaskMenu.xul

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/PSMTaskMenu.dtd" >
-
-<overlay id="psmTaskMenuID"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script language="JavaScript">
-    function displaySecurityAdvisor()
-    {
-      var psm = Components.classes["component://netscape/psm"].getService();
-      psm = psm.QueryInterface(Components.interfaces.nsIPSMComponent);
-      psm.displaySecurityAdvisor( null, null );
-    }
-  </script>
-
-  <menupopup id="personalManagers">
-    <menuitem id="PSMMentItem" position="1" value="&PSMCmd.label;" oncommand="displaySecurityAdvisor()"/>
-  </menupopup>
-
-</overlay>

mozilla/extensions/psm-glue/res/content/makefile.win

@@ -1,35 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-    $(MAKE_INSTALL) securityOverlay.xul     $(DIST)\bin\chrome\packages\core\communicator\content
-    $(MAKE_INSTALL) securityUI.js           $(DIST)\bin\chrome\packages\core\communicator\content
-    $(MAKE_INSTALL) PSMTaskMenu.xul	$(DIST)\bin\chrome\packages\core\communicator\content
-    
-clobber::
-    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\securityOverlay.xul
-    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\securityUI.js
-    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\PSMTaskMenu.xul
-

mozilla/extensions/psm-glue/res/content/securityOverlay.xul

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/securityOverlay.css" type="text/css"?> 
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/securityOverlay.dtd">
-
-<overlay id="NavSecurityOverlay"
-         xmlns:html="http://www.w3.org/TR/REC-html40"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script language="JavaScript" src="chrome://communicator/content/securityUI.js" />
-
-  <statusbarpanel id="security-button" onclick="displayPageInfo()" tooltip="aToolTip" tooltiptext="&lockIcon.label;"/>    
-      
-</overlay>

mozilla/extensions/psm-glue/res/content/securityUI.js

@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
-*/
-
-window.addEventListener("load", SetSecurityButton, false);
-
-var securityUI;
-
-function SetSecurityButton()
-{
-    dump("in SetSecurityButton\n");
-
-    var ui = Components.classes["component://netscape/secure_browser_ui"].createInstance();
-    securityUI = ui.QueryInterface(Components.interfaces.nsSecureBrowserUI);
-
-    var button  = document.getElementById('security-button');
-	if (button && window.content)
-		securityUI.init(window.content, button);
-}
-
-function displayPageInfo()
-{
-   if (securityUI)
-     securityUI.displayPageInfoUI();
-}
-
-

mozilla/extensions/psm-glue/res/locale/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= en-US
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/extensions/psm-glue/res/locale/en-US/MANIFEST

@@ -1,3 +0,0 @@
-PSMTaskMenu.dtd
-securityOverlay.dtd
-security.properties

mozilla/extensions/psm-glue/res/locale/en-US/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-COMMUNICATOR_RESOURCE_CONTENT = \
-	$(srcdir)/PSMTaskMenu.dtd \
-	$(srcdir)/security.properties \
-	$(srcdir)/securityOverlay.dtd \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-install:: 
-	$(INSTALL) $(COMMUNICATOR_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale
-
-
-

mozilla/extensions/psm-glue/res/locale/en-US/PSMTaskMenu.dtd

@@ -1 +0,0 @@
-<!ENTITY PSMCmd.label     "Security Manager">

mozilla/extensions/psm-glue/res/locale/en-US/makefile.win

@@ -1,37 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..\..\..
-
-include <$(DEPTH)\config\rules.mak>
-
-COMMUNICATOR_DIST=$(DIST)\bin\chrome\locales\en-US\communicator\locale
-
-
-install::
-	$(MAKE_INSTALL) PSMTaskMenu.dtd $(COMMUNICATOR_DIST)
-	$(MAKE_INSTALL) security.properties $(COMMUNICATOR_DIST)
-	$(MAKE_INSTALL) securityOverlay.dtd $(COMMUNICATOR_DIST)
-
-clobber::
-  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\PSMTaskMenu.dtd
-  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\security.properties
-  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\securityOverlay.dtd

mozilla/extensions/psm-glue/res/locale/en-US/security.properties

@@ -1,29 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-# 
-
-Title=Security Warning
-MixedContentMessage=You have requested a secure document that contains some insecure information.
-LeaveSiteMessage=You have requested an insecure document. The document and any information you send back could be observed by a third party while in transit.
-EnterSiteMessage=You have requested a secure document. The document and any information you send back are encrypted for privacy while in transit.
-PostToInsecure=Warning! Although this document is secure, the information you have submitted is insecure and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
-PostToInsecureFromInsecure=Any information you submit is insecure and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission. 
-DontShowAgain=Show Me This Alert Next Time.
-FindText=Please find the Personal Security Manager application

mozilla/extensions/psm-glue/res/locale/en-US/securityOverlay.dtd

@@ -1,2 +0,0 @@
-
-<!ENTITY  lockIcon.label  "Show security information for this window">

mozilla/extensions/psm-glue/res/locale/makefile.win

@@ -1,27 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..\..
-
-DIRS=en-US
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/extensions/psm-glue/res/makefile.win

@@ -1,27 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = content locale
-
-include <$(DEPTH)\config\rules.mak>

mozilla/extensions/psm-glue/src/Makefile.in

@@ -1,66 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Hubbie Shaw
-#   Doug Turner <dougt@netscape.com>
-# 
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = psmglue
-
-IS_COMPONENT	= 1
-LIBRARY_NAME	= psmglue
-
-
-CPPSRCS	= \
-	nsPSMComponent.cpp \
-	nsPSMUICallbacks.cpp \
-	nsSSLSocketProvider.cpp \
-	nsPSMModule.cpp \
-	nsSSLIOLayer.cpp \
-	nsSecureBrowserUIImpl.cpp \
-	nsSDR.cpp \
-	nsFSDR.cpp \
-	nsCrypto.cpp \
-	nsKeygenHandler.cpp \
-	$(NULL)
-
-CSRCS = \
-	nsPSMMutex.c	\
-	nsPSMShimLayer.c	\
-	$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-	$(MOZ_COMPONENT_LIBS) \
-	-lcmt \
-	-lprotocol \
-	$(MOZ_JS_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
-		-I$(srcdir) \
-		$(NULL)

mozilla/extensions/psm-glue/src/makefile.win

@@ -1,72 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Hubbie Shaw
-#   Doug Turner <dougt@netscape.com>
-#
-
-MODULE = psmglue
-
-DEPTH=..\..\..
-IGNORE_MANIFEST=1
-
-DLLNAME       = psmglue
-PDBFILE       = $(DLLNAME).pdb
-MAPFILE       = $(DLLNAME).map
-DLL           = .\$(OBJDIR)\$(DLLNAME).dll
-MAKE_OBJ_TYPE = DLL
-
-include <$(DEPTH)/config/config.mak>
-
-LINCS = $(LINCS)     \
-    -I$(PUBLIC)      \
-    -I$(PUBLIC)/security \
-    $(NULL)
-
-LLIBS   = \
-    $(LIBNSPR) \
-    $(DIST)\lib\neckobase_s.lib \
-    $(DIST)\lib\xpcom.lib \
-    $(DIST)\lib\js3250.lib \
-    $(DIST)\lib\cmt.lib       \
-    $(DIST)\lib\protocol.lib  \
-    $(DIST)\lib\mozreg.lib       \
-    $(DIST)\lib\jsdom.lib \
-    $(NULL)
-
-OBJS = \
-    .\$(OBJDIR)\nsPSMMutex.obj \
-    .\$(OBJDIR)\nsPSMShimLayer.obj \
-    .\$(OBJDIR)\nsPSMComponent.obj \
-    .\$(OBJDIR)\nsPSMUICallbacks.obj \
-    .\$(OBJDIR)\nsPSMModule.obj \
-    .\$(OBJDIR)\nsSecureBrowserUIImpl.obj \
-    .\$(OBJDIR)\nsSSLIOLayer.obj \
-    .\$(OBJDIR)\nsSSLSocketProvider.obj \
-    .\$(OBJDIR)\nsSDR.obj \
-    .\$(OBJDIR)\nsFSDR.obj \
-    .\$(OBJDIR)\nsCrypto.obj \
-    .\$(OBJDIR)\nsKeygenHandler.obj \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components

mozilla/extensions/psm-glue/src/nsCrypto.h

@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- */
-#ifndef _nsCrypto_h_
-#define _nsCrypto_h_
-#include "nsIDOMCRMFObject.h"
-#include "nsIDOMCrypto.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIDOMPkcs11.h"
-
-#define NS_CRYPTO_CLASSNAME "Crypto JavaScript Class"
-#define NS_CRYPTO_CID \
-  {0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
-
-#define NS_PKCS11_CLASSNAME "Pkcs11 JavaScript Class"
-#define NS_PKCS11_CID \
-  {0x74b7a390, 0x3b41, 0x11d4, { 0x8a, 0x80, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
-
-class nsIPSMComponent;
-class nsIDOMScriptObjectFactory;
-
-
-class nsCRMFObject : public nsIDOMCRMFObject,
-                     public nsIScriptObjectOwner {
-public:
-  nsCRMFObject();
-  virtual ~nsCRMFObject();
-  NS_DECL_IDOMCRMFOBJECT
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-  NS_IMETHOD SetScriptObject(void* aScriptObject);
-
-  nsresult init();
-
-  nsresult SetCRMFRequest(char *inRequest);
-private:
-
-  nsString mBase64Request;
-  void *mScriptObject;
-};
-
-
-class nsCrypto: public nsIDOMCrypto,
-                public nsIScriptObjectOwner {
-public:
-  nsCrypto();
-  virtual ~nsCrypto();
-  nsresult init();
-  
-  NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-  NS_IMETHOD SetScriptObject(void* aScriptObject);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_IDOMCRYPTO
-
-  static nsresult GetScriptObjectFactory(nsIDOMScriptObjectFactory **aResult);
-  static nsIDOMScriptObjectFactory *gScriptObjectFactory;
-  static nsIPrincipal* GetScriptPrincipal(JSContext *cx);
-  static const char *kPSMComponentProgID;
-
- private:
-
-  nsIPSMComponent *mPSM;
-  nsString         mVersionString;
-  PRBool           mVersionStringSet;
-  void            *mScriptObject;
-};
-
-class nsPkcs11 : public nsIDOMPkcs11,
-                 public nsIScriptObjectOwner {
-public:
-  nsPkcs11();
-  virtual ~nsPkcs11();
-
-  nsresult init();
-  NS_DECL_ISUPPORTS
-  NS_DECL_IDOMPKCS11
-  NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-  NS_IMETHOD SetScriptObject(void* aScriptObject);
-
-private:
-  nsIPSMComponent *mPSM;
-  void            *mScriptObject;
-};
-
-nsresult
-getPSMComponent(nsIPSMComponent ** retPSM);
-
-#endif //_nsCrypto_h_
-
-
-
-

mozilla/extensions/psm-glue/src/nsFSDR.h

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Terry Hayes <thayes@netscape.com>
- *   Steve Morse <morse@netscape.com>
- */
-
-#ifndef _NSFSDR_H_
-#define _NSFSDR_H_
-
-#include "nsISecretDecoderRing.h"
-
-// ===============================================
-// nsFSecretDecoderRing - "fake" implementation of nsISecretDecoderRing
-// ===============================================
-
-#define NS_FSDR_CLASSNAME "Fake Secret Decoder Ring"
-#define NS_FSDR_CID \
-  { 0x1ee28720, 0x2b93, 0x11d4, { 0xa0, 0xa4, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
-
-#define NS_FSDR_PROGID "netscape.security.fsdr"
-
-class nsFSecretDecoderRing : public nsISecretDecoderRing
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISECRETDECODERRING
-
-  nsFSecretDecoderRing();
-  virtual ~nsFSecretDecoderRing();
-
-  nsresult init();
-
-private:
-  nsIPSMComponent *mPSM;
-
-  static const char *kPSMComponentProgID;
-
-  nsresult encode(const unsigned char *data, PRInt32 dataLen, char **_retval);
-  nsresult decode(const char *data, unsigned char **result, PRInt32 * _retval);
-};
-
-#endif /* _NSFSDR_H_ */

mozilla/extensions/psm-glue/src/nsKeygenHandler.cpp

@@ -1,255 +0,0 @@
-//For some weird reason, nsProxiedService has to be the first file 
-//included.  Don't ask me, I'm just the messenger.
-#include "nsProxiedService.h"
-#include "nsKeygenHandler.h"
-#include "nsVoidArray.h"
-#include "nsSecureBrowserUIImpl.h"
-#include "nsIServiceManager.h"
-#include "nsIDOMHTMLSelectElement.h"
-#include "nsIContent.h"
-#include "nsIPSMComponent.h"
-#include "nsIPSMUIHandler.h"
-#include "nsPSMUICallbacks.h"
-#include "nsCrypto.h"
-#include "cmtcmn.h"
-#include "cmtjs.h"
-
-//These defines are taken from the PKCS#11 spec
-#define CKM_RSA_PKCS_KEY_PAIR_GEN     0x00000000
-#define CKM_DH_PKCS_KEY_PAIR_GEN      0x00000020
-#define CKM_DSA_KEY_PAIR_GEN          0x00000010
-
-static NS_DEFINE_IID(kFormProcessorIID,   NS_IFORMPROCESSOR_IID); 
-static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID);
-
-static const char *mozKeyGen = "-mozilla-keygen";
-
-NS_IMPL_ADDREF(nsKeygenFormProcessor); 
-NS_IMPL_RELEASE(nsKeygenFormProcessor); 
-NS_IMPL_QUERY_INTERFACE(nsKeygenFormProcessor, kFormProcessorIID); 
-
-nsKeygenFormProcessor::nsKeygenFormProcessor() 
-{ 
-   NS_INIT_REFCNT(); 
-   getPSMComponent(&mPSM);
-} 
-
-char *
-nsKeygenFormProcessor::ChooseToken(PCMT_CONTROL control, 
-				   CMKeyGenTagArg *psmarg,
-				   CMKeyGenTagReq *reason)
-{
-  CMUint32 resID;
-  CMTStatus crv;
-  CMTItem url;
-  char *keyString = nsnull;
-  nsresult rv = NS_OK;
-  NameList *tokenNames;
-  int i;
-
-  // In this case, PSM provided us with a list of potential tokens to choose
-  // from, but we're gonna make it use it's UI for now, so let's delte the
-  // memory associated with the structure it sent back.
-  tokenNames = (NameList*)psmarg->current;
-  for (i=0; i < tokenNames->numitems; i++) {
-    nsCRT::free(tokenNames->names[i]);
-  }
-  nsCRT::free((char*)tokenNames);
-  resID = psmarg->rid;
-  memset(&url, 0, sizeof(CMTItem));
-  NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
-  crv = CMT_GetStringAttribute(control, resID, SSM_FID_CHOOSE_TOKEN_URL, &url);
-  if (crv != CMTSuccess) {
-    goto loser;
-  }
-  if (NS_SUCCEEDED(rv)) {
-    handler->DisplayURI(400, 300, PR_TRUE, (char*)url.data);
-  } else {
-    goto loser;
-  }
-  return CMT_GetGenKeyResponse(control, psmarg, reason);
- loser:
-  if (keyString)
-    nsCRT::free(keyString);
-  return nsnull;
-}
-
-char *
-nsKeygenFormProcessor::SetUserPassword(PCMT_CONTROL control, 
-				       CMKeyGenTagArg *psmarg,
-				       CMKeyGenTagReq *reason)
-{
-  nsresult rv;
-  CMTStatus crv;
-  CMTItem url;
-  char *keystring=nsnull;
-
-  // We need to delete the memory the PSM client API allocated for us since
-  // we're just gonna tell it to use it's own UI.
-  nsCRT::free((char*)psmarg->current);
-  NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
-  memset (&url, 0, sizeof(CMTItem));
-  crv = CMT_GetStringAttribute(control,psmarg->rid, SSM_FID_INIT_DB_URL, &url);
-  if (crv != CMTSuccess || NS_FAILED(rv)){
-    goto loser;
-  }
-
-  handler->DisplayURI(500, 450, PR_TRUE, (char*)url.data);
-  
-  return CMT_GetGenKeyResponse(control, psmarg, reason);
- loser:
-  if (keystring)
-    nsCRT::free(keystring);
-  return nsnull;
-}
-
-nsresult
-nsKeygenFormProcessor::GetPublicKey(nsString& value, nsString& challenge, 
-				    nsString& keyType,
-				    nsString& outPublicKey, nsString& pqg)
-{
-    PCMT_CONTROL control;
-    nsresult rv;
-    CMKeyGenParams *params = nsnull;
-    CMKeyGenTagArg *psmarg = nsnull;
-    CMKeyGenTagReq reason;
-    char *emptyCString = "null";
-    char *keystring = nsnull;
-
-    rv = mPSM->GetControlConnection(&control);
-    if (NS_FAILED(rv)) {
-	goto loser;
-    }
-    params = new CMKeyGenParams;
-    if (params == nsnull) {
-      goto loser;
-    }
-    params->typeString = (keyType.IsEmpty()) ? emptyCString : 
-                                               keyType.ToNewCString();
-    params->challenge  = (challenge.IsEmpty()) ? emptyCString : 
-                                                 challenge.ToNewCString();
-    params->choiceString = value.ToNewCString();
-    params->pqgString = (pqg.IsEmpty()) ? emptyCString : pqg.ToNewCString();
-    psmarg = new CMKeyGenTagArg;
-    if (psmarg == nsnull) {
-      goto loser;
-    }
-    // ARGH, while this is going on, we need to lock the control
-    // connection so that the event loop doesn't drop our response on
-    // the floor.
-    CMT_LockConnection(control);
-    psmarg->op = CM_KEYGEN_START;
-    psmarg->rid = 0;
-    psmarg->tokenName = NULL;
-    psmarg->current = params;
-    keystring = CMT_GenKeyOldStyle(control, psmarg, &reason);
-    while (!keystring) {
-      psmarg->op = reason;
-      switch (psmarg->op) {
-      case CM_KEYGEN_PICK_TOKEN:
-	keystring = ChooseToken(control, psmarg, &reason);
-	break;
-      case CM_KEYGEN_SET_PASSWORD:
-	keystring = SetUserPassword(control, psmarg, &reason);
-	break;
-      case CM_KEYGEN_ERR:
-      default:
-	goto loser;
-      }
-    }
-    CMT_UnlockConnection(control);
-    outPublicKey.AssignWithConversion(keystring);
-    nsCRT::free(keystring);
-    return NS_OK;
- loser:
-    return NS_ERROR_FAILURE;
-}
-
-NS_METHOD 
-nsKeygenFormProcessor::ProcessValue(nsIDOMHTMLElement *aElement, 
-				    const nsString& aName, 
-				    nsString& aValue) 
-{ 
-#ifdef DEBUG_javi
-  char *name = aName.ToNewCString(); 
-  char *value = aValue.ToNewCString(); 
-  printf("ProcessValue: name %s value %s\n",  name, value); 
-  delete [] name; 
-  delete [] value; 
-#endif 
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIDOMHTMLSelectElement>selectElement;
-  nsresult res = aElement->QueryInterface(kIDOMHTMLSelectElementIID, 
-					  getter_AddRefs(selectElement));
-  if (NS_SUCCEEDED(res)) {
-    nsAutoString keygenvalue;
-    nsAutoString challengeValue;
-    nsString publicKey;
-    nsString mozillaKeygen;
-    nsString mozType;
-
-    mozType.AssignWithConversion("_moz-type");
-    mozillaKeygen.AssignWithConversion(mozKeyGen);
-    res = selectElement->GetAttribute(mozType, keygenvalue);
-
-    if (NS_CONTENT_ATTR_HAS_VALUE == res && keygenvalue.Equals(mozillaKeygen)) {
-      nsString challenge;
-      nsString keyType;
-      nsString keyTypeValue;
-      nsString pqg, pqgValue;
-
-      challenge.AssignWithConversion("challenge");
-      pqg.AssignWithConversion("pqg");
-      res = selectElement->GetAttribute(pqg, pqgValue);
-      keyType.AssignWithConversion("keytype");
-      res = selectElement->GetAttribute(keyType, keyTypeValue);
-      if (NS_FAILED(res) || keyTypeValue.IsEmpty()) {
-	// If this field is not present, we default to rsa.
-	keyTypeValue.AssignWithConversion("rsa");
-      }
-      res = selectElement->GetAttribute(challenge, challengeValue);
-      rv = GetPublicKey(aValue, challenge, keyTypeValue, 
-			publicKey, pqgValue);
-      aValue = publicKey;
-    }
-  }
-
-  return rv; 
-} 
-
-NS_METHOD nsKeygenFormProcessor::ProvideContent(const nsString& aFormType, 
-						nsVoidArray& aContent, 
-						nsString& aAttribute) 
-{ 
-  nsString selectString;
-  nsresult rv;
-  PCMT_CONTROL control;
-  PRUint32 i;
-
-  selectString.AssignWithConversion("SELECT");
-  if (aFormType.EqualsIgnoreCase(selectString)) {
-    nsString *selectString;
-    char **result;
-
-    rv = mPSM->GetControlConnection(&control);
-    if (NS_FAILED(rv)) {
-	goto loser;
-    }
-    result = CMT_GetKeyChoiceList(control, "rsa"/*Need to figure out if DSA*/,
-				  nsnull);
-    for (i=0; result[i] != nsnull; i++) {
-	selectString = new nsString;
-	selectString->AssignWithConversion(result[i]);
-	aContent.AppendElement(selectString);
-	delete []result[i];
-    }
-    delete []result;
-    aAttribute.AssignWithConversion(mozKeyGen);
-  }
-  return NS_OK;
- loser:
-  return NS_ERROR_FAILURE; 
-} 
-
-
-

mozilla/extensions/psm-glue/src/nsKeygenHandler.h

@@ -1,32 +0,0 @@
-#ifndef _NSKEYGENHANDLER_H_
-#define _NSKEYGENHANDLER_H_
-// Form Processor 
-#include "nsIFormProcessor.h" 
-#include "ssmdefs.h"
-#include "cmtcmn.h"
-
-class nsIPSMComponent;
-
-class nsKeygenFormProcessor : public nsIFormProcessor { 
-public: 
-  nsKeygenFormProcessor(); 
-  NS_IMETHOD ProcessValue(nsIDOMHTMLElement *aElement, 
-                          const nsString& aName, 
-                          nsString& aValue); 
-
-  NS_IMETHOD ProvideContent(const nsString& aFormType, 
-                            nsVoidArray& aContent, 
-                            nsString& aAttribute); 
-  NS_DECL_ISUPPORTS 
-protected:
-  nsresult GetPublicKey(nsString& value, nsString& challenge, 
-			nsString& keyType, nsString& outPublicKey,
-			nsString& pqg);
-  char * ChooseToken(PCMT_CONTROL control, CMKeyGenTagArg *psmarg,  
-		     CMKeyGenTagReq *reason);
-  char * SetUserPassword(PCMT_CONTROL control, CMKeyGenTagArg *psmarg,  
-		     CMKeyGenTagReq *reason);
-  nsIPSMComponent *mPSM;
-}; 
-
-#endif //_NSKEYGENHANDLER_H_

mozilla/extensions/psm-glue/src/nsPSMComponent.cpp

@@ -1,935 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Mitch Stoltz <mstoltz@netscape.com>
-*/
-
-#include "nsProxiedService.h"
-#include "nsPSMUICallbacks.h"
-#include "VerReg.h"
-
-#include "nspr.h"
-#include "nsPSMComponent.h"
-
-#include "nsCRT.h"
-
-#include "nsNetUtil.h"
-#include "nsIURI.h"
-#include "nsIChannel.h"
-#include "nsIInputStream.h"
-#include "nsIStreamListener.h"
-
-#include "nsIPref.h"
-#include "nsIProfile.h"
-#include "nsILocalFile.h"
-
-#include "nsDirectoryService.h"
-
-#include "rsrcids.h"
-
-#include "nsPSMMutex.h"
-#include "nsPSMShimLayer.h"
-#include "nsPSMUICallbacks.h"
-
-#include "nsISecureBrowserUI.h"
-#include "nsIDocumentLoaderObserver.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsICertificatePrincipal.h"
-
-#include "nsIProtocolProxyService.h"
-
-#define PSM_VERSION_REG_KEY "/Netscape/Personal Security Manager"
-
-#ifdef WIN32
-#define PSM_FILE_NAME "psm.exe"
-#elif XP_UNIX
-#define PSM_FILE_NAME "start-psm"
-#else
-#define PSM_FILE_NAME "psm"
-#endif
-
-
-static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
-static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-static NS_DEFINE_CID(kProtocolProxyServiceCID, NS_PROTOCOLPROXYSERVICE_CID);
-
-nsPSMComponent* nsPSMComponent::mInstance = nsnull;
-
-nsPSMComponent::nsPSMComponent()
-{
-    NS_INIT_REFCNT();
-    mControl = nsnull;
-}
-
-nsPSMComponent::~nsPSMComponent()
-{
-    if (mControl)
-    {
-        CMT_CloseControlConnection(mControl);
-        mControl = nsnull;
-    }
-}
-
-
-NS_IMETHODIMP      
-nsPSMComponent::CreatePSMComponent(nsISupports* aOuter, REFNSIID aIID, void **aResult)
-{                                                                  
-    if (!aResult) {                                                
-        return NS_ERROR_INVALID_POINTER;                           
-    }                                                              
-    if (aOuter) {                                                  
-        *aResult = nsnull;                                         
-        return NS_ERROR_NO_AGGREGATION;                              
-    }                                                                
-    
-    if (mInstance == nsnull) 
-    {
-        mInstance = new nsPSMComponent();
-    }
-
-    if (mInstance == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    
-    nsresult rv = mInstance->QueryInterface(aIID, aResult);                        
-    if (NS_FAILED(rv)) 
-    {                                             
-        *aResult = nsnull;                                           
-    }                                                                
-    return rv;                                                       
-}
-
-/* nsISupports Implementation for the class */
-NS_IMPL_THREADSAFE_ISUPPORTS3(nsPSMComponent, 
-                              nsIPSMComponent, 
-                              nsIContentHandler,
-                              nsISignatureVerifier);
-
-#define INIT_NUM_PREFS 100
-/* preference types */
-#define STRING_PREF 0
-#define BOOL_PREF 1
-#define INT_PREF 2
-
-
-/* resizable list struct that contains pref items */
-typedef struct CMSetPrefList {
-    int n; /* number of filled items */
-    int capacity; /* allocated memory */
-    CMTSetPrefElement* list; /* actual list */
-} CMSetPrefList;
-
-static void get_pack_bool_pref(nsIPref *prefManager, char* key, CMTSetPrefElement* list, int* n)
-{
-    PRBool boolpref;
-
-    list[*n].key = nsCRT::strdup(key);
-    list[*n].type = BOOL_PREF;
-
-    if ((prefManager->GetBoolPref(key, &boolpref) != 0) || boolpref) 
-    {
-        list[*n].value = nsCRT::strdup("true");
-    }
-    else 
-    {
-        list[*n].value = nsCRT::strdup("false");
-    }
-
-    (*n)++;    /* increment the counter after done packing */
-
-    return;
-}
-
-static void SaveAllPrefs(int number, CMTSetPrefElement* list)
-{
-    nsCOMPtr<nsIPref> prefManager;
-
-    nsresult res = nsServiceManager::GetService(kPrefCID, 
-                                                nsIPref::GetIID(), 
-                                                getter_AddRefs(prefManager));
-    
-    if (NS_FAILED(res)  || !prefManager)
-    {
-        return;
-    }
-
-
-    int i;
-    int intval;
-
-    for (i = 0; i < number; i++) 
-    {
-        if (list[i].key == nsnull) 
-        {
-            /* misconfigured item: next */
-            continue;
-        }
-
-        switch (list[i].type) 
-        {
-             case 0:    /* string type */
-                 prefManager->SetCharPref(list[i].key, list[i].value);
-                 break;
-             case 1:    /* boolean type */
-                 if (strcmp(list[i].value, "true") == 0) {
-                  prefManager->SetBoolPref(list[i].key, (PRBool)1);
-                 }
-                 else if (strcmp(list[i].value, "false") == 0) {
-                  prefManager->SetBoolPref(list[i].key, (PRBool)0);
-                 }
-                 break;
-             case 2:
-                 intval = atoi(list[i].value);
-                 prefManager->SetIntPref(list[i].key, intval);
-                 break;
-             default:
-                 break;
-         }
-    }
-
-    return;
-}
-
-NS_IMETHODIMP
-nsPSMComponent::PassPrefs()
-{
-    // if we have not passed anything to psm yet, this function can just return.
-
-    if (!mControl)
-        return NS_OK;
-
-    int i;
-    nsresult rv = NS_ERROR_FAILURE;
-    char* strpref = NULL;
-    int intpref;
-    PRBool boolpref;
-    CMSetPrefList prefs = {0};
-    CMTSetPrefElement* list = NULL;
-
-    char* pickAuto = "Select Automatically";
-    char* alwaysAsk = "Ask Every Time";
-    
-    nsCOMPtr<nsIPref> prefManager;
-
-    nsresult res = nsServiceManager::GetService(kPrefCID, 
-                                                nsIPref::GetIID(), 
-                                                getter_AddRefs(prefManager));
-
-    if (NS_OK != res) 
-    {
-        return NS_ERROR_FAILURE;
-    }
-
-    /* allocate memory for list */
-    prefs.n = 0; /* counter */
-    prefs.capacity = INIT_NUM_PREFS;
-    prefs.list = (CMTSetPrefElement*) new char[(INIT_NUM_PREFS * sizeof(CMTSetPrefElement))];
-    
-    if (prefs.list == NULL) 
-    {
-         return rv;
-    }
-
-    /* shorthand */
-    list = prefs.list;
-
-    /* get preferences */
-    get_pack_bool_pref(prefManager, "security.enable_ssl2", (CMTSetPrefElement*)list, &(prefs.n));
-    get_pack_bool_pref(prefManager, "security.enable_ssl3", (CMTSetPrefElement*)list, &(prefs.n));
-
-    /* this pref is a boolean pref in nature but a string pref for 
-     * historical reason
-     */
-
-    list[prefs.n].key = nsCRT::strdup("security.default_personal_cert");
-    list[prefs.n].type = STRING_PREF;
-
-    if ((prefManager->CopyCharPref(list[prefs.n].key, &strpref) == 0) && (strcmp(strpref, pickAuto) == 0)) 
-    {
-         list[prefs.n].value = nsCRT::strdup(pickAuto);
-    }
-    else 
-    {
-         /* although one could choose a specific cert for client auth in
-          * Nova, that mode is deprecated with PSM and mapped to ASK
-          */
-         list[prefs.n].value = nsCRT::strdup(alwaysAsk);
-    }
-
-    prefs.n++;
-    if (strpref != NULL) 
-    {
-         nsCRT::free(strpref);
-    }
-
-    list[prefs.n].key = nsCRT::strdup("security.default_mail_cert");
-    list[prefs.n].type = STRING_PREF;
-    if (prefManager->CopyCharPref(list[prefs.n].key, &list[prefs.n].value) != 0) 
-    {
-         list[prefs.n].value = NULL;
-    }
-    prefs.n++;
-
-    list[prefs.n].key = nsCRT::strdup("security.ask_for_password");
-    list[prefs.n].type = INT_PREF;
-    if (prefManager->GetIntPref(list[prefs.n].key, &intpref) != 0) 
-    {
-         intpref = 0;    /* default */
-    }
-
-    list[prefs.n].value = PR_smprintf("%d", intpref);
-    prefs.n++;
-
-    list[prefs.n].key = nsCRT::strdup("security.password_lifetime");
-    list[prefs.n].type = INT_PREF;
-    if (prefManager->GetIntPref(list[prefs.n].key, &intpref) != 0) 
-    {
-         intpref = 30;    /* default */
-    }
-
-    list[prefs.n].value = PR_smprintf("%d", intpref);
-    prefs.n++;
-
-    /* OCSP preferences */
-    /* XXX since these are the new ones added by PSM, we will be more
-     *     error-tolerant in fetching them
-     */
-    if (prefManager->GetBoolPref("security.OCSP.enabled", &boolpref) == 0) 
-    {
-         if (boolpref) 
-        {
-             list[prefs.n].value = nsCRT::strdup("true");
-         }
-         else 
-        {
-             list[prefs.n].value = nsCRT::strdup("false");
-         }
-         list[prefs.n].key = nsCRT::strdup("security.OCSP.enabled");
-         list[prefs.n].type = BOOL_PREF;
-         prefs.n++;
-    }
-
-    if (prefManager->GetBoolPref("security.OCSP.useDefaultResponder", &boolpref) == 0) 
-    {
-         if (boolpref) 
-        {
-             list[prefs.n].value = nsCRT::strdup("true");
-         }
-         else 
-        {
-             list[prefs.n].value = nsCRT::strdup("false");
-         }
-         list[prefs.n].key = nsCRT::strdup("security.OCSP.useDefaultResponder");
-         list[prefs.n].type = BOOL_PREF;
-         prefs.n++;
-    }
-
-    if (prefManager->CopyCharPref("security.OCSP.URL", &strpref) == 0) 
-    {
-         list[prefs.n].value = strpref;
-         list[prefs.n].key = nsCRT::strdup("security.OCSP.URL");
-         list[prefs.n].type = STRING_PREF;
-         prefs.n++;
-    }
-
-    if (prefManager->CopyCharPref("security.OCSP.signingCA", &strpref) == 0) 
-    {
-         list[prefs.n].value = strpref;
-         list[prefs.n].key = nsCRT::strdup("security.OCSP.signingCA");
-         list[prefs.n].type = STRING_PREF;
-         prefs.n++;
-    }
-
-    /* now application-specific preferences */
-    /* get navigator preferences */
-    get_pack_bool_pref(prefManager, "security.warn_entering_secure", (CMTSetPrefElement*)list, &prefs.n);
-    get_pack_bool_pref(prefManager, "security.warn_leaving_secure",  (CMTSetPrefElement*)list, &prefs.n);
-    get_pack_bool_pref(prefManager, "security.warn_viewing_mixed",   (CMTSetPrefElement*)list, &prefs.n);
-    get_pack_bool_pref(prefManager, "security.warn_submit_insecure", (CMTSetPrefElement*)list, &prefs.n);
-
-    // Add any other prefs here such as ldap or mail/news.
-     
-     CMT_SetSavePrefsCallback(mControl, (savePrefsCallback_fn)SaveAllPrefs);
-
-    if (CMT_PassAllPrefs(mControl, prefs.n, (CMTSetPrefElement*)prefs.list) !=  CMTSuccess) 
-    {
-         goto loser;
-    }
-
-    rv = NS_OK; /* success */
-loser:
-    /* clean out memory for prefs */
-    for (i = 0; i < prefs.n; i++) 
-    {
-         if (prefs.list[i].key != NULL) 
-        {
-             nsCRT::free(prefs.list[i].key);
-         }
-         
-        if (prefs.list[i].value != NULL) 
-        {
-             nsCRT::free(prefs.list[i].value);
-         }
-    }
-
-    if (prefs.list != NULL) 
-    {
-         delete(prefs.list);
-    }
-    return rv;
-}
-
-#ifdef XP_MAC
-extern "C" {
-    void RunMacPSM(void* arg);
-    PRThread* SSM_CreateAndRegisterThread(PRThreadType type, void (*start)(void *arg),
-                                          void *arg, PRThreadPriority priority,
-                                          PRThreadScope scope, PRThreadState state,
-                                          PRUint32 stackSize);
-    void SSM_KillAllThreads(void);
-}
-#endif
-            
-NS_IMETHODIMP
-nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval )
-{
-     nsresult rv;
-     *_retval = nsnull;
-    if (mControl) 
-    {
-        *_retval = mControl;
-        return NS_OK;
-    }
-    else      /* initialize mutex, sock table, etc. */
-    {
-            
-        if (nsPSMMutexInit() != PR_SUCCESS)
-            return NS_ERROR_FAILURE;
-
-#ifdef XP_MAC
-        /* FIXME:  Really need better error handling in PSM, which simply exits on error. */
-        /* use a cached monitor to rendezvous with the PSM thread. */
-        PRMonitor* monitor = PR_CEnterMonitor(this);
-        if (monitor != nsnull) {
-            /* create the Cartman thread, and let it run awhile to get things going. */
-            PRThread* cartmanThread = SSM_CreateAndRegisterThread(PR_USER_THREAD, RunMacPSM, 
-							                                      this, PR_PRIORITY_NORMAL,
-							                                      PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-            if (cartmanThread != nsnull) {
-                /* need a good way to rendezvouz with the Cartman thread. */
-                PR_CWait(this, PR_INTERVAL_NO_TIMEOUT);
-            }
-            
-            PR_CExitMonitor(this);
-        }
-#endif
-
-        // Try to see if it is open already
-        mControl = CMT_ControlConnect(&nsPSMMutexTbl, &nsPSMShimTbl);
-        
-        // Find the one in the bin directory
-        if (mControl == nsnull)
-        {
-            nsCOMPtr<nsILocalFile> psmAppFile;
-            NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_PROGID, &rv);
-            if (NS_FAILED(rv)) return rv;
-
-            directoryService->Get("system.OS_CurrentProcessDirectory", 
-                                   NS_GET_IID(nsIFile), 
-                                   getter_AddRefs(psmAppFile));
-
-        
-            psmAppFile->Append("psm");
-            psmAppFile->Append(PSM_FILE_NAME);
-        
-            PRBool isExecutable, exists;
-            psmAppFile->Exists(&exists);
-            psmAppFile->IsExecutable(&isExecutable);
-            if (exists && isExecutable)
-            {
-                nsXPIDLCString path;
-                psmAppFile->GetPath(getter_Copies(path));
-                // FIX THIS.  using a file path is totally wrong here.  
-                mControl = CMT_EstablishControlConnection((char*)(const char*)path, &nsPSMShimTbl, &nsPSMMutexTbl);
-            }
-        }
-
-        // Get the one in the version registry           
-        if (mControl == nsnull)
-        {
-            //Try to find it.
-            int err;
-            char filepath[MAXREGPATHLEN];
-
-            err = VR_GetPath(PSM_VERSION_REG_KEY, sizeof(filepath), filepath);
-            if ( err == REGERR_OK )
-            {
-                nsFileSpec psmSpec(filepath);
-                psmSpec += PSM_FILE_NAME;
-		
-                if (psmSpec.Exists())
-                {
-                    mControl = CMT_EstablishControlConnection((char *)psmSpec.GetNativePathCString(), &nsPSMShimTbl, &nsPSMMutexTbl);
-                }
-            }
-         }
-
-        
-        if (!mControl || InitPSMUICallbacks(mControl) != PR_SUCCESS)
-            goto failure;
-
-        nsFileSpec profileSpec;
-        PRUnichar*      profileName;
-        
-        NS_WITH_SERVICE(nsIProfile, profile, kProfileCID, &rv);
-        if (NS_FAILED(rv)) goto failure;
-        
-        rv = profile->GetCurrentProfileDir(&profileSpec);
-        if (NS_FAILED(rv)) goto failure;;
-        
-#ifdef XP_MAC
-        profileSpec += "Security";
-        // make sure the dir exists
-        profileSpec.CreateDirectory();
-#endif
-        
-        rv = profile->GetCurrentProfile(&profileName);
-        if (NS_FAILED(rv)) goto failure;
-          
-        CMTStatus psmStatus;
-        nsCAutoString profilenameC;
-        profilenameC.AssignWithConversion(profileName);
-
-        psmStatus = CMT_Hello( mControl, 
-                               PROTOCOL_VERSION, 
-                               profilenameC, 
-                               (char*)profileSpec.GetNativePathCString());        
-        
-        if (psmStatus == CMTFailure)
-        {  
-            PR_FREEIF(profileName);       
-            goto failure;
-        }
-        
-        if (InitPSMEventLoop(mControl) != PR_SUCCESS)
-        {
-            PR_FREEIF(profileName);       
-            goto failure;
-        }
-            
-        if (NS_FAILED(PassPrefs()))
-        {  
-            PR_FREEIF(profileName);       
-            goto failure;
-        }
-
-        PR_FREEIF(profileName);
-        
-        nsCOMPtr<nsIProtocolProxyService> proxySvc = do_GetService(kProtocolProxyServiceCID, &rv);
-        if (NS_FAILED(rv)) return rv;
-        proxySvc->AddNoProxyFor("127.0.0.1", mControl->port);
-        
-        *_retval = mControl;
-        return NS_OK;
-    }
-
-failure:
-#ifdef DEBUG
-    printf("*** Failure setting up Cartman! \n");
-#endif
-
-    if (mControl)
-    {
-        CMT_CloseControlConnection(mControl);
-        mControl = NULL;
-    }
-
-    // TODO we need to unregister our UI callback BEFORE destroying our mutex.
-    // nsPSMMutexDestroy();
-
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsPSMComponent::DisplaySecurityAdvisor(const char *pickledStatus, const char *hostName)
-{
-    CMT_CONTROL *controlConnection;
-    GetControlConnection( &controlConnection );
-    if (DisplayPSMUIDialog(controlConnection, pickledStatus, hostName) == PR_SUCCESS)
-        return NS_OK;
-    return NS_ERROR_FAILURE;
-}
-
-class CertDownloader : public nsIStreamListener
-{
-    public:
-        CertDownloader() {NS_ASSERTION(0, "don't use this constructor."); }
-        CertDownloader(PRInt32 type);
-        virtual ~CertDownloader();
-
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSISTREAMOBSERVER
-        NS_DECL_NSISTREAMLISTENER
-    protected:
-        char* mByteData;
-        PRInt32 mBufferOffset;
-        PRInt32 mContentLength;
-        PRInt32 mType;
-};
-
-
-CertDownloader::CertDownloader(PRInt32 type)
-{
-    NS_INIT_REFCNT();
-    mByteData = nsnull;
-    mType = type;
-}
-
-CertDownloader::~CertDownloader()
-{
-    if (mByteData)
-        nsMemory::Free(mByteData);
-}
-
-NS_IMPL_ISUPPORTS(CertDownloader,NS_GET_IID(nsIStreamListener));
-
-
-NS_IMETHODIMP
-CertDownloader::OnStartRequest(nsIChannel* channel, nsISupports* context)
-{
-    channel->GetContentLength(&mContentLength);
-    if (mContentLength == -1)
-        return NS_ERROR_FAILURE;
-    
-    mBufferOffset = 0;
-    mByteData = (char*) nsMemory::Alloc(mContentLength);
-    if (!mByteData)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-CertDownloader::OnDataAvailable(nsIChannel* channel, 
-                                nsISupports* context,
-                                nsIInputStream *aIStream, 
-                                PRUint32 aSourceOffset,
-                                PRUint32 aLength)
-{
-    if (!mByteData)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    PRUint32 amt;
-    nsresult err;
-
-    do 
-    {
-        err = aIStream->Read(mByteData+mBufferOffset, mContentLength-mBufferOffset, &amt);
-        if (amt == 0) break;
-        if (NS_FAILED(err))  return err;
-        
-        aLength -= amt;
-        mBufferOffset += amt;
-
-    } while (aLength > 0);
-    
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-CertDownloader::OnStopRequest(nsIChannel* channel, 
-                              nsISupports* context,
-                              nsresult aStatus,
-                              const PRUnichar* aMsg)
-{
-
-    nsCOMPtr<nsIPSMComponent> psm = do_QueryInterface(context);
-
-    if (!psm) return NS_ERROR_FAILURE;
-
-    CMT_CONTROL *controlConnection;
-    psm->GetControlConnection( &controlConnection );
-    unsigned int certID;
-                    
-    certID = CMT_DecodeAndCreateTempCert(controlConnection, mByteData, mContentLength, mType);
-
-    if (certID)
-        CMT_DestroyResource(controlConnection, certID, SSM_RESTYPE_CERTIFICATE);
-
-  return NS_OK;
-}
-
-
-/* other mime types that we should handle sometime:
-
-application/x-pkcs7-crl
-application/x-pkcs7-mime
-application/pkcs7-signature
-application/pre-encrypted
-
-*/
-
-
-NS_IMETHODIMP 
-nsPSMComponent::HandleContent(const char * aContentType, 
-                              const char * aCommand, 
-                              const char * aWindowTarget, 
-                              nsISupports* aWindowContext, 
-                              nsIChannel * aChannel)
-{
-    // We were called via CI.  We better protect ourselves and addref.
-    NS_ADDREF_THIS();
-
-    nsresult rv = NS_OK;
-    if (!aChannel) return NS_ERROR_NULL_POINTER;
-    
-    CMUint32 type = -1;
-
-    if ( nsCRT::strcasecmp(aContentType, "application/x-x509-ca-cert") == 0)
-    {
-        type = 1;  //CA cert
-    }
-    else if (nsCRT::strcasecmp(aContentType, "application/x-x509-server-cert") == 0)
-    {
-        type =  2; //Server cert
-    }
-    else if (nsCRT::strcasecmp(aContentType, "application/x-x509-user-cert") == 0)
-    {
-        type =  3; //User cert
-    }
-    else if (nsCRT::strcasecmp(aContentType, "application/x-x509-email-cert") == 0)
-    {
-        type =  4; //Someone else's email cert
-    }
-    
-    if (type != -1)
-    {
-        // I can't directly open the passed channel cause it fails :-(
-
-        nsCOMPtr<nsIURI> uri;
-        rv = aChannel->GetURI(getter_AddRefs(uri));
-        if (NS_FAILED(rv)) return rv;
-
-        nsCOMPtr<nsIChannel> channel;
-        rv = NS_OpenURI(getter_AddRefs(channel), uri);
-        if (NS_FAILED(rv)) return rv;
-
-        return channel->AsyncRead(new CertDownloader(type), NS_STATIC_CAST(nsIPSMComponent*,this));
-    }
-
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-//---------------------------------------------
-// Functions Implenenting NSISignatureVerifier
-//---------------------------------------------
-NS_IMETHODIMP
-nsPSMComponent::HashBegin(PRUint32 alg, PRUint32* id)
-{
-  CMT_CONTROL *controlConnection;
-  if (NS_FAILED(GetControlConnection( &controlConnection )))
-    return NS_ERROR_FAILURE;
-
-  if(CMT_HashCreate(controlConnection, alg, (CMUint32*)id) != CMTSuccess)
-    return NS_ERROR_FAILURE;
-  if(CMT_HASH_Begin(controlConnection, *id) != CMTSuccess)
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;  
-}
-
-NS_IMETHODIMP
-nsPSMComponent::HashUpdate(PRUint32 id, const char* buf, PRUint32 buflen)
-{
-  CMT_CONTROL *controlConnection;
-
-  if (NS_FAILED(GetControlConnection( &controlConnection )))
-    return NS_ERROR_FAILURE;
-  if (CMT_HASH_Update(controlConnection, id, 
-      (const unsigned char*)buf, buflen) != CMTSuccess)    
-    return NS_ERROR_FAILURE;
-    
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPSMComponent::HashEnd(PRUint32 id, unsigned char** hash, 
-                        PRUint32* hashLen, PRUint32 maxLen)
-{
-  if (!hash)
-    return NS_ERROR_ILLEGAL_VALUE;
-
-  CMT_CONTROL *controlConnection;
-  if (NS_FAILED(GetControlConnection( &controlConnection )))
-    return NS_ERROR_FAILURE;
- 
-  if(CMT_HASH_End(controlConnection, id, *hash,
-                        (CMUint32*)hashLen, maxLen) != CMTSuccess)
-    return NS_ERROR_FAILURE;
-  CMT_HASH_Destroy(controlConnection, id);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPSMComponent::CreatePrincipalFromSignature(const char* aRSABuf, PRUint32 aRSABufLen,
-                                             nsIPrincipal** aPrincipal)
-{
-  PRInt32 errorCode;
-  return VerifySignature(aRSABuf, aRSABufLen, nsnull, 0, &errorCode, aPrincipal);
-}
-
-PR_STATIC_CALLBACK(void)
-UselessPK7DataSink(void* arg, const char* buf, CMUint32 len)
-{
-}
-
-NS_IMETHODIMP
-nsPSMComponent::VerifySignature(const char* aRSABuf, PRUint32 aRSABufLen, 
-                                const char* aPlaintext, PRUint32 aPlaintextLen,
-                                PRInt32* aErrorCode,
-                                nsIPrincipal** aPrincipal)
-{
-  if (!aPrincipal || !aErrorCode)
-    return NS_ERROR_NULL_POINTER;
-  *aErrorCode = 0;
-  *aPrincipal = nsnull;
-
-  CMT_CONTROL *controlConnection;
-  if (NS_FAILED(GetControlConnection( &controlConnection )))
-    return NS_ERROR_FAILURE;
-  
-  //-- Decode the signature stream
-  CMUint32 decoderID;
-  CMInt32* blah = nsnull;
-  CMTStatus result = CMT_PKCS7DecoderStart(controlConnection, nsnull,
-                                           &decoderID, blah,
-                                           UselessPK7DataSink, nsnull);
-  if (result != CMTSuccess) return NS_ERROR_FAILURE;
-  result = CMT_PKCS7DecoderUpdate(controlConnection, decoderID, aRSABuf, aRSABufLen);
-  if (result != CMTSuccess) return NS_ERROR_FAILURE;
-  CMUint32 contentInfo;
-  result = CMT_PKCS7DecoderFinish(controlConnection, 
-                                            decoderID, &contentInfo);
-  if (result != CMTSuccess) return NS_ERROR_FAILURE;
-
-  CMTItem hashItem;
-  hashItem.data = 0;
-  hashItem.len = 0;
-  //-- If a plaintext was provided, hash it.
-  if (aPlaintext)
-  {
-    CMUint32 hashId;
-    CMT_HashCreate(controlConnection, nsISignatureVerifier::SHA1, &hashId);
-    CMT_HASH_Begin(controlConnection, hashId);
-    CMTStatus result = CMT_HASH_Update(controlConnection, hashId, 
-                                       (const unsigned char*)aPlaintext, aPlaintextLen);
-    if (result != CMTSuccess) return NS_ERROR_FAILURE;
-    
-    unsigned char* hash = (unsigned char*)PR_MALLOC(nsISignatureVerifier::SHA1_LENGTH);
-    if (!hash) return NS_ERROR_OUT_OF_MEMORY;
-    CMUint32 hashLen;
-    result = CMT_HASH_End(controlConnection, hashId, hash,
-                          &hashLen, nsISignatureVerifier::SHA1_LENGTH);
-    if (result != CMTSuccess)
-    {
-      PR_FREEIF(hash);
-      return NS_ERROR_FAILURE;
-    }
-    NS_ASSERTION(hashLen == nsISignatureVerifier::SHA1_LENGTH,
-                 "PSMComponent: Hash too short.");
-    CMT_HASH_Destroy(controlConnection, hashId);
-    hashItem.data = hash;
-    hashItem.len = hashLen;
-  }
-
-  //-- Verify signature
-  // We need to call this function even if we're only creating a principal, not
-  // verifying, because PSM won't give us certificate information unless this
-  // function has been called.
-  result = CMT_PKCS7VerifyDetachedSignature(controlConnection, contentInfo,
-                                            6 /* =Object Signing Cert */,
-                                            3 /* =SHA1 algorithm (MD5=2)*/,
-                                            1,/* Save Certificate */
-                                            &hashItem, (CMInt32*)aErrorCode);
-
-  if (result != CMTSuccess) return NS_ERROR_FAILURE;
-  if (aPlaintext && *aErrorCode != 0) return NS_OK; // Verification failed.
-
-  CMUint32 certID;
-  result = CMT_GetRIDAttribute(controlConnection, contentInfo,
-                               SSM_FID_P7CINFO_SIGNER_CERT, &certID);
-  if ((result != CMTSuccess) || !certID) return NS_OK; // No signature present
-  
-  CMTItem fingerprint;
-  result = CMT_GetStringAttribute(controlConnection, certID,
-                                  SSM_FID_CERT_FINGERPRINT, &fingerprint);
-  if (result != CMTSuccess) return NS_ERROR_FAILURE;
-
-  //-- Get a principal
-  nsresult rv;
-  NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                  NS_SCRIPTSECURITYMANAGER_PROGID, &rv)
-    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-  rv = secMan->GetCertificatePrincipal((char*)fingerprint.data,
-                                       aPrincipal);
-  if (NS_FAILED(rv)) return rv;
-
-  //-- Get common name and store it in the principal.
-  //   Using common name + organizational unit as the user-visible certificate name
-  nsCOMPtr<nsICertificatePrincipal> certificate = do_QueryInterface(*aPrincipal, &rv);
-  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-  CMTItem common;
-  result = CMT_GetStringAttribute(controlConnection, certID,
-                                  SSM_FID_CERT_COMMON_NAME, &common);
-  if (result != CMTSuccess) return NS_ERROR_FAILURE;
-  CMTItem subject;
-  result = CMT_GetStringAttribute(controlConnection, certID,
-                                  SSM_FID_CERT_SUBJECT_NAME, &subject);
-  if (result != CMTSuccess) return NS_ERROR_FAILURE;
-
-  nsCAutoString commonName;
-  commonName = (char*)common.data;
-  static const char orgUnitTag[] = " OU=";
-  char* orgUnitPos = PL_strstr((char*)subject.data, orgUnitTag);
-  if (orgUnitPos)
-  {
-    orgUnitPos += sizeof(orgUnitTag)-1;
-    char* orgUnitEnd = PL_strchr(orgUnitPos, ',');
-    PRInt32 orgUnitLen;
-    if(orgUnitEnd)
-      orgUnitLen = orgUnitEnd - orgUnitPos;
-    else
-      orgUnitLen = PL_strlen(orgUnitPos);
-    commonName.Append(' ');
-    commonName.Append(orgUnitPos, orgUnitLen);
-  }
-  char* commonChar = commonName.ToNewCString();
-  if (!commonChar) return NS_ERROR_OUT_OF_MEMORY;
-  rv = certificate->SetCommonName(commonChar);
-  Recycle(commonChar);
-  return rv;
-}
-

mozilla/extensions/psm-glue/src/nsPSMComponent.h

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "nscore.h"
-#include "nsIPSMComponent.h"
-#include "nsISignatureVerifier.h"
-#include "nsIStringBundle.h"
-
-#include "nsIContentHandler.h"
-
-#define SECURITY_STRING_BUNDLE_URL "chrome://communicator/locale/security.properties"
-
-#define NS_PSMCOMPONENT_CID {0xddcae170, 0x5412, 0x11d3, {0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37}}
-
-// Implementation of the PSM component interface.
-class nsPSMComponent : public nsIPSMComponent, 
-                       public nsIContentHandler, 
-                       public nsISignatureVerifier
-{
-public:
-  NS_DEFINE_STATIC_CID_ACCESSOR( NS_PSMCOMPONENT_CID );
-
-  nsPSMComponent();
-  virtual ~nsPSMComponent();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIPSMCOMPONENT
-  NS_DECL_NSICONTENTHANDLER
-  NS_DECL_NSISIGNATUREVERIFIER
-
-  static NS_METHOD CreatePSMComponent(nsISupports* aOuter, REFNSIID aIID, void **aResult);
-
-private:
-  
-  PCMT_CONTROL mControl;
-  
-  nsCOMPtr<nsISupports> mSecureBrowserIU;
-  static nsPSMComponent* mInstance;
-}; 

mozilla/extensions/psm-glue/src/nsPSMModule.cpp

@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-
-#include "nsPSMUICallbacks.h"
-#include "nsPSMComponent.h"
-
-#include "nsISecureBrowserUI.h"
-#include "nsSecureBrowserUIImpl.h"
-
-#include "nsSSLSocketProvider.h"
-
-#include "nsSDR.h"
-#include "nsFSDR.h"
-#include "nsCrypto.h"
-#include "nsKeygenHandler.h"
-//For the NS_CRYPTO_PROGID define
-#include "nsDOMCID.h"
-
-#include "nsCURILoader.h"
-#include "nsISupportsUtils.h"
-
-// Define SDR object constructor
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kFormProcessorCID,   NS_IFORMPROCESSOR_CID); 
-
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSecretDecoderRing, init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFSecretDecoderRing, init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCrypto, init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPkcs11, init)
-
-static nsModuleComponentInfo components[] =
-{
-    { 
-        PSM_COMPONENT_CLASSNAME,  
-        NS_PSMCOMPONENT_CID, 
-        PSM_COMPONENT_PROGID,   
-        nsPSMComponent::CreatePSMComponent
-    },
-    
-    { 
-        "PSM Content Handler - application/x-x509-ca-cert",  
-        NS_PSMCOMPONENT_CID, 
-        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-ca-cert",   
-        nsPSMComponent::CreatePSMComponent
-    },
-    
-    { 
-        "PSM Content Handler - application/x-x509-server-cert",  
-        NS_PSMCOMPONENT_CID, 
-        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-server-cert",   
-        nsPSMComponent::CreatePSMComponent
-    },
-
-    { 
-        "PSM Content Handler - application/x-x509-user-cert",  
-        NS_PSMCOMPONENT_CID, 
-        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-user-cert",   
-        nsPSMComponent::CreatePSMComponent
-    },
-    
-    { 
-        "PSM Content Handler - application/x-x509-email-cert",  
-        NS_PSMCOMPONENT_CID, 
-        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-email-cert",   
-        nsPSMComponent::CreatePSMComponent
-    },
-
-
-    { 
-        PSM_UI_HANLDER_CLASSNAME, 
-        NS_PSMUIHANDLER_CID, 
-        PSM_UI_HANLDER_PROGID,  
-        nsPSMUIHandlerImpl::CreatePSMUIHandler
-    },
-
-    { 
-        NS_SECURE_BROWSER_UI_CLASSNAME, 
-        NS_SECURE_BROWSER_UI_CID, 
-        NS_SECURE_BROWSER_UI_PROGID, 
-        nsSecureBrowserUIImpl::Create 
-    },
-
-    { 
-        NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME, 
-        NS_SECURE_BROWSER_DOCOBSERVER_CID, 
-        NS_SECURE_BROWSER_DOCOBSERVER_PROGID, 
-        nsSecureBrowserUIImpl::Create
-    },
-
-    { 
-        NS_ISSLSOCKETPROVIDER_CLASSNAME,
-        NS_SSLSOCKETPROVIDER_CID,
-        NS_ISSLSOCKETPROVIDER_PROGID,
-        nsSSLSocketProvider::Create 
-    },
-
-    {
-        NS_SDR_CLASSNAME,
-        NS_SDR_CID,
-        NS_SDR_PROGID,
-        nsSecretDecoderRingConstructor
-    },
-
-    {
-        NS_FSDR_CLASSNAME,
-        NS_FSDR_CID,
-        NS_FSDR_PROGID,
-        nsFSecretDecoderRingConstructor
-    },
-    
-    {
-        NS_CRYPTO_CLASSNAME,
-        NS_CRYPTO_CID,
-        NS_CRYPTO_PROGID,
-        nsCryptoConstructor
-    },
-    {
-        NS_PKCS11_CLASSNAME,
-        NS_PKCS11_CID,
-        NS_PKCS11_PROGID,
-        nsPkcs11Constructor
-    }
-
-};
-
-#if 0
-NS_IMPL_NSGETMODULE("PSMComponent", components);
-#endif
-
-extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
-                                          nsIFile* location,
-                                          nsIModule** result)
-{
-  nsresult rv;
-  // Put in code to register KEYGEN form input handler.
-  rv= NS_NewGenericModule("PSMComponent",
-                          sizeof(components) / sizeof(components[0]),
-                          components, nsnull, result);
-  // Register a form processor. The form processor has the opportunity to 
-  // modify the value's passed during form submission. 
-  nsKeygenFormProcessor* testFormProcessor = new nsKeygenFormProcessor(); 
-  nsCOMPtr<nsISupports> formProcessor; 
-  rv = testFormProcessor->QueryInterface(kISupportsIID, 
-                                         getter_AddRefs(formProcessor)); 
-  if (NS_SUCCEEDED(rv) && formProcessor) { 
-    rv = nsServiceManager::RegisterService(kFormProcessorCID, formProcessor); 
-  } 
-  return rv;
-}
-
-
-
-
-

mozilla/extensions/psm-glue/src/nsPSMMutex.c

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "prmon.h"
-#include "prtypes.h"
-
-#include "nsPSMMutex.h"
-
-static PRMonitor *_nsPSMMutexVar;
-
-PRStatus
-nsPSMMutexInit()
-{
-  if (!_nsPSMMutexVar)
-      _nsPSMMutexVar = PR_NewMonitor();
-
-  return _nsPSMMutexVar ? PR_SUCCESS : PR_FAILURE;
-}
-
-PRStatus
-nsPSMMutexDestroy()
-{
-    if (!_nsPSMMutexVar)
-        return PR_FAILURE;
-    
-    PR_Wait(_nsPSMMutexVar, PR_INTERVAL_NO_TIMEOUT);
-
-    PR_DestroyMonitor(_nsPSMMutexVar);
-    return PR_SUCCESS;
-}
-
-static void
-nsPSMMutexLock(CMTMutexPointer *p)
-{
-  PR_EnterMonitor(*(PRMonitor **)p);
-  return;
-}
-
-static void
-nsPSMMutexUnlock(CMTMutexPointer *p)
-{
-  PR_ExitMonitor(*(PRMonitor **)p);
-  return;
-}
-
-CMT_MUTEX nsPSMMutexTbl = 
-{
-  &_nsPSMMutexVar,
-  (CMTMutexFunction)nsPSMMutexLock,
-  (CMTMutexFunction)nsPSMMutexUnlock
-};

mozilla/extensions/psm-glue/src/nsPSMMutex.h

@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#ifndef _NSPSMMUTEX_H
-#define _NSPSMMUTEX_H
-
-#include "cmtcmn.h"
-
-PR_BEGIN_EXTERN_C
-
-PR_EXTERN(CMT_MUTEX) nsPSMMutexTbl;
-
-PR_EXTERN(PRStatus) nsPSMMutexInit(void);
-PR_EXTERN(PRStatus) nsPSMMutexDestroy(void);
-
-PR_END_EXTERN_C
-
-#endif

mozilla/extensions/psm-glue/src/nsPSMShimLayer.c

@@ -1,293 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "nspr.h"
-#include "nsPSMShimLayer.h"
-
-#ifdef XP_UNIX
-#include <sys/stat.h>
-#include <unistd.h>
-#include "private/pprio.h"  /* for PR_Socket */
-#endif
-
-#define PSM_TIMEOUT_IN_SEC 300
-
-#define NSPSMSHIMMAXFD 50
-
-
-static PRIntervalTime gTimeout  = PR_INTERVAL_NO_TIMEOUT;
-
-CMT_SocketFuncs nsPSMShimTbl =
-{
-    nsPSMShimGetSocket,
-    nsPSMShimConnect,
-    nsPSMShimVerifyUnixSocket,
-    nsPSMShimSend,
-    nsPSMShimSelect,
-    nsPSMShimReceive,
-    nsPSMShimShutdown,
-    nsPSMShimClose
-};
-
-
-CMTSocket
-nsPSMShimGetSocket(int unixSock)
-{
-    PRStatus   rv;
-    PRFileDesc *fd;
-    CMSocket   *sock;
-    PRSocketOptionData sockopt;
-
-    /*
-    if (PR_INTERVAL_NO_WAIT == gTimeout) 
-    {
-        gTimeout  = PR_SecondsToInterval(PSM_TIMEOUT_IN_SEC);
-    }
-    */
-
-    if (unixSock)
-    {
-#ifndef XP_UNIX        
-        return NULL;
-#else
-        fd = PR_Socket(PR_AF_LOCAL, PR_SOCK_STREAM, 0);
-        PR_ASSERT(fd);
-#endif
-    }
-    else
-    {
-        fd = PR_NewTCPSocket();
-        PR_ASSERT(fd);
-
-        /* disable Nagle algorithm delay for control sockets */
-        sockopt.option = PR_SockOpt_NoDelay;
-        sockopt.value.no_delay = PR_TRUE;   
-        rv = PR_SetSocketOption(fd, &sockopt);
-        PR_ASSERT(PR_SUCCESS == rv);
-    }
-
-    sock = (CMSocket *)PR_Malloc(sizeof(CMSocket));
-
-    if (sock == NULL)
-      return sock;
-    
-    sock->fd     = fd;
-    sock->isUnix = unixSock;
-
-    memset(&sock->netAddr, 0, sizeof(PRNetAddr));
-    
-    return (CMTSocket)sock;
-}
-
-CMTStatus
-nsPSMShimConnect(CMTSocket sock, short port, char *path)
-{
-    CMTStatus   rv = CMTSuccess;
-    PRStatus    err;
-    PRErrorCode errcode;
-    PRSocketOptionData   sockopt;
-    PRBool      nonBlocking;
-    CMSocket    *cmSock = (CMSocket *)sock;
-    
-    if (!sock) return CMTFailure;
-
-    if (cmSock->isUnix)
-    {
-#ifndef XP_UNIX
-        return CMTFailure;
-#else
-        int pathLen;
-        if (!path)
-        {
-            return CMTFailure;
-        }
-
-        /* check buffer overrun */
-        pathLen = strlen(path)+1;
-        
-        pathLen = pathLen < sizeof(cmSock->netAddr.local.path)
-                ? pathLen : sizeof(cmSock->netAddr.local.path);
-  
-        memcpy(&cmSock->netAddr.local.path, path, pathLen);
-        cmSock->netAddr.local.family = PR_AF_LOCAL;
-#endif
-    }
-    else  /* cmSock->isUnix */
-    {
-        cmSock->netAddr.inet.family = PR_AF_INET;
-        cmSock->netAddr.inet.port   = PR_htons(port);
-        cmSock->netAddr.inet.ip     = PR_htonl(PR_INADDR_LOOPBACK);
-    }
-
-    /* Save non-blocking status */
-    sockopt.option = PR_SockOpt_Nonblocking;
-    err = PR_GetSocketOption(cmSock->fd, &sockopt);
-    PR_ASSERT(PR_SUCCESS == err);
-
-    nonBlocking = sockopt.value.non_blocking;
-
-    /* make connect blocking for now */
-    sockopt.option = PR_SockOpt_Nonblocking;
-    sockopt.value.non_blocking = PR_FALSE;   
-    err = PR_SetSocketOption(cmSock->fd, &sockopt);
-    PR_ASSERT(PR_SUCCESS == err);
-
-    err = PR_Connect( cmSock->fd, &cmSock->netAddr, PR_INTERVAL_MAX );
-    
-    if (err == PR_FAILURE)    
-    {
-        errcode = PR_GetError();
-        
-        if (PR_IS_CONNECTED_ERROR != errcode)
-            rv = CMTFailure;
-    }    
-    
-    /* restore nonblock status */
-    if (nonBlocking) {
-      sockopt.option = PR_SockOpt_Nonblocking;
-      sockopt.value.non_blocking = nonBlocking;  
-      err = PR_SetSocketOption(cmSock->fd, &sockopt);
-      PR_ASSERT(PR_SUCCESS == err);
-    }
-
-    return rv;
-}
-
-CMTStatus
-nsPSMShimVerifyUnixSocket(CMTSocket sock)
-{
-#ifndef XP_UNIX
-    return CMTFailure;
-#else
-
-    int  rv;
-    CMSocket  *cmSock;
-    struct stat statbuf;
-
-    cmSock = (CMSocket *)sock;
-        
-    if (!cmSock || !cmSock->isUnix) 
-        return CMTFailure;
- 
-    rv = stat(cmSock->netAddr.local.path, &statbuf);
-    if (rv < 0 || statbuf.st_uid != geteuid() )
-    {
-        PR_Close(cmSock->fd);
-        cmSock->fd = NULL;
-        PR_Free(cmSock);
-        return CMTFailure;
-    }
-    return CMTSuccess;   
-#endif
-}
-
-size_t
-nsPSMShimSend(CMTSocket sock, void *buffer, size_t length)
-{
-    CMSocket *cmSock = (CMSocket *)sock;
-
-    if (!sock) return CMTFailure;
-    
-   return PR_Send(cmSock->fd, buffer, length, 0, gTimeout);
-}
-
-size_t
-nsPSMShimReceive(CMTSocket sock, void *buffer, size_t bufSize)
-{
-    CMSocket *cmSock = (CMSocket *)sock;
-    
-    if (!sock) return CMTFailure;
-
-    return PR_Recv(cmSock->fd, buffer, bufSize, 0, gTimeout);
-}
-
-
-CMTSocket
-nsPSMShimSelect(CMTSocket *socks, int numsocks, int poll)
-{
-    CMSocket       **sockArr = (CMSocket **)socks;
-    PRPollDesc       readPDs[NSPSMSHIMMAXFD];
-    PRIntervalTime   timeout;
-    PRInt32          cnt;
-    int              i;
-
-    if (!socks) return NULL;
-
-    memset(readPDs, 0, sizeof(readPDs));
-
-    PR_ASSERT(NSPSMSHIMMAXFD >= numsocks);
-
-    for (i=0; i<numsocks; i++)
-    {
-        readPDs[i].fd       = sockArr[i]->fd;
-        readPDs[i].in_flags = PR_POLL_READ;
-    }
-
-    timeout = poll ? PR_INTERVAL_NO_WAIT : PR_INTERVAL_NO_TIMEOUT;
-
-    cnt = PR_Poll(readPDs, numsocks, timeout);
-
-    /* Figure out which socket was selected */
-    if (cnt > 0)
-    {
-        for (i=0; i<numsocks; i++)
-        {
-            if (readPDs[i].out_flags & PR_POLL_READ)
-            {
-            return (CMTSocket)sockArr[i];
-            }
-        }
-    }
-    return NULL;
-}
-
-
-CMTStatus
-nsPSMShimShutdown(CMTSocket sock)
-{
-    CMSocket *cmSock = (CMSocket*)sock;
-    PRStatus rv;
-
-    if (!sock) return CMTFailure;
-
-    rv = PR_Shutdown(cmSock->fd, PR_SHUTDOWN_SEND);
-    return (PR_SUCCESS == rv) ? CMTSuccess : CMTFailure;
-}
-
-CMTStatus
-nsPSMShimClose(CMTSocket sock)
-{
-    CMSocket *cmSock = (CMSocket*)sock;
-    PRStatus rv      = PR_SUCCESS;
-    PR_ASSERT(cmSock);
-
-    if (!sock) return CMTFailure;
-
-    rv = PR_Close(cmSock->fd);
-    cmSock->fd = NULL;
-
-    PR_Free(cmSock);
-
-    return (PR_SUCCESS == rv) ? CMTSuccess : CMTFailure;
-}

mozilla/extensions/psm-glue/src/nsPSMShimLayer.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#ifndef _NSPSMSHIMLAYER_H_
-#define _NSPSMSHIMLAYER_H_
-
-#include "cmtcmn.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct CMSocket {
-    PRFileDesc *fd;
-    PRBool      isUnix;
-    PRNetAddr   netAddr;
-} CMSocket; 
-
-PR_EXTERN(CMT_SocketFuncs) nsPSMShimTbl;
-
-PR_EXTERN(CMTSocket)
-nsPSMShimGetSocket(int unixSock);
-
-PR_EXTERN(CMTStatus)
-nsPSMShimConnect(CMTSocket sock, short port, char *path);
-
-PR_EXTERN(CMTStatus)
-nsPSMShimVerifyUnixSocket(CMTSocket sock);
-
-PR_EXTERN(size_t)
-nsPSMShimSend(CMTSocket sock, void *buffer, size_t length);
-
-PR_EXTERN(CMTSocket)
-nsPSMShimSelect(CMTSocket *socks, int numsocks, int poll);
-
-PR_EXTERN(size_t)
-nsPSMShimReceive(CMTSocket sock, void *buffer, size_t bufSize);
-
-PR_EXTERN(CMTStatus)
-nsPSMShimShutdown(CMTSocket sock);
-
-PR_EXTERN(CMTStatus)
-nsPSMShimClose(CMTSocket sock);
-
-PR_END_EXTERN_C
-
-#endif /* _NSPSMSHIMLAYER_H_ */

mozilla/extensions/psm-glue/src/nsPSMUICallbacks.cpp

@@ -1,348 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#include "nsProxiedService.h"
-#include "nsIEventQueueService.h"
-#include "nsPSMUICallbacks.h"
-#include "nsINetSupportDialogService.h"
-#include "nsIFilePicker.h"
-
-#include "nsAppShellCIDs.h"
-#include "prprf.h"
-#include "prmem.h"
-
-#include "nsSSLIOLayer.h" // for SSMSTRING_PADDED_LENGTH
-#include "ssmdefs.h"
-#include "rsrcids.h"
-
-// Interfaces Needed
-#include "nsIAppShellService.h"
-#include "nsIDocShell.h"
-#include "nsIDOMWindow.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIPrompt.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIURL.h"
-#include "nsIXULWindow.h"
-
-static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
-static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
-
-
-// Happy callbacks
-static char * PromptUserCallback(void *arg, char *prompt, int isPasswd);
-static char * FilePathPromptCallback(void *arg, char *prompt, char *fileRegEx, CMUint32 shouldFileExist);
-static void   ApplicationFreeCallback(char *userInput);
-
-static void * CartmanUIHandler(uint32 resourceID, void* clientContext, uint32 width, uint32 height, 
-								CMBool isModal, char* urlStr, void *data);
-
-extern "C" void CARTMAN_UIEventLoop(void *data);
-
-
-/* nsISupports Implementation for the class */
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsPSMUIHandlerImpl, nsIPSMUIHandler)
-
-NS_METHOD
-nsPSMUIHandlerImpl::DisplayURI(PRInt32 width, PRInt32 height, PRBool modal, const char *urlStr)
-{
-    nsresult rv;
-    nsCOMPtr<nsIDOMWindow> hiddenWindow;
-    JSContext *jsContext;
-
-    NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
-	if (NS_SUCCEEDED(rv))
-	{
-		rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs( hiddenWindow ),
-                                                    &jsContext );
-
-	     if ( NS_SUCCEEDED( rv ) ) 
-         {
-            // Set up arguments for "window.open"
-            void *stackPtr;
-            char params[36];
-
-            if (modal)  // if you change this, remember to change the buffer size above.
-                strcpy(params, "menubar=no,height=%d,width=%d,modal");
-            else
-                strcpy(params, "menubar=no,height=%d,width=%d");
-
-            char buffer[256];
-            PR_snprintf(buffer,
-                        sizeof(buffer),
-                        params,
-                        height,
-                        width );
-
-            jsval	*argv = JS_PushArguments(jsContext, &stackPtr, "sss", urlStr, "_blank", buffer);
-            if (argv)
-            {
-	            // open the window
-	            nsIDOMWindow	*newWindow;
-	            hiddenWindow->Open(jsContext, argv, 3, &newWindow);
-                newWindow->ResizeTo(width, height);
-	            JS_PopArguments(jsContext, stackPtr);
-            }
-        }
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsPSMUIHandlerImpl::PromptForFile(const PRUnichar *prompt, const char *fileRegEx, PRBool shouldFileExist, char **outFile)
-{
-    NS_ENSURE_ARG_POINTER(outFile);
-    nsCOMPtr<nsIFilePicker> fp = do_CreateInstance("component://mozilla/filepicker");
-    
-    if (!fp)
-        return NS_ERROR_NULL_POINTER;
-
-
-    fp->Init(nsnull, prompt, nsIFilePicker::modeOpen);
-    fp->AppendFilter(NS_ConvertASCIItoUCS2(fileRegEx).GetUnicode(), NS_ConvertASCIItoUCS2(fileRegEx).GetUnicode());  
-    fp->AppendFilters(nsIFilePicker::filterAll);
-    PRInt16 mode;
-    nsresult rv = fp->Show(&mode);
-
-    if (NS_FAILED(rv) || (mode == nsIFilePicker::returnCancel))
-         return rv;
-
-    nsCOMPtr<nsILocalFile> file;
-    rv = fp->GetFile(getter_AddRefs(file));
-
-    if (file)
-      file->GetPath(outFile);
-
-    return rv;
-}
-
-NS_METHOD      
-nsPSMUIHandlerImpl::CreatePSMUIHandler(nsISupports* aOuter, REFNSIID aIID, void **aResult)
-{                                                                  
-    nsresult rv = NS_OK; 
-    if ( aResult ) 
-    { 
-        /* Allocate new find component object. */
-        nsPSMUIHandlerImpl *component = new nsPSMUIHandlerImpl(); 
-        if ( component ) 
-        { 
-            /* Allocated OK, do query interface to get proper */
-            /* pointer and increment refcount.                */
-            rv = component->QueryInterface( aIID, aResult ); 
-            if ( NS_FAILED( rv ) ) 
-            { 
-                /* refcount still at zero, delete it here. */
-                delete component; 
-            } 
-        } 
-        else 
-        { 
-            rv = NS_ERROR_OUT_OF_MEMORY; 
-        } 
-    } 
-    else 
-    { 
-        rv = NS_ERROR_NULL_POINTER; 
-    } 
-    return rv; 
-} 
-
-
-
-extern "C" void CARTMAN_UIEventLoop(void *data)
-{
-   CMT_EventLoop((PCMT_CONTROL)data);
-}
-
-PRStatus InitPSMEventLoop(PCMT_CONTROL control)
-{
-    PR_CreateThread(PR_USER_THREAD,
-                    CARTMAN_UIEventLoop,
-                    control, 
-                    PR_PRIORITY_NORMAL, 
-                    PR_GLOBAL_THREAD, 
-                    PR_UNJOINABLE_THREAD,
-                    0);  
-
-    return PR_SUCCESS;
-}
-
-PRStatus InitPSMUICallbacks(PCMT_CONTROL control)
-{
-    if (!control)
-        return PR_FAILURE;  
-    
-    CMT_SetPromptCallback(control, (promptCallback_fn)PromptUserCallback, nsnull);
-    CMT_SetAppFreeCallback(control, (applicationFreeCallback_fn) ApplicationFreeCallback);
-    CMT_SetFilePathPromptCallback(control, (filePathPromptCallback_fn) FilePathPromptCallback, nsnull);
-
-    if (CMT_SetUIHandlerCallback(control, (uiHandlerCallback_fn) CartmanUIHandler, NULL) != CMTSuccess) 
-            return PR_FAILURE;
-
-    return PR_SUCCESS;
-}
-
-PRStatus DisplayPSMUIDialog(PCMT_CONTROL control, const char *pickledStatus, const char *hostName)
-{
-    CMUint32 advRID = 0;
-    CMInt32 width = 0;
-    CMInt32 height = 0;
-    CMTItem urlItem = {0, NULL, 0};
-    CMTStatus rv = CMTSuccess;
-    CMTItem advisorContext = {0, NULL, 0};
-    void * pwin;
-
-    CMTSecurityAdvisorData data;
-    memset(&data, '\0', sizeof(CMTSecurityAdvisorData));
-    
-    if (hostName)
-    {
-        // if there is a hostName, than this request is about
-        // a webpage.  
-        data.hostname    = (char*) hostName;
-        data.infoContext = SSM_BROWSER;
-    
-        if (pickledStatus)
-        {
-            CMTItem pickledResource = {0, NULL, 0};
-            CMUint32 socketStatus = 0;
-    
-            pickledResource.len = *(int*)(pickledStatus);
-            pickledResource.data = (unsigned char*) PR_Malloc(SSMSTRING_PADDED_LENGTH(pickledResource.len));
-        
-            if (! pickledResource.data) return PR_FAILURE;
-
-            memcpy(pickledResource.data, pickledStatus+sizeof(int), pickledResource.len);
-        
-            /* Unpickle the SSL Socket Status */
-            if (CMT_UnpickleResource( control, 
-                                      SSM_RESTYPE_SSL_SOCKET_STATUS,
-                                      pickledResource, 
-                                      &socketStatus) == CMTSuccess)
-            {
-                data.infoContext = SSM_BROWSER;    
-                data.resID = socketStatus;
-            }
-
-            PR_FREEIF(pickledResource.data);
-        }
-    }
-
-    /* Create a Security Advisor context object. */
-    rv = CMT_SecurityAdvisor(control, &data, &advRID);
-
-    if (rv != CMTSuccess)
-        return PR_FAILURE;
-
-    /* Get the URL, width, height, etc. from the advisor context. */
-    rv = CMT_GetStringAttribute(control, 
-                                advRID, 
-                                SSM_FID_SECADVISOR_URL,
-                                &urlItem);
-
-    if ((rv != CMTSuccess) || (!urlItem.data))
-        return PR_FAILURE;
-
-    rv = CMT_GetNumericAttribute(control, 
-                                 advRID, 
-                                 SSM_FID_SECADVISOR_WIDTH,
-                                 &width);
-    if (rv != CMTSuccess)
-        return PR_FAILURE;
-
-    rv = CMT_GetNumericAttribute(control, 
-                                 advRID, 
-                                 SSM_FID_SECADVISOR_HEIGHT,
-                                 &height);
-    if (rv != CMTSuccess)
-        return PR_FAILURE;
-
-    /* Fire the URL up in a window of its own. */
-    pwin = CartmanUIHandler(advRID, nsnull, width, height, CM_FALSE, (char*)urlItem.data, NULL);
-    
-    //allocated by cmt, we can free with free:
-    free(urlItem.data);
-    
-    return PR_SUCCESS;
-}
-
-
-
-void* CartmanUIHandler(uint32 resourceID, void* clientContext, uint32 width, uint32 height, CMBool isModal, char* urlStr, void *data)
-{
-    nsresult rv = NS_OK;
-    
-    NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
-    
-    if(NS_SUCCEEDED(rv))
-	    handler->DisplayURI(width, height, isModal, urlStr);
-
-    return nsnull;
-}
-
-    
-    
-char * PromptUserCallback(void *arg, char *prompt, int isPasswd)
-{
-
-    nsresult rv = NS_OK;
-    PRUnichar *password;
-    PRBool  value;
-
-    NS_WITH_PROXIED_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, NS_UI_THREAD_EVENTQ, &rv);
-    
-    if (NS_SUCCEEDED(rv)) {
-	    rv = dialog->PromptPassword(nsnull, NS_ConvertASCIItoUCS2(prompt).GetUnicode(),
-                                  NS_ConvertASCIItoUCS2(" ").GetUnicode(),      // hostname
-                                  PR_TRUE, &password, &value);
-
-        if (NS_SUCCEEDED(rv) && value) {
-            nsString a(password);
-            char* str = a.ToNewCString();
-            Recycle(password);
-            return str;
-        }
-    }
-
-    return nsnull;
-}
-
-void ApplicationFreeCallback(char *userInput)
-{
-    nsMemory::Free(userInput);
-}
-
-char * FilePathPromptCallback(void *arg, char *prompt, char *fileRegEx, CMUint32 shouldFileExist)
-{
-    nsresult rv = NS_OK;
-    
-    char* filePath = nsnull;
-    
-    NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
-    
-    if(NS_SUCCEEDED(rv))
-	    handler->PromptForFile(NS_ConvertASCIItoUCS2(prompt).GetUnicode(), fileRegEx, (PRBool)shouldFileExist, &filePath);
-
-    return filePath;
-}

mozilla/extensions/psm-glue/src/nsPSMUICallbacks.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#ifndef _NSPSMUICALLBACKS_H
-#define _NSPSMUICALLBACKS_H
-
-#include "prtypes.h"
-#include "cmtcmn.h"
-
-#include "nsIPSMUIHandler.h"
-
-PRStatus InitPSMUICallbacks(PCMT_CONTROL gControl);
-PRStatus InitPSMEventLoop(PCMT_CONTROL gControl);
-PRStatus DisplayPSMUIDialog(PCMT_CONTROL control, const char* pickledStatus, const char *hostName);
-
-
-#define NS_PSMUIHANDLER_CID {0x15944e30, 0x601e, 0x11d3, {0x8c, 0x4a, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74}}
-
-class nsPSMUIHandlerImpl : public nsIPSMUIHandler 
-{
-    public:
-
-        NS_DEFINE_STATIC_CID_ACCESSOR( NS_PSMUIHANDLER_CID );
-    
-        /* ctor/dtor */
-        nsPSMUIHandlerImpl() { NS_INIT_REFCNT(); }
-        virtual ~nsPSMUIHandlerImpl() { }
-
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSIPSMUIHANDLER
-
-        static NS_METHOD CreatePSMUIHandler(nsISupports* aOuter, REFNSIID aIID, void **aResult);
-};
-
-#endif

mozilla/extensions/psm-glue/src/nsSDR.cpp

@@ -1,320 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *  thayes@netscape.com
- */
-
-#include "stdlib.h"
-#include "plstr.h"
-#include "nsMemory.h"
-#include "nsIServiceManager.h"
-
-#include "plbase64.h"
-
-#include "nsISecretDecoderRing.h"
-
-#include "cmtcmn.h"
-#include "nsIPSMComponent.h"
-
-#include "nsSDR.h"
-
-NS_IMPL_ISUPPORTS1(nsSecretDecoderRing, nsISecretDecoderRing)
-
-nsSecretDecoderRing::nsSecretDecoderRing()
-{
-  NS_INIT_ISUPPORTS();
-
-  mPSM = NULL;
-}
-
-nsSecretDecoderRing::~nsSecretDecoderRing()
-{
-  if (mPSM) mPSM->Release();
-}
-
-/* Init the new instance */
-nsresult nsSecretDecoderRing::
-init()
-{
-  nsresult rv;
-  nsISupports *psm;
-
-  rv = nsServiceManager::GetService(kPSMComponentProgID, NS_GET_IID(nsIPSMComponent),
-                                    &psm);
-  if (rv != NS_OK) goto loser;  /* Should promote error */
-
-  mPSM = (nsIPSMComponent *)psm;
-
-loser:
-  return rv;
-}
-
-/* [noscript] long encrypt (in buffer data, in long dataLen, out buffer result); */
-NS_IMETHODIMP nsSecretDecoderRing::
-Encrypt(unsigned char * data, PRInt32 dataLen, unsigned char * *result, PRInt32 *_retval)
-{
-    nsresult rv = NS_OK;
-    unsigned char *r = 0;
-    CMT_CONTROL *control;
-    CMTStatus status;
-    CMUint32 cLen;
-
-    if (data == nsnull || result == nsnull || _retval == nsnull) {
-       rv = NS_ERROR_INVALID_POINTER;
-       goto loser;
-    }
-
-    /* Check object initialization */
-    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
-    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
-
-    /* Get the control connect to use for the request */
-    rv = mPSM->GetControlConnection(&control);
-    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
-   
-    status = CMT_SDREncrypt(control, (void *)0, (const unsigned char *)0, 0, 
-               data, dataLen, result, &cLen);
-    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* XXX */
-
-    /* Copy returned data to nsMemory buffer ? */
-    *_retval = cLen;
-
-loser:
-    return rv;
-}
-
-/* [noscript] long decrypt (in buffer data, in long dataLen, out buffer result); */
-NS_IMETHODIMP nsSecretDecoderRing::
-Decrypt(unsigned char * data, PRInt32 dataLen, unsigned char * *result, PRInt32 *_retval)
-{
-    nsresult rv = NS_OK;
-    CMTStatus status;
-    CMT_CONTROL *control;
-    CMUint32 len;
-
-    if (data == nsnull || result == nsnull || _retval == nsnull) {
-       rv = NS_ERROR_INVALID_POINTER;
-       goto loser;
-    }
-
-    /* Check object initialization */
-    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
-    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
-
-    /* Get the control connection */
-    rv = mPSM->GetControlConnection(&control);
-    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
-    
-    /* Call PSM to decrypt the value */
-    status = CMT_SDRDecrypt(control, (void *)0, data, dataLen, result, &len);
-    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* Promote? */
-
-    /* Copy returned data to nsMemory buffer ? */
-    *_retval = len;
-
-loser:
-    return rv;
-}
-
-/* string encryptString (in string text); */
-NS_IMETHODIMP nsSecretDecoderRing::
-EncryptString(const char *text, char **_retval)
-{
-    nsresult rv = NS_OK;
-    unsigned char *encrypted = 0;
-    PRInt32 eLen;
-
-    if (text == nsnull || _retval == nsnull) {
-        rv = NS_ERROR_INVALID_POINTER;
-        goto loser;
-    }
-
-    rv = Encrypt((unsigned char *)text, PL_strlen(text), &encrypted, &eLen);
-    if (rv != NS_OK) { goto loser; }
-
-    rv = encode(encrypted, eLen, _retval);
-
-loser:
-    if (encrypted) nsMemory::Free(encrypted);
-
-    return rv;
-}
-
-/* string decryptString (in string crypt); */
-NS_IMETHODIMP nsSecretDecoderRing::
-DecryptString(const char *crypt, char **_retval)
-{
-    nsresult rv = NS_OK;
-    char *r = 0;
-    unsigned char *decoded = 0;
-    PRInt32 decodedLen;
-    unsigned char *decrypted = 0;
-    PRInt32 decryptedLen;
-
-    if (crypt == nsnull || _retval == nsnull) {
-      rv = NS_ERROR_INVALID_POINTER;
-      goto loser;
-    }
-
-    rv = decode(crypt, &decoded, &decodedLen);
-    if (rv != NS_OK) goto loser;
-
-    rv = Decrypt(decoded, decodedLen, &decrypted, &decryptedLen);
-    if (rv != NS_OK) goto loser;
-
-    // Convert to NUL-terminated string
-    r = (char *)nsMemory::Alloc(decryptedLen+1);
-    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
-
-    memcpy(r, decrypted, decryptedLen);
-    r[decryptedLen] = 0;
-
-    *_retval = r;
-    r = 0;
-
-loser:
-    if (r) nsMemory::Free(r);
-    if (decrypted) nsMemory::Free(decrypted);
-    if (decoded) nsMemory::Free(decoded);
- 
-    return rv;
-}
-
-/* void changePassword(); */
-NS_IMETHODIMP nsSecretDecoderRing::
-ChangePassword()
-{
-  nsresult rv = NS_OK;
-  CMTStatus status;
-  CMT_CONTROL *control;
-
-  rv = mPSM->GetControlConnection(&control);
-  if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
-
-  status = CMT_SDRChangePassword(control, (void*)0);
-
-loser:
-  return rv;
-}
-
-/* void logout(); */
-NS_IMETHODIMP nsSecretDecoderRing::
-Logout()
-{
-    nsresult rv = NS_OK;
-    CMTStatus status;
-    CMT_CONTROL *control;
-
-    /* Check object initialization */
-    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
-    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
-
-    /* Get the control connection */
-    rv = mPSM->GetControlConnection(&control);
-    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
-    
-    /* Call PSM to decrypt the value */
-    status = CMT_LogoutAllTokens(control);
-    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* Promote? */
-
-loser:
-    return rv;
-}
-
-
-// Support routines
-
-nsresult nsSecretDecoderRing::
-encode(const unsigned char *data, PRInt32 dataLen, char **_retval)
-{
-    nsresult rv = NS_OK;
-
-    *_retval = PL_Base64Encode((const char *)data, dataLen, NULL);
-    if (!*_retval) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
-
-loser:
-    return rv;
-
-#if 0
-    nsresult rv = NS_OK;
-    char *r = 0;
-
-    // Allocate space for encoded string (with NUL)
-    r = (char *)nsMemory::Alloc(dataLen+1);
-    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
-
-    memcpy(r, data, dataLen);
-    r[dataLen] = 0;
-
-    *_retval = r;
-    r = 0;
-
-loser:
-    if (r) nsMemory::Free(r);
-
-    return rv;
-#endif
-}
-
-nsresult nsSecretDecoderRing::
-decode(const char *data, unsigned char **result, PRInt32 * _retval)
-{
-    nsresult rv = NS_OK;
-    PRUint32 len = PL_strlen(data);
-    int adjust = 0;
-
-    /* Compute length adjustment */
-    if (data[len-1] == '=') {
-      adjust++;
-      if (data[len-2] == '=') adjust++;
-    }
-
-    *result = (unsigned char *)PL_Base64Decode(data, len, NULL);
-    if (!*result) { rv = NS_ERROR_ILLEGAL_VALUE; goto loser; }
-
-    *_retval = (len*3)/4 - adjust;
-
-loser:
-    return rv;
-
-#if 0
-    nsresult rv = NS_OK;
-    unsigned char *r = 0;
-    PRInt32 rLen;
-
-    // Allocate space for decoded string (missing NUL)
-    rLen = PL_strlen(data);
-    r = (unsigned char *)nsMemory::Alloc(rLen);
-    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
-
-    memcpy(r, data, rLen);
-
-    *result = r;
-    r = 0;
-    *_retval = rLen;
-
-loser:
-    if (r) nsMemory::Free(r);
-
-    return rv;
-#endif
-}
-
-const char * nsSecretDecoderRing::kPSMComponentProgID = PSM_COMPONENT_PROGID;

mozilla/extensions/psm-glue/src/nsSDR.h

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Terry Hayes <thayes@netscape.com>
- */
-
-#ifndef _NSSDR_H_
-#define _NSSDR_H_
-
-#include "nsISecretDecoderRing.h"
-
-// ===============================================
-// nsSecretDecoderRing - implementation of nsISecretDecoderRing
-// ===============================================
-
-#define NS_SDR_CLASSNAME "Secret Decoder Ring"
-#define NS_SDR_CID \
-  { 0xd9a0341, 0xce7, 0x11d4, { 0x9f, 0xdd, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
-#define NS_SDR_PROGID "netscape.security.sdr"
-
-class nsSecretDecoderRing : public nsISecretDecoderRing
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISECRETDECODERRING
-
-  nsSecretDecoderRing();
-  virtual ~nsSecretDecoderRing();
-
-  nsresult init();
-
-private:
-  nsIPSMComponent *mPSM;
-
-  static const char *kPSMComponentProgID;
-
-  nsresult encode(const unsigned char *data, PRInt32 dataLen, char **_retval);
-  nsresult decode(const char *data, unsigned char **result, PRInt32 * _retval);
-};
-
-#endif /* _NSSDR_H_ */

mozilla/extensions/psm-glue/src/nsSSLIOLayer.cpp

@@ -1,550 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
-*/
-
-#include "nspr.h"
-#include "nsString.h"
-#include "cmtcmn.h"
-
-#include "nsIPSMComponent.h"
-#include "nsIPSMSocketInfo.h"
-#include "nsIServiceManager.h"
-#include "nsPSMShimLayer.h"
-#include "nsSSLIOLayer.h"
-
-static PRDescIdentity  nsSSLIOLayerIdentity;
-static PRIOMethods     nsSSLIOLayerMethods;
-static nsIPSMComponent* gPSMService = nsnull;
-
-
-
-class nsPSMSocketInfo : public nsIPSMSocketInfo
-{
-public:
-    nsPSMSocketInfo();
-    virtual ~nsPSMSocketInfo();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPSMSOCKETINFO
-
-    // internal functions to psm-glue.
-    nsresult SetSocketPtr(CMSocket *socketPtr);
-    nsresult SetControlPtr(CMT_CONTROL *aControlPtr);
-    nsresult SetFileDescPtr(PRFileDesc *aControlPtr);
-    nsresult SetHostName(char *aHostName);
-    nsresult SetProxyName(char *aName);
-
-    nsresult SetHostPort(PRInt32 aPort);
-    nsresult SetProxyPort(PRInt32 aPort);
-    nsresult SetPickledStatus();
-
-protected:
-    CMT_CONTROL* mControl;
-    CMSocket*    mSocket;
-    PRFileDesc*  mFd;
-    
-    nsString     mHostName;
-    PRInt32      mHostPort;
-    
-    nsString     mProxyName;
-    PRInt32      mProxyPort;
-    
-    unsigned char* mPickledStatus;
-};
-
-
-static PRStatus PR_CALLBACK
-nsSSLIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-    nsresult                result;
-    PRStatus                rv = PR_SUCCESS;
-    CMTStatus               status = CMTFailure;
-    
-    /* Set the error in case of failure. */
-
-    PR_SetError(PR_UNKNOWN_ERROR, status);
-
-    if (!fd || !addr || !fd->secret || !gPSMService)
-        return PR_FAILURE;
-    
-    char ipBuffer[PR_NETDB_BUF_SIZE];
-    rv = PR_NetAddrToString(addr, (char*)&ipBuffer, PR_NETDB_BUF_SIZE);
-    if (rv != PR_SUCCESS)
-        return PR_FAILURE;
-    
-    if (addr->raw.family == PR_AF_INET6 && PR_IsNetAddrType(addr, PR_IpAddrV4Mapped)) 
-    {
-      /* Chop off the leading "::ffff:" */
-      strcpy(ipBuffer, ipBuffer + 7);
-    }
-
-    
-    CMT_CONTROL *control;
-    result = gPSMService->GetControlConnection(&control);
-    if (result != PR_SUCCESS)
-        return PR_FAILURE;
-    
-    CMSocket* cmsock = (CMSocket *)PR_Malloc(sizeof(CMSocket));
-    if (!cmsock)
-        return PR_FAILURE;
-    
-    memset(cmsock, 0, sizeof(CMSocket));
-    
-    cmsock->fd        = fd->lower;
-    cmsock->isUnix    = PR_FALSE;
-   
-    nsPSMSocketInfo *infoObject = (nsPSMSocketInfo *)fd->secret;
-    
-    infoObject->SetControlPtr(control);
-    infoObject->SetSocketPtr(cmsock);
-    
-    char* proxyName;
-    char* hostName;
-    infoObject->GetProxyName(&proxyName);
-    infoObject->GetHostName(&hostName);
-    
-    if (!proxyName)
-    {
-        // Direct connection
-        status = CMT_OpenSSLConnection(control,
-                                       cmsock,
-                                       SSM_REQUEST_SSL_DATA_SSL,
-                                       PR_ntohs(addr->inet.port),
-                                       ipBuffer,
-                                       (hostName ? hostName : ipBuffer),
-                                       CM_FALSE, 
-                                       nsnull);
-    
-    }
-    else
-    {
-        // not supported yet.
-
-        return PR_FAILURE;
-#if 0
-        PRInt32 destPort;
-        
-        infoObject->GetProxyPort(&destPort);
-
-        status = CMT_OpenSSLProxyConnection(control,
-                                            cmsock,
-                                            destPort, 
-                                            proxyName,  // wants IP
-                                            hostName);
-#endif
-    }
-
-    if (hostName)  Recycle(hostName);
-    if (proxyName) Recycle(proxyName);
-        
-    if (CMTSuccess == status)
-    {
-        // since our stuff can block, what we want to do is return PR_FAILURE,
-        // but set the nspr ERROR to BLOCK.  This will put us into a select
-        // q.
-        PR_SetError(PR_WOULD_BLOCK_ERROR, status);
-        return PR_FAILURE;
-    }
-
-    return PR_FAILURE;
-}
-
-  /* CMT_DestroyDataConnection(ctrl, sock); */
-  /*   need to strip our layer, pass result to DestroyDataConnection */
-  /*   which will clean up the CMT accounting of sock, then call our */
-  /*   shim layer to translate back to NSPR */
-
-static PRStatus PR_CALLBACK
-nsSSLIOLayerClose(PRFileDesc *fd)
-{
-  nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
-  PRDescIdentity          id     = PR_GetLayersIdentity(fd);
-   
-  if (infoObject && id == nsSSLIOLayerIdentity)
-  {
-    CMInt32 errorCode = PR_FAILURE;
-    CMT_CONTROL* control;
-    CMSocket*    socket;
-    
-    PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
-
-    infoObject->GetControlPtr(&control);
-    infoObject->GetSocketPtr(&socket);
-    infoObject->SetPickledStatus();
-
-    CMT_GetSSLDataErrorCode(control, socket, &errorCode);
-    CMT_DestroyDataConnection(control, socket);
-    NS_RELEASE(infoObject);  // if someone is interested in us, the better have an addref.
-    fd->identity = PR_INVALID_IO_LAYER;
-    
-    return (PRStatus)errorCode;
-  }
-
-  return PR_FAILURE;
-}
- 
-static PRInt32 PR_CALLBACK
-nsSSLIOLayerRead( PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-    if (!fd)
-        return PR_FAILURE;
-
-    PRInt32 result = PR_Recv(fd, buf, amount, 0, PR_INTERVAL_MIN);
-    
-    if (result > 0)
-        return result;
-    
-    if (result == -1)
-    {
-        PRErrorCode code = PR_GetError();
-
-        if (code == PR_IO_TIMEOUT_ERROR )
-            PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
-        return PR_FAILURE;
-    }
-    
-    if (result == 0)
-    {
-        nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
-        PRDescIdentity          id     = PR_GetLayersIdentity(fd);
-
-        if (infoObject && id == nsSSLIOLayerIdentity)
-        {
-            CMInt32 errorCode = PR_FAILURE;
-            
-            CMT_CONTROL* control;
-            CMSocket*    socket;
-    
-            infoObject->GetControlPtr(&control);
-            infoObject->GetSocketPtr(&socket);
-
-            CMT_GetSSLDataErrorCode(control, socket, &errorCode);
-
-			if (errorCode == PR_IO_TIMEOUT_ERROR)
-			{
-				PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
-				return PR_FAILURE;
-			}
-
-            PR_SetError(0, 0);
-            return errorCode;
-        }
-    }
-
-    return result;
-}
-
-static PRInt32 PR_CALLBACK
-nsSSLIOLayerWrite( PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-    if (!fd)
-        return PR_FAILURE;
-
-    PRInt32 result = PR_Send(fd, buf, amount, 0, PR_INTERVAL_MIN);
-    
-    if (result > 0)
-        return result;
-
-    if (result == -1)
-    {
-        PRErrorCode code = PR_GetError();
-
-        if (code == PR_IO_TIMEOUT_ERROR )
-            PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
-        return PR_FAILURE;
-    }
-
-    if (result == 0)
-    {
-        nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
-        PRDescIdentity          id     = PR_GetLayersIdentity(fd);
-
-        if (infoObject && id == nsSSLIOLayerIdentity)
-        {
-            CMInt32 errorCode = PR_FAILURE;
-            CMT_CONTROL* control;
-            CMSocket*    socket;
-    
-            infoObject->GetControlPtr(&control);
-            infoObject->GetSocketPtr(&socket);
-
-            CMT_GetSSLDataErrorCode(control, socket, &errorCode);
-            PR_SetError(0, 0);
-            return errorCode;
-        }
-    }
-    return result;
-}
-
-
-
-nsPSMSocketInfo::nsPSMSocketInfo()
-{ 
-    NS_INIT_REFCNT(); 
-    mControl = nsnull; 
-    mSocket = nsnull;
-    mPickledStatus = nsnull;
-}
-
-nsPSMSocketInfo::~nsPSMSocketInfo()
-{
-    PR_FREEIF(mPickledStatus);    
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsPSMSocketInfo, nsIPSMSocketInfo);
-
-NS_IMETHODIMP
-nsPSMSocketInfo::GetControlPtr(CMT_CONTROL * *aControlPtr)
-{
-    *aControlPtr = mControl;
-    return NS_OK;
-}
-
-nsresult
-nsPSMSocketInfo::SetControlPtr(CMT_CONTROL *aControlPtr)
-{
-    mControl = aControlPtr;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPSMSocketInfo::GetSocketPtr(CMSocket * *socketPtr)
-{
-    *socketPtr = mSocket;
-    return NS_OK;
-}
-
-nsresult
-nsPSMSocketInfo::SetSocketPtr(CMSocket *socketPtr)
-{
-    mSocket = socketPtr;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPSMSocketInfo::GetFileDescPtr(PRFileDesc * *aFilePtr)
-{
-    *aFilePtr = mFd;
-    return NS_OK;
-}
-
-
-nsresult
-nsPSMSocketInfo::SetFileDescPtr(PRFileDesc *aFilePtr)
-{
-    mFd = aFilePtr;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsPSMSocketInfo::GetHostName(char * *aHostName)
-{
-    if (mHostName.IsEmpty())
-        *aHostName = nsnull;
-    else
-        *aHostName = mHostName.ToNewCString();
-    return NS_OK;
-}
-
-
-nsresult 
-nsPSMSocketInfo::SetHostName(char *aHostName)
-{
-    mHostName.AssignWithConversion(aHostName);
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsPSMSocketInfo::GetHostPort(PRInt32 *aPort)
-{
-    *aPort = mHostPort;
-    return NS_OK;
-}
-
-nsresult 
-nsPSMSocketInfo::SetHostPort(PRInt32 aPort)
-{
-    mHostPort = aPort;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsPSMSocketInfo::GetProxyName(char * *aName)
-{
-    if (mProxyName.IsEmpty())
-        *aName = nsnull;
-    else
-        *aName = mProxyName.ToNewCString();
-    return NS_OK;
-}
-
-
-nsresult 
-nsPSMSocketInfo::SetProxyName(char *aName)
-{
-    mProxyName.AssignWithConversion(aName);
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsPSMSocketInfo::GetProxyPort(PRInt32 *aPort)
-{
-    *aPort = mProxyPort;
-    return NS_OK;
-}
-
-nsresult 
-nsPSMSocketInfo::SetProxyPort(PRInt32 aPort)
-{
-    mProxyPort = aPort;
-    return NS_OK;
-}
-
-
-
-nsresult
-nsPSMSocketInfo::SetPickledStatus()
-{
-    PR_FREEIF(mPickledStatus);
-
-    long level;
-    CMTItem pickledStatus = {0, nsnull, 0};
-    unsigned char* ret    = nsnull;
-
-    if (CMT_GetSSLSocketStatus(mControl, mSocket, &pickledStatus, &level) != PR_FAILURE)
-    {        
-        ret = (unsigned char*) PR_Malloc( (SSMSTRING_PADDED_LENGTH(pickledStatus.len) + sizeof(int)) );
-        if (ret) 
-        {
-            *(int*)ret = pickledStatus.len;
-            memcpy(ret+sizeof(int), pickledStatus.data, *(int*)ret);
-        }
-
-        PR_FREEIF(pickledStatus.data);
-        mPickledStatus = ret;
-    }
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsPSMSocketInfo::GetPickledStatus(char * *pickledStatusString)
-{
-    if (!mPickledStatus)
-        SetPickledStatus();
-
-    if (mPickledStatus)
-    {
-        PRInt32 len = *(int*)mPickledStatus;
-        char *out = (char *)nsMemory::Alloc(len);
-        memcpy(out, mPickledStatus, len);
-        *pickledStatusString = out;
-        return NS_OK;
-    }
-    *pickledStatusString = nsnull;
-    return NS_ERROR_FAILURE;
-}
-
-nsresult
-nsSSLIOLayerNewSocket( const char *host, 
-                       PRInt32 port, 
-                       const char *proxyHost, 
-                       PRInt32 proxyPort,
-                       PRFileDesc **fd, 
-                       nsISupports** info)
-{
-    static PRBool  firstTime = PR_TRUE;
-    if (firstTime)
-    {
-        nsSSLIOLayerIdentity        = PR_GetUniqueIdentity("Cartman layer");
-        nsSSLIOLayerMethods         = *PR_GetDefaultIOMethods();
-
-        nsSSLIOLayerMethods.connect = nsSSLIOLayerConnect;
-        nsSSLIOLayerMethods.close   = nsSSLIOLayerClose;
-        nsSSLIOLayerMethods.read    = nsSSLIOLayerRead;
-        nsSSLIOLayerMethods.write   = nsSSLIOLayerWrite;
-        
-        
-        nsresult result = nsServiceManager::GetService( PSM_COMPONENT_PROGID,
-                                                        NS_GET_IID(nsIPSMComponent), 
-                                                        (nsISupports**)&gPSMService);  
-        if (NS_FAILED(result))
-            return PR_FAILURE;
-    
-        firstTime                   = PR_FALSE;
-
-    }
-    
-
-    PRFileDesc *   sock;
-    PRFileDesc *   layer;
-    PRStatus       rv;
-
-    /* Get a normal NSPR socket */
-    sock = PR_NewTCPSocket();  
-    if (! sock) return NS_ERROR_OUT_OF_MEMORY;
-    
-    /* disable Nagle algorithm delay for control sockets */
-    PRSocketOptionData sockopt;
-    sockopt.option = PR_SockOpt_NoDelay;
-    sockopt.value.no_delay = PR_TRUE;   
-    rv = PR_SetSocketOption(sock, &sockopt);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-
-    layer = PR_CreateIOLayerStub(nsSSLIOLayerIdentity, &nsSSLIOLayerMethods);
-    if (! layer)
-    {
-        PR_Close(sock);
-        return NS_ERROR_FAILURE;
-    }
-        
-    nsPSMSocketInfo *infoObject = new nsPSMSocketInfo();
-    if (!infoObject)
-    {
-        PR_Close(sock);
-        // clean up IOLayerStub.
-        return NS_ERROR_FAILURE;
-    }
-    
-    NS_ADDREF(infoObject);
-    
-    infoObject->SetHostName((char*)host);
-    infoObject->SetHostPort(port);
-    infoObject->SetProxyName((char*)proxyHost);
-    infoObject->SetProxyPort(proxyPort);
-
-    layer->secret = (PRFilePrivate*) infoObject;
-    rv = PR_PushIOLayer(sock, PR_GetLayersIdentity(sock), layer);
-    
-    if (rv == PR_SUCCESS)
-    {
-        *fd   = sock;
-        *info = infoObject;
-        NS_ADDREF(*info);
-        return NS_OK;
-    }
-    
-    PR_Close(sock);
-    return NS_ERROR_FAILURE;
-}

mozilla/extensions/psm-glue/src/nsSSLIOLayer.h

@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
-*/
-
-#ifndef _NSSSLIOLAYER_H
-#define _NSSSLIOLAYER_H
-
-#include "prtypes.h"
-#include "prio.h"
-#include "nsIPSMSocketInfo.h"
-
-// define taken from 4.x cartman glue code.  
-#define SSMSTRING_PADDED_LENGTH(x) ((((x)+3)/4)*4)
-
-nsresult nsSSLIOLayerNewSocket(const char *host, 
-                               PRInt32 port, 
-                               const char *proxyHost, 
-                               PRInt32 proxyPort, 
-                               PRFileDesc **fd, 
-                               nsISupports **securityInfo);
-#endif /* _NSSSLIOLAYER_H */

mozilla/extensions/psm-glue/src/nsSSLSocketProvider.cpp

@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
-*/
-
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsSSLSocketProvider.h"
-#include "nsSSLIOLayer.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsSSLSocketProvider::nsSSLSocketProvider()
-{
-  NS_INIT_REFCNT();
-}
-
-nsresult
-nsSSLSocketProvider::Init()
-{
-  nsresult rv = NS_OK;
-  return rv;
-}
-
-nsSSLSocketProvider::~nsSSLSocketProvider()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsSSLSocketProvider, nsISocketProvider, nsISSLSocketProvider);
-
-NS_METHOD
-nsSSLSocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{                                                                               
-    nsresult rv;                                                                
-                                                                                
-    nsSSLSocketProvider * inst;                                                      
-                                                                                
-    if (NULL == aResult) {                                                      
-        rv = NS_ERROR_NULL_POINTER;                                             
-        return rv;                                                              
-    }                                                                           
-    *aResult = NULL;                                                            
-    if (NULL != aOuter) {                                                       
-        rv = NS_ERROR_NO_AGGREGATION;                                           
-        return rv;                                                              
-    }                                                                           
-                                                                                
-    NS_NEWXPCOM(inst, nsSSLSocketProvider);                                          
-    if (NULL == inst) {                                                         
-        rv = NS_ERROR_OUT_OF_MEMORY;                                            
-        return rv;                                                              
-    }                                                                           
-    NS_ADDREF(inst);                                                            
-    rv = inst->QueryInterface(aIID, aResult);                                   
-    NS_RELEASE(inst);                                                           
-                                                                                
-    return rv;                                                                  
-}                                                                               
-
-
-NS_IMETHODIMP
-nsSSLSocketProvider::NewSocket(const char *host, 
-                               PRInt32 port, 
-                               const char *proxyHost, 
-                               PRInt32 proxyPort, 
-                               PRFileDesc **_result, 
-                               nsISupports **securityInfo)
-{
-  nsresult rv = nsSSLIOLayerNewSocket(host,
-                                      port,
-                                      proxyHost,
-                                      proxyPort,
-                                      _result, 
-                                      securityInfo);
-  
-  return (NS_FAILED(rv)) ? NS_ERROR_SOCKET_CREATE_FAILED : NS_OK;
-}

mozilla/extensions/psm-glue/src/nsSSLSocketProvider.h

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
-*/
-
-#ifndef _NSSSLSOCKETPROVIDER_H_
-#define _NSSSLSOCKETPROVIDER_H_
-
-#include "nsISSLSocketProvider.h"
-
-
-/* 274418d0-5437-11d3-bbc8-0000861d1237 */         
-#define NS_SSLSOCKETPROVIDER_CID   { 0x274418d0, 0x5437, 0x11d3, {0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37}}
-
-
-class nsSSLSocketProvider : public nsISSLSocketProvider
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  NS_DECL_NSISOCKETPROVIDER
-
-  NS_DECL_NSISSLSOCKETPROVIDER
-
-  // nsSSLSocketProvider methods:
-  nsSSLSocketProvider();
-  virtual ~nsSSLSocketProvider();
-
-  static NS_METHOD
-  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-  nsresult Init();
-
-protected:
-};
-
-#endif /* _NSSSLSOCKETPROVIDER_H_ */

mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp

@@ -1,654 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998-2000 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Stuart Parmenter <pavlov@netscape.com>
-*/
-
-#include "nspr.h"
-#include "prlog.h"
-
-#include "nsISecureBrowserUI.h"
-#include "nsSecureBrowserUIImpl.h"
-#include "nsIPSMComponent.h"
-#include "nsPSMComponent.h"
-#include "nsCOMPtr.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIServiceManager.h"
-
-#include "nsIScriptGlobalObject.h"
-#include "nsIObserverService.h"
-#include "nsIDocumentLoader.h"
-#include "nsCURILoader.h"
-#include "nsIDocShell.h"
-#include "nsIDocumentViewer.h"
-#include "nsCURILoader.h"
-#include "nsIDocument.h"
-#include "nsIDOMHTMLDocument.h"
-#include "nsIDOMXULDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindow.h"
-#include "nsIContent.h"
-#include "nsIWebProgress.h"
-#include "nsIChannel.h"
-#include "nsIPSMSocketInfo.h"
-
-#include "nsIURI.h"
-
-#include "prmem.h"
-
-#include "nsINetSupportDialogService.h"
-#include "nsIPrompt.h"
-#include "nsICommonDialogs.h"
-#include "nsIPref.h"
-
-#include "nsIFormSubmitObserver.h"
-
-static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
-static NS_DEFINE_CID(kCommonDialogsCID,         NS_CommonDialog_CID );
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-
-#define ENTER_SITE_PREF      "security.warn_entering_secure"
-#define LEAVE_SITE_PREF      "security.warn_leaving_secure"
-#define MIXEDCONTENT_PREF    "security.warn_viewing_mixed"
-#define INSECURE_SUBMIT_PREF "security.warn_submit_insecure"
-
-#if defined(PR_LOGGING)
-//
-// Log module for nsSecureBroswerUI logging...
-//
-// To enable logging (see prlog.h for full details):
-//
-//    set NSPR_LOG_MODULES=nsSecureBroswerUI:5
-//    set NSPR_LOG_FILE=nspr.log
-//
-// this enables PR_LOG_DEBUG level information and places all output in
-// the file nspr.log
-//
-PRLogModuleInfo* gSecureDocLog = nsnull;
-#endif /* PR_LOGGING */
-
- 
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    nsresult rv;
-
-    nsSecureBrowserUIImpl * inst;
-
-    if (NULL == aResult) {
-        rv = NS_ERROR_NULL_POINTER;
-        return rv;
-    }
-    *aResult = NULL;
-    if (NULL != aOuter) {
-        rv = NS_ERROR_NO_AGGREGATION;
-        return rv;
-    }
-
-    NS_NEWXPCOM(inst, nsSecureBrowserUIImpl);
-    if (NULL == inst) {
-        rv = NS_ERROR_OUT_OF_MEMORY;
-        return rv;
-    }
-    NS_ADDREF(inst);
-    rv = inst->QueryInterface(aIID, aResult);
-    NS_RELEASE(inst);
-
-    return rv;
-}
-
-nsSecureBrowserUIImpl::nsSecureBrowserUIImpl()
-{
-    NS_INIT_REFCNT();
-    
-#if defined(PR_LOGGING)
-    if (nsnull == gSecureDocLog) {
-        gSecureDocLog = PR_NewLogModule("nsSecureBroswerUI");
-    }
-#endif /* PR_LOGGING */
-
-
-    mIsSecureDocument = mMixContentAlertShown = mIsDocumentBroken = PR_FALSE;
-    mLastPSMStatus    = nsnull;
-    mCurrentURI       = nsnull;
-    mSecurityButton   = nsnull;
-}
-
-nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl()
-{
-    PR_FREEIF(mLastPSMStatus);
-}
-
-NS_IMPL_ISUPPORTS4(nsSecureBrowserUIImpl, 
-                   nsSecureBrowserUI, 
-                   nsIWebProgressListener, 
-                   nsIFormSubmitObserver,
-                   nsIObserver); 
-
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Init(nsIDOMWindow *window, nsIDOMElement *button)
-{
-    mSecurityButton = button;
-    mWindow         = window;
-
-    nsresult rv = nsServiceManager::GetService( kPrefCID, 
-                                                NS_GET_IID(nsIPref), 
-                                                getter_AddRefs(mPref));  
-    if (NS_FAILED(rv)) return rv;
-
-    NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsILocale* locale = nsnull;
-    rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, locale, getter_AddRefs(mStringBundle));
-    if (NS_FAILED(rv)) return rv;
-
-    // hook up to the form post notifications:
-    nsIObserverService *svc = 0;
-    rv = nsServiceManager::GetService(NS_OBSERVERSERVICE_PROGID, 
-                                      NS_GET_IID(nsIObserverService), 
-                                      (nsISupports**)&svc );
-    if (NS_SUCCEEDED(rv) && svc) {
-        nsString  topic; topic.AssignWithConversion(NS_FORMSUBMIT_SUBJECT);
-        rv = svc->AddObserver( this, topic.GetUnicode());
-        nsServiceManager::ReleaseService( NS_OBSERVERSERVICE_PROGID, svc );
-    }
-
-    // hook up to the webprogress notifications.
-    nsCOMPtr<nsIDocShell> docShell;
-
-    nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface(window);
-    if (!sgo) return NS_ERROR_NULL_POINTER;
-
-    sgo->GetDocShell(getter_AddRefs(docShell));
-    if (!docShell) return NS_ERROR_NULL_POINTER;
-
-    nsCOMPtr<nsIWebProgress> wp = do_GetInterface(docShell);
-    if (!wp) return NS_ERROR_NULL_POINTER;
-
-    wp->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this));
-
-    mInitByLocationChange = PR_TRUE;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::DisplayPageInfoUI()
-{
-    nsresult res;
-    NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
-    if (NS_FAILED(res)) 
-        return res;
-    
-    nsXPIDLCString host;
-    if (mCurrentURI)
-        mCurrentURI->GetHost(getter_Copies(host));
-    
-    return psm->DisplaySecurityAdvisor(mLastPSMStatus, host);
-}
-
-
-
-
-NS_IMETHODIMP 
-nsSecureBrowserUIImpl::Observe(nsISupports*, const PRUnichar*, const PRUnichar*) 
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-static nsresult IsChildOfDomWindow(nsIDOMWindow *parent, nsIDOMWindow *child, PRBool* value)
-{
-    *value = PR_FALSE;
-
-    if (parent == child)
-    {
-        *value = PR_TRUE;
-        return NS_OK;
-    }
-
-    nsCOMPtr<nsIDOMWindow> childsParent;
-    child->GetParent(getter_AddRefs(childsParent));
-        
-    if (childsParent && childsParent.get() != child)
-        IsChildOfDomWindow(parent, childsParent, value);
-    
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsSecureBrowserUIImpl::Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL)
-{
-    // Return NS_OK unless we want to prevent this form from submitting.
-
-    if (!window || !actionURL || !formNode) {
-        return NS_OK;
-    }
-    
-    nsCOMPtr<nsIDocument> document; 
-    formNode->GetDocument(*getter_AddRefs(document)); 
-    if (!document) return NS_OK; 
-
-    nsCOMPtr<nsIScriptGlobalObject> globalObject; 
-    document->GetScriptGlobalObject(getter_AddRefs(globalObject)); 
-    nsCOMPtr<nsIDOMWindow> postingWindow = do_QueryInterface(globalObject); 
-    
-    PRBool isChild;
-    IsChildOfDomWindow(mWindow, postingWindow, &isChild);
-
-    if (!isChild)
-        return NS_OK;
-
-    PRBool okayToPost;
-    nsresult res = CheckPost(actionURL, &okayToPost);
-
-    if (NS_SUCCEEDED(res) && okayToPost)
-        return NS_OK;
-    
-    return NS_ERROR_FAILURE;
-}
-
-//  nsIWebProgressListener
-NS_IMETHODIMP 
-nsSecureBrowserUIImpl::OnProgressChange(nsIWebProgress* aWebProgress,
-                                        nsIRequest* aRequest, 
-                                        PRInt32 aCurSelfProgress, 
-                                        PRInt32 aMaxSelfProgress, 
-                                        PRInt32 aCurTotalProgress, 
-                                        PRInt32 aMaxTotalProgress)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsSecureBrowserUIImpl::OnStateChange(nsIWebProgress* aWebProgress,
-                                     nsIRequest* aRequest, 
-                                     PRInt32 aProgressStateFlags,
-                                     nsresult aStatus)
-{
-    nsresult res = NS_OK;
-
-    if (aRequest == nsnull || !mSecurityButton || !mPref)
-        return NS_ERROR_NULL_POINTER;
-
-    // Get the channel from the request...
-    // If the request is not network based, then ignore it.    
-    nsCOMPtr<nsIChannel> channel;
-    channel = do_QueryInterface(aRequest, &res);
-    if (NS_FAILED(res))
-        return NS_OK;
-
-    nsCOMPtr<nsIURI> loadingURI;
-    channel->GetURI(getter_AddRefs(loadingURI));
-    
-#if defined(DEBUG)
-    nsXPIDLCString temp;
-    loadingURI->GetSpec(getter_Copies(temp));
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: OnStateChange: %x :%s\n", this, aProgressStateFlags,(const char*)temp));
-#endif
-
-    // A Document is starting to load...
-    if ((aProgressStateFlags & flag_start) && 
-        (aProgressStateFlags & flag_is_network))
-    {
-        // starting to load a webpage
-        PR_FREEIF(mLastPSMStatus); mLastPSMStatus = nsnull;
-
-        mIsSecureDocument = mMixContentAlertShown = mIsDocumentBroken = PR_FALSE;
-
-        res = CheckProtocolContextSwitch( loadingURI, mCurrentURI);    
-        return res;
-    } 
-
-    // A document has finished loading    
-    if ((aProgressStateFlags & flag_stop) &&
-        (aProgressStateFlags & flag_is_network) &&
-        mIsSecureDocument)
-    {
-        if (!mIsDocumentBroken) // and status is okay  FIX
-        {
-            // qi for the psm information about this channel load.
-            nsCOMPtr<nsISupports> info;
-            channel->GetSecurityInfo(getter_AddRefs(info));
-            nsCOMPtr<nsIPSMSocketInfo> psmInfo = do_QueryInterface(info);
-            if (psmInfo)
-            {
-                // Everything looks okay.  Lets stash the picked status.
-                PR_FREEIF(mLastPSMStatus);
-                res = psmInfo->GetPickledStatus(&mLastPSMStatus);
-
-                if (NS_SUCCEEDED(res)) {
-                    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Icon set to lock\n", this));
-                    res = mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("high") );
-                    return res;
-                }
-            }
-        }
-
-        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Icon set to broken\n", this));
-        mIsDocumentBroken = PR_TRUE;
-        res = mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken"));
-        return res;
-    }
-    
-    ///    if (aProgressStateFlags == nsIWebProgress::flag_net_redirecting)
-    ///    {
-    ///        // need to implmentent.
-    ///    }
-
-    // don't need to do anything more if the page is broken or not secure...
-
-    if (!mIsSecureDocument || mIsDocumentBroken)
-        return NS_OK;
-
-    // A URL is starting to load...
-    if ((aProgressStateFlags & flag_start) &&
-        (aProgressStateFlags & flag_is_request))
-    {   // check to see if we are going to mix content.
-        return CheckMixedContext(loadingURI);
-    }
-
-    // A URL has finished loading...    
-    if ((aProgressStateFlags & flag_stop) &&
-        (aProgressStateFlags & flag_is_request))
-    {
-        if (1)  // FIX status from the flag...
-        {
-            nsCOMPtr<nsISupports> info;
-            channel->GetSecurityInfo(getter_AddRefs(info));
-            nsCOMPtr<nsIPSMSocketInfo> psmInfo = do_QueryInterface(info, &res);
-
-                    // qi for the psm information about this channel load.
-            if (psmInfo) {
-                return NS_OK;    
-            }
-        }
-
-        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: OnStateChange - Icon set to broken\n", this));
-        mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken") );
-        mIsDocumentBroken = PR_TRUE;
-    }    
-
-    return res;
-}
-
-
-NS_IMETHODIMP 
-nsSecureBrowserUIImpl::OnLocationChange(nsIURI* aLocation)
-{
-    mCurrentURI = aLocation;
-    
-    if (mInitByLocationChange)
-    {
-        IsURLHTTPS(mCurrentURI, &mIsSecureDocument);
-        mInitByLocationChange = PR_FALSE;
-    }
-
-    return NS_OK;
-}
-
-
-nsresult
-nsSecureBrowserUIImpl::IsURLHTTPS(nsIURI* aURL, PRBool* value)
-{
-	*value = PR_FALSE;
-
-	if (!aURL)
-		return NS_OK;
-
-    char* scheme;
-	aURL->GetScheme(&scheme);
-
-	if (scheme == nsnull)
-		return NS_ERROR_NULL_POINTER;
-
-    if ( PL_strncasecmp(scheme, "https",  5) == 0 )
-		*value = PR_TRUE;
-	
-	nsMemory::Free(scheme);
-	return NS_OK;
-}
-
-
-
-void nsSecureBrowserUIImpl::GetBundleString(const nsString& name, nsString &outString)
-{
-    if (mStringBundle && name.Length() > 0) {
-        PRUnichar *ptrv = nsnull;
-        if (NS_SUCCEEDED(mStringBundle->GetStringFromName(name.GetUnicode(), &ptrv)))
-            outString = ptrv;
-        else
-            outString.SetLength(0);;
-
-        nsMemory::Free(ptrv);
-
-    } else {
-        outString.SetLength(0);;
-    }
-}
-
-nsresult 
-nsSecureBrowserUIImpl::CheckProtocolContextSwitch( nsIURI* newURI, nsIURI* oldURI)
-{
-    nsresult res;
-    PRBool isNewSchemeSecure, isOldSchemeSecure, boolpref;
-
-    res = IsURLHTTPS(oldURI, &isOldSchemeSecure);
-    if (NS_FAILED(res)) 
-        return res;
-    res = IsURLHTTPS(newURI, &isNewSchemeSecure);
-    if (NS_FAILED(res)) 
-        return res;
-
-    // Check to see if we are going from a secure page to and insecure page
-    if ( !isNewSchemeSecure && isOldSchemeSecure)
-    {
-        mSecurityButton->RemoveAttribute( NS_ConvertASCIItoUCS2("level") );
-    
-        if ((mPref->GetBoolPref(LEAVE_SITE_PREF, &boolpref) != 0))
-            boolpref = PR_TRUE;
-        
-        if (boolpref) 
-        {
-            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &res);
-            if (NS_FAILED(res)) 
-                return res;
-
-            nsAutoString windowTitle, message, dontShowAgain;
-
-            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
-            GetBundleString(NS_ConvertASCIItoUCS2("LeaveSiteMessage"), message);
-            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
-
-            PRBool outCheckValue = PR_TRUE;
-            dialog->AlertCheck(mWindow, 
-                               windowTitle.GetUnicode(), 
-                               message.GetUnicode(), 
-                               dontShowAgain.GetUnicode(), 
-                               &outCheckValue);
-
-            if (!outCheckValue) {
-                mPref->SetBoolPref(LEAVE_SITE_PREF, PR_FALSE);
-                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
-                if (NS_FAILED(res)) 
-                    return res;
-                psm->PassPrefs();
-            }
-        }
-    }
-    // check to see if we are going from an insecure page to a secure one.
-    else if (isNewSchemeSecure && !isOldSchemeSecure)
-    {
-        if ((mPref->GetBoolPref(ENTER_SITE_PREF, &boolpref) != 0))
-            boolpref = PR_TRUE;
-        
-        if (boolpref) 
-        {
-            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &res);
-            if (NS_FAILED(res)) 
-                return res;
-
-            nsAutoString windowTitle, message, dontShowAgain;
-
-            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
-            GetBundleString(NS_ConvertASCIItoUCS2("EnterSiteMessage"), message);
-            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
-
-            PRBool outCheckValue = PR_TRUE;
-            dialog->AlertCheck(mWindow, 
-                               windowTitle.GetUnicode(), 
-                               message.GetUnicode(), 
-                               dontShowAgain.GetUnicode(), 
-                               &outCheckValue);
-
-            if (!outCheckValue)
-            {
-                mPref->SetBoolPref(ENTER_SITE_PREF, PR_FALSE);
-                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
-                if (NS_FAILED(res)) 
-                    return res;
-                psm->PassPrefs();
-            }
-        }
-    }
-
-    mIsSecureDocument = isNewSchemeSecure;
-    return NS_OK;
-}
-
-
-nsresult
-nsSecureBrowserUIImpl::CheckMixedContext(nsIURI* nextURI)
-{
-    PRBool secure;
-
-    nsresult rv = IsURLHTTPS(nextURI, &secure);
-    if (NS_FAILED(rv))
-        return rv;
-
-    if (!secure  && mIsSecureDocument)
-    {
-        mIsDocumentBroken = PR_TRUE;
-        mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken") );
-
-        if (!mPref) return NS_ERROR_NULL_POINTER;
-
-        PRBool boolpref;
-        if ((mPref->GetBoolPref(MIXEDCONTENT_PREF, &boolpref) != 0))
-            boolpref = PR_TRUE;
-
-        if (boolpref && !mMixContentAlertShown) 
-        {
-            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv);
-            if (NS_FAILED(rv)) 
-                return rv;
-
-            nsAutoString windowTitle, message, dontShowAgain;
-
-            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
-            GetBundleString(NS_ConvertASCIItoUCS2("MixedContentMessage"), message);
-            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
-
-            PRBool outCheckValue = PR_TRUE;
-
-            dialog->AlertCheck(mWindow, 
-                               windowTitle.GetUnicode(), 
-                               message.GetUnicode(), 
-                               dontShowAgain.GetUnicode(), 
-                               &outCheckValue);
-
-            if (!outCheckValue) {
-                mPref->SetBoolPref(MIXEDCONTENT_PREF, PR_FALSE);
-                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &rv);
-                if (NS_FAILED(rv)) 
-                    return rv;
-                psm->PassPrefs();
-            }
-
-            mMixContentAlertShown = PR_TRUE;
-        }
-    }
-
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::CheckPost(nsIURI *actionURL, PRBool *okayToPost)
-{
-    PRBool secure;
-
-    nsresult rv = IsURLHTTPS(actionURL, &secure);
-    if (NS_FAILED(rv))
-        return rv;
-    
-    // if we are posting to a secure link from a secure page, all is okay.
-    if (secure  && mIsSecureDocument)
-        return NS_OK;
-
-
-    PRBool boolpref;    
-
-    // posting to a non https URL.
-    if ((mPref->GetBoolPref(INSECURE_SUBMIT_PREF, &boolpref) != 0))
-        boolpref = PR_TRUE;
-    
-    if (boolpref) {
-        NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv);
-        if (NS_FAILED(rv)) 
-            return rv;
-
-        nsAutoString windowTitle, message, dontShowAgain;
-        
-        GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
-        GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
-
-        // posting to insecure webpage from a secure webpage.
-        if (!secure  && mIsSecureDocument && !mIsDocumentBroken) {
-            GetBundleString(NS_ConvertASCIItoUCS2("PostToInsecure"), message);
-        } else { // anything else, post generic warning
-            GetBundleString(NS_ConvertASCIItoUCS2("PostToInsecureFromInsecure"), message);
-        }
-
-        PRBool outCheckValue = PR_TRUE;
-        dialog->ConfirmCheck(mWindow, 
-                             windowTitle.GetUnicode(), 
-                             message.GetUnicode(), 
-                             dontShowAgain.GetUnicode(), 
-                             &outCheckValue, 
-                             okayToPost);
-
-        if (!outCheckValue) {
-            mPref->SetBoolPref(INSECURE_SUBMIT_PREF, PR_FALSE);
-            NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &rv);
-            if (NS_FAILED(rv)) 
-                return rv;
-            psm->PassPrefs();
-        }
-    } else {
-        *okayToPost = PR_TRUE;
-    }
-  
-    return NS_OK;
-}

mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.h

@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
-*/
-
-#ifndef nsSecureBrowserUIImpl_h_
-#define nsSecureBrowserUIImpl_h_
-
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsString.h"
-#include "nsIObserver.h"
-#include "nsIDocumentLoaderObserver.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindow.h"
-#include "nsIStringBundle.h"
-#include "nsISecureBrowserUI.h"
-#include "nsIDocShell.h"
-#include "nsIPref.h"
-#include "nsIWebProgressListener.h"
-#include "nsIFormSubmitObserver.h"
-#include "nsIURI.h"
-
-#define NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME "Mozilla Secure Browser Doc Observer"
-
-#define NS_SECURE_BROWSER_DOCOBSERVER_CID \
-{0x97c06c30, 0xa145, 0x11d3, \
-{0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
-
-#define NS_SECURE_BROWSER_DOCOBSERVER_PROGID "component://netscape/secure_browser_docobserver"
-
-
-class nsSecureBrowserUIImpl : public nsSecureBrowserUI, 
-                              public nsIWebProgressListener, 
-                              public nsIFormSubmitObserver,
-                              public nsIObserver
-{
-public:
-
-	nsSecureBrowserUIImpl();
-	virtual ~nsSecureBrowserUIImpl();
-    
-    static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-	NS_DECL_ISUPPORTS    
-    NS_DECL_NSIWEBPROGRESSLISTENER
-    NS_DECL_NSSECUREBROWSERUI
-
-
-    // nsIObserver
-    NS_DECL_NSIOBSERVER
-    NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI *actionURL);
-
-protected:
-
-	nsCOMPtr<nsIDOMWindow>              mWindow;
-    nsCOMPtr<nsIDOMElement>             mSecurityButton;
-	nsCOMPtr<nsIDocumentLoaderObserver> mOldWebShellObserver;
-    nsCOMPtr<nsIPref>                   mPref;
-    nsCOMPtr<nsIStringBundle>           mStringBundle;
-    
-    nsCOMPtr<nsIURI>                    mCurrentURI;
-
-	PRBool					mIsSecureDocument;  // is https loaded
-	PRBool					mIsDocumentBroken;  // 
-	PRBool					mMixContentAlertShown;
-    
-    PRBool                  mInitByLocationChange;
-
-    char*                   mLastPSMStatus;
-    
-
-    void GetBundleString(const nsString& name, nsString &outString);
-    nsresult LoadStringBundle();
-    
-    nsresult CheckProtocolContextSwitch( nsIURI* newURI, nsIURI* oldURI);
-    nsresult CheckMixedContext(nsIURI* nextURI);
-    nsresult CheckPost(nsIURI *actionURL, PRBool *okayToPost);
-    nsresult IsURLHTTPS(nsIURI* aURL, PRBool *value);
-};
-
-
-#endif /* nsSecureBrowserUIImpl_h_ */
-
-
-
-
-
-

mozilla/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/parser/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/parser/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/string/obsolete/nsStr.cpp

@@ -0,0 +1,717 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL. 
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+  
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the nsStr data structure.
+  This general purpose buffer management class is used as the basis for our strings.
+  It's benefits include:
+    1. An efficient set of library style functions for manipulating nsStrs
+    2. Support for 1 and 2 byte character strings (which can easily be increased to n)
+    3. Unicode awareness and interoperability.
+
+*******************************************************************************************/
+
+#include "nsStr.h"
+#include "bufferRoutines.h"
+#include "stdio.h"  //only used for printf
+#include "nsCRT.h"
+#include "nsDeque.h"
+
+ 
+//static const char* kCallFindChar =  "For better performance, call FindChar() for targets whose length==1.";
+//static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1.";
+
+static const PRUnichar gCommonEmptyBuffer[1] = {0};
+
+/**
+ * This method initializes all the members of the nsStr structure 
+ *
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,eCharSize aCharSize) {
+  aDest.mStr=(char*)gCommonEmptyBuffer;
+  aDest.mLength=0;
+  aDest.mCapacity=0;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=0;
+}
+
+/**
+ * This method initializes all the members of the nsStr structure
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer){
+  aDest.mStr=(aCString) ? aCString : (char*)gCommonEmptyBuffer;
+  aDest.mLength=aLength;
+  aDest.mCapacity=aCapacity;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=aOwnsBuffer;
+}
+
+
+/**
+ * This member destroys the memory buffer owned by an nsStr object (if it actually owns it)
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Destroy(nsStr& aDest) {
+  if((aDest.mStr) && (aDest.mStr!=(char*)gCommonEmptyBuffer)) {
+    Free(aDest);
+  }
+}
+
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents are not preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::EnsureCapacity(nsStr& aString,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aString.mCapacity) {
+    result=Realloc(aString,aNewLength);
+    if(aString.mStr)
+      AddNullTerminator(aString);
+  }
+  return result;
+}
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents ARE preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::GrowCapacity(nsStr& aDest,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aDest.mCapacity) {
+    nsStr theTempStr;
+    nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+    result=EnsureCapacity(theTempStr,aNewLength);
+    if(result) {
+      if(aDest.mLength) {
+        Append(theTempStr,aDest,0,aDest.mLength);        
+      } 
+      Free(aDest);
+      aDest.mStr = theTempStr.mStr;
+      theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+      aDest.mLength=theTempStr.mLength;
+      aDest.mCapacity=theTempStr.mCapacity;
+      aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+    }
+  }
+  return result;
+}
+
+/**
+ * Replaces the contents of aDest with aSource, up to aCount of chars.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed.
+ * @param   aSource is where chars are copied from
+ * @param   aCount is the number of chars copied from aSource
+ */
+void nsStr::Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(&aDest!=&aSource){
+    Truncate(aDest,0);
+    Append(aDest,aSource,anOffset,aCount);
+  }
+}
+
+/**
+ * This method appends the given nsStr to this one. Note that we have to 
+ * pay attention to the underlying char-size of both structs.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aSource is where char are copied from
+ * @aCount  is the number of bytes to be copied 
+ */
+void nsStr::Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(anOffset<aSource.mLength){
+    PRUint32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+    PRUint32 theLength=(anOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-anOffset);
+    if(0<theLength){
+      
+      PRBool isBigEnough=PR_TRUE;
+      if(aDest.mLength+theLength > aDest.mCapacity) {
+        isBigEnough=GrowCapacity(aDest,aDest.mLength+theLength);
+      }
+
+      if(isBigEnough) {
+        //now append new chars, starting at offset
+        (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDest.mLength,aSource.mStr,anOffset,theLength);
+
+        aDest.mLength+=theLength;
+        AddNullTerminator(aDest);
+      }
+    }
+  }
+}
+
+
+/**
+ * This method inserts up to "aCount" chars from a source nsStr into a dest nsStr.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed
+ * @param   aDestOffset is where in aDest the insertion is to occur
+ * @param   aSource is where chars are copied from
+ * @param   aSrcOffset is where in aSource chars are copied from
+ * @param   aCount is the number of chars from aSource to be inserted into aDest
+ */
+void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount){
+  //there are a few cases for insert:
+  //  1. You're inserting chars into an empty string (assign)
+  //  2. You're inserting onto the end of a string (append)
+  //  3. You're inserting onto the 1..n-1 pos of a string (the hard case).
+  if(0<aSource.mLength){
+    if(aDest.mLength){
+      if(aDestOffset<aDest.mLength){
+        PRInt32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+        PRInt32 theLength=(aSrcOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-aSrcOffset);
+
+        if(aSrcOffset<aSource.mLength) {
+            //here's the only new case we have to handle. 
+            //chars are really being inserted into our buffer...
+
+          if(aDest.mLength+theLength > aDest.mCapacity) {
+            nsStr theTempStr;
+            nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+            PRBool isBigEnough=EnsureCapacity(theTempStr,aDest.mLength+theLength);  //grow the temp buffer to the right size
+
+            if(isBigEnough) {
+              if(aDestOffset) {
+                Append(theTempStr,aDest,0,aDestOffset); //first copy leftmost data...
+              } 
+              
+              Append(theTempStr,aSource,0,aSource.mLength); //next copy inserted (new) data
+            
+              PRUint32 theRemains=aDest.mLength-aDestOffset;
+              if(theRemains) {
+                Append(theTempStr,aDest,aDestOffset,theRemains); //next copy rightmost data
+              }
+
+              Free(aDest);
+              aDest.mStr = theTempStr.mStr;
+              theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+              aDest.mCapacity=theTempStr.mCapacity;
+              aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+            }
+
+          }
+
+          else {
+              //shift the chars right by theDelta...
+            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      
+            //now insert new chars, starting at offset
+            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+          }
+
+            //finally, make sure to update the string length...
+          aDest.mLength+=theLength;
+          AddNullTerminator(aDest);
+
+        }//if
+        //else nothing to do!
+      }
+      else Append(aDest,aSource,0,aCount);
+    }
+    else Append(aDest,aSource,0,aCount);
+  }
+}
+
+
+/**
+ * This method deletes up to aCount chars from aDest
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aDestOffset is where in aDest deletion is to occur
+ * @param   aCount is the number of chars to be deleted in aDest
+ */
+void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
+  if(aDestOffset<aDest.mLength){
+
+    PRUint32 theDelta=aDest.mLength-aDestOffset;
+    PRUint32 theLength=(theDelta<aCount) ? theDelta : aCount;
+
+    if(aDestOffset+theLength<aDest.mLength) {
+
+      //if you're here, it means we're cutting chars out of the middle of the string...
+      //so shift the chars left by theLength...
+      (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      aDest.mLength-=theLength;
+      AddNullTerminator(aDest);
+    }
+    else Truncate(aDest,aDestOffset);
+  }//if
+}
+
+/**
+ * This method truncates the given nsStr at given offset
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be truncated
+ * @param   aDestOffset is where in aDest truncation is to occur
+ */
+void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
+  if(aDestOffset<aDest.mLength){
+    aDest.mLength=aDestOffset;
+    AddNullTerminator(aDest);
+  }
+}
+
+
+/**
+ * This method forces the given string to upper or lowercase
+ * @update	gess1/7/99
+ * @param   aDest is the string you're going to change
+ * @param   aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
+ * @return
+ */
+void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
+  gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+
+  if((aDest.mLength>0) && aSet){
+    PRInt32 theIndex=-1;
+    PRInt32 theMax=aDest.mLength;
+    PRInt32 theSetLen=nsCRT::strlen(aSet);
+
+    if(aEliminateLeading) {
+      while(++theIndex<=theMax) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound==thePos)
+          break;
+      }
+      if(0<theIndex) {
+        if(theIndex<theMax) {
+          Delete(aDest,0,theIndex);
+        }
+        else Truncate(aDest,0);
+      }
+    }
+
+    if(aEliminateTrailing) {
+      theIndex=aDest.mLength;
+      PRInt32 theNewLen=theIndex;
+      while(--theIndex>0) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);  //read at end now...
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound<thePos) 
+          theNewLen=theIndex;
+        else break;
+      }
+      if(theNewLen<theMax) {
+        Truncate(aDest,theNewLen);
+      }
+    }
+
+  }
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+  Trim(aDest,aSet,aEliminateLeading,aEliminateTrailing);
+  PRUint32 aNewLen=gCompressChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+  aDest.mLength=aNewLen;
+}
+
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::StripChars(nsStr& aDest,const char* aSet){
+  if((0<aDest.mLength) && (aSet)) {
+    PRUint32 aNewLen=gStripChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+    aDest.mLength=aNewLen;
+  }
+}
+
+
+  /**************************************************************
+    Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  // NS_PRECONDITION(aTarget.mLength!=1,kCallFindChar);
+
+  PRInt32 result=kNotFound;
+  
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 theMax=aDest.mLength-aTarget.mLength;
+    PRInt32 index=(0<=anOffset) ? anOffset : 0;
+    
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+      PRInt32 theTargetMax=aTarget.mLength;
+      while(index<=theMax) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_TRUE;
+        while((++theSubIndex<theTargetMax) && (matches)){
+          PRUnichar theChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+          PRUnichar theTargetChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aTarget,theSubIndex)) : GetCharAt(aTarget,theSubIndex);
+          matches=PRBool(theChar==theTargetChar);
+        }
+        if(matches) { 
+          result=index;
+          break;
+        }
+        index++;
+      } //while
+    }//if
+  }//if
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? (PRUint32)anOffset : 0;
+    result=gFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset-1 : -1;
+  PRInt32 thePos;
+
+    //Note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if((0<aDest.mLength) && (0<aSet.mLength)){
+    while(++index<(PRInt32)aDest.mLength) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+  /**************************************************************
+    Reverse Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest (in reverse) for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search (counting from left)
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aTarget.mLength!=1,kCallRFindChar);
+
+  PRInt32 result=kNotFound;
+
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+
+      nsStr theCopy;
+      nsStr::Initialize(theCopy,eOneByte);
+      nsStr::Assign(theCopy,aTarget,0,aTarget.mLength);
+      if(aIgnoreCase){
+        nsStr::ChangeCase(theCopy,PR_FALSE); //force to lowercase
+      }
+    
+      PRInt32   theTargetMax=theCopy.mLength;
+      while(index>=0) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_FALSE;
+        if(index+theCopy.mLength<=aDest.mLength) {
+          matches=PR_TRUE;
+          while((++theSubIndex<theTargetMax) && (matches)){
+            PRUnichar theDestChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+            PRUnichar theTargetChar=GetCharAt(theCopy,theSubIndex);
+            matches=PRBool(theDestChar==theTargetChar);
+          } //while
+        } //if
+        if(matches) {
+          result=index;
+          break;
+        }
+        index--;
+      } //while
+      nsStr::Destroy(theCopy);
+    }//if
+  }//if
+  return result;
+}
+ 
+
+/**
+ *  This searches aDest (in reverse) for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+    result=gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+/**
+ *  This searches aDest (in reverese) for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallRFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength;
+  PRInt32 thePos;
+
+    //note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if(0<aDest.mLength) {
+    while(--index>=0) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+
+/**
+ * Compare source and dest strings, up to an (optional max) number of chars
+ * @param   aDest is the first str to compare
+ * @param   aSource is the second str to compare
+ * @param   aCount -- if (-1), then we use length of longer string; if (0<aCount) then it gives the max # of chars to compare
+ * @param   aIgnorecase tells us whether to search with case sensitivity
+ * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
+ */
+PRInt32 nsStr::Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  PRInt32 result=0;
+
+  if(aCount) {
+    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
+
+    if(0==minlen) {
+      if ((aDest.mLength == 0) && (aSource.mLength == 0))
+        return 0;
+      if (aDest.mLength == 0)
+        return -1;
+      return 1;
+    }
+
+    PRInt32 maxlen=(aSource.mLength<aDest.mLength) ? aDest.mLength : aSource.mLength;
+    aCount = (aCount<0) ? maxlen : MinInt(aCount,maxlen);
+    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,aCount,aIgnoreCase);
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+PRBool nsStr::Alloc(nsStr& aDest,PRUint32 aCount) {
+
+  static int mAllocCount=0;
+  mAllocCount++;
+
+  //we're given the acount value in charunits; now scale up to next multiple.
+  PRUint32	theNewCapacity=kDefaultStringSize;
+  while(theNewCapacity<aCount){ 
+		theNewCapacity<<=1;
+  }
+
+  aDest.mCapacity=theNewCapacity++;
+  PRUint32 theSize=(theNewCapacity<<aDest.mCharSize);
+  aDest.mStr = (char*)nsAllocator::Alloc(theSize);
+
+  PRBool result=PR_FALSE;
+  if(aDest.mStr) {
+    aDest.mOwnsBuffer=1;
+    result=PR_TRUE;
+  }
+  return result;
+}
+
+PRBool nsStr::Free(nsStr& aDest){
+  if(aDest.mStr){
+    if(aDest.mOwnsBuffer){
+      nsAllocator::Free(aDest.mStr);
+    }
+    aDest.mStr=0;
+    aDest.mOwnsBuffer=0;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){
+
+  nsStr temp;
+  memcpy(&temp,&aDest,sizeof(aDest));
+
+  PRBool result=Alloc(temp,aCount);
+  if(result) {
+    Free(aDest);
+    aDest.mStr=temp.mStr;
+    aDest.mCapacity=temp.mCapacity;
+    aDest.mOwnsBuffer=temp.mOwnsBuffer;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+CBufDescriptor::CBufDescriptor(char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_FALSE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_TRUE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+
+CBufDescriptor::CBufDescriptor(PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_FALSE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_TRUE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+//----------------------------------------------------------------------------------------
+
+

mozilla/string/obsolete/nsStr.h

@@ -0,0 +1,450 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+    1. There are two philosophies to building string classes:
+        A. Hide the underlying buffer & offer API's allow indirect iteration
+        B. Reveal underlying buffer, risk corruption, but gain performance
+        
+       We chose the option B for performance reasons. 
+
+    2  Our internal buffer always holds capacity+1 bytes.
+
+    The nsStr struct is a simple structure (no methods) that contains
+    the necessary info to be described as a string. This simple struct
+    is manipulated by the static methods provided in this class. 
+    (Which effectively makes this a library that works on structs).
+
+    There are also object-based versions called nsString and nsAutoString
+    which use nsStr but makes it look at feel like an object. 
+
+ ***********************************************************************/
+
+/***********************************************************************
+  ASSUMPTIONS:
+
+    1. nsStrings and nsAutoString are always null terminated. 
+    2. If you try to set a null char (via SetChar()) a new length is set
+    3. nsCStrings can be upsampled into nsString without data loss
+    4. Char searching is faster than string searching. Use char interfaces
+       if your needs will allow it.
+    5. It's easy to use the stack for nsAutostring buffer storage (fast too!).
+       See the CBufDescriptor class in this file.
+    6. It's ONLY ok to provide non-null-terminated buffers to Append() and Insert()
+       provided you specify a 0<n value for the optional count argument.
+    7. Downsampling from nsString to nsCString is lossy -- avoid it if possible!
+    8. Calls to ToNewCString() and ToNewUnicode() should be matched with calls to Recycle().
+
+ ***********************************************************************/
+
+
+/**********************************************************************************
+  
+ AND NOW FOR SOME GENERAL DOCUMENTATION ON STRING USAGE...
+
+    The fundamental datatype in the string library is nsStr. It's a structure that
+    provides the buffer storage and meta-info. It also provides a C-style library
+    of functions for direct manipulation (for those of you who prefer K&R to Bjarne). 
+
+    Here's a diagram of the class hierarchy: 
+
+      nsStr
+        |___nsString
+        |      |
+        |      ------nsAutoString
+        |
+        |___nsCString
+               |
+               ------nsCAutoString
+
+    Why so many string classes? The 4 variants give you the control you need to 
+    determine the best class for your purpose. There are 2 dimensions to this 
+    flexibility: 1) stack vs. heap; and 2) 1-byte chars vs. 2-byte chars.
+
+    Note: While nsAutoString and nsCAutoString begin life using stack-based storage,
+          they may not stay that way. Like all nsString classes, autostrings will
+          automatically grow to contain the data you provide. When autostrings
+          grow beyond their intrinsic buffer, they switch to heap based allocations.
+          (We avoid alloca to avoid considerable platform difficulties; see the 
+           GNU documentation for more details).
+
+    I should also briefly mention that all the string classes use a "memory agent" 
+    object to perform memory operations. This class proxies the standard nsAllocator
+    for actual memory calls, but knows the structure of nsStr making heap operations
+    more localized.
+    
+
+  CHOOSING A STRING CLASS:
+
+    In order to choose a string class for you purpose, use this handy table:
+
+                        heap-based    stack-based
+                    -----------------------------------
+        ascii data  |   nsCString     nsCAutoString   |
+                    |----------------------------------
+      unicode data  |    nsString      nsAutoString   |
+                    ----------------------------------- 
+    
+  
+    Note: The i18n folks will stenuously object if we get too carried away with the
+          use of nsCString's that pass interface boundaries. Try to limit your
+          use of these to external interfaces that demand them, or for your own
+          private purposes in cases where they'll never be seen by humans. 
+
+    
+  PERFORMANCE CONSIDERATIONS:
+
+    Here are a few tricks to know in order to get better string performance: 
+    
+      1) Try to limit conversions between ascii and unicode; By sticking with nsString
+         wherever possible your code will be i18n-compliant.
+
+
+      2) Preallocating your string buffer cuts down trips to the allocator. So if you
+         have need for an arbitrarily large buffer, pre-size it like this:
+
+         {
+           nsString mBuffer;
+           mBuffer.SetCapacity(aReasonableSize);
+         }
+
+      3) Allocating nsAutoString or nsCAutoString on the heap is memory inefficient
+         (after all, the whole point is to avoid a heap allocation of the buffer).
+
+
+      4) Consider using an autoString to write into your arbitrarily-sized stack buffers, rather
+         than it's own buffers.
+
+         For example, let's say you're going to call printf() to emit pretty-printed debug output 
+         of your object. You know from experience that the pretty-printed version of your object 
+         exceeds the capacity of an autostring. Ignoring memory considerations, you could simply 
+         use nsCString, appending the stringized version of each of your class's data members. 
+         This will probably result in calls to the heap manager. 
+
+         But there's a way to do this without necessarily having to call the heap manager.
+         All you do is declare a stack based buffer and instruct nsCString to use that instead 
+         of it's own internal buffer by using the CBufDescriptor class:
+         
+         {
+           char theBuffer[256];
+           CBufDescritor theBufDecriptor( theBuffer, PR_TRUE, sizeof(theBuffer), 0);
+           nsCAutoString s3( theBufDescriptor );
+           s3="HELLO, my name is inigo montoya, you killed my father, prepare to die!.";
+         }
+
+         The assignment statment to s3 will cause the given string to be written to your
+         stack-based buffer via the normal nsString/nsCString interfaces. Cool, huh?  
+         Note however that just like any other nsStringXXX use, if you write more data 
+         than will fit in the buffer, a visit to the heap manager will be in order. 
+     
+
+ **********************************************************************************/
+
+
+#ifndef _nsStr
+#define _nsStr
+
+#include "nscore.h"
+#include "nsIAllocator.h"
+#include <string.h>
+
+//----------------------------------------------------------------------------------------
+
+enum  eCharSize {eOneByte=0,eTwoByte=1};
+#define kDefaultCharSize eTwoByte
+#define kRadix10        (10)
+#define kRadix16        (16)
+#define kAutoDetect     (100)
+#define kRadixUnknown   (kAutoDetect+1)
+const   PRInt32 kDefaultStringSize = 64;
+const   PRInt32 kNotFound = -1;
+
+
+//----------------------------------------------------------------------------------------
+
+class NS_COM CBufDescriptor {
+public:
+  CBufDescriptor(char* aString,           PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const char* aString,     PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(PRUnichar* aString,      PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+
+  char*     mBuffer;
+  eCharSize mCharSize;
+  PRUint32  mCapacity;
+  PRInt32   mLength;
+  PRBool    mStackBased;
+  PRBool    mIsConst;
+};
+
+//----------------------------------------------------------------------------------------
+
+
+struct NS_COM nsStr {  
+
+//----------------------------------------------------------------------------------------
+
+  nsStr() {
+    MOZ_COUNT_CTOR(nsStr);
+  }
+
+  ~nsStr() {
+    MOZ_COUNT_DTOR(nsStr);
+  }
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,eCharSize aCharSize);
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer);
+
+ /**
+  * This method destroys the given nsStr, and *MAY* 
+  * deallocate it's memory depending on the setting
+  * of the internal mOwnsBUffer flag.
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used to the nsStr
+  */
+  static void Destroy(nsStr& aDest); 
+
+ /**
+  * These methods are where memory allocation/reallocation occur. 
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used on the nsStr
+  * @return  
+  */
+  static PRBool EnsureCapacity(nsStr& aString,PRUint32 aNewLength);
+  static PRBool GrowCapacity(nsStr& aString,PRUint32 aNewLength);
+
+ /**
+  * These methods are used to append content to the given nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to assign contents of a source string to dest string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to insert content from source string to the dest nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to insert
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount);
+
+ /**
+  * This method deletes chars from the given str. 
+  * The given allocator may choose to resize the str as well.
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be deleted from
+  * @param  aDestOffset tells us where in dest to start deleting
+  * @param  aCount tells us the (max) # of chars to delete
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount);
+
+ /**
+  * This method is used to truncate the given string.
+  * The given allocator may choose to resize the str as well (but it's not likely).
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Truncate(nsStr& aDest,PRUint32 aDestOffset);
+
+ /**
+  * This method is used to perform a case conversion on the given string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be case shifted
+  * @param  toUpper tells us to go upper vs. lower
+  */
+  static void ChangeCase(nsStr& aDest,PRBool aToUpper);
+
+
+  /**
+   * This method trims chars (given in aSet) from the edges of given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to remove from given buffer
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+  
+  /**
+   * This method compresses duplicate runs of a given char from the given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+
+  /**
+   * This method removes all occurances of chars in given set from aDest 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void StripChars(nsStr& aDest,const char* aSet);
+
+  /**
+   * This method compares the data bewteen two nsStr's 
+   *
+   * @update	gess 01/04/99
+   * @param   aStr1 is the first buffer to be compared
+   * @param   aStr2 is the 2nd buffer to be compared
+   * @param   aCount is the number of chars to compare
+   * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+   * @return  -1,0,1 depending on <,==,>
+   */
+  static PRInt32  Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
+
+ /**
+  * These methods scan the given string for 1 or more chars in a given direction
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be searched to
+  * @param  aSource (or aChar) is the substr we're looking to find
+  * @param  aIgnoreCase tells us whether to search in a case-sensitive manner
+  * @param  anOffset tells us where in the dest string to start searching
+  * @return the index of the source (substr) in dest, or -1 (kNotFound) if not found.
+  */
+  static PRInt32 FindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+  static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+
+  PRUint32        mLength;
+  PRUint32        mCapacity;
+  eCharSize       mCharSize;
+  PRBool          mOwnsBuffer;
+
+  union { 
+    char*         mStr;
+    PRUnichar*    mUStr;
+  };
+
+private:
+  static PRBool Alloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Realloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Free(nsStr& aString);
+
+};
+
+/**************************************************************
+  A couple of tiny helper methods used in the string classes.
+ **************************************************************/
+
+inline PRInt32 MinInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt1 : anInt2;
+}
+
+inline PRInt32 MaxInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt2 : anInt1;
+}
+
+inline void AddNullTerminator(nsStr& aDest) {
+  if(eTwoByte==aDest.mCharSize) 
+    aDest.mUStr[aDest.mLength]=0;
+  else aDest.mStr[aDest.mLength]=0;
+}
+
+/**
+ * Return the given buffer to the heap manager. Calls allocator::Free()
+ * @return string length
+ */
+inline void Recycle( char* aBuffer) { nsAllocator::Free(aBuffer); }
+inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
+
+/**
+* This method is used to access a given char in the given string
+*
+* @update	gess 01/04/99
+* @param  aDest is the nsStr to be appended to
+* @param  anIndex tells us where in dest to get the char from
+* @return the given char, or 0 if anIndex is out of range
+*/
+inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
+  if(anIndex<aDest.mLength)  {
+    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
+  }//if
+  return 0;
+}
+
+
+#endif
+

mozilla/string/obsolete/nsString.h

@@ -0,0 +1,747 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsCString_
+#define _nsCString_
+
+#include "nsString2.h"
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsStr.h"
+#include "nsIAtom.h"
+
+
+class NS_COM nsSubsumeCStr;
+
+class NS_COM nsCString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsCString();
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsCString(const char* aCString,PRInt32 aLength=-1);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsCString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsCString(nsSubsumeCStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsCString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string capacity
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Accessor methods...
+   *********************************************************************/
+
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String creation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new string
+   */
+  nsSubsumeCStr operator+(const nsCString& aString);
+
+  /**
+   * create a new string by adding this to the given char*.
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(const char* aCString);
+
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(PRUnichar aChar);
+  nsSubsumeCStr operator+(char aChar);
+
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsCString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsCString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsCString& StripChars(const char* aSet);
+  nsCString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsCString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
+  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+      operator char*() {return mStr;}
+      operator const char*() const {return (const char*)mStr;}
+
+  /**
+   * This method constructs a new nsCString that is a clone
+   * of this string.
+   * 
+   */
+  nsCString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsCString& Assign(PRUnichar aChar);
+  nsCString& Assign(char aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsCString& operator=(const nsCString& aString) {return Assign(aString);}
+  nsCString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsCString& operator=(char aChar) {return Assign(aChar);}
+  nsCString& operator=(const char* aCString) {return Assign(aCString);}
+  nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsCString& operator=(const nsSubsumeCStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsCString& operator=(nsSubsumeCStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
+  nsCString& operator+=(const char* aCString) {return Append(aCString);}
+  nsCString& operator+=(PRUnichar aChar){return Append(aChar);}
+  nsCString& operator+=(char aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString,PRInt32 aCount);
+  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Append(const char* aString,PRInt32 aCount=-1);
+  nsCString& Append(PRUnichar aChar);
+  nsCString& Append(char aChar);
+  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsCString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset);
+  nsCString& Insert(char aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   * @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char* aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars in given string you want to compare
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  PRBool  EqualsIgnoreCase(const nsStr& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
+
+
+  static  void        Recycle(nsCString* aString);
+  static  nsCString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsCString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsCString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsCAutoString : public nsCString {
+public: 
+
+    nsCAutoString();
+    nsCAutoString(const char* aString,PRInt32 aLength=-1);
+    nsCAutoString(const CBufDescriptor& aBuffer);
+    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+    nsCAutoString(const nsStr& aString);
+    nsCAutoString(const nsCAutoString& aString);
+
+#ifdef AIX
+    nsCAutoString(const nsSubsumeCStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsCAutoString(nsSubsumeCStr& aSubsumeStr);
+#endif // AIX
+    nsCAutoString(PRUnichar aChar);
+    virtual ~nsCAutoString();
+
+    nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
+    nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
+    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
+    nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize];
+};
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeCStr : public nsCString {
+public:
+  nsSubsumeCStr(nsStr& aString);
+  nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+
+};
+
+
+#endif
+
+

mozilla/string/obsolete/nsString2.h

@@ -0,0 +1,840 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsString_
+#define _nsString_
+
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsString.h"
+#include "nsIAtom.h"
+#include "nsStr.h"
+#include "nsCRT.h"
+
+class nsISizeOfHandler;
+
+
+#define nsString2     nsString
+#define nsAutoString2 nsAutoString
+
+
+class NS_COM nsSubsumeStr;
+class NS_COM nsString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsString();
+
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsString(const char* aCString);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsString(const PRUnichar* aString);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsString
+   */
+  nsString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsString
+   */
+  nsString(const nsString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsString(nsSubsumeStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string length
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in store as 1 or 2 byte (unicode) strings.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsUnicode(void) const {
+    PRBool result=PRBool(mCharSize==eTwoByte);
+    return result;
+  }
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Getters/Setters...
+   *********************************************************************/
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+  const PRUnichar* GetUnicode(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+   /**
+     * Set nth character.
+     */
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String concatenation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new subsumable string
+   */
+  nsSubsumeStr operator+(const nsStr& aString);
+  nsSubsumeStr operator+(const nsString& aString);
+
+  /**
+   * create a new string by adding this to the given cstring
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const char* aCString);
+
+  /**
+   * create a new string by adding this to the given prunichar*.
+   * @param   aString is a ptr to UC-string to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const PRUnichar* aString);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(char aChar);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a unichar to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(PRUnichar aChar);
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsString& StripChars(const char* aSet);
+  nsString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
+  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+  /**
+   * This method constructs a new nsString is a clone of this string.
+   * 
+   */
+  nsString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates an UTF8 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewUTF8String() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Assign(char aChar);
+  nsString& Assign(PRUnichar aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsString& operator=(const nsString& aString) {return Assign(aString);}
+  nsString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsString& operator=(char aChar) {return Assign(aChar);}
+  nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsString& operator=(const char* aCString) {return Assign(aCString);}
+  nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsString& operator=(const nsSubsumeStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsString& operator=(nsSubsumeStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const char* aCString) {return Append(aCString);}
+  //nsString& operator+=(char aChar){return Append(aChar);}
+  nsString& operator+=(const PRUnichar* aUCString) {return Append(aUCString);}
+  nsString& operator+=(PRUnichar aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
+  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString,PRInt32 aCount);
+  nsString& Append(const nsString& aString,PRInt32 aCount);
+  nsString& Append(const char* aString,PRInt32 aCount=-1);
+  nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Append(char aChar);
+  nsString& Append(PRUnichar aChar);
+  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  //nsString& Insert(char aChar,PRUint32 anOffset);
+  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 Find(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 RFind(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsString &aString) const;
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char *aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsString &aString) const;
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsString &aString) const;
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsString &aString) const;
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsString &aString) const;
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsString &aString) const;
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars to be compared.
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const;   
+  PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
+
+  PRBool  EqualsIgnoreCase(const nsString& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
+
+  /**
+   *  Determine if given buffer is plain ascii
+   *  
+   *  @param   aBuffer -- if null, then we test *this, otherwise we test given buffer
+   *  @return  TRUE if is all ascii chars or if strlen==0
+   */
+  PRBool IsASCII(const PRUnichar* aBuffer=0);
+
+
+  /**
+   *  Determine if given char is a valid space character
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if is valid space char
+   */
+  static  PRBool IsSpace(PRUnichar ch);
+
+  /**
+   *  Determine if given char in valid alpha range
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if in alpha range
+   */
+  static  PRBool IsAlpha(PRUnichar ch);
+
+  /**
+   *  Determine if given char is valid digit
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if char is a valid digit
+   */
+  static  PRBool IsDigit(PRUnichar ch);
+
+  static  void        Recycle(nsString* aString);
+  static  nsString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsAutoString : public nsString {
+public: 
+
+    nsAutoString();
+    nsAutoString(const char* aCString,PRInt32 aLength=-1);
+    nsAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+    nsAutoString(const CBufDescriptor& aBuffer);    
+    nsAutoString(const nsStr& aString);
+    nsAutoString(const nsAutoString& aString);
+#ifdef AIX
+    nsAutoString(const nsSubsumeStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsAutoString(nsSubsumeStr& aSubsumeStr);
+#endif // AIX
+    nsAutoString(PRUnichar aChar);
+    virtual ~nsAutoString();
+
+    nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
+    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
+    nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
+    nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize<<eTwoByte];
+};
+
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeStr : public nsString {
+public:
+  nsSubsumeStr(nsStr& aString);
+  nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+};
+
+
+
+#endif
+
+

mozilla/string/obsolete/nsXPIDLString.cpp

@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDebug.h"
+#include "nsIAllocator.h"
+#include "nsXPIDLString.h"
+#include "plstr.h"
+
+// If the allocator changes, fix it here.
+#define XPIDL_STRING_ALLOC(__len)  ((PRUnichar*) nsAllocator::Alloc((__len) * sizeof(PRUnichar)))
+#define XPIDL_CSTRING_ALLOC(__len) ((char*) nsAllocator::Alloc((__len) * sizeof(char)))
+#define XPIDL_FREE(__ptr)          (nsAllocator::Free(__ptr))
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+
+nsXPIDLString::nsXPIDLString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLString::~nsXPIDLString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLString::operator const PRUnichar*()
+{
+    return mBuf;
+}
+
+
+PRUnichar*
+nsXPIDLString::Copy(const PRUnichar* aString)
+{
+    NS_ASSERTION(aString, "null ptr");
+    if (! aString)
+        return 0;
+
+    PRInt32 len = 0;
+
+    {
+        const PRUnichar* p = aString;
+        while (*p++)
+            len++;
+    }
+
+    PRUnichar* result = XPIDL_STRING_ALLOC(len + 1);
+    if (result) {
+        PRUnichar* q = result;
+        while (*aString) {
+            *q = *aString;
+            q++;
+            aString++;
+        }
+        *q = '\0';
+    }
+    return result;
+}
+
+
+PRUnichar**
+nsXPIDLString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const PRUnichar**
+nsXPIDLString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const PRUnichar**) &mBuf;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+
+nsXPIDLCString::nsXPIDLCString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLCString::~nsXPIDLCString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+	
+    mBuf = Copy(aCString);
+    mBufOwner = PR_TRUE;
+    
+    return *this;
+}
+
+
+nsXPIDLCString::operator const char*()
+{
+    return mBuf;
+}
+
+
+char*
+nsXPIDLCString::Copy(const char* aCString)
+{
+    NS_ASSERTION(aCString, "null ptr");
+    if (! aCString)
+        return 0;
+
+    PRInt32 len = PL_strlen(aCString);
+    char* result = XPIDL_CSTRING_ALLOC(len + 1);
+    if (result)
+        PL_strcpy(result, aCString);
+
+    return result;
+}
+
+
+char**
+nsXPIDLCString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const char**
+nsXPIDLCString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const char**) &mBuf;
+}
+
+

mozilla/string/obsolete/nsXPIDLString.h

@@ -0,0 +1,302 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  A set of string wrapper classes that ease transition to use of XPIDL
+  interfaces. nsXPIDLString and nsXPIDLCString are to XPIDL `wstring'
+  and `string' out params as nsCOMPtr is to generic XPCOM interface
+  pointers. They help you deal with object ownership.
+
+  Consider the following interface:
+
+    interface nsIFoo {
+      attribute string Bar;
+    };
+
+  This will generate the following C++ header file:
+
+    class nsIFoo {
+      NS_IMETHOD SetBar(const PRUnichar* aValue);
+      NS_IMETHOD GetBar(PRUnichar* *aValue);
+    };
+
+  The GetBar() method will allocate a copy of the nsIFoo object's
+  "bar" attribute, and leave you to deal with freeing it:
+
+    nsIFoo* aFoo; // assume we get this somehow
+    PRUnichar* bar;
+    aFoo->GetFoo(&bar);
+    // Use bar here...
+    printf("bar is %s!\n", bar);
+    nsAllocator::Free(bar);
+
+  This makes your life harder, because you need to convolute your code
+  to ensure that you don't leak `bar'.
+
+  Enter nsXPIDLString, which manages the ownership of the allocated
+  string, and automatically destroys it when the nsXPIDLString goes
+  out of scope:
+
+    nsIFoo* aFoo;
+    nsXPIDLString bar;
+    aFoo->GetFoo( getter_Copies(bar) );
+    // Use bar here...
+    printf("bar is %s!\n", (const char*) bar);
+    // no need to remember to nsAllocator::Free().
+
+  Like nsCOMPtr, nsXPIDLString uses some syntactic sugar to make it
+  painfully clear exactly what the code expects. You need to wrap an
+  nsXPIDLString object with either `getter_Copies()' or
+  `getter_Shares()' before passing it to a getter: these tell the
+  nsXPIDLString how ownership is being handled.
+
+  In the case of `getter_Copies()', the callee is allocating a copy
+  (which is usually the case). In the case of `getter_Shares()', the
+  callee is returning a const reference to `the real deal' (this can
+  be done using the [shared] attribute in XPIDL).
+
+ */
+
+#ifndef nsXPIDLString_h__
+#define nsXPIDLString_h__
+
+#include "nsCom.h"
+#include "prtypes.h"
+
+#ifndef __PRUNICHAR__
+#define __PRUNICHAR__
+typedef PRUint16 PRUnichar;
+#endif /* __PRUNICHAR__ */
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |PRUnichar*| interface for |wstring| parameters in
+//   XPIDL interfaces.
+//
+
+class NS_COM nsXPIDLString {
+private:
+    PRUnichar* mBuf;
+    PRBool     mBufOwner;
+
+    PRUnichar** StartAssignmentByValue();
+    const PRUnichar** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a Unicode string.
+     */
+    nsXPIDLString();
+
+    virtual ~nsXPIDLString();
+
+    /**
+     * Return a reference to the immutable Unicode string.
+     */
+    operator const PRUnichar*();
+
+    /**
+     * Make a copy of the Unicode string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static PRUnichar* Copy(const PRUnichar* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator PRUnichar**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const PRUnichar**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLString(nsXPIDLString& /* aXPIDLString */) {}
+    nsXPIDLString& operator =(nsXPIDLString& /* aXPIDLString */) { return *this; }
+};
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLString::GetterCopies
+getter_Copies(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterCopies(aXPIDLString);
+}
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLString::GetterShares
+getter_Shares(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterShares(aXPIDLString);
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |char*| interface for |string| parameters in XPIDL
+//   interfaces.
+//
+
+class NS_COM nsXPIDLCString {
+private:
+    char*  mBuf;
+    PRBool mBufOwner;
+
+    char** StartAssignmentByValue();
+    const char** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a single-byte string.
+     */
+    nsXPIDLCString();
+
+    virtual ~nsXPIDLCString();
+
+	/**
+	 * Assign a single-byte string to this wrapper. Copies and owns the result.
+	 */
+	nsXPIDLCString& operator =(const char* aString);
+
+    /**
+     * Return a reference to the immutable single-byte string.
+     */
+    operator const char*();
+
+    /**
+     * Make a copy of the single-byte string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static char* Copy(const char* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator char**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const char**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLCString(nsXPIDLCString& /* aXPIDLString */) {}
+    nsXPIDLCString& operator =(nsXPIDLCString& /* aXPIDLCString */) { return *this; }
+};
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLCString::GetterCopies
+getter_Copies(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterCopies(aXPIDLString);
+}
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLCString::GetterShares
+getter_Shares(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterShares(aXPIDLString);
+}
+
+
+
+#endif // nsXPIDLString_h__

mozilla/xpcom/ds/MANIFEST

@@ -0,0 +1,30 @@
+nsAVLTree.h
+nsCppSharedAllocator.h
+nsCRT.h
+nsDeque.h
+nsEnumeratorUtils.h
+nsHashtable.h
+nsHashtableEnumerator.h
+nsIArena.h
+nsIBuffer.h
+nsIByteBuffer.h
+nsIObserverList.h
+nsIPageManager.h
+nsIProperties.h
+nsISimpleEnumerator.h
+nsISizeOfHandler.h
+nsIUnicharBuffer.h
+nsIVariant.h
+nsInt64.h
+nsQuickSort.h
+nsStr.h
+nsString.h
+nsString2.h
+nsSupportsPrimitives.h
+nsTime.h
+nsUnitConversion.h
+nsVector.h
+nsVoidArray.h
+nsXPIDLString.h
+plvector.h
+nsTextFormater.h

mozilla/xpcom/ds/MANIFEST_IDL

@@ -0,0 +1,6 @@
+nsIAtom.idl
+nsICollection.idl
+nsIEnumerator.idl
+nsIObserver.idl
+nsIObserverService.idl
+nsISupportsArray.idl

mozilla/xpcom/ds/Makefile.in

@@ -0,0 +1,113 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_ds
+LIBRARY_NAME	= xpcomds_s
+
+REQUIRES	= xpcom uconv unicharutil
+
+CPPSRCS		= \
+		nsArena.cpp \
+		nsAtomTable.cpp \
+		nsAVLTree.cpp \
+		nsByteBuffer.cpp \
+		nsCRT.cpp \
+		nsConjoiningEnumerator.cpp \
+		nsDeque.cpp \
+		nsEmptyEnumerator.cpp \
+		nsEnumeratorUtils.cpp \
+		nsHashtable.cpp \
+		nsHashtableEnumerator.cpp \
+		nsObserver.cpp \
+		nsObserverList.cpp \
+		nsObserverService.cpp \
+		nsProperties.cpp \
+		nsQuickSort.cpp \
+		nsSizeOfHandler.cpp \
+		nsStr.cpp \
+		nsString.cpp \
+		nsString2.cpp \
+		nsSupportsArray.cpp \
+		nsSupportsArrayEnumerator.cpp \
+		nsSupportsPrimitives.cpp \
+		nsUnicharBuffer.cpp \
+		nsVariant.cpp \
+		nsVoidArray.cpp \
+		nsXPIDLString.cpp \
+		plvector.cpp \
+		nsTextFormater.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsAVLTree.h \
+		nsCppSharedAllocator.h \
+		nsCRT.h \
+		nsDeque.h \
+		nsEnumeratorUtils.h \
+		nsHashtable.h \
+		nsHashtableEnumerator.h \
+		nsIArena.h \
+		nsIByteBuffer.h \
+		nsIObserverList.h \
+		nsIProperties.h \
+		nsISimpleEnumerator.h \
+		nsISizeOfHandler.h \
+		nsIUnicharBuffer.h \
+		nsIVariant.h \
+		nsInt64.h \
+		nsQuickSort.h \
+		nsStr.h \
+		nsString.h \
+		nsString2.h \
+		nsSupportsPrimitives.h \
+		nsTime.h \
+		nsUnitConversion.h \
+		nsVector.h \
+		nsVoidArray.h \
+		nsXPIDLString.h \
+		plvector.h \
+		nsTextFormater.h \
+		$(NULL)			
+
+XPIDLSRCS	= \
+		nsIAtom.idl \
+		nsICollection.idl \
+		nsIEnumerator.idl \
+		nsIObserver.idl \
+		nsIObserverService.idl \
+		nsISupportsArray.idl \
+		nsISupportsPrimitives.idl \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+

mozilla/xpcom/ds/bufferRoutines.h

@@ -0,0 +1,758 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the workhorse copy and shift functions used in nsStrStruct.
+  Ultimately, I plan to make the function pointers in this system available for 
+  use by external modules. They'll be able to install their own "handlers".
+  Not so, today though.
+
+*******************************************************************************************/
+
+#ifndef _BUFFERROUTINES_H
+#define _BUFFERROUTINES_H
+
+#include "nsCRT.h"
+
+#ifndef RICKG_TESTBED
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+#endif
+
+#define KSHIFTLEFT  (0)
+#define KSHIFTRIGHT (1)
+
+
+inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
+  return ((PRUnichar*)aString)[anIndex];
+}
+
+inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
+  return (PRUnichar)aString[anIndex];
+}
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to shift the contents of a char buffer.
+//  The functions are differentiated by shift direction and the underlying charsize.
+//
+
+/**
+ * This method shifts single byte characters left by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where left-shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char*   dst = aDest+anOffset;
+  char*   src = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-(aCount+anOffset));
+}
+
+/**
+ * This method shifts single byte characters right by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char* src = aDest+anOffset;
+  char* dst = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-anOffset);
+}
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* dst = root+anOffset;
+  PRUnichar* src = root+anOffset+aCount;
+
+  memmove(dst,src,(aLength-(aCount+anOffset))*sizeof(PRUnichar));
+}
+
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftDoubleCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* src = root+anOffset;
+  PRUnichar* dst = root+anOffset+aCount;
+
+  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
+}
+
+
+typedef void (*ShiftChars)(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount);
+ShiftChars gShiftChars[2][2]= {
+  {&ShiftCharsLeft,&ShiftCharsRight},
+  {&ShiftDoubleCharsLeft,&ShiftDoubleCharsRight}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to copy one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * Going 1 to 1 is easy, since we assume ascii. No conversions are necessary.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  char* dst = aDest+anDestOffset;
+  char* src = (char*)aSource+anOffset;
+
+  memcpy(dst,src,aCount);
+} 
+
+/**
+ * Going 1 to 2 requires a conversion from ascii to unicode. This can be expensive.
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  const unsigned char* first= (const unsigned char*)aSource+anOffset;
+  const unsigned char* last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    *to=(PRUnichar)(*first);  
+    to++;
+    first++;
+  }
+}
+ 
+
+/**
+ * Going 2 to 1 requires a conversion from unicode down to ascii. This can be lossy.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  char*             to   = aDest+anDestOffset;
+  PRUnichar*        theSource=(PRUnichar*)aSource;
+  const PRUnichar*  first= theSource+anOffset;
+  const PRUnichar*  last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    if(*first<256)
+      *to=(char)*first;  
+    else *to='.';
+    to++;
+    first++;
+  }
+}
+
+/**
+ * Going 2 to 2 is fast and efficient.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  PRUnichar* theSource=(PRUnichar*)aSource;
+  PRUnichar* from= theSource+anOffset;
+
+  memcpy((void*)to,(void*)from,aCount*sizeof(PRUnichar));
+}
+
+
+//--------------------------------------------------------------------------------------
+
+
+typedef void (*CopyChars)(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount);
+
+CopyChars gCopyChars[2][2]={
+  {&CopyChars1To1,&CopyChars1To2},
+  {&CopyChars2To1,&CopyChars2To2}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to search a buffer looking for a char.
+//
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar1(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  if(aIgnoreCase) {
+    char theChar=(char)nsCRT::ToUpper(aChar);
+    const char* ptr=aDest+(anOffset-1);
+    const char* last=aDest+aLength;
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-aDest;
+    }
+  }
+  else {
+
+    const char* ptr = aDest+anOffset;
+    char theChar=(char)aChar;
+    const char* result=(const char*)memchr(ptr, theChar,aLength-anOffset);
+    if(result) {
+      return result-aDest;
+    }
+  }
+  return kNotFound;
+}
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar2(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  const PRUnichar*  root=(PRUnichar*)aDest;
+  const PRUnichar*  ptr=root+(anOffset-1);
+  const PRUnichar*  last=root+aLength;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-root;
+    }
+  }
+  else {
+    while(++ptr<last){
+      if(*ptr==aChar)
+        return (ptr-root);
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer (in reverse) for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar1(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  PRInt32 theIndex=0;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(aDest[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(aDest[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  PRInt32 theIndex=0;
+  PRUnichar*  theBuf=(PRUnichar*)aDest;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(theBuf[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(theBuf[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase);
+FindChars gFindChars[]={&FindChar1,&FindChar2};
+FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to compare one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp(aStr1,aStr2,aCount);
+  else result=strncmp(aStr1,aStr2,aCount);
+  return result;
+}
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  else result=nsCRT::strncmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  return result;
+}
+
+
+typedef PRInt32 (*CompareChars)(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase);
+CompareChars gCompare[2][2]={
+  {&Compare1To1,&Compare1To2},
+  {&Compare2To1,&Compare2To2},
+};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to convert the case of strings...
+//
+
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRInt32 result=0;
+
+  typedef char  chartype;
+  chartype* cp = (chartype*)aString;
+  chartype* end = cp + aCount-1;
+  while (cp <= end) {
+    chartype ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+#ifndef RICKG_TESTBED
+class HandleCaseConversionShutdown3 : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown3(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown3(void) {}
+   NS_DECL_ISUPPORTS
+};
+
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
+static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
+static nsICaseConversion * gCaseConv = 0; 
+
+NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown3, kIShutdownListenerIID);
+
+nsresult HandleCaseConversionShutdown3::OnShutdown(const nsCID& cid, nsISupports* service) {
+    if (cid.Equals(kUnicharUtilCID)) {
+        NS_ASSERTION(service == gCaseConv, "wrong service!");
+        if(gCaseConv){
+          gCaseConv->Release();
+          gCaseConv = 0;
+        }
+    }
+    return NS_OK;
+}
+
+
+class CCaseConversionServiceInitializer {
+public:
+  CCaseConversionServiceInitializer(){
+    mListener = new HandleCaseConversionShutdown3();
+    if(mListener){
+      mListener->AddRef();
+      nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,(nsISupports**) &gCaseConv, mListener);
+    }
+  }
+protected:
+  HandleCaseConversionShutdown3* mListener;
+};
+
+#endif
+
+//----------------------------------------------------------------------------------------
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRUnichar* cp = (PRUnichar*)aString;
+  PRUnichar* end = cp + aCount-1;
+  PRInt32 result=0;
+
+#ifndef RICKG_TESTBED
+  static CCaseConversionServiceInitializer  gCaseConversionServiceInitializer;
+
+  // I18N code begin
+  if(gCaseConv) {
+    nsresult err=(aToUpper) ? gCaseConv->ToUpper(cp, cp, aCount) : gCaseConv->ToLower(cp, cp, aCount);
+    if(NS_SUCCEEDED(err))
+      return 0;
+  }
+  // I18N code end
+#endif
+
+
+  while (cp <= end) {
+    PRUnichar ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+
+  return result;
+}
+
+typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
+CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
+
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used compress char sequences in a buffer...
+//
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  from = aString;
+  chartype*  end =  aString + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  from = (chartype*)aString;
+  chartype*  end =  from + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*CompressChars)(char* aString,PRUint32 aCount,const char* aSet);
+CompressChars gCompressChars[]={&CompressChars1,&CompressChars2};
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  to   = aString;
+  chartype*  from = aString-1;
+  chartype*  end  = aString + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  to   = (chartype*)aString;
+  chartype*  from = (chartype*)aString-1;
+  chartype*  end  = to + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*StripChars)(char* aString,PRUint32 aCount,const char* aSet);
+StripChars gStripChars[]={&StripChars1,&StripChars2};
+
+#endif

mozilla/xpcom/ds/makefile.win

@@ -0,0 +1,120 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                          \
+        nsTextFormater.h           \
+        nsAVLTree.h                \
+        nsCppSharedAllocator.h     \
+        nsCRT.h                    \
+        nsDeque.h                  \
+        nsEnumeratorUtils.h        \
+        nsHashtable.h              \
+        nsHashtableEnumerator.h    \
+        nsIArena.h                 \
+        nsIByteBuffer.h            \
+        nsIObserverList.h          \
+        nsIProperties.h            \
+        nsISimpleEnumerator.h      \
+        nsISizeOfHandler.h         \
+        nsIUnicharBuffer.h         \
+        nsIVariant.h               \
+        nsInt64.h                  \
+        nsQuickSort.h              \
+        nsStr.h                    \
+        nsString.h                 \
+        nsString2.h                \
+        nsSupportsPrimitives.h     \
+        nsTime.h                   \
+        nsUnitConversion.h         \
+        nsVector.h                 \
+        nsVoidArray.h              \
+        nsXPIDLString.h            \
+        plvector.h                 \
+        $(NULL)			
+
+XPIDL_MODULE = xpcom_ds
+
+XPIDLSRCS =                         \
+        .\nsIAtom.idl               \
+        .\nsICollection.idl         \
+        .\nsIEnumerator.idl         \
+	.\nsIObserver.idl           \
+	.\nsIObserverService.idl    \
+	.\nsISupportsArray.idl	    \
+	.\nsISupportsPrimitives.idl \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomds_s
+
+LINCS =                         \
+	-I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\uconv       \
+        -I$(PUBLIC)\unicharutil \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                        \
+        .\$(OBJDIR)\nsTextFormater.obj            \
+        .\$(OBJDIR)\nsArena.obj                   \
+        .\$(OBJDIR)\nsAtomTable.obj               \
+        .\$(OBJDIR)\nsAVLTree.obj                 \
+        .\$(OBJDIR)\nsByteBuffer.obj              \
+        .\$(OBJDIR)\nsCRT.obj                     \
+        .\$(OBJDIR)\nsConjoiningEnumerator.obj    \
+        .\$(OBJDIR)\nsDeque.obj                   \
+        .\$(OBJDIR)\nsEmptyEnumerator.obj         \
+        .\$(OBJDIR)\nsEnumeratorUtils.obj         \
+        .\$(OBJDIR)\nsHashtable.obj               \
+        .\$(OBJDIR)\nsHashtableEnumerator.obj     \
+        .\$(OBJDIR)\nsObserver.obj                \
+        .\$(OBJDIR)\nsObserverList.obj            \
+        .\$(OBJDIR)\nsObserverService.obj         \
+        .\$(OBJDIR)\nsProperties.obj              \
+        .\$(OBJDIR)\nsQuickSort.obj               \
+        .\$(OBJDIR)\nsSizeOfHandler.obj           \
+        .\$(OBJDIR)\nsStr.obj                     \
+        .\$(OBJDIR)\nsString.obj                  \
+        .\$(OBJDIR)\nsString2.obj                 \
+        .\$(OBJDIR)\nsSupportsArray.obj           \
+        .\$(OBJDIR)\nsSupportsArrayEnumerator.obj \
+        .\$(OBJDIR)\nsSupportsPrimitives.obj      \
+        .\$(OBJDIR)\nsUnicharBuffer.obj           \
+        .\$(OBJDIR)\nsVariant.obj                 \
+        .\$(OBJDIR)\nsVoidArray.obj               \
+        .\$(OBJDIR)\nsXPIDLString.obj             \
+        .\$(OBJDIR)\plvector.obj                  \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpcom/ds/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/xpcom/ds/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/xpcom/ds/nsArena.cpp

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsArena.h"
+#include "nsCRT.h"
+
+ArenaImpl::ArenaImpl(void)
+  : mInitialized(PR_FALSE)
+{
+  NS_INIT_REFCNT();
+  nsCRT::memset(&mPool, 0, sizeof(PLArenaPool));
+}
+
+NS_IMETHODIMP
+ArenaImpl::Init(PRUint32 aBlockSize)
+{
+  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
+    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
+  }
+  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
+  mBlockSize = aBlockSize;
+  mInitialized = PR_TRUE;
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS1(ArenaImpl, nsIArena)
+
+ArenaImpl::~ArenaImpl()
+{
+  if (mInitialized)
+    PL_FinishArenaPool(&mPool);
+
+  mInitialized = PR_FALSE;
+}
+
+NS_IMETHODIMP_(void*)
+ArenaImpl::Alloc(PRUint32 size)
+{
+  // Adjust size so that it's a multiple of sizeof(double)
+  PRUint32 align = size & (sizeof(double) - 1);
+  if (0 != align) {
+    size += sizeof(double) - align;
+  }
+
+  void* p;
+  PL_ARENA_ALLOCATE(p, &mPool, size);
+  return p;
+}
+
+NS_METHOD
+ArenaImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+  
+  ArenaImpl* it = new ArenaImpl();
+  if (nsnull == it)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                 PRUint32 aArenaBlockSize)
+{
+  nsresult rv;
+  nsIArena* arena;
+  rv = ArenaImpl::Create(NULL, nsIArena::GetIID(), (void**)&arena);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = arena->Init(aArenaBlockSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(arena);
+    return rv;
+  }    
+  
+  *aInstancePtrResult = arena;
+  return rv;
+}

mozilla/xpcom/ds/nsArena.h

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsArena_h__
+#define nsArena_h__
+
+#include "nsIArena.h"
+
+#define PL_ARENA_CONST_ALIGN_MASK 7
+#include "plarena.h"
+
+// Simple arena implementation layered on plarena
+class ArenaImpl : public nsIArena {
+public:
+  ArenaImpl(void);
+  virtual ~ArenaImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 arenaBlockSize);
+
+  NS_IMETHOD_(void*) Alloc(PRUint32 size);
+
+protected:
+  PLArenaPool mPool;
+  PRUint32 mBlockSize;
+
+private:
+  PRBool mInitialized;
+};
+
+#endif // nsArena_h__

mozilla/xpcom/ds/nsAtomTable.cpp

@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAtomTable.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "plhash.h"
+#include "nsISizeOfHandler.h"
+
+/**
+ * The shared hash table for atom lookups.
+ */
+static nsrefcnt gAtoms;
+static struct PLHashTable* gAtomHashTable;
+
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+static PRIntn
+DumpAtomLeaks(PLHashEntry *he, PRIntn index, void *arg)
+{
+  AtomImpl* atom = (AtomImpl*) he->value;
+  if (atom) {
+    nsAutoString tmp;
+    atom->ToString(tmp);
+    fputs(tmp, stdout);
+    fputs("\n", stdout);
+  }
+  return HT_ENUMERATE_NEXT;
+}
+#endif
+
+NS_COM void NS_PurgeAtomTable(void)
+{
+  if (gAtomHashTable) {
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+    if (gAtoms) {
+      if (getenv("MOZ_DUMP_ATOM_LEAKS")) {
+        printf("*** leaking %d atoms\n", gAtoms);
+        PL_HashTableEnumerateEntries(gAtomHashTable, DumpAtomLeaks, 0);
+      }
+    }
+#endif
+    PL_HashTableDestroy(gAtomHashTable);
+    gAtomHashTable = nsnull;
+  }
+}
+
+AtomImpl::AtomImpl()
+{
+  NS_INIT_REFCNT();
+  // Every live atom holds a reference on the atom hashtable
+  gAtoms++;
+}
+
+AtomImpl::~AtomImpl()
+{
+  NS_PRECONDITION(nsnull != gAtomHashTable, "null atom hashtable");
+  if (nsnull != gAtomHashTable) {
+    PL_HashTableRemove(gAtomHashTable, mString);
+    nsrefcnt cnt = --gAtoms;
+    if (0 == cnt) {
+      // When the last atom is destroyed, the atom arena is destroyed
+      NS_ASSERTION(0 == gAtomHashTable->nentries, "bad atom table");
+      PL_HashTableDestroy(gAtomHashTable);
+      gAtomHashTable = nsnull;
+    }
+  }
+}
+
+NS_IMPL_ISUPPORTS1(AtomImpl, nsIAtom)
+
+void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
+{
+  size = size + uslen * sizeof(PRUnichar);
+  AtomImpl* ii = (AtomImpl*) ::operator new(size);
+  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
+  ii->mString[uslen] = 0;
+  return ii;
+}
+
+NS_IMETHODIMP 
+AtomImpl::ToString(nsString& aBuf) /*FIX: const */
+{
+  aBuf.SetLength(0);
+  aBuf.Append(mString, nsCRT::strlen(mString));
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+AtomImpl::GetUnicode(const PRUnichar **aResult) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mString;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AtomImpl::SizeOf(nsISizeOfHandler* aHandler, PRUint32* _retval) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  PRUint32 sum = sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar);
+  *_retval = sum;
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+
+static PLHashNumber HashKey(const PRUnichar* k)
+{
+  return (PLHashNumber) nsCRT::HashValue(k);
+}
+
+static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
+{
+  return nsCRT::strcmp(k1, k2) == 0;
+}
+
+NS_COM nsIAtom* NS_NewAtom(const char* isolatin1)
+{
+  nsAutoString tmp(isolatin1);
+  return NS_NewAtom(tmp.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const nsString& aString)
+{
+  return NS_NewAtom(aString.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const PRUnichar* us)
+{
+  if (nsnull == gAtomHashTable) {
+    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                                     (PLHashComparator) CompareKeys,
+                                     (PLHashComparator) nsnull,
+                                     nsnull, nsnull);
+  }
+  PRUint32 uslen;
+  PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
+  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
+  PLHashEntry* he = *hep;
+  if (nsnull != he) {
+    nsIAtom* id = (nsIAtom*) he->value;
+    NS_ADDREF(id);
+    return id;
+  }
+  AtomImpl* id = new(us, uslen) AtomImpl();
+  PL_HashTableRawAdd(gAtomHashTable, hep, hashCode, id->mString, id);
+  NS_ADDREF(id);
+  return id;
+}
+
+NS_COM nsrefcnt NS_GetNumberOfAtoms(void)
+{
+  if (nsnull != gAtomHashTable) {
+    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
+  }
+  return gAtoms;
+}

mozilla/xpcom/ds/nsAtomTable.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAtomTable_h__
+#define nsAtomTable_h__
+
+#include "nsIAtom.h"
+
+class AtomImpl : public nsIAtom {
+public:
+  AtomImpl();
+  virtual ~AtomImpl();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIATOM
+
+  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
+
+  void operator delete(void* ptr) {
+    ::operator delete(ptr);
+  }
+
+  // Actually more; 0 terminated. This slot is reserved for the
+  // terminating zero.
+  PRUnichar mString[1];
+};
+
+#endif // nsAtomTable_h__

mozilla/xpcom/ds/nsBuffer.cpp

@@ -0,0 +1,723 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsBuffer.h"
+#include "nsAutoLock.h"
+#include "nsCRT.h"
+#include "nsIInputStream.h"
+#include "nsIServiceManager.h"
+#include "nsIPageManager.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsBuffer::nsBuffer()
+    : mGrowBySize(0),
+      mMaxSize(0),
+      mAllocator(nsnull),
+      mObserver(nsnull),
+      mBufferSize(0),
+      mReadSegment(nsnull),
+      mReadCursor(0),
+      mWriteSegment(nsnull),
+      mWriteCursor(0),
+      mReaderClosed(PR_FALSE),
+      mCondition(NS_OK)
+{
+    NS_INIT_REFCNT();
+    PR_INIT_CLIST(&mSegments);
+}
+
+NS_IMETHODIMP
+nsBuffer::Init(PRUint32 growBySize, PRUint32 maxSize,
+               nsIBufferObserver* observer, nsIAllocator* allocator)
+{
+    NS_ASSERTION(sizeof(PRCList) <= SEGMENT_OVERHEAD,
+                 "need to change SEGMENT_OVERHEAD size");
+    NS_ASSERTION(growBySize > SEGMENT_OVERHEAD, "bad growBySize");
+    mGrowBySize = growBySize;
+    mMaxSize = maxSize;
+    mObserver = observer;
+    NS_IF_ADDREF(mObserver);
+    mAllocator = allocator;
+    NS_ADDREF(mAllocator);
+    return NS_OK;
+}
+
+nsBuffer::~nsBuffer()
+{
+    // Free any allocated pages...
+    while (!PR_CLIST_IS_EMPTY(&mSegments)) {
+        PRCList* header = (PRCList*)mSegments.next;
+        char* segment = (char*)header;
+
+        PR_REMOVE_LINK(header);     // unlink from mSegments
+        (void) mAllocator->Free(segment);
+    }
+
+    NS_IF_RELEASE(mObserver);
+    NS_IF_RELEASE(mAllocator);
+}
+
+NS_IMPL_ISUPPORTS1(nsBuffer, nsIBuffer)
+
+NS_METHOD
+nsBuffer::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    if (aOuter)
+        return NS_ERROR_NO_AGGREGATION;
+
+    nsBuffer* buf = new nsBuffer();
+    if (buf == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(buf);
+    nsresult rv = buf->QueryInterface(aIID, aResult);
+    NS_RELEASE(buf);
+    return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsresult
+nsBuffer::PushWriteSegment()
+{
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    if (mBufferSize >= mMaxSize) {
+        if (mObserver) {
+            nsresult rv = mObserver->OnFull(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+
+    // allocate a new segment to write into
+    PRCList* header;
+
+    header = (PRCList*)mAllocator->Alloc(mGrowBySize);
+    if (header == nsnull) 
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    mBufferSize += mGrowBySize;
+
+    PR_INSERT_BEFORE(header, &mSegments);       // insert at end
+
+    // initialize the write segment
+    mWriteSegment = header;
+    mWriteSegmentEnd = (char*)mWriteSegment + mGrowBySize;
+    mWriteCursor = (char*)mWriteSegment + sizeof(PRCList);
+
+    return NS_OK;
+}
+
+nsresult
+nsBuffer::PopReadSegment()
+{
+    nsresult rv;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    PRCList* header = (PRCList*)mSegments.next;
+    char* segment = (char*)header;
+
+    NS_ASSERTION(mReadSegment == header, "wrong segment");
+
+    // make sure that the writer isn't still in this segment (that the
+    // reader is removing)
+    NS_ASSERTION(!(segment <= mWriteCursor && mWriteCursor < segment + mGrowBySize),
+                 "removing writer's segment");
+
+    PR_REMOVE_LINK(header);     // unlink from mSegments
+
+    mBufferSize -= mGrowBySize;
+
+    rv = mAllocator->Free(segment);
+    if (NS_FAILED(rv)) return rv;
+
+    // initialize the read segment
+    if (PR_CLIST_IS_EMPTY(&mSegments)) {
+        mReadSegment = nsnull;
+        mReadSegmentEnd = nsnull;
+        mReadCursor = nsnull;
+        if (mObserver) {
+            rv = mObserver->OnEmpty(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+    else {
+        mReadSegment = mSegments.next;
+        mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+        mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+    }
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIBuffer methods:
+
+NS_IMETHODIMP
+nsBuffer::ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                       PRUint32 *readCount)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    nsresult rv = NS_OK;
+    PRUint32 readBufferLen;
+    const char* readBuffer;
+
+    *readCount = 0;
+    while (count > 0) {
+        rv = GetReadSegment(0, &readBuffer, &readBufferLen);
+        if (NS_FAILED(rv) || readBufferLen == 0) {
+            return *readCount == 0 ? rv : NS_OK;
+        }
+
+        readBufferLen = PR_MIN(readBufferLen, count);
+        while (readBufferLen > 0) {
+            PRUint32 writeCount;
+            rv = writer(closure, readBuffer, *readCount, readBufferLen, &writeCount);
+			NS_ASSERTION(rv != NS_BASE_STREAM_EOF, "Write should not return EOF");
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || NS_FAILED(rv) || writeCount == 0) {
+                // if we failed to write just report what we were
+                // able to read so far
+                return *readCount == 0 ? rv : NS_OK;
+            }
+            NS_ASSERTION(writeCount <= readBufferLen, "writer returned bad writeCount");
+            readBuffer += writeCount;
+            readBufferLen -= writeCount;
+            *readCount += writeCount;
+            count -= writeCount;
+
+            if (mReadCursor + writeCount == mReadSegmentEnd) {
+                rv = PopReadSegment();
+                if (NS_FAILED(rv)) {
+                    return *readCount == 0 ? rv : NS_OK;
+                }
+            }
+            else {
+                mReadCursor += writeCount;
+            }
+        }
+    }
+    return NS_OK;
+}
+
+static NS_METHOD
+nsWriteToRawBuffer(void* closure,
+                   const char* fromRawSegment,
+                   PRUint32 offset,
+                   PRUint32 count,
+                   PRUint32 *writeCount)
+{
+    char* toBuf = (char*)closure;
+    nsCRT::memcpy(&toBuf[offset], fromRawSegment, count);
+    *writeCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount)
+{
+    return ReadSegments(nsWriteToRawBuffer, toBuf, bufLen, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadSegment(PRUint32 segmentLogicalOffset, 
+                         const char* *resultSegment,
+                         PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+
+    // set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            *resultSegmentLen = 0;
+            *resultSegment = nsnull;
+            return mCondition;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    PRInt32 offset = (PRInt32)segmentLogicalOffset;
+    while (offset >= 0) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                // don't continue past the write segment
+                *resultSegmentLen = 0;
+                *resultSegment = nsnull;
+                return mCondition;
+            }
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                curSeg = PR_NEXT_LINK(curSeg);
+                if (curSeg == mReadSegment) {
+                    // been all the way around
+                    *resultSegmentLen = 0;
+                    *resultSegment = nsnull;
+                    return mCondition;
+                }
+                curSegEnd = (char*)curSeg + mGrowBySize;
+                curSegStart = (char*)curSeg + sizeof(PRCList);
+                offset -= amt;
+            }
+        }
+    }
+    NS_NOTREACHED("nsBuffer::GetReadSegment failed");
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadableAmount(PRUint32 *result)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    *result = 0; 
+
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            return NS_OK;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    while (PR_TRUE) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            return NS_OK;
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            curSeg = PR_NEXT_LINK(curSeg);
+            if (curSeg == mReadSegment) {
+                // been all the way around
+                return NS_OK;
+            }
+            curSegEnd = (char*)curSeg + mGrowBySize;
+            curSegStart = (char*)curSeg + sizeof(PRCList);
+        }
+    }
+    return NS_ERROR_FAILURE;
+}
+
+#define COMPARE(s1, s2, i)	ignoreCase ? nsCRT::strncasecmp((const char *)s1, (const char *)s2, (PRUint32)i) : nsCRT::strncmp((const char *)s1, (const char *)s2, (PRUint32)i)
+
+NS_IMETHODIMP
+nsBuffer::Search(const char* string, PRBool ignoreCase, 
+                 PRBool *found, PRUint32 *offsetSearchedTo)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsresult rv;
+    const char* bufSeg1;
+    PRUint32 bufSegLen1;
+    PRUint32 segmentPos = 0;
+    PRUint32 strLen = nsCRT::strlen(string);
+
+    rv = GetReadSegment(segmentPos, &bufSeg1, &bufSegLen1);
+    if (NS_FAILED(rv) || bufSegLen1 == 0) {
+        *found = PR_FALSE;
+        *offsetSearchedTo = segmentPos;
+        return NS_OK;
+    }
+
+    while (PR_TRUE) {
+        PRUint32 i;
+        // check if the string is in the buffer segment
+        for (i = 0; i < bufSegLen1 - strLen + 1; i++) {
+            if (COMPARE(&bufSeg1[i], string, strLen) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos + i;
+                return NS_OK;
+            }
+        }
+
+        // get the next segment
+        const char* bufSeg2;
+        PRUint32 bufSegLen2;
+        segmentPos += bufSegLen1;
+        rv = GetReadSegment(segmentPos, &bufSeg2, &bufSegLen2);
+        if (NS_FAILED(rv) || bufSegLen2 == 0) {
+            *found = PR_FALSE;
+            if (mCondition != NS_OK)    // XXX NS_FAILED?
+                *offsetSearchedTo = segmentPos - bufSegLen1;
+            else
+                *offsetSearchedTo = segmentPos - bufSegLen1 - strLen + 1;
+            return NS_OK;
+        }
+
+        // check if the string is straddling the next buffer segment
+        PRUint32 limit = PR_MIN(strLen, bufSegLen2 + 1);
+        for (i = 0; i < limit; i++) {
+            PRUint32 strPart1Len = strLen - i - 1;
+            PRUint32 strPart2Len = strLen - strPart1Len;
+            const char* strPart2 = &string[strLen - strPart2Len];
+            PRUint32 bufSeg1Offset = bufSegLen1 - strPart1Len;
+            if (COMPARE(&bufSeg1[bufSeg1Offset], string, strPart1Len) == 0 &&
+                COMPARE(bufSeg2, strPart2, strPart2Len) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos - strPart1Len;
+                return NS_OK;
+            }
+        }
+
+        // finally continue with the next buffer
+        bufSeg1 = bufSeg2;
+        bufSegLen1 = bufSegLen2;
+    }
+    NS_NOTREACHED("can't get here");
+    return NS_ERROR_FAILURE;    // keep compiler happy
+}
+
+NS_IMETHODIMP
+nsBuffer::ReaderClosed()
+{
+    nsresult rv = NS_OK;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    // first prevent any more writing
+    mReaderClosed = PR_TRUE;
+
+    // then free any unread segments...
+    
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (!PR_CLIST_IS_EMPTY(&mSegments)) {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    while (mReadSegment) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (mReadCursor <= snapshotWriteCursor &&
+            snapshotWriteCursor < mReadSegmentEnd) {
+            // same segment -- we've discarded all the unread segments we
+            // can, so just updatethe read cursor
+            mReadCursor = mWriteCursor;
+            break;
+        }
+        // else advance to the next segment, freeing this one
+        rv = PopReadSegment();
+        if (NS_FAILED(rv)) break;
+    }
+
+#ifdef DEBUG
+    PRUint32 amt;
+    const char* buf;
+    rv = GetReadSegment(0, &buf, &amt);
+    NS_ASSERTION(rv == NS_BASE_STREAM_EOF ||
+                 (NS_SUCCEEDED(rv) && amt == 0), "ReaderClosed failed");
+#endif
+
+    return rv;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetCondition(nsresult *result)
+{
+    *result = mCondition;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP
+nsBuffer::WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                        PRUint32 *writeCount)
+{
+    nsresult rv = NS_OK;
+
+    nsAutoCMonitor mon(this);
+    *writeCount = 0;
+
+    if (mReaderClosed) {
+        rv = NS_BASE_STREAM_CLOSED;
+        goto done;
+    }
+
+    if (NS_FAILED(mCondition)) {
+        rv = mCondition;
+        goto done;
+    }
+
+    while (count > 0) {
+        PRUint32 writeBufLen;
+        char* writeBuf;
+        rv = GetWriteSegment(&writeBuf, &writeBufLen);
+        if (NS_FAILED(rv) || writeBufLen == 0) {
+            // if we failed to allocate a new segment, we're probably out
+            // of memory, but we don't care -- just report what we were
+            // able to write so far
+            rv = (*writeCount == 0) ? rv : NS_OK;
+            goto done;
+        }
+
+        writeBufLen = PR_MIN(writeBufLen, count);
+        while (writeBufLen > 0) {
+            PRUint32 readCount = 0;
+            rv = reader(closure, writeBuf, *writeCount, writeBufLen, &readCount);
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || readCount == 0) {
+                // if the place we're putting the data would block (probably ran
+                // out of room) just return what we were able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            if (NS_FAILED(rv)) {
+                // save the failure condition so that we can get it again later
+                nsresult rv2 = SetCondition(rv);
+                NS_ASSERTION(NS_SUCCEEDED(rv2), "SetCondition failed");
+                // if we failed to read just report what we were
+                // able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            NS_ASSERTION(readCount <= writeBufLen, "reader returned bad readCount");
+            writeBuf += readCount;
+            writeBufLen -= readCount;
+            *writeCount += readCount;
+            count -= readCount;
+
+            // set the write cursor after the data is valid
+            if (mWriteCursor + readCount == mWriteSegmentEnd) {
+                mWriteSegment = nsnull;      // allocate a new segment next time around
+                mWriteSegmentEnd = nsnull;
+                mWriteCursor = nsnull;
+            }
+            else
+                mWriteCursor += readCount;
+        }
+    }
+done:
+    if (mObserver && *writeCount) {
+        mObserver->OnWrite(this, *writeCount);
+    }
+    return rv;
+}
+
+static NS_METHOD
+nsReadFromRawBuffer(void* closure,
+                    char* toRawSegment,
+                    PRUint32 offset,
+                    PRUint32 count,
+                    PRUint32 *readCount)
+{
+    const char* fromBuf = (const char*)closure;
+    nsCRT::memcpy(toRawSegment, &fromBuf[offset], count);
+    *readCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromRawBuffer, (void*)fromBuf, bufLen, writeCount);
+}
+
+static NS_METHOD
+nsReadFromInputStream(void* closure,
+                      char* toRawSegment, 
+                      PRUint32 offset,
+                      PRUint32 count,
+                      PRUint32 *readCount)
+{
+    nsIInputStream* fromStream = (nsIInputStream*)closure;
+    return fromStream->Read(toRawSegment, count, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromInputStream, fromStream, count, writeCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWriteSegment(char* *resultSegment,
+                          PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    *resultSegmentLen = 0;
+    *resultSegment = nsnull;
+    if (mWriteSegment == nsnull) {
+        rv = PushWriteSegment();
+        if (NS_FAILED(rv) || rv == NS_BASE_STREAM_WOULD_BLOCK) return rv;
+
+        NS_ASSERTION(mWriteSegment != nsnull, "failed to allocate segment");
+    }
+
+    *resultSegmentLen = mWriteSegmentEnd - mWriteCursor;
+    *resultSegment = mWriteCursor;
+    NS_ASSERTION(*resultSegmentLen > 0, "Failed to get write segment.");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWritableAmount(PRUint32 *amount)
+{
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    PRUint32 readableAmount;
+    rv = GetReadableAmount(&readableAmount);
+    if (NS_FAILED(rv)) return rv;
+    *amount = mMaxSize - readableAmount;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReaderClosed(PRBool *result)
+{
+    *result = mReaderClosed;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::SetCondition(nsresult condition)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    mCondition = condition;
+    mWriteSegment = nsnull;     // allows reader to free last segment w/o asserting
+    mWriteSegmentEnd = nsnull;
+    // don't reset mWriteCursor here -- we need it for the EOF point in the buffer
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_CID(kAllocatorCID, NS_ALLOCATOR_CID);
+
+NS_COM nsresult
+NS_NewBuffer(nsIBuffer* *result,
+             PRUint32 growBySize, PRUint32 maxSize,
+             nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kAllocatorCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+static NS_DEFINE_CID(kPageManagerCID, NS_PAGEMANAGER_CID);
+
+NS_COM nsresult
+NS_NewPageBuffer(nsIBuffer* *result,
+                 PRUint32 growBySize, PRUint32 maxSize,
+                 nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kPageManagerCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsBuffer.h

@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsBuffer_h___
+#define nsBuffer_h___
+
+#include "nsIBuffer.h"
+#include "nscore.h"
+#include "prclist.h"
+#include "nsIAllocator.h"
+
+class nsBuffer : public nsIBuffer {
+public:
+    NS_DECL_ISUPPORTS
+
+    static NS_METHOD
+    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+    // nsIBuffer methods:
+    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
+                    nsIBufferObserver* observer, nsIAllocator* allocator);
+    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount);
+    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                            PRUint32 *readCount);
+    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset, 
+                              const char* *resultSegment,
+                              PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetReadableAmount(PRUint32 *amount);
+    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
+                      PRBool *found, PRUint32 *offsetSearchedTo);
+    NS_IMETHOD ReaderClosed(void);
+    NS_IMETHOD GetCondition(nsresult *result);
+
+    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount);
+    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount);
+    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                             PRUint32 *writeCount);
+    NS_IMETHOD GetWriteSegment(char* *resultSegment,
+                               PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetWritableAmount(PRUint32 *amount);
+    NS_IMETHOD GetReaderClosed(PRBool *result);
+    NS_IMETHOD SetCondition(nsresult condition);
+
+    // nsBuffer methods:
+    nsBuffer();
+    virtual ~nsBuffer();
+
+    nsresult PushWriteSegment();
+    nsresult PopReadSegment();
+
+protected:
+    PRUint32            mGrowBySize;
+    PRUint32            mMaxSize;
+    nsIAllocator*       mAllocator;
+    nsIBufferObserver*  mObserver;
+
+    PRCList             mSegments;
+    PRUint32            mBufferSize;
+    
+    PRCList*            mReadSegment;
+    char*               mReadSegmentEnd;
+    char*               mReadCursor;
+
+    PRCList*            mWriteSegment;
+    char*               mWriteSegmentEnd;
+    char*               mWriteCursor;
+
+    PRBool              mReaderClosed;
+    nsresult            mCondition;
+};
+
+#endif // nsBuffer_h___

mozilla/xpcom/ds/nsBufferPoolService.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsBufferPoolService_h___
+#define nsBufferPoolService_h___
+
+#include "nsIBufferPoolService.h"
+
+class nsBufferPoolService : public nsIBufferPoolService {
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsIBufferPoolService methods:
+    NS_IMETHOD NewBuffer(PRUint32 minSize, PRUint32 maxSize,
+                         nsIByteBuffer* *result);
+
+    // nsBufferPoolService methods:
+    nsBufferPoolService();
+    virtual ~nsBufferPoolService();
+
+protected:
+    
+};
+
+#endif // nsBufferPoolService_h___

mozilla/xpcom/ds/nsByteBuffer.cpp

@@ -0,0 +1,151 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsByteBuffer.h"
+#include "nsIInputStream.h"
+#include "nsCRT.h"
+
+#define MIN_BUFFER_SIZE 32
+
+ByteBufferImpl::ByteBufferImpl(void)
+  : mBuffer(NULL), mSpace(0), mLength(0)
+{
+  NS_INIT_REFCNT();
+}
+
+NS_IMETHODIMP
+ByteBufferImpl::Init(PRUint32 aBufferSize)
+{
+  if (aBufferSize < MIN_BUFFER_SIZE) {
+    aBufferSize = MIN_BUFFER_SIZE;
+  }
+  mSpace = aBufferSize;
+  mLength = 0;
+  mBuffer = new char[aBufferSize];
+  return mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMPL_ISUPPORTS1(ByteBufferImpl,nsIByteBuffer)
+
+ByteBufferImpl::~ByteBufferImpl()
+{
+  if (nsnull != mBuffer) {
+    delete[] mBuffer;
+    mBuffer = nsnull;
+  }
+  mLength = 0;
+}
+
+NS_METHOD
+ByteBufferImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+
+  ByteBufferImpl* it = new ByteBufferImpl();
+  if (nsnull == it) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, (void**)aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetLength(void) const
+{
+  return mLength;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetBufferSize(void) const
+{
+  return mSpace;
+}
+
+NS_IMETHODIMP_(char*)
+ByteBufferImpl::GetBuffer(void) const
+{
+  return mBuffer;
+}
+
+NS_IMETHODIMP_(PRBool)
+ByteBufferImpl::Grow(PRUint32 aNewSize)
+{
+  if (aNewSize < MIN_BUFFER_SIZE) {
+    aNewSize = MIN_BUFFER_SIZE;
+  }
+  char* newbuf = new char[aNewSize];
+  if (nsnull != newbuf) {
+    if (0 != mLength) {
+      nsCRT::memcpy(newbuf, mBuffer, mLength);
+    }
+    delete[] mBuffer;
+    mBuffer = newbuf;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+NS_IMETHODIMP_(PRInt32)
+ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                     PRUint32 aKeep)
+{
+  NS_PRECONDITION(nsnull != aStream, "null stream");
+  NS_PRECONDITION(aKeep <= mLength, "illegal keep count");
+  if ((nsnull == aStream) || (PRUint32(aKeep) > PRUint32(mLength))) {
+    // whoops
+    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
+    return -1;
+  }
+
+  if (0 != aKeep) {
+    // Slide over kept data
+    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep), aKeep);
+  }
+
+  // Read in some new data
+  mLength = aKeep;
+  PRUint32 nb;
+  *aErrorCode = aStream->Read(mBuffer + aKeep, mSpace - aKeep, &nb);
+  if (NS_SUCCEEDED(*aErrorCode)) {
+    mLength += nb;
+  }
+  else
+    nb = 0;
+  return nb;
+}
+
+NS_COM nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                                  nsISupports* aOuter,
+                                  PRUint32 aBufferSize)
+{
+  nsresult rv;
+  nsIByteBuffer* buf;
+  rv = ByteBufferImpl::Create(aOuter, nsIByteBuffer::GetIID(), (void**)&buf);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = buf->Init(aBufferSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(buf);
+    return rv;
+  }
+  *aInstancePtrResult = buf;
+  return rv;
+}

mozilla/xpcom/ds/nsByteBuffer.h

@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsByteBuffer_h__
+#define nsByteBuffer_h__
+
+#include "nsIByteBuffer.h"
+
+class ByteBufferImpl : public nsIByteBuffer {
+public:
+  ByteBufferImpl(void);
+  virtual ~ByteBufferImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 aBufferSize);
+  NS_IMETHOD_(PRUint32) GetLength(void) const;
+  NS_IMETHOD_(PRUint32) GetBufferSize(void) const;
+  NS_IMETHOD_(char*) GetBuffer() const;
+  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize);
+  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                            PRUint32 aKeep);
+
+  char* mBuffer;
+  PRUint32 mSpace;
+  PRUint32 mLength;
+};
+
+#endif // nsByteBuffer_h__

mozilla/xpcom/ds/nsCRT.cpp

@@ -0,0 +1,555 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */ 
+
+ 
+/**
+ * MODULE NOTES:
+ * @update  gess7/30/98
+ *
+ * Much as I hate to do it, we were using string compares wrong.
+ * Often, programmers call functions like strcmp(s1,s2), and pass
+ * one or more null strings. Rather than blow up on these, I've 
+ * added quick checks to ensure that cases like this don't cause
+ * us to fail.
+ *
+ * In general, if you pass a null into any of these string compare
+ * routines, we simply return 0.
+ */
+
+
+#include "nsCRT.h"
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+
+
+// XXX Bug: These tables don't lowercase the upper 128 characters properly
+
+// This table maps uppercase characters to lower case characters;
+// characters that are neither upper nor lower case are unaffected.
+static const unsigned char kUpper2Lower[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64,
+
+    // upper band mapped to lower [A-Z] => [a-z]
+       97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,
+
+                                               91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+static const unsigned char kLower2Upper[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96,
+
+    // lower band mapped to upper [a-z] => [A-Z]
+       65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+
+                                              123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+// XXX bug: this doesn't map 0x80 to 0x9f properly
+ const PRUnichar kIsoLatin1ToUCS2[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+//----------------------------------------------------------------------
+
+#define TOLOWER(_ucs2) \
+  (((_ucs2) < 128) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
+
+#define TOUPPER(_ucs2) \
+  (((_ucs2) < 128) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
+
+class HandleCaseConversionShutdown : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown(void) {}
+   NS_DECL_ISUPPORTS
+};
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+
+static nsICaseConversion * gCaseConv = NULL; 
+
+NS_IMPL_ISUPPORTS1(HandleCaseConversionShutdown, nsIShutdownListener)
+
+nsresult
+HandleCaseConversionShutdown::OnShutdown(const nsCID& cid,
+                                         nsISupports* aService)
+{
+  if (cid.Equals(kUnicharUtilCID)) {
+    NS_ASSERTION(aService == gCaseConv, "wrong service!");
+    gCaseConv->Release();
+    gCaseConv = NULL;
+  }
+  return NS_OK;
+}
+
+static HandleCaseConversionShutdown* gListener = NULL;
+
+static void StartUpCaseConversion()
+{
+    nsresult err;
+
+    if ( NULL == gListener )
+    {
+      gListener = new HandleCaseConversionShutdown();
+      gListener->AddRef();
+    }
+    err = nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion),
+                                        (nsISupports**) &gCaseConv, gListener);
+}
+static void CheckCaseConversion()
+{
+    if(NULL == gCaseConv )
+      StartUpCaseConversion();
+
+    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
+   
+}
+
+static PRUnichar _ToLower(PRUnichar aChar)
+{
+  PRUnichar oLower;
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToLower(aChar, &oLower);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oLower : aChar ;
+}
+
+static PRUnichar _ToUpper(PRUnichar aChar)
+{
+  nsresult err;
+  PRUnichar oUpper;
+  CheckCaseConversion();
+  err = gCaseConv->ToUpper(aChar, &oUpper);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oUpper : aChar ;
+}
+
+//----------------------------------------------------------------------
+
+PRUnichar nsCRT::ToUpper(PRUnichar aChar)
+{
+  return TOUPPER(aChar);
+}
+
+PRUnichar nsCRT::ToLower(PRUnichar aChar)
+{
+  return TOLOWER(aChar);
+}
+
+PRBool nsCRT::IsUpper(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToLower(aChar);
+}
+
+PRBool nsCRT::IsLower(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToUpper(aChar);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// My lovely strtok routine
+
+#define IS_DELIM(m, c)          ((m)[(c) >> 3] & (1 << ((c) & 7)))
+#define SET_DELIM(m, c)         ((m)[(c) >> 3] |= (1 << ((c) & 7)))
+#define DELIM_TABLE_SIZE        32
+
+char* nsCRT::strtok(char* string, const char* delims, char* *newStr)
+{
+  NS_ASSERTION(string, "Unlike regular strtok, the first argument cannot be null.");
+
+  char delimTable[DELIM_TABLE_SIZE];
+  PRUint32 i;
+  char* result;
+  char* str = string;
+
+  for (i = 0; i < DELIM_TABLE_SIZE; i++)
+    delimTable[i] = '\0';
+
+  for (i = 0; i < DELIM_TABLE_SIZE && delims[i]; i++) {
+    SET_DELIM(delimTable, delims[i]);
+  }
+  NS_ASSERTION(delims[i] == '\0', "too many delimiters");
+
+  // skip to beginning
+  while (*str && IS_DELIM(delimTable, *str)) {
+    str++;
+  }
+  result = str;
+
+  // fix up the end of the token
+  while (*str) {
+    if (IS_DELIM(delimTable, *str)) {
+      *str++ = '\0';
+      break;
+    }
+    str++;
+  }
+  *newStr = str;
+
+  return str == result ? NULL : result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+PRUint32 nsCRT::strlen(const PRUnichar* s)
+{
+  PRUint32 len = 0;
+  if(s) {
+    while (*s++ != 0) {
+      len++;
+    }
+  }
+  return len;
+}
+
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null 
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char.
+ * NOTE: If either is null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+{
+  if(s1 && s2) { 
+    if(n != 0) {
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare unichar string ptrs without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char;
+ * also ignoring the case of characters.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+{
+  if(s1 && s2) {
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring, up to N chars.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+{
+  if(s1 && s2) {
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare a unichar string ptr to cstring without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Caseless compare up to N chars between unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+{
+  if(s1 && s2){
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if (c1 == 0) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+PRUnichar* nsCRT::strdup(const PRUnichar* str)
+{
+  PRUint32 len = nsCRT::strlen(str) + 1; // add one for null
+
+
+	nsCppSharedAllocator<PRUnichar> shared_allocator;
+	PRUnichar* rslt = shared_allocator.allocate(len);
+  // PRUnichar* rslt = new PRUnichar[len];
+
+  if (rslt == NULL) return NULL;
+  nsCRT::memcpy(rslt, str, len * sizeof(PRUnichar));
+  return rslt;
+}
+
+PRUint32 nsCRT::HashValue(const char* us)
+{
+  PRUint32 rv = 0;
+  if(us) {
+    char ch;
+    while ((ch = *us++) != 0) {
+      // FYI: rv = rv*37 + ch
+      rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    }
+  }
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const char* us, PRUint32* uslenp)
+{
+  PRUint32 rv = 0;
+  PRUint32 len = 0;
+  char ch;
+  while ((ch = *us++) != 0) {
+    // FYI: rv = rv*37 + ch
+    rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    len++;
+  }
+  *uslenp = len;
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const PRUnichar* us)
+{
+  PRUint32 rv = 0;
+  if(us) {
+    PRUnichar ch;
+    while ((ch = *us++) != 0) {
+      // FYI: rv = rv*37 + ch
+      rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    }
+  }
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const PRUnichar* us, PRUint32* uslenp)
+{
+  PRUint32 rv = 0;
+  PRUint32 len = 0;
+  PRUnichar ch;
+  while ((ch = *us++) != 0) {
+    // FYI: rv = rv*37 + ch
+    rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    len++;
+  }
+  *uslenp = len;
+  return rv;
+}
+
+PRInt32 nsCRT::atoi( const PRUnichar *string )
+{
+  return atoi(string);
+}
+

mozilla/xpcom/ds/nsCRT.h

@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsCRT_h___
+#define nsCRT_h___
+
+#include <stdlib.h>
+#include <string.h>
+#include "plstr.h"
+#include "nscore.h"
+#include "prtypes.h"
+#include "nsCppSharedAllocator.h"
+
+#define CR '\015'
+#define LF '\012'
+#define VTAB '\013'
+#define FF '\014'
+#define TAB '\011'
+#define CRLF "\015\012"     /* A CR LF equivalent string */
+
+#ifdef XP_MAC
+#  define NS_LINEBREAK             "\015"
+#  define NS_LINEBREAK_LEN 1
+#else
+#  ifdef XP_PC
+#    define NS_LINEBREAK           "\015\012"
+#    define NS_LINEBREAK_LEN       2
+#  else
+#    if defined(XP_UNIX) || defined(XP_BEOS)
+#      define NS_LINEBREAK         "\012"
+#      define NS_LINEBREAK_LEN     1
+#    endif /* XP_UNIX */
+#  endif /* XP_PC */
+#endif /* XP_MAC */
+
+
+extern const PRUnichar kIsoLatin1ToUCS2[256];
+
+
+// This macro can be used in a class declaration for classes that want
+// to ensure that their instance memory is zeroed.
+#define NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz) {             \
+    void* rv = ::operator new(sz);            \
+    if (rv) {                                 \
+      nsCRT::zero(rv, sz);                    \
+    }                                         \
+    return rv;                                \
+  }                                           \
+  void operator delete(void* ptr) {           \
+    ::operator delete(ptr);                   \
+  }
+
+// This macro works with the next macro to declare a non-inlined
+// version of the above.
+#define NS_DECL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz);     \
+  void operator delete(void* ptr);
+
+#define NS_IMPL_ZEROING_OPERATOR_NEW(_class) \
+  void* _class::operator new(size_t sz) {    \
+    void* rv = ::operator new(sz);           \
+    if (rv) {                                \
+      nsCRT::zero(rv, sz);                   \
+    }                                        \
+    return rv;                               \
+  }                                          \
+  void _class::operator delete(void* ptr) {  \
+    ::operator delete(ptr);                  \
+  }
+
+// Freeing helper
+#define CRTFREEIF(x) if (x) { nsCRT::free(x); x = 0; }
+
+/// This is a wrapper class around all the C runtime functions. 
+
+class NS_COM nsCRT {
+public:
+
+  /** Copy bytes from aSrc to aDest.
+    @param aDest the destination address
+    @param aSrc the source address
+    @param aCount the number of bytes to copy
+    */
+  static void memcpy(void* aDest, const void* aSrc, PRUint32 aCount) {
+    ::memcpy(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memmove(void* aDest, const void* aSrc, PRUint32 aCount) {
+    ::memmove(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memset(void* aDest, PRUint8 aByte, PRUint32 aCount) {
+    ::memset(aDest, aByte, aCount);
+  }
+
+  static void zero(void* aDest, PRUint32 aCount) {
+    ::memset(aDest, 0, (size_t)aCount);
+  }
+
+  /** Compute the string length of s
+   @param s the string in question
+   @return the length of s
+   */
+  static PRUint32 strlen(const char* s) {
+    return PRUint32(::strlen(s));
+  }
+
+  /// Compare s1 and s2.
+  static PRInt32 strcmp(const char* s1, const char* s2) {
+    return PRUint32(PL_strcmp(s1, s2));
+  }
+
+  static PRInt32 strncmp(const char* s1, const char* s2,
+                         PRUint32 aMaxLen) {
+    return PRInt32(PL_strncmp(s1, s2, aMaxLen));
+  }
+
+  /// Case-insensitive string comparison.
+  static PRInt32 strcasecmp(const char* s1, const char* s2) {
+    return PRInt32(PL_strcasecmp(s1, s2));
+  }
+
+  /// Case-insensitive string comparison with length
+  static PRInt32 strncasecmp(const char* s1, const char* s2, PRUint32 aMaxLen) {
+    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
+  }
+
+  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    // inline the first test (assumes strings are not null):
+    PRInt32 diff = ((const unsigned char*)s1)[0] - ((const unsigned char*)s2)[0];
+    if (diff != 0) return diff;
+    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
+  }
+  
+  static char* strdup(const char* str) {
+    return PL_strdup(str);
+  }
+
+  static void free(char* str) {
+    PL_strfree(str);
+  }
+
+  /**
+
+    How to use this fancy (thread-safe) version of strtok: 
+
+    void main( void ) {
+      printf( "%s\n\nTokens:\n", string );
+      // Establish string and get the first token:
+      char* newStr;
+      token = nsCRT::strtok( string, seps, &newStr );   
+      while( token != NULL ) {
+        // While there are tokens in "string"
+        printf( " %s\n", token );
+        // Get next token:
+        token = nsCRT::strtok( newStr, seps, &newStr );
+      }
+    }
+    * WARNING - STRTOK WHACKS str THE FIRST TIME IT IS CALLED *
+    * MAKE A COPY OF str IF YOU NEED TO USE IT AFTER strtok() *
+  */
+  static char* strtok(char* str, const char* delims, char* *newStr); 
+
+  /// Like strlen except for ucs2 strings
+  static PRUint32 strlen(const PRUnichar* s);
+
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strcmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strncmp(const PRUnichar* s1, const PRUnichar* s2,
+                         PRUint32 aMaxLen);
+
+  /// Like strcasecmp except for ucs2 strings
+  static PRInt32 strcasecmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strncasecmp except for ucs2 strings
+  static PRInt32 strncasecmp(const PRUnichar* s1, const PRUnichar* s2,
+                             PRUint32 aMaxLen);
+
+  /// Like strcmp with a char* and a ucs2 string
+  static PRInt32 strcmp(const PRUnichar* s1, const char* s2);
+  /// Like strncmp with a char* and a ucs2 string
+  static PRInt32 strncmp(const PRUnichar* s1, const char* s2,
+                         PRUint32 aMaxLen);
+
+  /// Like strcasecmp with a char* and a ucs2 string
+  static PRInt32 strcasecmp(const PRUnichar* s1, const char* s2);
+  /// Like strncasecmp with a char* and a ucs2 string
+  static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
+                             PRUint32 aMaxLen);
+
+  // Note: uses new[] to allocate memory, so you must use delete[] to
+  // free the memory
+  static PRUnichar* strdup(const PRUnichar* str);
+
+  static void free(PRUnichar* str) {
+  	nsCppSharedAllocator<PRUnichar> shared_allocator;
+  	shared_allocator.deallocate(str, 0 /*we never new or kept the size*/);
+  }
+
+  /// Compute a hashcode for a C string
+  static PRUint32 HashValue(const char* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRUint32 HashValue(const char* s1, PRUint32* s1len);
+
+  /// Compute a hashcode for a ucs2 string
+  static PRUint32 HashValue(const PRUnichar* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRUint32 HashValue(const PRUnichar* s1, PRUint32* s1len);
+
+  /// String to integer.
+  static PRInt32 atoi( const PRUnichar *string );
+  
+  static PRUnichar ToUpper(PRUnichar aChar);
+
+  static PRUnichar ToLower(PRUnichar aChar);
+  
+  static PRBool IsUpper(PRUnichar aChar);
+
+  static PRBool IsLower(PRUnichar aChar);
+};
+
+#endif /* nsCRT_h___ */

mozilla/xpcom/ds/nsConjoiningEnumerator.cpp

@@ -0,0 +1,365 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIEnumerator.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// Intersection Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsConjoiningEnumerator : public nsIBidirectionalEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsIBidirectionalEnumerator methods:
+  NS_DECL_NSIBIDIRECTIONALENUMERATOR
+
+  // nsConjoiningEnumerator methods:
+  nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsConjoiningEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+  nsIEnumerator* mCurrent;
+};
+
+nsConjoiningEnumerator::nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second), mCurrent(first)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsConjoiningEnumerator::~nsConjoiningEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS2(nsConjoiningEnumerator, nsIBidirectionalEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::First(void)
+{
+  mCurrent = mFirst;
+  return mCurrent->First();
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Next(void)
+{
+  nsresult rv = mCurrent->Next();
+  if (NS_FAILED(rv) && mCurrent == mFirst) {
+    mCurrent = mSecond;
+    rv = mCurrent->First();
+  }
+  return rv;
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::CurrentItem(nsISupports **aItem)
+{
+  return mCurrent->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::IsDone(void)
+{
+  return (mCurrent == mFirst && mCurrent->IsDone() == NS_OK)
+      || (mCurrent == mSecond && mCurrent->IsDone() == NS_OK)
+    ? NS_OK : NS_COMFALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Last(void)
+{
+  nsresult rv;
+  nsIBidirectionalEnumerator* be;
+  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+  if (NS_FAILED(rv)) return rv;
+  mCurrent = mSecond;
+  rv = be->Last();
+  NS_RELEASE(be);
+  return rv;
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Prev(void)
+{
+  nsresult rv;
+  nsIBidirectionalEnumerator* be;
+  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+  if (NS_FAILED(rv)) return rv;
+  rv = be->Prev();
+  NS_RELEASE(be);
+  if (NS_FAILED(rv) && mCurrent == mSecond) {
+    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+    if (NS_FAILED(rv)) return rv;
+    mCurrent = mFirst;
+    rv = be->Last();
+    NS_RELEASE(be);
+  }  
+  return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                           nsIBidirectionalEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsConjoiningEnumerator* e = new nsConjoiningEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static nsresult
+nsEnumeratorContains(nsIEnumerator* e, nsISupports* item)
+{
+  nsresult rv;
+  for (e->First(); e->IsDone() != NS_OK; e->Next()) {
+    nsISupports* other;
+    rv = e->CurrentItem(&other);
+    if (NS_FAILED(rv)) return rv;
+    if (item == other) {
+      NS_RELEASE(other);
+      return NS_OK;     // true -- exists in enumerator
+    }
+    NS_RELEASE(other);
+  }
+  return NS_COMFALSE;   // false -- doesn't exist
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Intersection Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsIntersectionEnumerator : public nsIEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsIntersectionEnumerator methods:
+  nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsIntersectionEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+};
+
+nsIntersectionEnumerator::nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsIntersectionEnumerator::~nsIntersectionEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS1(nsIntersectionEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::First(void)
+{
+  nsresult rv = mFirst->First();
+  if (NS_FAILED(rv)) return rv;
+  return Next();
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::Next(void)
+{
+  nsresult rv;
+
+  // find the first item that exists in both
+  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
+    nsISupports* item;
+    rv = mFirst->CurrentItem(&item);
+    if (NS_FAILED(rv)) return rv;
+
+    // see if it also exists in mSecond
+    rv = nsEnumeratorContains(mSecond, item);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_RELEASE(item);
+    if (rv == NS_OK) {
+      // found in both, so return leaving it as the current item of mFirst
+      return NS_OK;
+    }
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::CurrentItem(nsISupports **aItem)
+{
+  return mFirst->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::IsDone(void)
+{
+  return mFirst->IsDone();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsIntersectionEnumerator* e = new nsIntersectionEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Union Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsUnionEnumerator : public nsIEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsUnionEnumerator methods:
+  nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsUnionEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+};
+
+nsUnionEnumerator::nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsUnionEnumerator::~nsUnionEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS1(nsUnionEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsUnionEnumerator::First(void)
+{
+  nsresult rv = mFirst->First();
+  if (NS_FAILED(rv)) return rv;
+  return Next();
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::Next(void)
+{
+  nsresult rv;
+
+  // find the first item that exists in both
+  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
+    nsISupports* item;
+    rv = mFirst->CurrentItem(&item);
+    if (NS_FAILED(rv)) return rv;
+
+    // see if it also exists in mSecond
+    rv = nsEnumeratorContains(mSecond, item);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_RELEASE(item);
+    if (rv != NS_OK) {
+      // if it didn't exist in mSecond, return, making it the current item
+      return NS_OK;
+    }
+    
+    // each time around, make sure that mSecond gets reset to the beginning
+    // so that when mFirst is done, we'll be ready to enumerate mSecond
+    rv = mSecond->First();
+    if (NS_FAILED(rv)) return rv;
+  }
+  
+  return mSecond->Next();
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::CurrentItem(nsISupports **aItem)
+{
+  if (mFirst->IsDone() != NS_OK)
+    return mFirst->CurrentItem(aItem);
+  else
+    return mSecond->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::IsDone(void)
+{
+  return (mFirst->IsDone() == NS_OK && mSecond->IsDone() == NS_OK)
+    ? NS_OK : NS_COMFALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsUnionEnumerator* e = new nsUnionEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsCppSharedAllocator.h

@@ -0,0 +1,122 @@
+#ifndef nsCppSharedAllocator_h__
+#define nsCppSharedAllocator_h__
+
+#include "nsIAllocator.h" // for |nsAllocator|
+#include "nscore.h"       // for |NS_XXX_CAST|
+#include <new.h>					// to allow placement |new|
+
+
+  // under Metrowerks (Mac), we don't have autoconf yet
+#ifdef __MWERKS__
+  #define HAVE_CPP_MEMBER_TEMPLATES
+	#define HAVE_CPP_NUMERIC_LIMITS
+#endif
+
+#ifdef HAVE_CPP_NUMERIC_LIMITS
+#include <limits>
+#else
+#include <limits.h>
+#endif
+
+
+template <class T>
+class nsCppSharedAllocator
+    /*
+      ...allows Standard Library containers, et al, to use our global shared
+      (XP)COM-aware allocator.
+    */
+  {
+    public:
+      typedef T          value_type;
+      typedef size_t     size_type;
+      typedef ptrdiff_t  difference_type;
+
+      typedef T*         pointer;
+      typedef const T*   const_pointer;
+
+      typedef T&         reference;
+      typedef const T&   const_reference;
+
+
+
+      nsCppSharedAllocator() { }
+
+#ifdef HAVE_CPP_MEMBER_TEMPLATES
+      template <class U>
+      nsCppSharedAllocator( const nsCppSharedAllocator<U>& ) { }
+#endif
+
+     ~nsCppSharedAllocator() { }
+
+
+      pointer
+      address( reference r ) const
+        {
+          return &r;
+        }
+
+      const_pointer
+      address( const_reference r ) const
+        {
+          return &r;
+        }
+
+      pointer
+      allocate( size_type n, const void* /*hint*/=0 )
+        {
+          return NS_REINTERPRET_CAST(pointer, nsAllocator::Alloc(NS_STATIC_CAST(PRUint32, n*sizeof(T))));
+        }
+
+      void
+      deallocate( pointer p, size_type /*n*/ )
+        {
+          nsAllocator::Free(p);
+        }
+
+      void
+      construct( pointer p, const T& val )
+        {
+          new (p) T(val);
+        }
+      
+      void
+      destroy( pointer p )
+        {
+          p->~T();
+        }
+
+      size_type
+      max_size() const
+        {
+#ifdef HAVE_CPP_NUMERIC_LIMITS
+          return numeric_limits<size_type>::max() / sizeof(T);
+#else
+          return ULONG_MAX / sizeof(T);
+#endif
+        }
+
+#ifdef HAVE_CPP_MEMBER_TEMPLATES
+      template <class U>
+      struct rebind
+        {
+          typedef nsCppSharedAllocator<U> other;
+        };
+#endif
+  };
+
+
+template <class T>
+PRBool
+operator==( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
+  {
+    return PR_TRUE;
+  }
+
+template <class T>
+PRBool
+operator!=( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
+  {
+    return PR_FALSE;
+  }
+
+#endif /* !defined(nsCppSharedAllocator_h__) */

mozilla/xpcom/ds/nsDeque.cpp

@@ -0,0 +1,594 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+ 
+#include "nsDeque.h"
+#include "nsCRT.h"
+#include <stdio.h>
+
+//#define _SELFTEST_DEQUE 1
+#undef _SELFTEST_DEQUE 
+
+/**
+ * Standard constructor
+ * @update	gess4/18/98
+ * @return  new deque
+ */
+nsDeque::nsDeque(nsDequeFunctor* aDeallocator) {
+  mDeallocator=aDeallocator;
+  mOrigin=mSize=0;
+  mData=mBuffer; // don't allocate space until you must
+  mCapacity=sizeof(mBuffer)/sizeof(mBuffer[0]);
+  nsCRT::zero(mData,mCapacity*sizeof(mBuffer[0]));
+}
+
+
+/**
+ * Destructor
+ * @update	gess4/18/98
+ */
+nsDeque::~nsDeque() {
+
+#if 0
+  char buffer[30];
+  printf("Capacity: %i\n",mCapacity);
+
+  static int mCaps[15] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+  switch(mCapacity) {
+    case 4:     mCaps[0]++; break;
+    case 8:     mCaps[1]++; break;
+    case 16:    mCaps[2]++; break;
+    case 32:    mCaps[3]++; break;
+    case 64:    mCaps[4]++; break;
+    case 128:   mCaps[5]++; break;
+    case 256:   mCaps[6]++; break;
+    case 512:   mCaps[7]++; break;
+    case 1024:  mCaps[8]++; break;
+    case 2048:  mCaps[9]++; break;
+    case 4096:  mCaps[10]++; break;
+    default:
+      break;
+  }
+#endif
+
+  Erase();
+  if(mData && (mData!=mBuffer))
+    delete [] mData;
+  mData=0;
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=0;
+}
+
+
+/**
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return  
+ */ 
+void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=aDeallocator;
+}
+
+/**
+ * Remove all items from container without destroying them.
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+nsDeque& nsDeque::Empty() {
+  if((0<mCapacity) && (mData)) {
+    nsCRT::zero(mData,mCapacity*sizeof(mData));
+  }
+  mSize=0;
+  mOrigin=0;
+  return *this;
+}
+
+/**
+ * Remove and delete all items from container
+ * 
+ * @update	gess4/18/98
+ * @return  this
+ */
+nsDeque& nsDeque::Erase() { 
+  if(mDeallocator && mSize) {
+    ForEach(*mDeallocator);
+  }
+  return Empty();
+}
+
+
+/**
+ * This method adds an item to the end of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::GrowCapacity(void) {
+
+  PRInt32 theNewSize = mCapacity<<2;
+  void** temp=new void*[theNewSize];
+
+  //Here's the interesting part: You can't just move the elements
+  //directy (in situ) from the old buffer to the new one.
+  //Since capacity has changed, the old origin doesn't make
+  //sense anymore. It's better to resequence the elements now.
+
+  if(mData) {
+    int tempi=0;
+    int i=0;
+    int j=0;
+    for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
+    for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j];         //copy the trailing elements...
+    if(mData!=mBuffer)
+      delete [] mData;
+  }
+  mCapacity=theNewSize;
+  mOrigin=0;       //now realign the origin...
+  mData=temp;
+  return *this;
+}
+
+/**
+ * This method adds an item to the end of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::Push(void* anItem) {
+  if(mSize==mCapacity) {
+    GrowCapacity();
+  }
+  int offset=mOrigin+mSize;
+  if(offset<mCapacity)
+    mData[offset]=anItem;
+  else mData[offset-mCapacity]=anItem;
+  mSize++;
+  return *this;
+}
+
+/**
+ * This method adds an item to the front of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::PushFront(void* anItem) {
+  if(mSize==mCapacity) {
+    GrowCapacity();
+  }
+  if(0==mOrigin){  //case1: [xxx..]
+    //mOrigin=mCapacity-1-mSize++;
+    mOrigin=mCapacity-1;
+    mData[mOrigin]=anItem;
+  }
+  else {// if(mCapacity==(mOrigin+mSize-1)){ //case2: [..xxx] and case3: [.xxx.]
+    mData[--mOrigin]=anItem;
+  }
+  mSize++;
+  return *this;
+}
+
+/**
+ * Remove and return the last item in the container.
+ * 
+ * @update	gess4/18/98
+ * @param   none
+ * @return  ptr to last item in container
+ */
+void* nsDeque::Pop(void) {
+  void* result=0;
+  if(mSize>0) {
+    int offset=mOrigin+mSize-1;
+    if(offset>=mCapacity) 
+      offset-=mCapacity;
+    result=mData[offset];
+    mData[offset]=0;
+    mSize--;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * This method gets called you want to remove and return
+ * the first member in the container.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::PopFront() {
+  void* result=0;
+  if(mSize>0) {
+    NS_ASSERTION(mOrigin<mCapacity,"Error: Bad origin");
+    result=mData[mOrigin];
+    mData[mOrigin++]=0;     //zero it out for debugging purposes.
+    mSize--;
+    if(mCapacity==mOrigin)  //you popped off the end, so cycle back around...
+      mOrigin=0;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * This method gets called you want to peek at the topmost
+ * member without removing it.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::Peek() {
+  void* result=0;
+  if(mSize>0) {
+    result=mData[mOrigin];
+  }
+  return result;
+}
+
+/**
+ * Call this to retrieve the ith element from this container.
+ * Keep in mind that accessing the underlying elements is 
+ * done in a relative fashion. Object 0 is not necessarily
+ * the first element (the first element is at mOrigin).
+ *
+ * @update	gess4/18/98
+ * @param   anIndex : 0 relative offset of item you want
+ * @return  void* or null
+ */
+void* nsDeque::ObjectAt(PRInt32 anIndex) const {
+  void* result=0;
+
+  if((anIndex>=0) && (anIndex<mSize))
+  {
+    if(anIndex<(mCapacity-mOrigin)) {
+      result=mData[mOrigin+anIndex];
+    }
+    else {
+      result=mData[anIndex-(mCapacity-mOrigin)];
+    }
+  }
+  return result;
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the beginning of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to 1st item
+ */
+nsDequeIterator nsDeque::Begin(void) const{
+  return nsDequeIterator(*this,0);
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the last of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to last item
+ */
+nsDequeIterator nsDeque::End(void) const{
+  return nsDequeIterator(*this,mSize);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+void nsDeque::ForEach(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+  }
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code. Iteration continues until your
+ * functor returns a non-null.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDeque::FirstThat(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+    if(obj)
+      return obj;
+  }
+  return 0;
+}
+
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+/**
+ * DequeIterator is an object that knows how to iterate (forward and backward)
+ * a Deque. Normally, you don't need to do this, but there are some special
+ * cases where it is pretty handy, so here you go.
+ *
+ * This is a standard dequeiterator constructor
+ *
+ * @update	gess4/18/98
+ * @param   aQueue is the deque object to be iterated
+ * @param   anIndex is the starting position for your iteration
+ */
+nsDequeIterator::nsDequeIterator(const nsDeque& aQueue,int anIndex):  mIndex(anIndex), mDeque(aQueue) {
+}
+
+/**
+ * Copy construct a new iterator beginning with given 
+ *
+ * @update	gess4/20/98
+ * @param   aCopy is another iterator to copy from
+ * @return
+ */
+nsDequeIterator::nsDequeIterator(const nsDequeIterator& aCopy) : mIndex(aCopy.mIndex), mDeque(aCopy.mDeque) {
+}
+
+/**
+ * Moves iterator to first element in deque
+ * @update	gess4/18/98
+ * @return  this
+ */
+nsDequeIterator& nsDequeIterator::First(void){
+  mIndex=0;
+  return *this;
+}
+
+/**
+ * Standard assignment operator for dequeiterator
+ *
+ * @update	gess4/18/98
+ * @param   aCopy is an iterator to be copied from
+ * @return  *this
+ */
+nsDequeIterator& nsDequeIterator::operator=(const nsDequeIterator& aCopy) {
+  //queue's are already equal.
+  mIndex=aCopy.mIndex;
+  return *this;
+}
+
+/**
+ * preform ! operation against to iterators to test for equivalence
+ * (or lack thereof)!
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the object to be compared to
+ * @return  TRUE if NOT equal.
+ */
+PRBool nsDequeIterator::operator!=(nsDequeIterator& anIter) {
+  return PRBool(!this->operator==(anIter));
+}
+
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator<(nsDequeIterator& anIter) {
+  return PRBool(((mIndex<anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator==(nsDequeIterator& anIter) {
+  return PRBool(((mIndex==anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator>=(nsDequeIterator& anIter) {
+  return PRBool(((mIndex>=anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Pre-increment operator 
+ *
+ * @update	gess4/18/98
+ * @return  object at preincremented index
+ */
+void* nsDequeIterator::operator++() {
+  return mDeque.ObjectAt(++mIndex);
+}
+
+/**
+ * Post-increment operator 
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-incremented index
+ */
+void* nsDequeIterator::operator++(int) {
+  return mDeque.ObjectAt(mIndex++);
+}
+
+/**
+ * Pre-decrement operator
+ *
+ * @update	gess4/18/98
+ * @return  object at pre-decremented index
+ */
+void* nsDequeIterator::operator--() {
+  return mDeque.ObjectAt(--mIndex);
+}
+
+/**
+ * Post-decrement operator
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-decremented index
+ */
+void* nsDequeIterator::operator--(int) {
+  return mDeque.ObjectAt(mIndex--);
+}
+
+/**
+ * Dereference operator
+ *
+ * @update	gess4/18/98
+ * @return  object at ith index
+ */
+void* nsDequeIterator::GetCurrent(void) {
+  return mDeque.ObjectAt(mIndex);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+void nsDequeIterator::ForEach(nsDequeFunctor& aFunctor) const{
+  mDeque.ForEach(aFunctor);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDequeIterator::FirstThat(nsDequeFunctor& aFunctor) const{
+  return mDeque.FirstThat(aFunctor);
+}
+
+#ifdef  _SELFTEST_DEQUE
+/**************************************************************
+  Now define the token deallocator class...
+ **************************************************************/
+class _SelfTestDeallocator: public nsDequeFunctor{
+public:
+  _SelfTestDeallocator::_SelfTestDeallocator() {
+    nsDeque::SelfTest();
+  }
+  virtual void* operator()(void* anObject) {
+    return 0;
+  }
+};
+static _SelfTestDeallocator gDeallocator;
+#endif
+
+/**
+ * conduct automated self test for this class
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+void nsDeque::SelfTest(void) {
+#ifdef  _SELFTEST_DEQUE
+
+  {
+    nsDeque theDeque(gDeallocator); //construct a simple one...
+    
+    int ints[200];
+    int count=sizeof(ints)/sizeof(int);
+    int i=0;
+
+    for(i=0;i<count;i++){ //initialize'em
+      ints[i]=10*(1+i);
+    }
+
+    for(i=0;i<70;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<56;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+    for(i=0;i<55;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<35;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+    for(i=0;i<35;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<38;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+  }
+
+  int x;
+  x=10;
+#endif
+}
+

mozilla/xpcom/ds/nsDeque.h

@@ -0,0 +1,410 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/**
+ * MODULE NOTES:
+ * @update  gess 4/15/98 (tax day)
+ * 
+ * The Deque is a very small, very efficient container object
+ * than can hold elements of type void*, offering the following features:
+ *    It's interface supports pushing and poping of children.
+ *    It can iterate (via an interator class) it's children.
+ *    When full, it can efficently resize dynamically.
+ *
+ *
+ * NOTE: The only bit of trickery here is that this deque is
+ * built upon a ring-buffer. Like all ring buffers, the first 
+ * element may not be at index[0]. The mOrigin member determines 
+ * where the first child is. This point is quietly hidden from 
+ * customers of this class.
+ *    
+ */
+
+
+#ifndef _NSDEQUE
+#define _NSDEQUE
+
+#include "nscore.h"
+
+/**
+ * The nsDequefunctor class is used when you want to create
+ * callbacks between the deque and your generic code.
+ * Use these objects in a call to ForEach();
+ *
+ * @update	gess4/20/98
+ */
+class NS_COM nsDequeFunctor{
+public:
+  virtual void* operator()(void* anObject)=0;
+};
+
+
+/******************************************************
+ * Here comes the nsDeque class itself...
+ ******************************************************/
+
+/**
+ * The deque (double-ended queue) class is a common container type, 
+ * whose behavior mimics a line in your favorite checkout stand.
+ * Classic CS describes the common behavior of a queue as FIFO. 
+ * A Deque allows items to be added and removed from either end of
+ * the queue.
+ *
+ * @update	gess4/20/98
+ */
+
+class NS_COM nsDeque {
+friend class nsDequeIterator;
+  public:
+                       nsDeque(nsDequeFunctor* aDeallocator);
+                      ~nsDeque();
+            
+  /**
+   * Returns the number of elements currently stored in
+   * this deque.
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return  int contains element count
+   */
+  inline PRInt32 GetSize() const { return mSize;}  
+
+  /**
+   * Pushes new member onto the end of the deque
+   *
+   * @update	gess4/18/98
+   * @param   ptr to object to store
+   * @return  *this
+   */
+  nsDeque& Push(void* anItem);
+
+  /**
+   * Pushes new member onto the front of the deque
+   *
+   * @update	gess4/18/98
+   * @param   ptr to object to store
+   * @return  *this
+   */
+  nsDeque& PushFront(void* anItem);
+  
+  /**
+   * Remove and return the first item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Pop(void);
+
+ /**
+   * Remove and return the first item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* PopFront(void);
+
+ 
+  /**
+   * Return topmost item without removing it.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Peek(void);
+  
+  /**
+   * method used to retrieve ptr to
+   * ith member in container. DOesn't remove
+   * that item.
+   *
+   * @update	gess4/18/98
+   * @param   index of desired item
+   * @return  ptr to ith element in list
+   */
+  void* ObjectAt(int anIndex) const;
+  
+  /**
+   * Remove all items from container without destroying them
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Empty();
+  
+  /**
+   * Remove and delete all items from container
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Erase();
+
+
+  /**
+   * Creates a new iterator, init'ed to start of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator Begin() const;
+  
+  /**
+   * Creates a new iterator, init'ed to end of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator End() const;
+
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  void ForEach(nsDequeFunctor& aFunctor) const;
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code. This process will interupt if
+   * your function returns a null to this iterator.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  void SetDeallocator(nsDequeFunctor* aDeallocator);
+
+  /**
+   * Perform automated selftest on the deque
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  static void SelfTest();
+
+protected:
+
+  PRInt32         mSize;
+  PRInt32         mCapacity;
+  PRInt32         mOrigin;
+  nsDequeFunctor* mDeallocator;
+  void*           mBuffer[8];
+  void**          mData;
+
+
+private: 
+  
+
+  /**
+   * Simple default constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque();
+
+  /**
+   * Copy constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque(const nsDeque& other);
+
+  /**
+   * Deque assignment operator (PRIVATE)
+   *
+   * @update	gess4/18/98
+   * @param   another deque
+   * @return  *this
+   */
+  nsDeque& operator=(const nsDeque& anOther);
+
+  nsDeque&  GrowCapacity(void);
+
+};
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+class NS_COM nsDequeIterator {
+public:
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDeque& aQueue,int anIndex=0);
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDequeIterator& aCopy);
+
+  /**
+   * Moves iterator to first element in deque
+   * @update	gess4/18/98
+   * @return  this
+   */
+  nsDequeIterator& First(void);
+
+  /**
+   * Standard assignment operator for deque
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDequeIterator& operator=(const nsDequeIterator& aCopy);
+
+  /**
+   * preform ! operation against to iterators to test for equivalence
+   * (or lack thereof)!
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the object to be compared to
+   * @return  TRUE if NOT equal.
+   */
+  PRBool operator!=(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator<(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator==(nsDequeIterator& anIter);
+  
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator>=(nsDequeIterator& anIter);
+
+  /**
+   * Pre-increment operator 
+   *
+   * @update	gess4/18/98
+   * @return  object at preincremented index
+   */
+  void* operator++();
+
+  /**
+   * Post-increment operator 
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-incremented index
+   */
+  void* operator++(int);
+
+  /**
+   * Pre-decrement operator
+   *
+   * @update	gess4/18/98
+   * @return  object at pre-decremented index
+   */
+  void* operator--();
+
+  /**
+   * Post-decrement operator
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-decremented index
+   */
+  void* operator--(int);
+  
+  /**
+   * Retrieve the ptr to the iterators notion of current node
+   *
+   * @update	gess4/18/98
+   * @return  object at ith index
+   */
+  void* GetCurrent(void);
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  void ForEach(nsDequeFunctor& aFunctor) const;
+  
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  protected:
+
+        PRInt32         mIndex;
+        const nsDeque&  mDeque;
+};
+
+
+#endif

mozilla/xpcom/ds/nsEmptyEnumerator.cpp

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  An empty enumerator.
+
+ */
+
+#include "nsIEnumerator.h"
+
+////////////////////////////////////////////////////////////////////////
+
+class EmptyEnumeratorImpl : public nsISimpleEnumerator
+{
+public:
+    EmptyEnumeratorImpl(void) {};
+    virtual ~EmptyEnumeratorImpl(void) {};
+
+    // nsISupports interface
+    NS_IMETHOD_(nsrefcnt) AddRef(void) {
+        return 2;
+    }
+
+    NS_IMETHOD_(nsrefcnt) Release(void) {
+        return 1;
+    }
+
+    NS_IMETHOD QueryInterface(REFNSIID iid, void** result) {
+        if (! result)
+            return NS_ERROR_NULL_POINTER;
+
+        if (iid.Equals(nsISimpleEnumerator::GetIID()) ||
+            iid.Equals(NS_GET_IID(nsISupports))) {
+            *result = (nsISimpleEnumerator*) this;
+            NS_ADDREF(this);
+            return NS_OK;
+        }
+        return NS_NOINTERFACE;
+    }
+
+    // nsISimpleEnumerator
+    NS_IMETHOD HasMoreElements(PRBool* aResult) {
+        *aResult = PR_FALSE;
+        return NS_OK;
+    }
+
+    NS_IMETHOD GetNext(nsISupports** aResult) {
+        return NS_ERROR_UNEXPECTED;
+    }
+};
+
+extern "C" NS_COM nsresult
+NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult)
+{
+    static EmptyEnumeratorImpl gEmptyEnumerator;
+    *aResult = &gEmptyEnumerator;
+    return NS_OK;
+}
+

mozilla/xpcom/ds/nsEnumeratorUtils.cpp

@@ -0,0 +1,228 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsEnumeratorUtils.h"
+
+
+nsArrayEnumerator::nsArrayEnumerator(nsISupportsArray* aValueArray)
+    : mValueArray(aValueArray),
+      mIndex(0)
+{
+    NS_INIT_REFCNT();
+    NS_IF_ADDREF(mValueArray);
+}
+
+nsArrayEnumerator::~nsArrayEnumerator(void)
+{
+    NS_IF_RELEASE(mValueArray);
+}
+
+NS_IMPL_ISUPPORTS1(nsArrayEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsArrayEnumerator::HasMoreElements(PRBool* aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mValueArray->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    *aResult = (mIndex < (PRInt32) cnt);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsArrayEnumerator::GetNext(nsISupports** aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mValueArray->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    if (mIndex >= (PRInt32) cnt)
+        return NS_ERROR_UNEXPECTED;
+
+    *aResult = mValueArray->ElementAt(mIndex++);
+    return NS_OK;
+}
+
+extern "C" NS_COM nsresult
+NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
+                      nsISupportsArray* array)
+{
+    nsArrayEnumerator* enumer = new nsArrayEnumerator(array);
+    if (enumer == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(enumer);
+    *result = enumer; 
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsSingletonEnumerator::nsSingletonEnumerator(nsISupports* aValue)
+    : mValue(aValue)
+{
+    NS_INIT_REFCNT();
+    NS_IF_ADDREF(mValue);
+    mConsumed = (mValue ? PR_FALSE : PR_TRUE);
+}
+
+nsSingletonEnumerator::~nsSingletonEnumerator()
+{
+    NS_IF_RELEASE(mValue);
+}
+
+NS_IMPL_ISUPPORTS1(nsSingletonEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsSingletonEnumerator::HasMoreElements(PRBool* aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    *aResult = !mConsumed;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsSingletonEnumerator::GetNext(nsISupports** aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (mConsumed)
+        return NS_ERROR_UNEXPECTED;
+
+    mConsumed = PR_TRUE;
+
+    NS_ADDREF(mValue);
+    *aResult = mValue;
+    return NS_OK;
+}
+
+extern "C" NS_COM nsresult
+NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
+                          nsISupports* singleton)
+{
+    nsSingletonEnumerator* enumer = new nsSingletonEnumerator(singleton);
+    if (enumer == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(enumer);
+    *result = enumer; 
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+
+nsAdapterEnumerator::nsAdapterEnumerator(nsIEnumerator* aEnum)
+    : mEnum(aEnum), mCurrent(0), mStarted(PR_FALSE)
+{
+    NS_INIT_REFCNT();
+    NS_ADDREF(mEnum);
+}
+
+
+nsAdapterEnumerator::~nsAdapterEnumerator()
+{
+    NS_RELEASE(mEnum);
+    NS_IF_RELEASE(mCurrent);
+}
+
+
+NS_IMPL_ISUPPORTS1(nsAdapterEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsAdapterEnumerator::HasMoreElements(PRBool* aResult)
+{
+    nsresult rv;
+
+    if (mCurrent) {
+        *aResult = PR_TRUE;
+        return NS_OK;
+    }
+
+    if (! mStarted) {
+        mStarted = PR_TRUE;
+        rv = mEnum->First();
+        if (rv == NS_OK) {
+            mEnum->CurrentItem(&mCurrent);
+            *aResult = PR_TRUE;
+        }
+        else {
+            *aResult = PR_FALSE;
+        }
+    }
+    else {
+        *aResult = PR_FALSE;
+
+        rv = mEnum->IsDone();
+        if (rv != NS_OK) {
+            // We're not done. Advance to the next one.
+            rv = mEnum->Next();
+            if (rv == NS_OK) {
+                mEnum->CurrentItem(&mCurrent);
+                *aResult = PR_TRUE;
+            }
+        }
+    }
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsAdapterEnumerator::GetNext(nsISupports** aResult)
+{
+    nsresult rv;
+
+    PRBool hasMore;
+    rv = HasMoreElements(&hasMore);
+    if (NS_FAILED(rv)) return rv;
+
+    if (! hasMore)
+        return NS_ERROR_UNEXPECTED;
+
+    // No need to addref, we "transfer" the ownership to the caller.
+    *aResult = mCurrent;
+    mCurrent = 0;
+    return NS_OK;
+}
+
+extern "C" NS_COM nsresult
+NS_NewAdapterEnumerator(nsISimpleEnumerator* *result,
+                        nsIEnumerator* enumerator)
+{
+    nsAdapterEnumerator* enumer = new nsAdapterEnumerator(enumerator);
+    if (enumer == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(enumer);
+    *result = enumer; 
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+

mozilla/xpcom/ds/nsEnumeratorUtils.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsEnumeratorUtils_h__
+#define nsEnumeratorUtils_h__
+
+#include "nsIEnumerator.h"
+#include "nsISupportsArray.h"
+
+class NS_COM nsArrayEnumerator : public nsISimpleEnumerator
+{
+public:
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator interface
+    NS_IMETHOD HasMoreElements(PRBool* aResult);
+    NS_IMETHOD GetNext(nsISupports** aResult);
+
+    // nsRDFArrayEnumerator methods
+    nsArrayEnumerator(nsISupportsArray* aValueArray);
+    virtual ~nsArrayEnumerator(void);
+
+protected:
+    nsISupportsArray* mValueArray;
+    PRInt32 mIndex;
+};
+
+extern "C" NS_COM nsresult
+NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
+                      nsISupportsArray* array);
+
+////////////////////////////////////////////////////////////////////////////////
+
+class NS_COM nsSingletonEnumerator : public nsISimpleEnumerator
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator methods
+    NS_IMETHOD HasMoreElements(PRBool* aResult);
+    NS_IMETHOD GetNext(nsISupports** aResult);
+
+    nsSingletonEnumerator(nsISupports* aValue);
+    virtual ~nsSingletonEnumerator();
+
+protected:
+    nsISupports* mValue;
+    PRBool mConsumed;
+};
+
+extern "C" NS_COM nsresult
+NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
+                          nsISupports* singleton);
+
+////////////////////////////////////////////////////////////////////////////////
+
+class NS_COM nsAdapterEnumerator : public nsISimpleEnumerator
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator methods
+    NS_IMETHOD HasMoreElements(PRBool* aResult);
+    NS_IMETHOD GetNext(nsISupports** aResult);
+
+    nsAdapterEnumerator(nsIEnumerator* aEnum);
+    virtual ~nsAdapterEnumerator();
+
+protected:
+    nsIEnumerator* mEnum;
+    nsISupports*   mCurrent;
+    PRBool mStarted;
+};
+
+extern "C" NS_COM nsresult
+NS_NewAdapterEnumerator(nsISimpleEnumerator* *result,
+                        nsIEnumerator* enumerator);
+
+////////////////////////////////////////////////////////////////////////
+
+#endif /* nsEnumeratorUtils_h__ */

mozilla/xpcom/ds/nsIArena.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIArena_h___
+#define nsIArena_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+#define NS_MIN_ARENA_BLOCK_SIZE 64
+#define NS_DEFAULT_ARENA_BLOCK_SIZE 4096
+
+/// Interface IID for nsIArena
+#define NS_IARENA_IID         \
+{ 0xa24fdad0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+#define NS_ARENA_PROGID "component://netscape/arena"
+#define NS_ARENA_CLASSNAME "Arena"
+
+/** Interface to a memory arena abstraction. Arena's use large blocks
+ * of memory to allocate smaller objects. Arena's provide no free
+ * operator; instead, all of the objects in the arena are deallocated
+ * by deallocating the arena (e.g. when it's reference count goes to
+ * zero)
+ */
+class nsIArena : public nsISupports {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IARENA_IID; return iid; }
+
+  NS_IMETHOD Init(PRUint32 arenaBlockSize) = 0;
+
+  NS_IMETHOD_(void*) Alloc(PRUint32 size) = 0;
+};
+
+/**
+ * Create a new arena using the desired block size for allocating the
+ * underlying memory blocks. The underlying memory blocks are allocated
+ * using the PR heap.
+ */
+extern NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                        PRUint32 aArenaBlockSize = 0);
+
+#define NS_ARENA_CID                                 \
+{ /* 9832ec80-0d6b-11d3-9331-00104ba0fd40 */         \
+    0x9832ec80,                                      \
+    0x0d6b,                                          \
+    0x11d3,                                          \
+    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#endif /* nsIArena_h___ */
+
+

mozilla/xpcom/ds/nsIAtom.idl

@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998-1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     
+ */
+#include "nsISupports.idl"
+
+interface nsISizeOfHandler;
+
+
+[ref] native nsStringRef(nsString);
+%{ C++
+class nsString;
+%}
+
+
+[uuid(3d1b15b0-93b4-11d1-895b-006008911b81)]
+interface nsIAtom : nsISupports
+{
+  /**
+   * Translate the unicode string into the stringbuf.
+   */
+  void ToString(in nsStringRef aString); 
+	
+  /**
+   * Return a pointer to a zero terminated unicode string.
+   */
+   void GetUnicode([shared, retval] out wstring aResult);
+
+  /**
+   * Get the size, in bytes, of the atom.
+   */
+  PRUint32 SizeOf(in nsISizeOfHandler aHandler);
+};
+
+
+%{C++
+
+/**
+ * Find an atom that matches the given iso-latin1 C string. The
+ * C string is translated into it's unicode equivalent.
+ */
+extern NS_COM nsIAtom* NS_NewAtom(const char* isolatin1);
+
+/**
+ * Find an atom that matches the given unicode string. The string is assumed
+ * to be zero terminated.
+ */
+extern NS_COM nsIAtom* NS_NewAtom(const PRUnichar* unicode);
+
+/**
+ * Find an atom that matches the given string.
+ */
+extern NS_COM nsIAtom* NS_NewAtom(const nsString& aString);
+
+/**
+ * Return a count of the total number of atoms currently
+ * alive in the system.
+ */
+extern NS_COM nsrefcnt NS_GetNumberOfAtoms(void);
+
+extern NS_COM void NS_PurgeAtomTable(void);
+
+%}

mozilla/xpcom/ds/nsIBuffer.h

@@ -0,0 +1,312 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIBuffer_h___
+#define nsIBuffer_h___
+
+/**
+ * nsIBuffer is something that we use to implement pipes (buffered
+ * input/output stream pairs). It might be useful to you for other
+ * purposes, but if not, oh well.
+ *
+ * One of the important things to understand about pipes is how
+ * they work with respect to EOF and result values. The following
+ * table describes:
+ *
+ *               | empty & not EOF    | full               | reader closed | writer closed                     |
+ * -------------------------------------------------------------------------------------------------------------
+ * buffer Read   | readCount == 0     | readCount == N     | N/A           | readCount == N, return NS_OK -or- |
+ * operations    | return WOULD_BLOCK | return NS_OK       |               | readCount == 0, return EOF        |
+ * -------------------------------------------------------------------------------------------------------------
+ * buffer Write  | writeCount == N    | writeCount == 0    | N/A           | assertion!                        | 
+ * operations    | return NS_OK       | return WOULD_BLOCK |               |                                   |
+ * -------------------------------------------------------------------------------------------------------------
+ * input stream  | readCount == 0     | readCount == N     | assertion!    | readCount == N, return NS_OK -or- |
+ * Read ops      | return WOULD_BLOCK | return NS_OK       |               | readCount == 0, return EOF        |
+ * -------------------------------------------------------------------------------------------------------------
+ * output stream | writeCount == N    | writeCount == 0    | return        | assertion!                        | 
+ * Write ops     | return NS_OK       | return WOULD_BLOCK | STREAM_CLOSED |                                   |
+ * -------------------------------------------------------------------------------------------------------------
+ */
+
+#include "nsISupports.h"
+#include "nscore.h"
+
+class nsIInputStream;
+class nsIAllocator;
+class nsIBufferInputStream;
+class nsIBufferOutputStream;
+class nsIBufferObserver;
+
+#define NS_IBUFFER_IID                               \
+{ /* 1eebb300-fb8b-11d2-9324-00104ba0fd40 */         \
+    0x1eebb300,                                      \
+    0xfb8b,                                          \
+    0x11d2,                                          \
+    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#define NS_BUFFER_CID                                \
+{ /* 5dbe4de0-fbab-11d2-9324-00104ba0fd40 */         \
+    0x5dbe4de0,                                      \
+    0xfbab,                                          \
+    0x11d2,                                          \
+    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#define NS_BUFFER_PROGID "component://netscape/buffer"
+#define NS_BUFFER_CLASSNAME "Buffer"
+
+/**
+ * The signature for the reader function passed to WriteSegment. This 
+ * specifies where the data should come from that gets written into the buffer.
+ * Implementers should return the following:
+ * @return NS_OK and readCount - if successfully read something
+ * @return NS_BASE_STREAM_EOF - if no more to read
+ * @return NS_BASE_STREAM_WOULD_BLOCK - if there is currently no data (in
+ *   a non-blocking mode)
+ * @return <other-error> - on failure
+ */
+typedef NS_CALLBACK(nsReadSegmentFun)(void* closure,
+                                      char* toRawSegment,
+                                      PRUint32 fromOffset,
+                                      PRUint32 count,
+                                      PRUint32 *readCount);
+
+/**
+ * The signature of the writer function passed to ReadSegments. This
+ * specifies where the data should go that gets read from the buffer.
+ * Implementers should return the following:
+ * @return NS_OK and writeCount - if successfully wrote something
+ * @return NS_BASE_STREAM_CLOSED - if no more can be written
+ * @return NS_BASE_STREAM_WOULD_BLOCK - if there is currently space to write (in
+ *   a non-blocking mode)
+ * @return <other-error> - on failure
+ */
+typedef NS_CALLBACK(nsWriteSegmentFun)(void* closure,
+                                       const char* fromRawSegment,
+                                       PRUint32 toOffset,
+                                       PRUint32 count,
+                                       PRUint32 *writeCount);
+
+class nsIBuffer : public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUFFER_IID);
+
+    /**
+     * The segment overhead is the amount of space chopped out of each
+     * segment for implementation purposes. The remainder of the segment
+     * is available for data, e.g.:
+     *     segmentDataSize = growBySize - SEGMENT_OVERHEAD;
+     */
+    enum { SEGMENT_OVERHEAD = 8 };
+
+    /**
+     * Initializes a buffer. The segment size (including overhead) will
+     * start from and increment by the growBySize, until reaching maxSize.
+     * The size of the data that can fit in a segment will be the growBySize
+     * minus SEGMENT_OVERHEAD bytes.
+     */
+    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
+                    nsIBufferObserver* observer, nsIAllocator* allocator) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Methods for Readers
+
+    /**
+     * Reads from the read cursor into a char buffer up to a specified length.
+     */
+    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount) = 0;
+
+    /**
+     * This read method allows you to pass a callback function that gets called
+     * repeatedly for each buffer segment until the entire amount is read.
+     * This avoids the need to copy data to/from and intermediate buffer.
+     */
+    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                            PRUint32 *readCount) = 0;
+
+    /**
+     * Returns the raw char buffer segment and its length available for reading.
+     * @param segmentLogicalOffset - The offset from the current read cursor for
+     *   the segment to be returned. If this is beyond the available written area,
+     *   NULL is returned for the resultSegment.
+     * @param resultSegment - The resulting read segment.
+     * @param resultSegmentLength - The resulting read segment length.
+     *
+     * @return NS_OK - if a read segment is successfully returned, or if
+     *   the requested offset is at or beyond the write cursor (in which case
+     *   the resultSegment will be nsnull and the resultSegmentLen will be 0)
+     * @return NS_BASE_STREAM_WOULD_BLOCK - if the buffer size becomes 0
+     * @return any error set by SetCondition if the requested offset is at
+     *   or beyond the write cursor (in which case the resultSegment will be
+     *   nsnull and the resultSegmentLen will be 0). Note that NS_OK will be
+     *   returned if SetCondition has not been called. 
+     * @return any error returned by OnEmpty
+     */
+    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset,
+                              const char* *resultSegment,
+                              PRUint32 *resultSegmentLen) = 0;
+
+    /**
+     * Returns the amount of data currently in the buffer available for reading.
+     */
+    NS_IMETHOD GetReadableAmount(PRUint32 *amount) = 0;
+
+    /**
+     * Searches for a string in the buffer. Since the buffer has a notion
+     * of EOF, it is possible that the string may at some time be in the
+     * buffer, but is is not currently found up to some offset. Consequently,
+     * both the found and not found cases return an offset:
+     *    if found, return offset where it was found
+     *    if not found, return offset of the first byte not searched
+     * In the case the buffer is at EOF and the string is not found, the first
+     * byte not searched will correspond to the length of the buffer.
+     */
+    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
+                      PRBool *found, PRUint32 *offsetSearchedTo) = 0;
+
+    /**
+     * Sets that the reader has closed their end of the stream.
+     */
+    NS_IMETHOD ReaderClosed(void) = 0;
+
+    /**
+     * Tests whether EOF marker is set. Note that this does not necessarily mean that
+     * all the data in the buffer has yet been consumed.
+     */
+    NS_IMETHOD GetCondition(nsresult *result) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Methods for Writers
+
+    /**
+     * Writes from a char buffer up to a specified length.
+     * @param writeCount - The amount that could be written. If the buffer becomes full,
+     *   this could be less then the specified bufLen.
+     */
+    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount) = 0;
+
+    /**
+     * Writes from an input stream up to a specified count of bytes.
+     * @param writeCount - The amount that could be written. If the buffer becomes full,
+     *   this could be less then the specified count.
+     */
+    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount) = 0;
+
+    /**
+     * This write method allows you to pass a callback function that gets called
+     * repeatedly for each buffer segment until the entire amount is written.
+     * This avoids the need to copy data to/from and intermediate buffer.
+     */
+    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                             PRUint32 *writeCount) = 0;
+
+    /**
+     * Returns the raw char buffer segment and its length available for writing.
+     * @param resultSegment - The resulting write segment.
+     * @param resultSegmentLength - The resulting write segment length.
+     *
+     * @return NS_OK - if there is a segment available to write to
+     * @return NS_BASE_STREAM_CLOSED - if ReaderClosed has been called
+     * @return NS_BASE_STREAM_WOULD_BLOCK - if the max buffer size is exceeded
+     * @return NS_ERROR_OUT_OF_MEMORY - if a new segment could not be allocated
+     * @return any error returned by OnFull
+     */
+    NS_IMETHOD GetWriteSegment(char* *resultSegment,
+                               PRUint32 *resultSegmentLen) = 0;
+
+    /**
+     * Returns the amount of space currently in the buffer available for writing.
+     */
+    NS_IMETHOD GetWritableAmount(PRUint32 *amount) = 0;
+
+    /**
+     * Returns whether the reader has closed their end of the stream.
+     */
+    NS_IMETHOD GetReaderClosed(PRBool *result) = 0;
+
+    /**
+     * Sets an EOF marker (typcially done by the writer) so that a reader can be informed
+     * when all the data in the buffer is consumed. After the EOF marker has been
+     * set, all subsequent calls to the above write methods will return NS_BASE_STREAM_EOF.
+     */
+    NS_IMETHOD SetCondition(nsresult condition) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+#define NS_IBUFFEROBSERVER_IID                       \
+{ /* 0c18bef0-22a8-11d3-9349-00104ba0fd40 */         \
+    0x0c18bef0,                                      \
+    0x22a8,                                          \
+    0x11d3,                                          \
+    {0x93, 0x49, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+/**
+ * A buffer observer is used to detect when the buffer becomes completely full
+ * or completely empty.
+ */
+class nsIBufferObserver : public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUFFEROBSERVER_IID);
+
+    NS_IMETHOD OnFull(nsIBuffer* buffer) = 0;
+
+    NS_IMETHOD OnWrite(nsIBuffer*, PRUint32 amount) = 0;
+
+    NS_IMETHOD OnEmpty(nsIBuffer* buffer) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Creates a new buffer.
+ * @param observer - may be null
+ */
+extern NS_COM nsresult
+NS_NewBuffer(nsIBuffer* *result,
+             PRUint32 growBySize, PRUint32 maxSize,
+             nsIBufferObserver* observer);
+
+/**
+ * Creates a new buffer, allocating segments from virtual memory pages.
+ */
+extern NS_COM nsresult
+NS_NewPageBuffer(nsIBuffer* *result,
+                 PRUint32 growBySize, PRUint32 maxSize,
+                 nsIBufferObserver* observer);
+
+extern NS_COM nsresult
+NS_NewBufferInputStream(nsIBufferInputStream* *result,
+                        nsIBuffer* buffer, PRBool blocking = PR_FALSE);
+
+extern NS_COM nsresult
+NS_NewBufferOutputStream(nsIBufferOutputStream* *result,
+                         nsIBuffer* buffer, PRBool blocking = PR_FALSE);
+
+extern NS_COM nsresult
+NS_NewPipe(nsIBufferInputStream* *inStrResult,
+           nsIBufferOutputStream* *outStrResult,
+           PRUint32 growBySize, PRUint32 maxSize,
+           PRBool blocking, nsIBufferObserver* observer);
+
+////////////////////////////////////////////////////////////////////////////////
+
+#endif // nsIBuffer_h___

mozilla/xpcom/ds/nsIByteBuffer.h

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIByteBuffer_h___
+#define nsIByteBuffer_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+class nsIInputStream;
+
+#define NS_IBYTE_BUFFER_IID    \
+{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+#define NS_IBYTEBUFFER_IID    \
+{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+#define NS_BYTEBUFFER_PROGID "component://netscape/byte-buffer"
+#define NS_BYTEBUFFER_CLASSNAME "Byte Buffer"
+
+/** Interface to a buffer that holds bytes */
+class nsIByteBuffer : public nsISupports {
+public:
+	static const nsIID& GetIID() { static nsIID iid = NS_IBYTEBUFFER_IID; return iid; }
+
+  NS_IMETHOD Init(PRUint32 aBufferSize) = 0;
+
+  /** @return length of buffer, i.e. how many bytes are currently in it. */
+  NS_IMETHOD_(PRUint32) GetLength(void) const = 0;
+
+  /** @return number of bytes allocated in the buffer */
+  NS_IMETHOD_(PRUint32) GetBufferSize(void) const = 0;
+
+  /** @return the buffer */
+  NS_IMETHOD_(char*) GetBuffer(void) const = 0;
+
+  /** Grow buffer to aNewSize bytes. */
+  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize) = 0;
+
+  /** Fill the buffer with data from aStream.  Don't grow the buffer, only
+   *  read until length of buffer equals buffer size. */
+  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                            PRUint32 aKeep) = 0;
+};
+
+#define NS_BYTEBUFFER_CID                            \
+{ /* a49d5280-0d6b-11d3-9331-00104ba0fd40 */         \
+    0xa49d5280,                                      \
+    0x0d6b,                                          \
+    0x11d3,                                          \
+    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+/** Create a new byte buffer using the given buffer size. */
+extern NS_COM nsresult 
+NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                 nsISupports* aOuter,
+                 PRUint32 aBufferSize = 0);
+
+#endif /* nsIByteBuffer_h___ */
+

mozilla/xpcom/ds/nsICollection.idl

@@ -0,0 +1,38 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+#include "nsIEnumerator.idl"
+
+[scriptable, uuid(83b6019c-cbc4-11d2-8cca-0060b0fc14a3)]
+interface nsICollection : nsISupports
+{
+
+  PRUint32 Count();
+  nsISupports GetElementAt(in PRUint32 index);
+  void QueryElementAt(in PRUint32 index, in nsIIDRef uuid, 
+                      [iid_is(uuid),retval] out nsQIResult result);
+  void SetElementAt(in PRUint32 index, in nsISupports item);
+  void AppendElement(in nsISupports item);
+  void RemoveElement(in nsISupports item);
+
+  nsIEnumerator Enumerate();
+
+  void Clear();
+
+};

mozilla/xpcom/ds/nsIEnumerator.idl

@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(D1899240-F9D2-11D2-BDD6-000064657374)]
+interface nsISimpleEnumerator : nsISupports {
+  boolean HasMoreElements();
+  nsISupports GetNext();
+};
+
+/*
+ * DO NOT USE THIS INTERFACE.  IT IS HORRIBLY BROKEN, USES NS_COMFALSE
+ * AND IS BASICALLY IMPOSSIBLE TO USE CORRECTLY THROUGH PROXIES OR
+ * XPCONNECT.  IF YOU SEE NEW USES OF THIS INTERFACE IN CODE YOU ARE
+ * REVIEWING, YOU SHOULD INSIST ON nsISimpleEnumerator.
+ *
+ * DON'T MAKE ME COME OVER THERE.
+ */
+[scriptable, uuid(ad385286-cbc4-11d2-8cca-0060b0fc14a3)]
+interface nsIEnumerator : nsISupports {
+
+  /** First will reset the list. will return NS_FAILED if no items
+   */
+  void first();
+
+  /** Next will advance the list. will return failed if already at end
+   */
+  void next();
+
+  /** CurrentItem will return the CurrentItem item it will fail if the 
+   *  list is empty
+   */
+  nsISupports currentItem();
+
+  /** return if the collection is at the end.  that is the beginning following 
+   *  a call to Prev and it is the end of the list following a call to next
+   */
+  void isDone();
+};
+
+[uuid(75f158a0-cadd-11d2-8cca-0060b0fc14a3)]
+interface nsIBidirectionalEnumerator : nsIEnumerator {
+
+  /** Last will reset the list to the end. will return NS_FAILED if no items
+   */
+  void Last();
+
+  /** Prev will decrement the list. will return failed if already at beginning
+   */
+  void Prev();
+};
+
+%{C++
+extern "C" NS_COM nsresult
+NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult);
+
+// Construct and return an implementation of a "conjoining enumerator." This
+// enumerator lets you string together two other enumerators into one sequence.
+// The result is an nsIBidirectionalEnumerator, but if either input is not
+// also bidirectional, the Last and Prev operations will fail.
+extern "C" NS_COM nsresult
+NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                           nsIBidirectionalEnumerator* *aInstancePtrResult);
+
+// Construct and return an implementation of a "union enumerator." This
+// enumerator will only return elements that are found in both constituent
+// enumerators.
+extern "C" NS_COM nsresult
+NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult);
+
+// Construct and return an implementation of an "intersection enumerator." This
+// enumerator will return elements that are found in either constituent
+// enumerators, eliminating duplicates.
+extern "C" NS_COM nsresult
+NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                             nsIEnumerator* *aInstancePtrResult);
+
+%}

mozilla/xpcom/ds/nsIObserver.idl

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(DB242E01-E4D9-11d2-9DDE-000064657374)]
+interface nsIObserver : nsISupports {
+
+	/*------------------------------- Observe ----------------------------------
+    | Called when aTopic changes for aSubject (presumably; it is actually      |
+    | called whenever anyone calls nsIObserverService::Notify for aTopic).     |
+    |                                                                          |
+    | Implement this in your class to handle the event appropriately.  If      |
+    | your observer objects can respond to multiple topics and/or subjects,    |
+    | then you will have to filter accordingly.                                |
+	--------------------------------------------------------------------------*/
+    void Observe( in nsISupports aSubject,
+				  in wstring     aTopic,
+				  in wstring     someData );
+
+};
+
+%{C++
+
+#define NS_OBSERVER_PROGID "component://netscape/xpcom/observer"
+
+#define NS_OBSERVER_CLASSNAME "Observer"
+
+%}

mozilla/xpcom/ds/nsIObserverList.h

@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIObserverList_h__
+#define nsIObserverList_h__
+
+#include "nsISupports.h"
+#include "nsIObserver.h"
+#include "nsIEnumerator.h"
+#include "nscore.h"
+
+
+// {E777D482-E6E3-11d2-8ACD-00105A1B8860}
+#define NS_IOBSERVERLIST_IID \
+{ 0xe777d482, 0xe6e3, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
+
+// {E777D484-E6E3-11d2-8ACD-00105A1B8860}
+#define NS_OBSERVERLIST_CID \
+{ 0xe777d484, 0xe6e3, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
+
+class nsIObserverList : public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IOBSERVERLIST_IID; return iid; }
+    
+    NS_IMETHOD AddObserver(nsIObserver** anObserver) = 0;
+    NS_IMETHOD RemoveObserver(nsIObserver** anObserver) = 0;
+	NS_IMETHOD EnumerateObserverList(nsIEnumerator** anEnumerator) = 0;
+   
+};
+
+extern NS_COM nsresult NS_NewObserverList(nsIObserverList** anObserverList);
+
+#endif /* nsIObserverList_h__ */