merge montulli1 branch with tip

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

mozilla/Makefile

@@ -25,7 +25,7 @@ ifndef NO_MOCHA
 DIRS_JS		= js
 endif
 
-DIRS		= config coreconf $(NSPRDIR) jpeg dbm xpcom base network caps
+DIRS		= config coreconf $(NSPRDIR) jpeg dbm xpcom network
 
 ifdef MOZ_NETCAST
 DIRS		+= netcast
@@ -41,8 +41,6 @@ ifndef NO_SECURITY
 DIRS		+= security
 endif
 
-DIRS		+= privacy
-
 DIRS		+= modules lib l10n cmd
 
 ifeq ($(STAND_ALONE_JAVA),1)
@@ -51,7 +49,7 @@ endif
 
 include $(DEPTH)/config/rules.mk
 
-export:: envirocheck $(OBJS)
+export:: $(OBJS)
 
 # Running this rule assembles all the SDK source pieces into dist/sdk.
 # You'll need to run this rule on every platform to get all the

mozilla/Makefile.in

@@ -1,100 +0,0 @@
-#
-# 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
-
-NSPRDIR		= nsprpub
-NSPR20		= 1
-MOZILLA_CLIENT	= 1
-
-ifndef NO_MOCHA
-DIRS_JS		= js
-endif
-
-DIRS		= config coreconf $(NSPRDIR) dbm xpcom base network caps
-
-ifndef MOZ_NATIVE_JPEG
-DIRS		+= jpeg
-endif
-
-ifdef MOZ_NETCAST
-DIRS		+= netcast
-endif
-
-ifdef MOZ_JAVA
-DIRS		+= sun-java ldap ifc $(DIRS_JS) nav-java ifc/tools js/jsd
-else
-DIRS		+= sun-java nav-java $(DIRS_JS)
-endif
-
-ifndef NO_SECURITY
-DIRS		+= security
-endif
-
-DIRS		+= privacy
-
-DIRS		+= modules lib l10n cmd
-
-ifeq ($(STAND_ALONE_JAVA),1)
-DIRS		= config lib/xp $(NSPRDIR) sun-java ifc js ifc/tools sun-java/java
-ifndef MOZ_NATIVE_JPEG
-DIRS		+= jpeg
-endif
-ifndef MOZ_NATIVE_ZLIB
-DIRS		+= modules/zlib
-endif
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-export:: envirocheck $(OBJS)
-
-# Running this rule assembles all the SDK source pieces into dist/sdk.
-# You'll need to run this rule on every platform to get all the
-# binaries (e.g. javah) copied there. You'll also have to do special
-# magic on a Mac.
-sdk-src::
-	$(SDKINSTALL) include/npapi.h $(SDK)/include/
-	$(SDKINSTALL) include/jri_md.h $(SDK)/include/
-	$(SDKINSTALL) include/jritypes.h $(SDK)/include/
-	$(SDKINSTALL) include/jri.h $(SDK)/include/
-	$(SDKINSTALL) lib/plugin/npupp.h $(SDK)/include/
-	$(SDKINSTALL) sdk/common/*.c* $(SDK)/common/
-	$(SDKINSTALL) sun-java/classsrc/$(ZIP_NAME).x $(SDK)/classes/$(ZIP_NAME)
-	$(SDKINSTALL) sdk/examples/simple/Source/*.c $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/*.java $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/*.class $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/_gen/*.h $(SDK)/examples/simple/Source/_gen/
-	$(SDKINSTALL) sdk/examples/simple/Source/_stubs/*.c $(SDK)/examples/simple/Source/_stubs/
-	$(SDKINSTALL) sdk/examples/simple/Unix/makefile.* $(SDK)/examples/simple/Unix/
-	$(SDKINSTALL) sdk/examples/simple/Testing/SimpleExample.html $(SDK)/examples/simple/Testing/
-	$(SDKINSTALL) sdk/examples/simple/readme.html $(SDK)/examples/simple/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/*.c $(SDK)/examples/UnixTemplate/Source/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Testing/Test.html $(SDK)/examples/UnixTemplate/Testing/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Unix/makefile.* $(SDK)/examples/UnixTemplate/Unix/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/readme.html $(SDK)/examples/UnixTemplate/
-
-sdk-bin::
-	cd sdk; $(MAKE); cd ..
-	$(SDKINSTALL) $(DIST)/bin/javah$(BIN_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
-	$(SDKINSTALL) sdk/examples/simple/Source/$(OBJDIR)/npsimple.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/$(OBJDIR)/nptemplate.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/

mozilla/base/Makefile

@@ -1,24 +0,0 @@
-#!gmake
-#
-# 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 = ..
-
-DIRS = public src tests
-
-include $(DEPTH)/config/config.mk
-
-include $(DEPTH)/config/rules.mk

mozilla/base/Makefile.in

@@ -1,33 +0,0 @@
-#!gmake
-#
-# 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@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = public src
-
-ifdef ENABLE_TESTS
-DIRS += tests
-endif
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk

mozilla/base/makefile.win

@@ -1,23 +0,0 @@
-#!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=..
-IGNORE_MANIFEST=1
-
-DIRS=public src tests 
-
-include <$(DEPTH)\config\rules.mak>

mozilla/base/public/MANIFEST

@@ -1,5 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist:base directory
-#
-
-nsISizeOfHandler.h

mozilla/base/public/Makefile

@@ -1,30 +0,0 @@
-#!gmake
-#
-# 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=../..
-
-DEFINES = -D_IMPL_NS_BASE
-
-EXPORTS =		\
-    nsISizeOfHandler.h	\
-    $(NULL)
-
-MODULE = raptor
-
-include $(DEPTH)/config/config.mk
-
-include $(DEPTH)/config/rules.mk

mozilla/base/public/Makefile.in

@@ -1,37 +0,0 @@
-#!gmake
-#
-# 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
-
-DEFINES = -D_IMPL_NS_BASE
-
-EXPORTS =		\
-    nsISizeOfHandler.h	\
-    $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = raptor
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk

mozilla/base/public/makefile.win

@@ -1,30 +0,0 @@
-#!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=..\..
-IGNORE_MANIFEST=1
-
-DEFINES = -D_IMPL_NS_BASE
-
-EXPORTS =		\
-    nsISizeOfHandler.h	\
-    $(NULL)
-
-MODULE = raptor 
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/base/public/nsISizeOfHandler.h

@@ -1,66 +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.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 nsISizeOfHandler_h___
-#define nsISizeOfHandler_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-/* c028d1f0-fc9e-11d1-89e4-006008911b81 */
-#define NS_ISIZEOF_HANDLER_IID \
-{ 0xc028d1f0, 0xfc9e, 0x11d1, {0x89, 0xe4, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81}}
-
-/**
- * An API to managing a sizeof computation of an arbitrary graph.
- * The handler is responsible for remembering which objects have been
- * seen before. Note that the handler doesn't hold references to
- * nsISupport's objects; the assumption is that the objects being
- * sized are stationary and will not be modified during the sizing
- * computation and therefore do not need an extra reference count.
- */
-class nsISizeOfHandler : public nsISupports {
-public:
-  /**
-   * Add in a simple size value to the running total.
-   * Always returns NS_OK.
-   */
-  NS_IMETHOD Add(size_t aSize) = 0;
-
-  /**
-   * Update aResult with PR_TRUE if the object has been traversed
-   * by the sizeof computation before. Otherwise aResult is set to
-   * PR_FALSE and the object is added to the internal database
-   * of objects that have been traversed. It's ok to pass a null
-   * pointer in; aResult will be set to PR_TRUE so you won't accidently
-   * try to traverse through null pointer.
-   *
-   * Note: This violates the COM API standard on purpose; so there!
-   */
-  virtual PRBool HaveSeen(void* anObject) = 0;
-
-  /**
-   * Return the currently computed size.
-   * Always returns NS_OK.
-   */
-  NS_IMETHOD GetSize(PRUint32& aResult) = 0;
-};
-
-extern NS_BASE nsresult
-NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult);
-
-#endif /* nsISizeofHandler_h___ */

mozilla/base/src/MANIFEST

@@ -1,22 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-nscore.h
-nsIArena.h
-nsIAtom.h
-nsIByteBuffer.h
-nsBTree.h
-nsCRT.h
-nsDeque.h
-nsITimer.h
-nsITimerCallback.h
-nsIUnicharBuffer.h
-nsRBTree.h
-nsIUnicharInputStream.h
-nsString.h
-nsVoidArray.h
-nsUnitConversion.h
-nsIBaseStream.h
-nsIInputStream.h
-nsIOutputStream.h

mozilla/base/src/Makefile

@@ -1,70 +0,0 @@
-#!gmake
-#
-# 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=../..
-
-DEFINES =-D_IMPL_NS_BASE
-
-DIRS = unix
-
-LIBRARY_NAME = raptorbase
-
-CPPSRCS =                       \
-    nsArena.cpp                 \
-    nsAtomTable.cpp             \
-    nsBTree.cpp                 \
-    nsByteBuffer.cpp            \
-    nsCRT.cpp                   \
-    nsDeque.cpp                 \
-    nsRBTree.cpp                \
-    nsSizeOfHandler.cpp		\
-    nsString.cpp                \
-    nsUnicharBuffer.cpp         \
-    nsUnicharInputStream.cpp    \
-    nsVoidArray.cpp             \
-    $(NULL)
-
-EXPORTS =                       \
-    nscore.h                    \
-    nsBTree.h                   \
-    nsCRT.h                     \
-    nsDeque.h                   \
-    nsIArena.h                  \
-    nsIAtom.h                   \
-    nsIByteBuffer.h             \
-    nsIBaseStream.h             \
-    nsIInputStream.h            \
-    nsIOutputStream.h           \
-    nsITimer.h                  \
-    nsITimerCallback.h          \
-    nsIUnicharBuffer.h          \
-    nsIUnicharInputStream.h     \
-    nsRBTree.h                  \
-    nsString.h                  \
-    nsVoidArray.h               \
-    nsUnitConversion.h          \
-    $(NULL)
-
-MODULE = raptor
-
-REQUIRES = xpcom netlib raptor
-
-include $(DEPTH)/config/config.mk
-
-TARGET = $(LIBARY)
-
-include $(DEPTH)/config/rules.mk

mozilla/base/src/Makefile.in

@@ -1,77 +0,0 @@
-#!gmake
-#
-# 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@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES =-D_IMPL_NS_BASE
-
-DIRS = unix
-
-LIBRARY_NAME = raptorbase
-
-CPPSRCS =                       \
-    nsArena.cpp                 \
-    nsAtomTable.cpp             \
-    nsBTree.cpp                 \
-    nsByteBuffer.cpp            \
-    nsCRT.cpp                   \
-    nsDeque.cpp                 \
-    nsRBTree.cpp                \
-    nsSizeOfHandler.cpp                \
-    nsString.cpp                \
-    nsUnicharBuffer.cpp         \
-    nsUnicharInputStream.cpp    \
-    nsVoidArray.cpp             \
-    $(NULL)
-
-EXPORTS =                       \
-    nscore.h                    \
-    nsBTree.h                   \
-    nsCRT.h                     \
-    nsDeque.h                   \
-    nsIArena.h                  \
-    nsIAtom.h                   \
-    nsIByteBuffer.h             \
-    nsIBaseStream.h             \
-    nsIInputStream.h            \
-    nsIOutputStream.h           \
-    nsITimer.h                  \
-    nsITimerCallback.h          \
-    nsIUnicharBuffer.h          \
-    nsIUnicharInputStream.h     \
-    nsRBTree.h                  \
-    nsString.h                  \
-    nsVoidArray.h               \
-    nsUnitConversion.h          \
-    $(NULL)
-
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = raptor
-
-REQUIRES = xpcom netlib raptor
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
-
-include $(topsrcdir)/config/rules.mk

mozilla/base/src/mac/nsTimerMac.cpp

@@ -1,283 +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.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.
- */
- 
-//
-// Mac implementation of the nsITimer interface
-//
-
-// nsMacTimerPeriodical idles, 
-
-
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "prlog.h"
-#include <LPeriodical.h>
-#include <LArray.h>
-#include <LArrayIterator.h>
-#include <LComparator.h>
-
-#pragma mark class TimerImpl
-//
-// TimerImpl implements nsITimer API
-// 
-class TimerImpl : public nsITimer 
-{
-	private:
-		nsTimerCallbackFunc mCallbackFunc;
-		nsITimerCallback * mCallbackObject;
-  	void * mClosure;
-  	PRUint32 mDelay;
-  	UInt32 mFireTime;	// Timer should fire when TickCount >= this number
-	
-	public:
-
-	// constructors
-
-	  TimerImpl();
-
-	  virtual ~TimerImpl(){};
-
-	 	NS_DECL_ISUPPORTS
-
-		UInt32 GetFireTime() { return mFireTime; }
-
-		void Fire();
-
-	// nsITimer overrides
-
-	  virtual nsresult Init(nsTimerCallbackFunc aFunc,
-	                        void *aClosure,
-	                        PRUint32 aDelay);
-
-		virtual nsresult Init(nsITimerCallback *aCallback,
-	                        PRUint32 aDelay);
-
-	  virtual void Cancel();
-
-	  virtual PRUint32 GetDelay();
-
-	  virtual void SetDelay(PRUint32 aDelay);
-	
-	private:
-	// Calculates mFireTime too
-		void SetDelaySelf( PRUint32 aDelay );
-};
-
-#pragma mark class TimerPeriodical
-//
-// TimerPeriodical is a singleton LPeriodical subclass that fires
-// off TimerImpl. The firing is done on idle
-// 
-class TimerPeriodical	: public LPeriodical
-{
-		static TimerPeriodical * gPeriodical;
-		
-		LArray * mTimers;	// List of TimerImpl *
-	
-	public:
-		// Returns the singleton instance
-		static TimerPeriodical * GetPeriodical();
-
-		TimerPeriodical();
-
-		virtual ~TimerPeriodical();
-		
-		nsresult AddTimer( TimerImpl * aTimer);
-		
-		nsresult RemoveTimer( TimerImpl * aTimer);
-
-		virtual	void	SpendTime( const EventRecord &inMacEvent);
-};
-
-#pragma mark class TimerImplComparator
-// 
-// TimerImplComparator compares two TimerImpl
-//
-class TimerImplComparator	: public LComparator
-{
-	virtual Int32		Compare(
-								const void*			inItemOne,
-								const void* 		inItemTwo,
-								Uint32				inSizeOne,
-								Uint32				inSizeTwo) const;
-};
-
-
-// 
-// TimerImpl implementation
-//
-
-static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
-NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
-
-TimerImpl::TimerImpl()
-{
-	NS_INIT_REFCNT();
-	mCallbackFunc = NULL;
-	mCallbackObject = NULL;
-	mClosure = NULL;
-	mDelay = 0;
-	mFireTime = 0;
-}
-
-nsresult TimerImpl::Init(nsTimerCallbackFunc aFunc,
-	                        void *aClosure,
-	                        PRUint32 aDelay)
-{
-	mCallbackFunc = aFunc;
-	mClosure = aClosure;
-	SetDelaySelf(aDelay);
-	return TimerPeriodical::GetPeriodical()->AddTimer(this);
-}
-
-nsresult TimerImpl::Init(nsITimerCallback *aCallback,
-	                        PRUint32 aDelay)
-{
-	mCallbackObject = aCallback;
-	SetDelaySelf(aDelay);
-	return TimerPeriodical::GetPeriodical()->AddTimer(this);
-}
-
-void TimerImpl::Cancel()
-{
-	TimerPeriodical::GetPeriodical()->RemoveTimer(this);
-}
-
-PRUint32 TimerImpl::GetDelay()
-{
-	return mDelay;
-}
-
-void TimerImpl::SetDelay(PRUint32 aDelay)
-{
-	SetDelaySelf(aDelay);
-	// Make sure that timer was sorted
-	NS_ADDREF(this);
-	TimerPeriodical::GetPeriodical()->RemoveTimer(this);
-	TimerPeriodical::GetPeriodical()->AddTimer(this);
-	NS_RELEASE(this);
-}
-
-void TimerImpl::Fire()
-{
-	if (mCallbackFunc != NULL) {
-		(*mCallbackFunc)(this, mClosure);
-  }
-  else if (mCallbackObject != NULL) {
-    mCallbackObject->Notify(this); // Fire the timer
-  }
-}
-
-void TimerImpl::SetDelaySelf( PRUint32 aDelay )
-{
-	mDelay = aDelay;
-	mFireTime = TickCount() + mDelay / 100 * 6;	// We need mFireTime in ticks, 1/60th of a second
-}
-
-TimerPeriodical * TimerPeriodical::gPeriodical = NULL;
-
-TimerPeriodical * TimerPeriodical::GetPeriodical()
-{
-	if (gPeriodical == NULL)
-		gPeriodical = new TimerPeriodical();
-	return gPeriodical;
-}
-
-TimerPeriodical::TimerPeriodical()
-{
-	mTimers = new LArray( sizeof(TimerImpl*));
-	mTimers->SetComparator( new TimerImplComparator());
-	mTimers->SetKeepSorted( true );
-}
-
-TimerPeriodical::~TimerPeriodical()
-{
-	PR_ASSERT(mTimers->GetCount() == 0);
-	delete mTimers;
-}
-
-nsresult TimerPeriodical::AddTimer( TimerImpl * aTimer)
-{
-	try
-	{
-		NS_ADDREF(aTimer);
-		mTimers->AddItem( aTimer );
-		StartRepeating();
-	}
-	catch(...)
-	{
-		return NS_ERROR_UNEXPECTED;
-	}
-	return NS_OK;
-}
-
-nsresult TimerPeriodical::RemoveTimer( TimerImpl * aTimer)
-{
-	mTimers->Remove( aTimer );
-	NS_RELEASE( aTimer );
-	if ( mTimers->GetCount() == 0 )
-		StopRepeating();
-	return NS_OK;
-}
-
-// Called through every event loop
-// Loops through the list of available timers, and 
-// fires off the available ones
-void	TimerPeriodical::SpendTime( const EventRecord &inMacEvent)
-{
-	LArrayIterator iter( *mTimers, LArrayIterator::from_Start);
-	TimerImpl * timer;
-	while (iter.Next( &timer))
-	{
-		if ( timer->GetFireTime() <= inMacEvent.when )
-		{
-			NS_ADDREF(timer);
-			RemoveTimer(timer);
-			timer->Fire();
-			NS_RELEASE(timer);
-		}
-		else
-			break;	// Items are sorted, so we do not need to iterate until the end
-	}
-}
-
-//
-//  class TimerImplComparator implementation
-//
-Int32 TimerImplComparator::Compare(
-								const void*			inItemOne,
-								const void* 		inItemTwo,
-								Uint32				inSizeOne,
-								Uint32				inSizeTwo) const
-{
-	return (( TimerImpl *) inItemOne)->GetFireTime() - (( TimerImpl *) inItemTwo)->GetFireTime();
-}
-								
-NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
-{
-    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-    if (nsnull == aInstancePtrResult) {
-      return NS_ERROR_NULL_POINTER;
-    }  
-    TimerImpl *timer = new TimerImpl();
-    if (nsnull == timer) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
-}

mozilla/base/src/makefile.win

@@ -1,99 +0,0 @@
-#!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=..\..
-IGNORE_MANIFEST=1
-
-DIRS = windows
-
-DEFINES=-D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
-LIBRARY_NAME=raptorbase 
-
-CPPSRCS =				\
-	nsArena.cpp			\
-	nsAtomTable.cpp			\
-	nsBTree.cpp			\
-	nsByteBuffer.cpp		\
-	nsCRT.cpp			\
-	nsDeque.cpp			\
-	nsRBTree.cpp			\
-	nsSizeOfHandler.cpp		\
-	nsString.cpp			\
-	nsUnicharBuffer.cpp		\
-	nsUnicharInputStream.cpp	\
-	nsVoidArray.cpp			\
-	$(NULL)
-
-CPP_OBJS =					\
-	.\$(OBJDIR)\nsArena.obj			\
-	.\$(OBJDIR)\nsAtomTable.obj		\
-	.\$(OBJDIR)\nsBTree.obj			\
-	.\$(OBJDIR)\nsByteBuffer.obj		\
-	.\$(OBJDIR)\nsCRT.obj			\
-	.\$(OBJDIR)\nsDeque.obj			\
-	.\$(OBJDIR)\nsRBTree.obj		\
-	.\$(OBJDIR)\nsSizeOfHandler.obj		\
-	.\$(OBJDIR)\nsString.obj		\
-	.\$(OBJDIR)\nsUnicharBuffer.obj		\
-	.\$(OBJDIR)\nsUnicharInputStream.obj	\
-	.\$(OBJDIR)\nsVoidArray.obj		\
-	$(NULL)
-
-EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
-    nsBTree.h nsCRT.h nsDeque.h nsITimer.h \
-    nsITimerCallback.h nsIUnicharBuffer.h nsRBTree.h \
-    nsIUnicharInputStream.h nsString.h nsVoidArray.h \
-    nsUnitConversion.h \
-    nsIBaseStream.h nsIInputStream.h nsIOutputStream.h
-
-MODULE=raptor 
-
-REQUIRES=xpcom netlib raptor 
-
-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib \
-    -I$(PUBLIC)\raptor 
-
-MAKE_OBJ_TYPE = DLL
-DLLNAME = raptorbase
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-# These are the libraries we need to link with to create the dll
-LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\libplc21.lib       \
- $(LIBNSPR)  
-!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
-LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
-!endif
-
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\$(DLLNAME).dll
-	rm -f $(DIST)\lib\$(DLLNAME).lib

mozilla/base/src/nsArena.cpp

@@ -1,80 +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.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 "nsIArena.h"
-#include "nsCRT.h"
-
-#define PL_ARENA_CONST_ALIGN_MASK 7
-#include "plarena.h"
-
-static NS_DEFINE_IID(kArenaIID, NS_IARENA_IID);
-
-// Simple arena implementation layered on plarena
-class ArenaImpl : public nsIArena {
-public:
-  ArenaImpl(PRInt32 aBlockSize);
-
-  NS_DECL_ISUPPORTS
-
-  virtual void* Alloc(PRInt32 aSize);
-
-protected:
-  ~ArenaImpl();
-
-  PLArenaPool mPool;
-  PRInt32 mBlockSize;
-};
-
-ArenaImpl::ArenaImpl(PRInt32 aBlockSize)
-{
-  NS_INIT_REFCNT();
-  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
-    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
-  }
-  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
-  mBlockSize = aBlockSize;
-}
-
-NS_IMPL_ISUPPORTS(ArenaImpl,kArenaIID)
-
-ArenaImpl::~ArenaImpl()
-{
-  PL_FinishArenaPool(&mPool);
-}
-
-void* ArenaImpl::Alloc(PRInt32 size)
-{
-  // Adjust size so that it's a multiple of sizeof(double)
-  PRInt32 align = size & (sizeof(double) - 1);
-  if (0 != align) {
-    size += sizeof(double) - align;
-  }
-
-  void* p;
-  PL_ARENA_ALLOCATE(p, &mPool, size);
-  return p;
-}
-
-NS_BASE nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
-                                 PRInt32 aArenaBlockSize)
-{
-  ArenaImpl* it = new ArenaImpl(aArenaBlockSize);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kArenaIID, (void **) aInstancePtrResult);
-}

mozilla/base/src/nsAtomTable.cpp

@@ -1,154 +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.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 "nsIAtom.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;
-
-class AtomImpl : public nsIAtom {
-public:
-  AtomImpl();
-  ~AtomImpl();
-
-  NS_DECL_ISUPPORTS
-
-  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
-
-  virtual void ToString(nsString& aBuf) const;
-
-  virtual const PRUnichar* GetUnicode() const;
-
-  NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
-
-  // Actually more; 0 terminated. This slot is reserved for the
-  // terminating zero.
-  PRUnichar mString[1];
-};
-
-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;
-    }
-  }
-}
-
-static NS_DEFINE_IID(kIAtomIID, NS_IATOM_IID);
-NS_IMPL_ISUPPORTS(AtomImpl, kIAtomIID);
-
-void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
-{
-  size = size + uslen * sizeof(PRUnichar);
-  AtomImpl* ii = (AtomImpl*) new char[size];
-  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
-  ii->mString[uslen] = 0;
-  return ii;
-}
-
-void AtomImpl::ToString(nsString& aBuf) const
-{
-  aBuf.SetLength(0);
-  aBuf.Append(mString, nsCRT::strlen(mString));
-}
-
-const PRUnichar* AtomImpl::GetUnicode() const
-{
-  return mString;
-}
-
-NS_IMETHODIMP
-AtomImpl::SizeOf(nsISizeOfHandler* aHandler) const
-{
-  aHandler->Add(sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar));
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-
-static PLHashNumber HashKey(const PRUnichar* k)
-{
-  return (PLHashNumber) nsCRT::HashCode(k);
-}
-
-static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
-{
-  return nsCRT::strcmp(k1, k2) == 0;
-}
-
-NS_BASE nsIAtom* NS_NewAtom(const char* isolatin1)
-{
-  nsAutoString tmp(isolatin1);
-  return NS_NewAtom(tmp.GetUnicode());
-}
-
-NS_BASE nsIAtom* NS_NewAtom(const nsString& aString)
-{
-  return NS_NewAtom(aString.GetUnicode());
-}
-
-NS_BASE nsIAtom* NS_NewAtom(const PRUnichar* us)
-{
-  if (nsnull == gAtomHashTable) {
-    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
-                                     (PLHashComparator) CompareKeys,
-                                     (PLHashComparator) nsnull,
-                                     nsnull, nsnull);
-  }
-  PRInt32 uslen;
-  PRInt32 hashCode = nsCRT::HashCode(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_BASE nsrefcnt NS_GetNumberOfAtoms(void)
-{
-  if (nsnull != gAtomHashTable) {
-    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
-  }
-  return gAtoms;
-}

mozilla/base/src/nsBTree.cpp

@@ -1,402 +0,0 @@
-
-/**
- * This file defines the binary tree class and it
- * nsNode child class.
- *
- * This simple version stores nodes, and the
- * nodes store void* ptrs.
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-
-#include "nsBTree.h"
-
-/**
- * default constructor
- * 
- * @update gess 4/11/98
- */
-nsNode::nsNode(){
-  mLeft=0;
-  mRight=0;
-  mParent=0;
-  mColor=eBlack;
-}
-
-
-/**
- * Copy constructor
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-nsNode::nsNode(const nsNode& aNode){
-  mLeft=aNode.mLeft;
-  mRight=aNode.mRight;
-  mParent=aNode.mParent;
-  mColor=aNode.mColor;
-}
-
-/**
- * destructor
- * 
- * @update gess 4/11/98
- */
-nsNode::~nsNode(){
-}
-
-/**
- * Retrive ptr to parent node
- * 
- * @update gess 4/11/98
- * @return ptr to parent node
- */
-nsNode* nsNode::GetParentNode(void) const{
-  return mParent;
-}
-
-/**
- * Retrieve ptr to left (less) node
- * 
- * @update gess 4/11/98
- * @return ptr to left (may be NULL)
- */
-nsNode* nsNode::GetLeftNode(void) const{
-  return mLeft;
-}
-
-/**
- * Retrieve ptr to right (more) node
- * 
- * @update gess 4/11/98
- * @return ptr to right node (may be NULL)
- */
-nsNode* nsNode::GetRightNode(void) const{
-  return mRight;
-}
-
-
-/**
- * 
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-nsNode& nsNode::operator=(const nsNode& aNode){
-  if(this!=&aNode){
-    mLeft=aNode.mLeft;
-    mRight=aNode.mRight;
-    mParent=aNode.mParent;
-    mColor=aNode.mColor;
-  }
-  return *this;
-}
-
-/********************************************************
- * Here comes the BTREE class...
- ********************************************************/
-
-/**
- * nsBTree constructor
- * 
- * @update gess 4/11/98
- */
-nsBTree::nsBTree(){
-  mRoot=0;
-}
-
-
-/**
- * destructor
- * 
- * @update gess 4/11/98
- */
-nsBTree::~nsBTree(){
-  if(mRoot){
-    //walk the tree and destroy the children.
-  }
-}
-  
-/**
- * Given a node, we're supposed to add it into 
- * our tree.
- * 
- * @update gess 4/11/98
- * @param  aNode to be added to tree
- * @return ptr to added node or NULL
- */
-nsNode* nsBTree::Add(nsNode& aNode){
-
-  nsNode* node1=mRoot; //x
-  nsNode* node2=0;     //y
-  while(node1) {
-    node2=node1;
-    if(aNode<*node1)
-      node1=node1->mLeft;
-    else node1=node1->mRight;
-  }
-  aNode.mParent=node2;
-  if(!node2){
-    mRoot=&aNode;
-  }
-  else{
-    if(aNode<*node2)
-      node2->mLeft=&aNode;
-    else node2->mRight=&aNode;
-  }
-
-  return &aNode;
-}
-
-
-/**
- * Removes given node from tree if present.
- * 
- * @update gess 4/11/98
- * @param  aNode to be found and removed
- * @return ptr to remove node, or NULL
- */
-nsNode* nsBTree::Remove(nsNode& aNode){
-  nsNode* result=0;  
-  nsNode* node3=Find(aNode);
-
-  if(node3) {
-    nsNode* node1;
-    nsNode* node2;
-
-    if((!node3->mLeft) || (!node3->mRight))
-      node2=node3;
-    else node2=After(*node3);
-
-    if(node2->mLeft)
-      node1=node2->mLeft;
-    else node1=node2->mRight;
-
-    if(node1)
-      node1->mParent=node2->mParent;
-
-    if(node2->mParent) {
-      if(node2==node2->mParent->mLeft)
-        node2->mParent->mLeft=node1;
-      else node2->mParent->mRight=node1;
-    }
-    else mRoot=node1;
-
-    if(node2!=node3)
-      (*node3)==(*node2);
-
-    if(node2->mColor == nsNode::eBlack)
-      ReBalance(*node1);
-
-    delete node2;
-    result=&aNode;
-  }
-  return result;
-}
-
-/**
- * Clears the tree of any data. 
- * Be careful here if your objects are heap based!
- * This method doesn't free the objects, so if you
- * don't have your own pointers, they will become
- * orphaned.
- * 
- * @update gess 4/11/98
- * @param  
- * @return this
- */
-nsBTree& nsBTree::Empty(nsNode* aNode) {
-  mRoot=0;
-  return *this;
-}
-
-/**
- * This method destroys all the objects in the tree.
- * WARNING: Never call this method on stored objects
- *          that are stack-based!
- * 
- * @update gess 4/11/98
- * @param  
- * @return this
- */
-nsBTree& nsBTree::Erase(nsNode* aNode){
-//  nsNode* node1 =(aNode) ? aNode : mRoot;
-
-  if(aNode) {
-    Erase(aNode->mLeft);  //begin by walking left side
-    Erase(aNode->mRight); //then search right side
-    delete aNode;         //until a leaf, then delete
-  }
-  return *this;
-}
-
-/**
- * Retrieve ptr to first node in tree
- * 
- * @update gess 4/11/98
- * @return 
- */
-nsNode* nsBTree::First(void) const{
-  if(mRoot)
-    return First(*mRoot);
-  return 0;
-}
-
-/**
- * Retrive ptr to first node rel to given node
- * 
- * @update gess 4/11/98
- * @param  node to begin scan from
- * @return ptr to first node from given node or NULL
- */
-nsNode* nsBTree::First(const nsNode& aNode) const{
-  nsNode* result=0;
-
-  if(mRoot) {
-    result=mRoot;
-    while(result->GetLeftNode()) {
-      result=result->GetLeftNode();
-    }
-  }
-  return result;
-}
-
-/**
- * Retrive ptr to last node 
- * 
- * @update gess 4/11/98
- * @return ptr to last node rel to root or NULL
- */
-nsNode* nsBTree::Last(void) const{
-  if(mRoot)
-    return Last(*mRoot);
-  return 0;
-}
-
-/**
- * Retrive ptr to last node rel to given node
- * 
- * @update gess 4/11/98
- * @param  node to begin scan from
- * @return ptr to first node from given node or NULL
- */
-nsNode* nsBTree::Last(const nsNode& aNode) const{
-  nsNode* result=0;
-
-  if(mRoot) {
-    result=mRoot;
-    while(result->GetRightNode()) {
-      result=result->GetRightNode();
-    }
-  }
-  return result;
-}
-
-
-/**
- * Retrive ptr to prior node rel to given node
- * 
- * @update gess 4/11/98
- * @param  node to begin scan from
- * @return ptr to prior node from given node or NULL
- */
-nsNode* nsBTree::Before(const nsNode& aNode) const{
-  
-  if(aNode.GetLeftNode())
-    return Last(*aNode.GetLeftNode());
-
-  //otherwise...
-
-  nsNode* node1=(nsNode*)&aNode;
-  nsNode* node2=aNode.GetParentNode();
-  
-  while((node2) && (node1==node2->GetLeftNode())) {
-    node1=node2;
-    node2=node2->GetParentNode();
-  }
-  return node2;
-}
-
-
-/**
- * Retrive ptr to next node rel to given node
- * 
- * @update gess 4/11/98
- * @param  node to begin scan from
- * @return ptr to next node from given node or NULL
- */
-nsNode* nsBTree::After(const nsNode& aNode) const{
-  
-  if(aNode.GetRightNode())
-    return First(*aNode.GetRightNode());
-
-  //otherwise...
-
-  nsNode* node1=(nsNode*)&aNode;
-  nsNode* node2=aNode.GetParentNode();
-  
-  while((node2) && (node1==node2->GetRightNode())) {
-    node1=node2;
-    node2=node2->GetParentNode();
-  }
-
-  return node2;
-}
-
-/**
- * Scan for given node
- * 
- * @update gess 4/11/98
- * @param  node to find
- * @return ptr to given node, or NULL
- */
-nsNode* nsBTree::Find(const nsNode& aNode) const{
-  nsNode* result=mRoot;
-
-  while((result) && (!(aNode==(*result)))) {
-    if(aNode<*result)
-      result=result->mLeft;
-    else result=result->mRight;
-  }
-  return (nsNode*)result;
-}
-
-/**
- * Rebalances tree around the given node. This only
- * needs to be called after a node is deleted.
- * This method does nothing for btrees, but is
- * needed for RBTrees.
- * 
- * @update gess 4/11/98
- * @param  aNode -- node to balance around
- * @return this
- */
-nsBTree& nsBTree::ReBalance(nsNode& aNode){
-  return *this;
-}
-
-
-/**
- * 
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-const nsBTree& nsBTree::ForEach(nsNodeFunctor& aFunctor,nsNode* aNode) const{
-  nsNode* node1 =(aNode) ? aNode : mRoot;
-
-  if(node1) {
-    if(node1->mLeft)
-      ForEach(aFunctor,node1->mLeft);  //begin by walking left side
-    aFunctor(*node1);
-    if(node1->mRight)
-      ForEach(aFunctor,node1->mRight); //then search right side
-  }
-  return *this;
-}
-

mozilla/base/src/nsBTree.h

@@ -1,283 +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.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.
- */
-
-/** 
- * This file defines the binary tree class and it
- * nsNode child class. Note that like all nsBTree
- * containers, this one does not automatically balance.
- * (Find for random data, bad for pre-ordered data).
- *
- * This simple version stores nodes, and the
- * nodes store void* ptrs.
- * 
- * @update gess 4/11/98
- */
-
-
-/**
- * nsNode
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-
-#ifndef _BTREE_H
-#define _BTREE_H
-
-#include "nscore.h"
-
-struct NS_BASE nsNode {
-
-  /**
-   * 
-   * @update	gess4/20/98
-   * @param 
-   * @return
-   */
-  nsNode();
-
-  /**
-   * Copy constructor
-   * @update gess 4/11/98
-   */  
-  nsNode(const nsNode& aNode);
-
-  /**
-   * destructor
-   * @update gess 4/11/98
-   */  
-  virtual ~nsNode();
-
-  /**
-   * Retrieve parent node
-   *
-   * @update gess 4/11/98
-   * @return 
-   */  
-  nsNode*  GetParentNode(void) const;
-
-  /**
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */  
-  nsNode*  GetLeftNode() const;
-
-  /**
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */  
-  nsNode*  GetRightNode() const;
-
-  /**
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */  
-  virtual nsNode& operator=(const nsNode& aNode);
-
-
-  /**
-   * This method gets called to determine which of 
-   * two nodes is less. When you create your own
-   * subclass of nsNode, this is the most important
-   * method for you to overload.
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */ 
-  virtual PRBool operator<(const nsNode& aNode) const=0;
-
-  /** 
-   * This method gets called to determine which of 
-   * two nodes is less. When you create your own
-   * subclass of nsNode, this is the most important
-   * method for you to overload.
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */ 
-  virtual PRBool operator==(const nsNode& aNode) const=0;
-
-  enum eRBColor {eRed,eBlack};
-
-  nsNode*   mParent;
-  nsNode*   mLeft;
-  nsNode*   mRight;
-  eRBColor  mColor;
-};
-
-/**
- * The Nodefunctor class is used when you want to create
- * callbacks between the nsRBTree and your generic code.
- *
- * @update	gess4/20/98
- */
-class NS_BASE nsNodeFunctor {
-public:
-  virtual nsNodeFunctor& operator()(nsNode& aNode)=0;
-};
-
-
-/****************************************************
- * Here comes the nsBTree class...
- ****************************************************/
-
-class NS_BASE nsBTree {
-public:
-friend class nsBTreeIterator;
-  
-  nsBTree();
-  virtual ~nsBTree();
-
-  /** 
-   * Add given node reference into our tree.
-   * 
-   * @update gess 4/11/98
-   * @param  aNode is a ref to a node to be added
-   * @return newly added node
-   */ 
-  nsNode*  Add(nsNode& aNode);
-
-  /** 
-   * Remove given node reference into our tree.
-   * 
-   * @update gess 4/11/98
-   * @param  aNode is a ref to a node to be removed
-   * @return Ptr to node if found (and removed) or NULL
-   */ 
-  nsNode*  Remove(nsNode& aNode);
-
-  /**
-   * Clears the tree of any data. 
-   * Be careful here if your objects are heap based!
-   * This method doesn't free the objects, so if you
-   * don't have your own pointers, they will become
-   * orphaned.
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return this
-   */
-   nsBTree& Empty(nsNode* aNode=0);
-
-  /**
-   * This method destroys all the objects in the tree.
-   * WARNING: Never call this method on stored objects
-   *          that are stack-based!
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return this
-   */
-   nsBTree& Erase(nsNode* aNode=0);
-
-  /** 
-   * Retrieve ptr to 1st node in tree (starting at root)
-   * 
-   * @update gess 4/11/98
-   * @return ptr to 1st node, possible to be NULL
-   */ 
-  nsNode*  First(void) const;
-
-  /** 
-   * Find first node in tree starting at given node
-   * 
-   * @update gess 4/11/98
-   * @param  aNode node to begin 1st search from
-   * @return ptr to 1st node below given node
-   */ 
-  nsNode*  First(const nsNode& aNode) const;
-
-  /** 
-   * Retrieve ptr to last node in tree relative to root.
-   * 
-   * @update gess 4/11/98
-   * @return ptr to last node or NULL
-   */ 
-  nsNode* Last(void) const;
-
-  /** 
-   * Retrieve ptr to last node in tree relative to given node.
-   * 
-   * @update gess 4/11/98
-   * @param  node to find last node from 
-   * @return ptr to last node or NULL
-   */ 
-  nsNode* Last(const nsNode& aNode) const;
-
-  /** 
-   * Retrieve a ptr to the node that preceeds given node
-   * 
-   * @update gess 4/11/98
-   * @param  aNode used as reference to find prev. 
-   * @return ptr to prev node or NULL
-   */ 
-  nsNode*  Before(const nsNode& aNode) const;
-
-  /** 
-   * Retrieve a ptr to the node after given node
-   * 
-   * @update gess 4/11/98
-   * @param  aNode used as reference to find next. 
-   * @return ptr to next node or NULL
-   */ 
-  nsNode*  After(const nsNode& aNode) const;
-
-  /** 
-   * Find given node in tree.
-   * (Why would you want to find a node you already have?)
-   * 
-   * @update gess 4/11/98
-   * @param  aNode is the node you're searching for
-   * @return ptr to node if found, or NULL
-   */ 
-  nsNode*  Find(const nsNode& aNode) const;
-
-  /** 
-   * Walks the tree, starting with root.
-   * 
-   * @update gess 4/11/98
-   */ 
-  virtual const nsBTree& ForEach(nsNodeFunctor& aFunctor,nsNode* aNode=0) const;
-            
-protected:
-
-  /**
-   * Rebalances tree around the given node. This only
-   * needs to be called after a node is deleted.
-   * 
-   * @update gess 4/11/98
-   * @param  aNode -- node to balance around
-   * @return this
-   */
-  virtual nsBTree& ReBalance(nsNode& aNode);
-
-
-  nsNode*  mRoot;
-};
-
-#endif
-

mozilla/base/src/nsByteBuffer.cpp

@@ -1,138 +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.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 "nsIByteBuffer.h"
-#include "nsIInputStream.h"
-#include "nsCRT.h"
-
-#define MIN_BUFFER_SIZE 32
-
-class ByteBufferImpl : public nsIByteBuffer {
-public:
-  ByteBufferImpl(PRInt32 aBufferSize);
-  ~ByteBufferImpl();
-
-  NS_DECL_ISUPPORTS
-  virtual PRInt32 GetLength() const;
-  virtual PRInt32 GetBufferSize() const;
-  virtual char* GetBuffer() const;
-  virtual PRBool Grow(PRInt32 aNewSize);
-  virtual PRInt32 Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                       PRInt32 aKeep);
-
-  char* mBuffer;
-  PRInt32 mSpace;
-  PRInt32 mLength;
-};
-
-ByteBufferImpl::ByteBufferImpl(PRInt32 aBufferSize)
-{
-  if (PRUint32(aBufferSize) < MIN_BUFFER_SIZE) {
-    aBufferSize = MIN_BUFFER_SIZE;
-  }
-  mSpace = aBufferSize;
-  mBuffer = new char[aBufferSize];
-  mLength = 0;
-  NS_INIT_REFCNT();
-}
-
-NS_DEFINE_IID(kByteBufferIID,NS_IBYTE_BUFFER_IID);
-NS_IMPL_ISUPPORTS(ByteBufferImpl,kByteBufferIID)
-
-ByteBufferImpl::~ByteBufferImpl()
-{
-  if (nsnull != mBuffer) {
-    delete mBuffer;
-    mBuffer = nsnull;
-  }
-  mLength = 0;
-}
-
-PRInt32 ByteBufferImpl::GetLength() const
-{
-  return mLength;
-}
-
-PRInt32 ByteBufferImpl::GetBufferSize() const
-{
-  return mSpace;
-}
-
-char* ByteBufferImpl::GetBuffer() const
-{
-  return mBuffer;
-}
-
-PRBool ByteBufferImpl::Grow(PRInt32 aNewSize)
-{
-  if (PRUint32(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;
-}
-
-PRInt32 ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                             PRInt32 aKeep)
-{
-  NS_PRECONDITION(nsnull != aStream, "null stream");
-  NS_PRECONDITION(PRUint32(aKeep) <= PRUint32(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;
-  PRInt32 amount = mSpace - aKeep;
-  PRInt32 nb;
-  *aErrorCode = aStream->Read(mBuffer, aKeep, amount, &nb);
-  if (NS_SUCCEEDED(*aErrorCode)) {
-    mLength += nb;
-  }
-  else
-    nb = 0;
-  return nb;
-}
-
-NS_BASE nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
-                                  nsISupports* aOuter,
-                                  PRInt32 aBufferSize)
-{
-  if (nsnull != aOuter) {
-    return NS_ERROR_NO_AGGREGATION;
-  }
-  ByteBufferImpl* it = new ByteBufferImpl(aBufferSize);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kByteBufferIID, (void **) aInstancePtrResult);
-}

mozilla/base/src/nsCRT.cpp

@@ -1,400 +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.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"
-
-// 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
-};
-
-static 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) < 256) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
-
-#define TOUPPER(_ucs2) \
-  (((_ucs2) < 256) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
-
-static PRUnichar _ToLower(PRUnichar aChar)
-{
-  // XXX need i18n code here
-  return aChar;
-}
-
-static PRUnichar _ToUpper(PRUnichar aChar)
-{
-  // XXX need i18n code here
-  return aChar;
-}
-
-//----------------------------------------------------------------------
-
-PRUnichar nsCRT::ToUpper(PRUnichar aChar)
-{
-  return TOUPPER(aChar);
-}
-
-PRUnichar nsCRT::ToLower(PRUnichar aChar)
-{
-  return TOLOWER(aChar);
-}
-
-PRInt32 nsCRT::strlen(const PRUnichar* s)
-{
-  PRInt32 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, PRInt32 n)
-{
-  if(s1 && s2) { 
-    if(0<n) {
-      while (--n >= 0) {
-        PRUnichar c1 = *s1++;
-        PRUnichar c2 = *s2++;
-        if (c1 != c2) {
-          if (c1 < c2) return -1;
-          return 1;
-        }
-        if ((0==c1) || (0==c2)) break;
-      }
-    }
-    else return 1;
-  }
-  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, PRInt32 n)
-{
-  if(s1 && s2) {
-    if(0<n){
-      while (--n >= 0) {
-        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;
-      }
-    } else return 1;
-  }
-  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, PRInt32 n)
-{
-  if(s1 && s2) {
-    if(0<n){
-      while (--n >= 0) {
-        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;
-      }
-    } else return 1;
-  }
-  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, PRInt32 n)
-{
-  if(s1 && s2){
-    if(0<n){
-      while (--n >= 0) {
-        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;
-      }
-    } else return 1;
-  }
-  return 0;
-}
-
-PRInt32 nsCRT::HashCode(const PRUnichar* us)
-{
-  PRInt32 rv = 0;
-  if(us) {
-    PRUnichar ch;
-    while ((ch = *us++) != 0) {
-      // FYI: rv = rv*37 + ch
-      rv = ((rv << 5) + (rv << 2) + rv) + ch;
-    }
-  }
-  return rv;
-}
-
-PRInt32 nsCRT::HashCode(const PRUnichar* us, PRInt32* uslenp)
-{
-  PRInt32 rv = 0;
-  PRInt32 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/base/src/nsCRT.h

@@ -1,115 +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.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"
-
-/// This is a wrapper class around all the C runtime functions. 
-
-class NS_BASE 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, PRInt32 aCount) {
-    ::memcpy(aDest, aSrc, (size_t)aCount);
-  }
-
-  static void memmove(void* aDest, const void* aSrc, PRInt32 aCount) {
-    ::memmove(aDest, aSrc, (size_t)aCount);
-  }
-
-  static void memset(void* aDest, PRUint8 aByte, PRInt32 aCount) {
-    ::memset(aDest, aByte, aCount);
-  }
-
-  static void zero(void* aDest, PRInt32 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 PRInt32 strlen(const char* s) {
-    return PRInt32(::strlen(s));
-  }
-
-  /// Compare s1 and s2.
-  static PRInt32 strcmp(const char* s1, const char* s2) {
-    return PRInt32(PL_strcmp(s1, s2));
-  }
-
-  /// 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, PRInt32 aMaxLen) {
-    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
-  }
-
-  /// Like strlen except for ucs2 strings
-  static PRInt32 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,
-                         PRInt32 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,
-                             PRInt32 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,
-                         PRInt32 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,
-                             PRInt32 aMaxLen);
-
-  /// Compute a hashcode for a ucs2 string
-  static PRInt32 HashCode(const PRUnichar* s1);
-
-  /// Same as above except that we return the length in s1len
-  static PRInt32 HashCode(const PRUnichar* s1, PRInt32* s1len);
-
-  /// String to integer.
-  static PRInt32 atoi( const PRUnichar *string );
-  
-  static PRUnichar ToUpper(PRUnichar aChar);
-
-  static PRUnichar ToLower(PRUnichar aChar);
-};
-
-#endif /* nsCRT_h___ */

mozilla/base/src/nsDeque.cpp

@@ -1,477 +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.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"
-
-/**
- * Standard constructor
- * @update	gess4/18/98
- * @return  new deque
- */
-nsDeque::nsDeque(nsDequeFunctor& aMemDestroyer) : mMemDestroyer(aMemDestroyer) {
-  mMemDestroyer=aMemDestroyer;
-  mCapacity=eGrowthDelta;
-  mOrigin=mSize=0;
-  mData=new void*[mCapacity];
-}
-
-
-/**
- * Destructor
- * @update	gess4/18/98
- */
-nsDeque::~nsDeque() {
-  Erase();
-  delete [] mData;
-  mData=0;
-}
-
-
-/**
- * Returns the number of elements currently stored in
- * this deque.
- *
- * @update	gess4/18/98
- * @param 
- * @return  int contains element count
- */ 
-PRInt32 nsDeque::GetSize(void) const {
-  return mSize;
-}
-
-/**
- * Remove all items from container without destroying them.
- *
- * @update	gess4/18/98
- * @param 
- * @return
- */
-nsDeque& nsDeque::Empty() {
-  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() {
-  ForEach(mMemDestroyer);
-  return Empty();
-}
-
-
-/**
- * This method adds an item to the end of the queue. 
- * This operation has the potential to cause the 
- * underlying buffer to resize.
- *
- * @update	gess4/18/98
- * @param   anItem: new item to be added to queue
- * @return  nada
- */
-nsDeque& nsDeque::Push(void* anItem) {
-  if(mSize==mCapacity) {
-    void** temp=new void*[mCapacity+eGrowthDelta];
-
-    //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.
-    
-    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...
-    mCapacity+=eGrowthDelta;
-    mOrigin=0;       //now realign the origin...
-    delete[]mData;
-    mData=temp;
-  }
-  int offset=mOrigin+mSize;
-  if(offset<mCapacity)
-    mData[offset]=anItem;
-  else mData[offset-mCapacity]=anItem;
-  mSize++;
-  return *this;
-}
-
-
-/**
- * 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::Pop() {
-  void* result=0;
-  if(mSize>0) {
-    result=mData[mOrigin];
-    mData[mOrigin++]=0;     //zero it out for debugging purposes.
-    mSize--;
-    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;
-}
-
-/**
- * Remove and return the last item in the container.
- * 
- * @update	gess4/18/98
- * @param   none
- * @return  ptr to last item in container
- */
-void* nsDeque::PopBack(void) {
-  void* result=0;
-  if(mSize>0) {
-    int offset=mOrigin+mSize;
-    if(offset>=mCapacity) 
-      offset-=mCapacity;
-    result=mData[offset-1];
-    mData[offset-1]=0;
-    mSize--;
-    if(0==mSize)
-      mOrigin=0;
-  }
-  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<(mSize-mOrigin)) {
-      result=mData[mOrigin+anIndex];
-    }
-    else {
-      result=mData[anIndex-(mSize-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
- */
-const 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) {
-}
-
-/**
- * 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
- */
-const 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);
-}
-
-/**
- * conduct automated self test for this class
- *
- * @update	gess4/18/98
- * @param 
- * @return
- */
-void nsDeque::SelfTest(void) {
-#undef  _SELFTEST_DEQUE
-#ifdef  _SELFTEST_DEQUE
-#include <iostream.h>
-
-  {
-    nsDeque theDeque(PR_FALSE); //construct a simple one...
-    
-    int ints[10]={100,200,300,400,500,600,700,800,900,1000};
-    int count=sizeof(ints)/sizeof(int);
-
-    int i=0;
-    for(i=0;i<count;i++){
-      theDeque.Push(&ints[i]);
-    }
-
-    int* temp1=(int*)theDeque.Pop(); //should have popped 100
-    int* temp2=(int*)theDeque.Pop(); //should have popped 200
-
-    theDeque.Push(temp1); //these should now become
-    theDeque.Push(temp2); //the last 2 items in deque.
-
-    nsDequeIterator iter1=theDeque.Begin();
-    nsDequeIterator iter2=theDeque.End();
-    while(iter1!=iter2) {
-      temp1=(int*)(iter1++);
-      cout << *temp1 << endl;
-    }
-
-    //now, afll thru and watch the deque dtor run...
-    cout << "done" << endl;
-  }
-
-  int x;
-  x=10;
-#endif
-}
-

mozilla/base/src/nsDeque.h

@@ -1,389 +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.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_BASE 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_BASE nsDeque {
-friend class nsDequeIterator;
-  public:
-                       nsDeque(nsDequeFunctor& aMemDestroyer);
-                      ~nsDeque();
-            
-  /**
-   * Returns the number of elements currently stored in
-   * this deque.
-   *
-   * @update	gess4/18/98
-   * @param 
-   * @return  int contains element count
-   */
-  PRInt32 GetSize() const;
-  
-
-  /**
-   * 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);
-  
-  /**
-   * 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);
-
-  /**
-   * Return topmost item without removing it.
-   * 
-   * @update	gess4/18/98
-   * @param   none
-   * @return  ptr to first item in container
-   */
-  void* Peek(void);
-  
-  /**
-   * Remove and return the last item in the container.
-   * 
-   * @update	gess4/18/98
-   * @param   none
-   * @return  ptr to first item in container
-   */
-  void* PopBack(void);
-    
-  /**
-   * 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
-   */
-  const 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;
-
-  /**
-   * Perform automated selftest on the deque
-   *
-   * @update	gess4/18/98
-   * @param 
-   * @return
-   */
-  static void SelfTest();
-
-protected:
-
-  PRInt32         mSize;
-  PRInt32         mCapacity;
-  PRInt32         mOrigin;
-  nsDequeFunctor& mMemDestroyer;
-  void**          mData;
-
-
-private: 
-  
-  enum {eGrowthDelta=64}; 
-
-  /**
-   * 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);
-
-  /**
-   * PRIVATE 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;
-
-};
-
-/******************************************************
- * Here comes the nsDequeIterator class...
- ******************************************************/
-
-class NS_BASE 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);
-
-  /**
-   * 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
-   */
-  const 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/base/src/nsIArena.h

@@ -1,51 +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.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} }
-
-/** 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:
-  virtual void* Alloc(PRInt32 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_BASE nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
-                                        PRInt32 aArenaBlockSize = 0);
-
-#endif /* nsIArena_h___ */

mozilla/base/src/nsIAtom.h

@@ -1,77 +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.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 nsIAtom_h___
-#define nsIAtom_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-class nsString;
-class nsISizeOfHandler;
-
-#define NS_IATOM_IID          \
-{ 0x3d1b15b0, 0x93b4, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-/**
- * A globally unique identfier.  nsIAtom's can be compared for
- * equality by using operator '=='. These objects are reference
- * counted like other nsISupports objects. When you are done with
- * the atom, NS_RELEASE it.
- */
-class nsIAtom : public nsISupports {
-public:
-  /**
-   * Translate the unicode string into the stringbuf.
-   */
-  virtual void ToString(nsString& aString) const = 0;
-
-  /**
-   * Return a pointer to a zero terminated unicode string.
-   */
-  virtual const PRUnichar* GetUnicode() const = 0;
-
-  /**
-   * Add the size, in bytes, of the atom to the handler.
-   */
-  NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
-};
-
-/**
- * Find an atom that matches the given iso-latin1 C string. The
- * C string is translated into it's unicode equivalent.
- */
-extern NS_BASE 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_BASE nsIAtom* NS_NewAtom(const PRUnichar* unicode);
-
-/**
- * Find an atom that matches the given string.
- */
-extern NS_BASE nsIAtom* NS_NewAtom(const nsString& aString);
-
-/**
- * Return a count of the total number of atoms currently
- * alive in the system.
- */
-extern NS_BASE nsrefcnt NS_GetNumberOfAtoms(void);
-
-#endif /* nsIAtom_h___ */

mozilla/base/src/nsIBaseStream.h

@@ -1,57 +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.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 nsIBaseStream_h___
-#define nsIBaseStream_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-
-/* 6ccb17a0-e95e-11d1-beae-00805f8a66dc */
-#define NS_IBASESTREAM_IID   \
-{ 0x6ccb17a0, 0xe95e, 0x11d1, \
-  {0xbe, 0xae, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} }
-
-/** Abstract stream */
-class nsIBaseStream : public nsISupports {
-public:
-
-    /** Close the stream. */
-    NS_IMETHOD
-    Close(void) = 0;
-};
-
-/** Error codes */
-//@{ 
-// XXX fix up the values so they are not total hacks... MMP
-/// End of file
-#define NS_BASE_STREAM_EOF            0x80001001
-/// Stream closed
-#define NS_BASE_STREAM_CLOSED         0x80001002
-/// Error from the operating system
-#define NS_BASE_STREAM_OSERROR        0x80001003
-/// Illegal arguments
-#define NS_BASE_STREAM_ILLEGAL_ARGS   0x80001004
-/// For unichar streams
-#define NS_BASE_STREAM_NO_CONVERTER   0x80001005
-/// For unichar streams
-#define NS_BASE_STREAM_BAD_CONVERSION 0x80001006
-//@}
-
-
-#endif /* nsInputStream_h___ */

mozilla/base/src/nsIByteBuffer.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 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} }
-
-/** Interface to a buffer that holds bytes */
-class nsIByteBuffer : public nsISupports {
-public:
-  /** @return length of buffer, i.e. how many bytes are currently in it. */
-  virtual PRInt32 GetLength() const = 0;
-
-  /** @return number of bytes allocated in the buffer */
-  virtual PRInt32 GetBufferSize() const = 0;
-
-  /** @return the buffer */
-  virtual char* GetBuffer() const = 0;
-
-  /** Grow buffer to aNewSize bytes. */
-  virtual PRBool Grow(PRInt32 aNewSize) = 0;
-
-  /** Fill the buffer with data from aStream.  Don't grow the buffer, only
-   *  read until length of buffer equals buffer size. */
-  virtual PRInt32 Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                       PRInt32 aKeep) = 0;
-};
-
-/** Create a new byte buffer using the given buffer size. */
-extern NS_BASE nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
-                                         nsISupports* aOuter,
-                                         PRInt32 aBufferSize = 0);
-
-#endif /* nsIByteBuffer_h___ */

mozilla/base/src/nsIInputStream.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 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 nsIInputStream_h___
-#define nsIInputStream_h___
-
-#include "nsIBaseStream.h"
-
-#define NS_IINPUTSTREAM_IID   \
-{ 0x022396f0, 0x93b5, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-/** Abstract byte input stream */
-class nsIInputStream : public nsIBaseStream {
-public:
-
-    /** Return the number of bytes in the stream
-     *  @param aLength out parameter to hold the length
-     *         of the stream. if an error occurs, the length
-     *         will be undefined
-     *  @return error status
-     */
-    NS_IMETHOD
-    GetLength(PRInt32 *aLength) = 0;
-
-    /** Read data from the stream.
-     *  @param aErrorCode the error code if an error occurs
-     *  @param aBuf the buffer into which the data is read
-     *  @param aOffset the start offset of the data
-     *  @param aCount the maximum number of bytes to read
-     *  @param aReadCount out parameter to hold the number of
-     *         bytes read, eof if 0. if an error occurs, the
-     *         read count will be undefined
-     *  @return error status
-     */   
-    NS_IMETHOD
-    Read(char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aReadCount) = 0; 
-};
-
-#endif /* nsInputStream_h___ */

mozilla/base/src/nsIOutputStream.h

@@ -1,46 +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.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 nsIOutputStream_h___
-#define nsIOutputStream_h___
-
-#include "nsIBaseStream.h"
-
-/* 7f13b870-e95f-11d1-beae-00805f8a66dc */
-#define NS_IOUTPUTSTREAM_IID   \
-{ 0x7f13b870, 0xe95f, 0x11d1, \
-  {0xbe, 0xae, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} }
-
-/** Abstract byte output stream */
-class nsIOutputStream : public nsIBaseStream {
-public:
-
-    /** Write data into the stream.
-     *  @param aBuf the buffer into which the data is read
-     *  @param aOffset the start offset of the data
-     *  @param aCount the maximum number of bytes to read
-     *  @param aWriteCount out parameter to hold the number of
-     *         bytes written. if an error occurs, the writecount
-     *         is undefined
-     *  @return error status
-     */   
-    NS_IMETHOD
-    Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aWriteCount) = 0; 
-};
-
-
-#endif /* nsOutputStream_h___ */

mozilla/base/src/nsITimer.h

@@ -1,86 +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.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 nsITimer_h___
-#define nsITimer_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-class nsITimer;
-class nsITimerCallback;
-
-/// Signature of timer callback function
-typedef void
-(*nsTimerCallbackFunc) (nsITimer *aTimer, void *aClosure);
-
-/// Interface IID for nsITimer
-#define NS_ITIMER_IID         \
-{ 0x497eed20, 0xb740, 0x11d1,  \
-{ 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
-
-/**
- * Timer class, used to invoke a function or method after a fixed
- * millisecond interval. <B>Note that this interface is subject to
- * change!</B>
- */
-class nsITimer : public nsISupports {
-public:  
-  /**
-   * Initialize a timer to fire after the given millisecond interval.
-   * This version takes a function to call and a closure to pass to
-   * that function.
-   *
-   * @param aFunc - The function to invoke
-   * @param aClosure - an opaque pointer to pass to that function
-   * @param aRepeat - (Not yet implemented) One-shot or repeating
-   * @param aDelay - The millisecond interval
-   * @result - NS_OK if this operation was successful
-   */
-  virtual nsresult Init(nsTimerCallbackFunc aFunc,
-                        void *aClosure,
-//                      PRBool aRepeat, 
-                        PRUint32 aDelay)=0;
-
-  /**
-   * Initialize a timer to fire after the given millisecond interval.
-   * This version takes an interface of type <code>nsITimerCallback</code>. 
-   * The <code>Notify</code> method of this method is invoked.
-   *
-   * @param aCallback - The interface to notify
-   * @param aRepeat - (Not yet implemented) One-shot or repeating
-   * @param aDelay - The millisecond interval
-   * @result - NS_OK if this operation was successful
-   */
-  virtual nsresult Init(nsITimerCallback *aCallback,
-//                      PRBool aRepeat, 
-                        PRUint32 aDelay)=0;
-
-  /// Cancels the timeout
-  virtual void Cancel()=0;
-
-  /// @return the millisecond delay of the timeout
-  virtual PRUint32 GetDelay()=0;
-
-  /// Change the millisecond interval for the timeout
-  virtual void SetDelay(PRUint32 aDelay)=0;
-};
-
-/** Factory method for creating an nsITimer */
-extern NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult);
-
-#endif

mozilla/base/src/nsITimerCallback.h

@@ -1,41 +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.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 nsITimerCallback_h___
-#define nsITimerCallback_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-class nsITimer;
-
-/// Interface IID for nsITimerCallback
-#define NS_ITIMERCALLBACK_IID         \
-{ 0x5079b3a0, 0xb743, 0x11d1,         \
-{ 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
-
-/**
- * Interface implemented by users of the nsITimer class. An instance
- * of this interface is passed in when creating a timer. The Notify()
- * method of that instance is invoked after the specified delay.
- */
-class nsITimerCallback : public nsISupports {
-public:  
-  virtual void Notify(nsITimer *timer)=0;
-};
-
-#endif

mozilla/base/src/nsIUnicharBuffer.h

@@ -1,46 +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.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 nsIUnicharBuffer_h___
-#define nsIUnicharBuffer_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-class nsIUnicharInputStream;
-
-#define NS_IUNICHAR_BUFFER_IID \
-{ 0x14cf6970, 0x93b5, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-/// Interface to a buffer that holds unicode characters
-class nsIUnicharBuffer : public nsISupports {
-public:
-  virtual PRInt32 GetLength() const = 0;
-  virtual PRInt32 GetBufferSize() const = 0;
-  virtual PRUnichar* GetBuffer() const = 0;
-  virtual PRBool Grow(PRInt32 aNewSize) = 0;
-  virtual PRInt32 Fill(nsresult* aErrorCode, nsIUnicharInputStream* aStream,
-                       PRInt32 aKeep) = 0;
-};
-
-/// Factory method for nsIUnicharBuffer.
-extern NS_BASE nsresult
-  NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
-                      nsISupports* aOuter,
-                      PRInt32 aBufferSize = 0);
-
-#endif /* nsIUnicharBuffer_h___ */

mozilla/base/src/nsIUnicharInputStream.h

@@ -1,98 +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.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 nsIUnicharInputStream_h___
-#define nsIUnicharInputStream_h___
-
-#include "nsIInputStream.h"
-class nsString;
-
-#define NS_IUNICHAR_INPUT_STREAM_IID \
-{ 0x2d97fbf0, 0x93b5, 0x11d1,        \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-#define NS_IB2UCONVERTER_IID  \
-{ 0x35e40290, 0x93b5, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-/// Enumeration of character set ids.
-enum nsCharSetID {
-  eCharSetID_IsoLatin1 = 0,
-  eCharSetID_UTF8,
-  eCharSetID_ShiftJis
-  // XXX more i'm sure...
-};
-
-/** Abstract unicode character input stream
- *  @see nsIInputStream
- */
-class nsIUnicharInputStream : public nsISupports {
-public:
-  NS_IMETHOD Read(PRUnichar* aBuf,
-                  PRInt32 aOffset,
-                  PRInt32 aCount,
-                  PRInt32 *aReadCount) = 0;
-  NS_IMETHOD Close() = 0;
-};
-
-/**
- * Create a nsIUnicharInputStream that wraps up a string. Data is fed
- * from the string out until the done. When this object is destroyed
- * it destroyes the string (so make a copy if you don't want it doing
- * that)
- */
-extern NS_BASE nsresult
-  NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
-                                 nsString* aString);
-
-/// Abstract interface for converting from bytes to unicode characters
-class nsIB2UConverter : public nsISupports {
-public:
-  /** aDstLen is updated to indicate how much data was translated into
-   * aDst; aSrcLen is updated to indicate how much data was used in
-   * the source buffer.
-   */
-  virtual PRInt32 Convert(PRUnichar* aDst,
-                          PRInt32 aDstOffset,
-                          PRInt32& aDstLen,
-                          const char* aSrc,
-                          PRInt32 aSrcOffset,
-                          PRInt32& aSrcLen) = 0;
-};
-
-/** Create a new nsUnicharInputStream that provides a converter for the
- * byte input stream aStreamToWrap. If no converter can be found then
- * nsnull is returned and the error code is set to
- * NS_INPUTSTREAM_NO_CONVERTER.
- */
-extern NS_BASE nsresult
-  NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
-                        nsISupports* aOuter,
-                        nsIInputStream* aStreamToWrap,
-                        PRInt32 aBufferSize = 0,
-                        nsCharSetID aCharSet = eCharSetID_IsoLatin1);
-
-/** Create a new nsB2UConverter for the given character set. When given
- * nsnull, the converter for iso-latin1 to unicode is provided. If no
- * converter can be found, nsnull is returned.
- */
-extern NS_BASE nsresult
-  NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
-                     nsISupports* aOuter,
-                     nsCharSetID aCharSet = eCharSetID_IsoLatin1);
-
-#endif /* nsUnicharInputStream_h___ */

mozilla/base/src/nsRBTree.cpp

@@ -1,423 +0,0 @@
-
-/**
- * This file defines the binary tree class and it
- * nsNode child class.
- *
- * This simple version stores nodes, and the
- * nodes store void* ptrs.
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-
-#include "nsRBTree.h"
-
-
-
-/**************************************************
-  Here comes the nsRBTree class...
- *************************************************/
-
-/**
- * nsRBTree constructor
- * 
- * @update gess 4/11/98
- */
-nsRBTree::nsRBTree() : nsBTree() {
-  mRoot=0;
-}
-
-/**
- * nsRBTree constructor
- * 
- * @update gess 4/11/98
- */
-nsRBTree::nsRBTree(const nsRBTree& aCopy) : nsBTree(aCopy) {
-  mRoot=aCopy.mRoot;
-}
-
-/**
- * nsRBTree destructor
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-nsRBTree::~nsRBTree(){
-  if(mRoot){
-    //walk the tree and destroy the children.
-  }
-}
-
-
-/**
- * Given a node, we're supposed to add it into 
- * our tree.
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-nsNode* nsRBTree::Add(nsNode& aNode){
-
-  nsBTree::Add(aNode);
-
-  nsNode* node1=&aNode;
-  nsNode* node2=0;
-
-  node1->mColor=nsNode::eRed;
-
-  while((node1!=mRoot) && (node1->mParent->mColor==nsNode::eRed)) {
-    if(node1->mParent==node1->mParent->mParent->mLeft) {
-      node2=node1->mParent->mParent->mLeft; 
-      if(node2->mColor==nsNode::eRed) {
-        node1->mParent->mColor=nsNode::eBlack;
-        node2->mColor=nsNode::eBlack;
-        node1->mParent->mParent->mColor=nsNode::eRed;
-        node1=node1->mParent->mParent;
-      }
-      else {
-        if(node1==node1->mParent->mRight) {
-          node1=node1->mParent;
-          ShiftLeft(*node1);
-        }
-        node1->mParent->mColor=nsNode::eBlack;
-        node1->mParent->mParent->mColor=nsNode::eRed;
-        ShiftRight(*node1->mParent->mParent);
-      }
-    }
-    else {
-      node2=node1->mParent->mParent->mRight; 
-      if (node2->mColor==nsNode::eRed){
-        node1->mParent->mColor=nsNode::eBlack;
-        node2->mColor=nsNode::eBlack;
-        node1->mParent->mParent->mColor=nsNode::eRed;
-        node1=node1->mParent->mParent;
-      }
-      else {
-        if (node1==node1->mParent->mLeft) {
-          node1=node1->mParent;
-          ShiftRight(*node1);
-        }
-        node1->mParent->mColor=nsNode::eBlack;
-        node1->mParent->mParent->mColor=nsNode::eRed;
-        ShiftLeft(*node1->mParent->mParent);
-      }
-    }
-  }
-
-  mRoot->mColor=nsNode::eBlack;
-  return &aNode;
-}
-
-
-/**
- * Retrive the first node in the tree
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-nsNode* nsRBTree::First(){
-  nsNode* result=First(*mRoot);
-  return result;
-}
-
-/**
- * Retrieve the first node given a starting node
- * 
- * @update gess 4/11/98
- * @param  aNode --
- * @return node ptr or null
- */
-nsNode* nsRBTree::First(nsNode& aNode){
-  nsNode* result=0;
-
-  if(mRoot) {
-    result=mRoot;
-    while(result->GetLeftNode()) {
-      result=result->GetLeftNode();
-    }
-  }
-  return result;
-}
-
-/**
- * Find the last node in the tree
- * 
- * @update gess 4/11/98
- * @param  
- * @return node ptr or null
- */
-nsNode* nsRBTree::Last(){
-  nsNode* result=Last(*mRoot);
-  return result;
-}
-
-/**
- * Find the last node from a given node
- * 
- * @update gess 4/11/98
- * @param  aNode -- node ptr to start from
- * @return node ptr or null
- */
-nsNode* nsRBTree::Last(nsNode& aNode){
-  nsNode* result=0;
-
-  if(mRoot) {
-    result=mRoot;
-    while(result->GetRightNode()) {
-      result=result->GetRightNode();
-    }
-  }
-  return result;
-}
-
-
-/**
- * Retrieve the node that preceeds the given node
- * 
- * @update gess 4/11/98
- * @param  aNode -- node to find precedent of
- * @return preceeding node ptr, or null
- */
-nsNode* nsRBTree::Before(nsNode& aNode){
-  
-  if(aNode.GetLeftNode())
-    return Last(*aNode.GetLeftNode());
-
-  //otherwise...
-
-  nsNode* node1=&aNode;
-  nsNode* node2=aNode.GetParentNode();
-  
-  while((node2) && (node1==node2->GetLeftNode())) {
-    node1=node2;
-    node2=node2->GetParentNode();
-  }
-  return node2;
-}
-
-
-/**
- * Retrieve a ptr to the node following the given node
- * 
- * @update gess 4/11/98
- * @param  aNode -- node to find successor node from
- * @return node ptr or null
- */
-nsNode* nsRBTree::After(nsNode& aNode){
-  
-  if(aNode.GetRightNode())
-    return First(*aNode.GetRightNode());
-
-  //otherwise...
-
-  nsNode* node1=&aNode;
-  nsNode* node2=aNode.GetParentNode();
-  
-  while((node2) && (node1==node2->GetRightNode())) {
-    node1=node2;
-    node2=node2->GetParentNode();
-  }
-
-  return node2;
-}
-
-/**
- * Find a (given) node in the tree
- * 
- * @update gess 4/11/98
- * @param  node to find in the tree
- * @return node ptr (if found) or null
- */
-nsNode* nsRBTree::Find(nsNode& aNode){
-  nsNode* result=mRoot;
-
-  while((result) && (!((*result)==aNode))) {
-    if(aNode<*result)
-      result=result->mLeft;
-    else result=result->mRight;
-  }
-  return result;
-}
-
-
-/**
- * Causes a shift to the left, to keep the
- * underlying RB data in balance
- * 
- * @update gess 4/11/98
- * @param  
- * @return this
- */
-nsRBTree& nsRBTree::ShiftLeft(nsNode& aNode){
-
-  nsNode* temp= aNode.mRight;
-
-  aNode.mRight=temp->mLeft;
-  if(temp->mLeft)
-    temp->mRight->mParent=&aNode;
-  temp->mParent= aNode.mParent;
-  if (aNode.mParent) {
-    if (&aNode==aNode.mParent->mLeft)
-      aNode.mParent->mLeft=temp;
-    else aNode.mParent->mRight=temp;
-  }
-  else mRoot=temp;
-  temp->mLeft=&aNode;;
-  aNode.mParent=temp;
-  return *this;
-}
-
-/**
- * Causes a shift right to occur, to keep the
- * underlying RB data in balance
- * 
- * @update gess 4/11/98
- * @param  aNode -- node at which to perform shift
- * @return this
- */
-nsRBTree& nsRBTree::ShiftRight(nsNode& aNode){
-  
-  nsNode* temp=aNode.mLeft;
-
-  aNode.mLeft=temp->mRight;
-  if(temp->mRight)
-    temp->mRight->mParent=&aNode;
-  temp->mParent=aNode.mParent;
-  if(aNode.mParent){
-    if(&aNode==aNode.mParent->mRight)
-      aNode.mParent->mRight=temp;
-    else aNode.mParent->mLeft=temp;
-    }
-  else mRoot=temp;
-  temp->mRight=&aNode;
-  aNode.mParent=temp;
-  return *this;
-}
-
-/**
- * Rebalances tree around the given node. This only
- * needs to be called after a node is deleted.
- * 
- * @update gess 4/11/98
- * @param  aNode -- node to balance around
- * @return this
- */
-nsBTree& nsRBTree::ReBalance(nsNode& aNode){
-
-  nsNode* node1=&aNode;
-  nsNode* node2=0;
-
-  while ((node1!=mRoot) && (node1->mColor==nsNode::eBlack)) {
-    if(node1==node1->mParent->mLeft) {
-      node2=node1->mParent->mRight;  
-      if(node2->mColor==nsNode::eRed) {
-        node2->mColor=nsNode::eBlack;
-        node1->mParent->mColor=nsNode::eRed;
-        ShiftLeft(*node1->mParent);
-        node2=node1->mParent->mRight;
-      }
-    
-      if((node2->mLeft->mColor == nsNode::eBlack) &&
-	 (node2->mRight->mColor == nsNode::eBlack)) {
-        node2->mColor=nsNode::eRed;
-        node1=node1->mParent;
-      } 
-      else {
-        if(node2->mRight->mColor == nsNode::eBlack) {
-          node2->mLeft->mColor=nsNode::eBlack;
-          node2->mColor=nsNode::eRed;
-          ShiftRight(*node2);
-          node2=node1->mParent->mRight;
-        }
-
-        node2->mColor=node1->mParent->mColor;
-        node1->mParent->mColor=nsNode::eBlack;
-        node2->mRight->mColor=nsNode::eBlack;
-        ShiftLeft(*node1->mParent);
-        node1=mRoot;
-      } //else
-    }
-    else {
-      node2=node1->mParent->mLeft;
-      if(node2->mColor==nsNode::eRed) {
-        node2->mColor=nsNode::eBlack;
-        node1->mParent->mColor=nsNode::eRed;
-        ShiftRight(*node1->mParent);
-        node2=node1->mParent->mLeft;
-      }
-
-      if((node2->mRight->mColor == nsNode::eBlack) &&
-	 (node2->mLeft->mColor == nsNode::eBlack)) {
-        node2->mColor=nsNode::eRed;
-        node1=node1->mParent;
-      }
-      else {
-        if(node2->mLeft->mColor == nsNode::eBlack){
-          node2->mRight->mColor=nsNode::eBlack;
-          node2->mColor=nsNode::eRed;
-          ShiftLeft(*node2);
-          node2=node1->mParent->mLeft;
-        }
-      
-        node2->mColor=node1->mParent->mColor;
-        node1->mParent->mColor=nsNode::eBlack;
-        node2->mLeft->mColor=nsNode::eBlack;
-        ShiftRight(*node1->mParent);
-        node1=mRoot;
-      } //else
-    } //if
-  } //while
-
-  node1->mColor=nsNode::eBlack;
-  return *this;
-}
-
-/**************************************************
-  Here comes the nsRBTreeIterator class...
- *************************************************/
-
-/**
- * 
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */
-nsRBTreeIterator::nsRBTreeIterator(const nsRBTree& aTree) : mTree(aTree) {
-}
-
-/**
- * copy constructor
- * 
- * @update gess 4/11/98
- * @param  aCopy is the object you want to copy from
- * @return newly constructed object
- */
-nsRBTreeIterator::nsRBTreeIterator(const nsRBTreeIterator& aCopy) : mTree(aCopy.mTree) {
-}
-
-/**
- * Destructor method
- * 
- * @update gess 4/11/98
- */
-nsRBTreeIterator::~nsRBTreeIterator(){
-}
-
-/**
- * This method iterates over the tree, calling
- * aFunctor for each node.
- * 
- * @update gess 4/11/98
- * @param  aFunctor -- object to call for each node
- * @param  aNode -- node at which to start iteration
- * @return this
- */
-const nsRBTreeIterator& nsRBTreeIterator::ForEach(nsNodeFunctor& aFunctor) const{
-  mTree.ForEach(aFunctor);
-  return *this;
-}

mozilla/base/src/nsRBTree.h

@@ -1,223 +0,0 @@
-
-/**
- * This file defines the binary tree class and its
- * nsNode child class.
- *
- * This simple version stores nodes, and the
- * nodes store void* ptrs.
- * 
- * @update gess 4/11/98
- * @param  
- * @return 
- */ 
-
-/** 
- * MODULE NOTES 
- * @update gess 4/11/98
- *
- * This file declares the nsRBTree (red/black tree).
- * Red/black trees are auto-balancing binary trees.
- *
- * To use this class, define a subclass of nsNode
- * which stores your data type. It's important that
- * you overload the following methods:
- *
- *      virtual PRBool operator<()
- *      virtual PRBool operator==()
- *
- */ 
-
-#ifndef _nsRBTree
-#define _nsRBTree
-
-
-#include "nsBTree.h"
-
-
-/**
- * Here comes the main event: our nsRBTree (red/black tree).
- * Red/Black trees are autobalancing binary trees.
- *
- * @update	gess4/20/98
- */
-
-class NS_BASE nsRBTree : public nsBTree {
-public:
-friend class NS_BASE nsRBTreeIterator;
-  
-  /**
-   * nsRBTree constructor
-   * 
-   * @update gess 4/11/98
-   */
-  nsRBTree();
-
-  /**
-   * nsRBTree constructor
-   * 
-   * @update gess 4/11/98
-   */
-  nsRBTree(const nsRBTree& aCopy);
-
-  /**
-   * nsRBTree destructor
-   * 
-   * @update gess 4/11/98
-   */
-  virtual ~nsRBTree();
-
-  /**
-   * Given a node, we're supposed to add it into 
-   * our tree.
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */
-  nsNode*   Add(nsNode& aNode);
-
-  /**
-   * Retrive the first node in the tree
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */
-  nsNode*   First(void);
-  
-  /**
-   * Retrieve the first node given a starting node
-   * 
-   * @update gess 4/11/98
-   * @param  aNode --
-   * @return node ptr or null
-   */
-  nsNode*   First(nsNode& aNode);
-  
-  /**
-   * Find the last node in the tree
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return node ptr or null
-   */
-  nsNode*   Last(void);
-  
-  /**
-   * Find the last node from a given node
-   * 
-   * @update gess 4/11/98
-   * @param  aNode -- node ptr to start from
-   * @return node ptr or null
-   */
-  nsNode*   Last(nsNode& aNode);
-  
-  /**
-   * Retrieve the node that preceeds the given node
-   * 
-   * @update gess 4/11/98
-   * @param  aNode -- node to find precedent of
-   * @return preceeding node ptr, or null
-   */
-  nsNode*   Before(nsNode& aNode);
-  
-  /**
-   * Retrieve a ptr to the node following the given node
-   * 
-   * @update gess 4/11/98
-   * @param  aNode -- node to find successor node from
-   * @return node ptr or null
-   */
-  nsNode*   After(nsNode& aNode);
-
-  /**
-   * Find a (given) node in the tree
-   * 
-   * @update gess 4/11/98
-   * @param  node to find in the tree
-   * @return node ptr (if found) or null
-   */
-  nsNode*   Find(nsNode& aNode);
-
-private:
-
-  /**
-   * Causes a shift to the left, to keep the
-   * underlying RB data in balance
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return this
-   */
-  nsRBTree&   ShiftLeft(nsNode& aNode);
-
-  /**
-   * Causes a shift right to occur, to keep the
-   * underlying RB data in balance
-   * 
-   * @update gess 4/11/98
-   * @param  aNode -- node at which to perform shift
-   * @return this
-   */
-  nsRBTree&   ShiftRight(nsNode& aNode);
-
-  /**
-   * Rebalances tree around the given node. This only
-   * needs to be called after a node is deleted.
-   * 
-   * @update gess 4/11/98
-   * @param  aNode -- node to balance around
-   * @return this
-   */
-  virtual nsBTree& ReBalance(nsNode& aNode);
-
-};
-
-class NS_BASE nsRBTreeIterator {
-public:
-
-  /**
-   * TreeIterator constructor
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */
-  nsRBTreeIterator(const nsRBTree& aTree);
-
-  /**
-   * TreeIterator constructor
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */
-  nsRBTreeIterator(const nsRBTreeIterator& aCopy);
-
-  /**
-   * tree iterator destructor
-   * 
-   * @update gess 4/11/98
-   * @param  
-   * @return 
-   */
-  ~nsRBTreeIterator();
-
-  /**
-   * This method iterates over the tree, calling
-   * aFunctor for each node.
-   * 
-   * @update gess 4/11/98
-   * @param  aFunctor -- object to call for each node
-   * @param  aNode -- node at which to start iteration
-   * @return this
-   */
-  const nsRBTreeIterator& ForEach(nsNodeFunctor& aFunctor) const;
-
-protected:
-  const nsRBTree& mTree;
-
-};
-
-
-#endif

mozilla/base/src/nsSizeOfHandler.cpp

@@ -1,121 +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.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 "nsISizeOfHandler.h"
-#include "plhash.h"
-
-static NS_DEFINE_IID(kISizeOfHandlerIID, NS_ISIZEOF_HANDLER_IID);
-
-class nsSizeOfHandler : public nsISizeOfHandler {
-public:
-  nsSizeOfHandler();
-  ~nsSizeOfHandler();
-
-  // nsISupports
-  NS_DECL_ISUPPORTS
-
-  // nsISizeOfHandler
-  NS_IMETHOD Add(size_t aSize);
-  virtual PRBool HaveSeen(void* anObject);
-  NS_IMETHOD GetSize(PRUint32& aResult);
-
-protected:
-  PRUint32 mTotalSize;
-  PLHashTable* mTable;
-};
-
-static PLHashNumber
-HashKey(void* key)
-{
-  return (PLHashNumber) key;
-}
-
-static PRIntn
-CompareKeys(void* key1, void* key2)
-{
-  return key1 == key2;
-}
-
-nsSizeOfHandler::nsSizeOfHandler()
-{
-  NS_INIT_REFCNT();
-  mTotalSize = 0;
-  mTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
-                           (PLHashComparator) CompareKeys,
-                           (PLHashComparator) nsnull,
-                           nsnull, nsnull);
-}
-
-nsSizeOfHandler::~nsSizeOfHandler()
-{
-  if (nsnull != mTable) {
-    PL_HashTableDestroy(mTable);
-  }
-}
-
-NS_IMPL_ISUPPORTS(nsSizeOfHandler, kISizeOfHandlerIID)
-
-NS_IMETHODIMP
-nsSizeOfHandler::Add(size_t aSize)
-{
-  mTotalSize += aSize;
-  return NS_OK;
-}
-
-PRBool
-nsSizeOfHandler::HaveSeen(void* anObject)
-{
-  if (nsnull == mTable) {
-    // When we run out of memory, HaveSeen returns PR_TRUE to stop
-    // wasting time.
-    return PR_TRUE;
-  }
-    
-  if (nsnull != anObject) {
-    PRInt32 hashCode = (PRInt32) anObject;
-    PLHashEntry** hep = PL_HashTableRawLookup(mTable, hashCode, anObject);
-    PLHashEntry* he = *hep;
-    if (nsnull != he) {
-      return PR_TRUE;
-    }
-    he = PL_HashTableRawAdd(mTable, hep, hashCode, anObject, anObject);
-    if (nsnull == he) {
-      // When we run out of memory, HaveSeen returns PR_TRUE to stop
-      // wasting time.
-      return PR_TRUE;
-    }
-    return PR_FALSE;
-  }
-  return PR_TRUE;
-}
-
-NS_IMETHODIMP
-nsSizeOfHandler::GetSize(PRUint32& aResult)
-{
-  aResult = mTotalSize;
-  return NS_OK;
-}
-
-NS_BASE nsresult
-NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult)
-{
-  nsISizeOfHandler *it = new nsSizeOfHandler();
-  if (it == nsnull) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kISizeOfHandlerIID, (void **) aInstancePtrResult);
-}

mozilla/base/src/nsString.h

@@ -1,240 +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.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:
- * LAST MODS:	gess 28Feb98
- * 
- * This very simple string class that knows how to do 
- * efficient (dynamic) resizing. It offers almost no
- * i18n support, and will undoubtedly have to be replaced.
- *
- */
-
-#ifndef _NSSTRING
-#define _NSSTRING
-
-
-#include "prtypes.h"
-#include "nscore.h"
-#include "nsIAtom.h"
-#include <iostream.h>
-#include <stdio.h>
-class nsISizeOfHandler;
-
-class NS_BASE nsString {
-  public: 
-
-                          nsString();
-                          nsString(const char* anISOLatin1);
-                          nsString(const nsString&);
-                          nsString(const PRUnichar* aUnicode);    
-
-  public:
-  virtual                 ~nsString();
-
-            PRInt32       Length() const { return mLength; }
-
-            void          SetLength(PRInt32 aLength);
-            void          Truncate(PRInt32 anIndex=0);
-  virtual   void          EnsureCapacityFor(PRInt32 aNewLength);
-
-  virtual   void          SizeOf(nsISizeOfHandler* aHandler) const;
-
-  ///accessor methods
-  //@{
-         const PRUnichar* GetUnicode(void) const;
-                          operator PRUnichar*() const;
-
-            PRUnichar     operator()(PRInt32 i) const;
-            PRUnichar&    operator[](PRInt32 i) const;
-            PRUnichar&    CharAt(PRInt32 anIndex) const;
-            PRUnichar&    First() const; 
-            PRUnichar&    Last() const;
-
-                //string creation methods...
-            nsString      operator+(const nsString& aString);
-            nsString      operator+(const char* anISOLatin1);
-            nsString      operator+(char aChar);
-            nsString      operator+(const PRUnichar* aBuffer);
-            nsString      operator+(PRUnichar aChar);
-
-            void          ToLowerCase();
-            void          ToLowerCase(nsString& aString) const;
-            void          ToUpperCase();
-            void          ToUpperCase(nsString& aString) const;
-
-            nsString*     ToNewString() const;
-            char*         ToNewCString() const;
-
-            char*         ToCString(char* aBuf,PRInt32 aBufLength) const;
-            void          Copy(nsString& aString) const;
-
-            PRUnichar*    ToNewUnicode() const;
-            float         ToFloat(PRInt32* aErrorCode) const;
-            PRInt32       ToInteger(PRInt32* aErrorCode) const;
-  //@}
-
-  ///string manipulation methods...                
-  //@{
-
-            nsString&     SetString(const PRUnichar* aStr,PRInt32 aLength=-1);
-            nsString&     SetString(const char* anISOLatin1,PRInt32 aLength=-1);
-
-            nsString&     operator=(const nsString& aString);
-            nsString&     operator=(const char* anISOLatin1);
-            nsString&     operator=(char aChar);
-            nsString&     operator=(const PRUnichar* aBuffer);
-            nsString&     operator=(PRUnichar aChar);
-            nsString&     operator+=(const nsString& aString);
-            nsString&     operator+=(const char* anISOLatin1);
-            nsString&     operator+=(const PRUnichar* aBuffer);
-            nsString&     operator+=(PRUnichar aChar);
-
-            nsString&     Append(const nsString& aString,PRInt32 aLength=-1);
-            nsString&     Append(const char* anISOLatin1,PRInt32 aLength=-1);
-            nsString&     Append(char aChar);
-            nsString&     Append(const PRUnichar* aBuffer,PRInt32 aLength=-1);
-            nsString&     Append(PRUnichar aChar);
-            nsString&     Append(PRInt32 aInteger,PRInt32 aRadix); //radix=8,10 or 16
-            nsString&     Append(float aFloat);
-                          
-            PRInt32       Left(nsString& aCopy,PRInt32 aCount);
-            PRInt32       Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount);
-            PRInt32       Right(nsString& aCopy,PRInt32 aCount);
-            PRInt32       Insert(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount=-1);
-            PRInt32       Insert(PRUnichar aChar,PRInt32 anOffset);
-
-            nsString&     Cut(PRInt32 anOffset,PRInt32 aCount);
-            nsString&     StripChars(const char* aSet);
-            nsString&     StripWhitespace();
-            nsString&     Trim( const char* aSet,
-                                PRBool aEliminateLeading=PR_TRUE,
-                                PRBool aEliminateTrailing=PR_TRUE);
-            nsString&     CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,
-                                              PRBool aEliminateTrailing=PR_TRUE);
-    static  PRBool        IsSpace(PRUnichar ch);
-    static  PRBool        IsAlpha(PRUnichar ch);
-    static  PRBool        IsDigit(PRUnichar ch);
-
-    //@}
-
-  ///searching methods...
-  //@{
-            PRInt32       Find(const char* anISOLatin1) const;
-            PRInt32       Find(const PRUnichar* aString) const;
-            PRInt32       Find(PRUnichar aChar,PRInt32 offset=0) const;
-            PRInt32       Find(const nsString& aString) const;
-            PRInt32       FindFirstCharInSet(const char* anISOLatin1Set,PRInt32 offset=0) const;
-            PRInt32       FindFirstCharInSet(nsString& aString,PRInt32 offset=0) const;
-            PRInt32       FindLastCharInSet(const char* anISOLatin1Set,PRInt32 offset=0) const;
-            PRInt32       FindLastCharInSet(nsString& aString,PRInt32 offset=0) const;
-            PRInt32       RFind(const char* anISOLatin1,PRBool aIgnoreCase=PR_FALSE) const;
-            PRInt32       RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE) const;
-            PRInt32       RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE) const;
-            PRInt32       RFind(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE) const;
-  //@}
-
-  ///comparision methods...
-  //@{
-    virtual PRInt32       Compare(const nsString &S,PRBool aIgnoreCase=PR_FALSE) const;
-    virtual PRInt32       Compare(const char *anISOLatin1,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
-    virtual PRInt32       Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
-
-            PRBool        operator==(const nsString &S) const;
-            PRBool        operator==(const char *anISOLatin1) const;
-            PRBool        operator==(const PRUnichar* aString) const;
-            PRBool        operator!=(const nsString &S) const;
-            PRBool        operator!=(const char *anISOLatin1) const;
-            PRBool        operator!=(const PRUnichar* aString) const;
-            PRBool        operator<(const nsString &S) const;
-            PRBool        operator<(const char *anISOLatin1) const;
-            PRBool        operator<(const PRUnichar* aString) const;
-            PRBool        operator>(const nsString &S) const;
-            PRBool        operator>(const char *anISOLatin1) const;
-            PRBool        operator>(const PRUnichar* aString) const;
-            PRBool        operator<=(const nsString &S) const;
-            PRBool        operator<=(const char *anISOLatin1) const;
-            PRBool        operator<=(const PRUnichar* aString) const;
-            PRBool        operator>=(const nsString &S) const;
-            PRBool        operator>=(const char *anISOLatin1) const;
-            PRBool        operator>=(const PRUnichar* aString) const;
-
-            PRBool        Equals(const nsString& aString) const;
-            PRBool        Equals(const char* anISOLatin1,PRInt32 aLength=-1) const;   
-            PRBool        Equals(const nsIAtom *aAtom) const;
-            PRBool        Equals(const PRUnichar* s1, const PRUnichar* s2) const;
-
-            PRBool        EqualsIgnoreCase(const nsString& aString) const;
-            PRBool        EqualsIgnoreCase(const char* anISOLatin1,PRInt32 aLength=-1) const;
-            PRBool        EqualsIgnoreCase(const nsIAtom *aAtom) const;
-            PRBool        EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
-  //@}
-
-            static void   SelfTest();
-    virtual void          DebugDump(ostream& aStream) const;
-
-  protected:
-
-typedef PRUnichar chartype;
-
-            chartype*       mStr;
-            PRInt32         mLength;
-            PRInt32         mCapacity;
-		static	PRBool					mSelfTested;
-};
-
-extern NS_BASE int fputs(const nsString& aString, FILE* out);
-
-//----------------------------------------------------------------------
-
-/**
- * A version of nsString which is designed to be used as an automatic
- * variable.  It attempts to operate out of a fixed size internal
- * buffer until too much data is added; then a dynamic buffer is
- * allocated and grown as necessary.
- */
-// XXX template this with a parameter for the size of the buffer?
-class NS_BASE nsAutoString : public nsString {
-public:
-                nsAutoString();
-                nsAutoString(const nsString& other);
-                nsAutoString(const nsAutoString& other);
-                nsAutoString(PRUnichar aChar);
-                nsAutoString(const char* isolatin1);
-                nsAutoString(const PRUnichar* us, PRInt32 uslen = -1);
-  virtual       ~nsAutoString();
-
-  nsAutoString& operator=(const nsString& aString) {nsString::operator=(aString); return *this;}
-  nsAutoString& operator=(const char* anISOLatin1) {nsString::operator=(anISOLatin1); return *this;}
-  nsAutoString& operator=(char aChar) {nsString::operator=(aChar); return *this;}
-  nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::operator=(aBuffer); return *this;}
-  nsAutoString& operator=(PRUnichar aChar) {nsString::operator=(aChar); return *this;}
-
-  virtual void  SizeOf(nsISizeOfHandler* aHandler) const;
-
-  static  void  SelfTest();
-
-protected:
-  virtual void EnsureCapacityFor(PRInt32 aNewLength);
-
-  PRUnichar mBuf[32];
-};
-
-#endif
-

mozilla/base/src/nsUnicharBuffer.cpp

@@ -1,140 +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.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 "nsIUnicharBuffer.h"
-#include "nsIUnicharInputStream.h"
-#include "nsCRT.h"
-
-#define MIN_BUFFER_SIZE 32
-
-class UnicharBufferImpl : public nsIUnicharBuffer {
-public:
-  UnicharBufferImpl(PRInt32 aBufferSize);
-  ~UnicharBufferImpl();
-
-  NS_DECL_ISUPPORTS
-  virtual PRInt32 GetLength() const;
-  virtual PRInt32 GetBufferSize() const;
-  virtual PRUnichar* GetBuffer() const;
-  virtual PRBool Grow(PRInt32 aNewSize);
-  virtual PRInt32 Fill(nsresult* aErrorCode, nsIUnicharInputStream* aStream,
-                       PRInt32 aKeep);
-
-  PRUnichar* mBuffer;
-  PRInt32 mSpace;
-  PRInt32 mLength;
-};
-
-UnicharBufferImpl::UnicharBufferImpl(PRInt32 aBufferSize)
-{
-  if (PRUint32(aBufferSize) < MIN_BUFFER_SIZE) {
-    aBufferSize = MIN_BUFFER_SIZE;
-  }
-  mSpace = aBufferSize;
-  mBuffer = new PRUnichar[aBufferSize];
-  mLength = 0;
-  NS_INIT_REFCNT();
-}
-
-NS_DEFINE_IID(kUnicharBufferIID, NS_IUNICHAR_BUFFER_IID);
-NS_IMPL_ISUPPORTS(UnicharBufferImpl,kUnicharBufferIID)
-
-UnicharBufferImpl::~UnicharBufferImpl()
-{
-  if (nsnull != mBuffer) {
-    delete mBuffer;
-    mBuffer = nsnull;
-  }
-  mLength = 0;
-}
-
-PRInt32 UnicharBufferImpl::GetLength() const
-{
-  return mLength;
-}
-
-PRInt32 UnicharBufferImpl::GetBufferSize() const
-{
-  return mSpace;
-}
-
-PRUnichar* UnicharBufferImpl::GetBuffer() const
-{
-  return mBuffer;
-}
-
-PRBool UnicharBufferImpl::Grow(PRInt32 aNewSize)
-{
-  if (PRUint32(aNewSize) < MIN_BUFFER_SIZE) {
-    aNewSize = MIN_BUFFER_SIZE;
-  }
-  PRUnichar* newbuf = new PRUnichar[aNewSize];
-  if (nsnull != newbuf) {
-    if (0 != mLength) {
-      nsCRT::memcpy(newbuf, mBuffer, mLength * sizeof(PRUnichar));
-    }
-    delete mBuffer;
-    mBuffer = newbuf;
-    return PR_TRUE;
-  }
-  return PR_FALSE;
-}
-
-PRInt32 UnicharBufferImpl::Fill(nsresult* aErrorCode,
-                                nsIUnicharInputStream* aStream,
-                                PRInt32 aKeep)
-{
-  NS_PRECONDITION(nsnull != aStream, "null stream");
-  NS_PRECONDITION(PRUint32(aKeep) < PRUint32(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 * sizeof(PRUnichar));
-  }
-
-  // Read in some new data
-  mLength = aKeep;
-  PRInt32 amount = mSpace - aKeep;
-  PRInt32 nb;
-  *aErrorCode = aStream->Read(mBuffer, aKeep, amount, &nb);
-  if (NS_SUCCEEDED(*aErrorCode)) {
-    mLength += nb;
-  }
-  else
-    nb = 0;
-  return nb;
-}
-
-NS_BASE nsresult NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
-                                     nsISupports* aOuter,
-                                     PRInt32 aBufferSize)
-{
-  if (nsnull != aOuter) {
-    return NS_ERROR_NO_AGGREGATION;
-  }
-  UnicharBufferImpl* it = new UnicharBufferImpl(aBufferSize);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kUnicharBufferIID, (void **) aInstancePtrResult);
-}

mozilla/base/src/nsUnicharInputStream.cpp

@@ -1,337 +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.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 "nsIUnicharInputStream.h"
-#include "nsIByteBuffer.h"
-#include "nsIUnicharBuffer.h"
-#include "nsString.h"
-#include "nsCRT.h"
-#include <fcntl.h>
-#ifdef NS_WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-static NS_DEFINE_IID(kIUnicharInputStreamIID, NS_IUNICHAR_INPUT_STREAM_IID);
-
-class StringUnicharInputStream : public nsIUnicharInputStream {
-public:
-  StringUnicharInputStream(nsString* aString);
-  ~StringUnicharInputStream();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD Read(PRUnichar* aBuf,
-                  PRInt32 aOffset,
-                  PRInt32 aCount,
-                  PRInt32 *aReadCount);
-  NS_IMETHOD Close();
-
-  nsString* mString;
-  PRInt32 mPos;
-  PRInt32 mLen;
-};
-
-StringUnicharInputStream::StringUnicharInputStream(nsString* aString)
-{
-  NS_INIT_REFCNT();
-  mString = aString;
-  mPos = 0;
-  mLen = aString->Length();
-}
-
-StringUnicharInputStream::~StringUnicharInputStream()
-{
-  if (nsnull != mString) {
-    delete mString;
-  }
-}
-
-nsresult StringUnicharInputStream::Read(PRUnichar* aBuf,
-                                        PRInt32 aOffset,
-                                        PRInt32 aCount,
-                                        PRInt32 *aReadCount)
-{
-  if (mPos >= mLen) {
-    *aReadCount = 0;
-    return (nsresult)-1;
-  }
-  const PRUnichar* us = mString->GetUnicode();
-  PRInt32 amount = mLen - mPos;
-  if (amount > aCount) {
-    amount = aCount;
-  }
-  nsCRT::memcpy(aBuf + aOffset, us + mPos, sizeof(PRUnichar) * amount);
-  mPos += amount;
-  *aReadCount = amount;
-  return NS_OK;
-}
-
-nsresult StringUnicharInputStream::Close()
-{
-  mPos = mLen;
-  if (nsnull != mString) {
-    delete mString;
-  }
-  return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS(StringUnicharInputStream, kIUnicharInputStreamIID);
-
-NS_BASE nsresult
-NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
-                               nsString* aString)
-{
-  NS_PRECONDITION(nsnull != aString, "null ptr");
-  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-  if ((nsnull == aString) || (nsnull == aInstancePtrResult)) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  StringUnicharInputStream* it = new StringUnicharInputStream(aString);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return it->QueryInterface(kIUnicharInputStreamIID,
-                            (void**) aInstancePtrResult);
-}
-
-//----------------------------------------------------------------------
-
-class IsoLatin1Converter : public nsIB2UConverter {
-public:
-  IsoLatin1Converter();
-
-  NS_DECL_ISUPPORTS
-  virtual PRInt32 Convert(PRUnichar* aDst,
-                          PRInt32 aDstOffset,
-                          PRInt32& aDstLen,
-                          const char* aSrc,
-                          PRInt32 aSrcOffset,
-                          PRInt32& aSrcLen);
-};
-
-IsoLatin1Converter::IsoLatin1Converter()
-{
-  NS_INIT_REFCNT();
-}
-
-NS_DEFINE_IID(kIB2UConverterIID, NS_IB2UCONVERTER_IID);
-NS_IMPL_ISUPPORTS(IsoLatin1Converter,kIB2UConverterIID);
-
-PRInt32 IsoLatin1Converter::Convert(PRUnichar* aDst,
-                                    PRInt32 aDstOffset,
-                                    PRInt32& aDstLen,
-                                    const char* aSrc,
-                                    PRInt32 aSrcOffset,
-                                    PRInt32& aSrcLen)
-{
-  PRInt32 amount = aSrcLen;
-  if (aSrcLen > aDstLen) {
-    amount = aDstLen;
-  }
-  const char* end = aSrc + amount;
-  while (aSrc < end) {
-    PRUint8 isoLatin1 = PRUint8(*aSrc++);
-    /* XXX insert table based lookup converter here */
-    *aDst++ = isoLatin1;
-  }
-  aDstLen = amount;
-  aSrcLen = amount;
-  return NS_OK;
-}
-
-NS_BASE nsresult
-NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
-                   nsISupports* aOuter,
-                   nsCharSetID aCharSet)
-{
-  if (nsnull != aOuter) {
-    return NS_ERROR_NO_AGGREGATION;
-  }
-  if (eCharSetID_IsoLatin1 != aCharSet) {
-    return NS_BASE_STREAM_NO_CONVERTER;
-  }
-  IsoLatin1Converter* it = new IsoLatin1Converter();
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kIB2UConverterIID, (void**)aInstancePtrResult);
-}
-
-//----------------------------------------------------------------------
-
-class ConverterInputStream : public nsIUnicharInputStream {
-public:
-  ConverterInputStream(nsIInputStream* aStream,
-                       nsIB2UConverter* aConverter,
-                       PRInt32 aBufSize);
-  ~ConverterInputStream();
-
-  NS_DECL_ISUPPORTS
-  NS_IMETHOD Read(PRUnichar* aBuf,
-                  PRInt32 aOffset,
-                  PRInt32 aCount,
-                  PRInt32 *aReadCount);
-  NS_IMETHOD Close();
-
-protected:
-  PRInt32 Fill(nsresult * aErrorCode);
-
-  nsIInputStream* mInput;
-  nsIB2UConverter* mConverter;
-  nsIByteBuffer* mByteData;
-  PRInt32 mByteDataOffset;
-  nsIUnicharBuffer* mUnicharData;
-  PRInt32 mUnicharDataOffset;
-  PRInt32 mUnicharDataLength;
-};
-
-ConverterInputStream::ConverterInputStream(nsIInputStream* aStream,
-                                           nsIB2UConverter* aConverter,
-                                           PRInt32 aBufferSize)
-{
-  NS_INIT_REFCNT();
-  mInput = aStream; aStream->AddRef();
-  mConverter = aConverter; aConverter->AddRef();
-  if (aBufferSize == 0) {
-    aBufferSize = 8192;
-  }
-  nsresult rv1 = NS_NewByteBuffer(&mByteData, nsnull, aBufferSize);
-  nsresult rv2 = NS_NewUnicharBuffer(&mUnicharData, nsnull, aBufferSize);
-  mByteDataOffset = 0;
-  mUnicharDataOffset = 0;
-  mUnicharDataLength = 0;
-}
-
-NS_IMPL_ISUPPORTS(ConverterInputStream,kIUnicharInputStreamIID);
-
-ConverterInputStream::~ConverterInputStream()
-{
-  Close();
-}
-
-nsresult ConverterInputStream::Close()
-{
-  if (nsnull != mInput) {
-    mInput->Release();
-    mInput = nsnull;
-  }
-  if (nsnull != mConverter) {
-    mConverter->Release();
-    mConverter = nsnull;
-  }
-  if (nsnull != mByteData) {
-    mByteData->Release();
-    mByteData = nsnull;
-  }
-  if (nsnull != mUnicharData) {
-    mUnicharData->Release();
-    mUnicharData = nsnull;
-  }
-
-  return NS_OK;
-}
-
-nsresult ConverterInputStream::Read(PRUnichar* aBuf,
-                                    PRInt32 aOffset,
-                                    PRInt32 aCount,
-                                    PRInt32 *aReadCount)
-{
-  PRInt32 rv = mUnicharDataLength - mUnicharDataOffset;
-  nsresult errorCode;
-  if (0 == rv) {
-    // Fill the unichar buffer
-    rv = Fill(&errorCode);
-    if (rv <= 0) {
-      *aReadCount = 0;
-      return errorCode;
-    }
-  }
-  if (rv > aCount) {
-    rv = aCount;
-  }
-  nsCRT::memcpy(aBuf + aOffset, mUnicharData->GetBuffer() + mUnicharDataOffset,
-                rv * sizeof(PRUnichar));
-  mUnicharDataOffset += rv;
-  *aReadCount = rv;
-  return NS_OK;
-}
-
-PRInt32 ConverterInputStream::Fill(nsresult * aErrorCode)
-{
-  if (nsnull == mInput) {
-    // We already closed the stream!
-    *aErrorCode = NS_BASE_STREAM_CLOSED;
-    return -1;
-  }
-
-  PRInt32 remainder = mByteData->GetLength() - mByteDataOffset;
-  mByteDataOffset = remainder;
-  PRInt32 nb = mByteData->Fill(aErrorCode, mInput, remainder);
-  if (nb <= 0) {
-    // Because we assume a many to one conversion, the lingering data
-    // in the byte buffer must be a partial conversion
-    // fragment. Because we know that we have recieved no more new
-    // data to add to it, we can't convert it. Therefore, we discard
-    // it.
-    return nb;
-  }
-  NS_ASSERTION(remainder + nb == mByteData->GetLength(), "bad nb");
-
-  // Now convert as much of the byte buffer to unicode as possible
-  PRInt32 dstLen = mUnicharData->GetBufferSize();
-  PRInt32 srcLen = remainder + nb;
-  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, dstLen,
-                                    mByteData->GetBuffer(), 0, srcLen);
-  mUnicharDataOffset = 0;
-  mUnicharDataLength = dstLen;
-  mByteDataOffset += srcLen;
-  return dstLen;
-}
-
-// XXX hook up auto-detect here (do we need more info, like the url?)
-NS_BASE nsresult
-NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
-                      nsISupports* aOuter,
-                      nsIInputStream* aStreamToWrap,
-                      PRInt32 aBufferSize,
-                      nsCharSetID aCharSet)
-{
-  if (nsnull != aOuter) {
-    return NS_ERROR_NO_AGGREGATION;
-  }
-
-  // Create converter
-  nsIB2UConverter* converter;
-  nsresult rv = NS_NewB2UConverter(&converter, nsnull, aCharSet);
-  if (NS_OK != rv) {
-    return rv;
-  }
-
-  // Create converter input stream
-  ConverterInputStream* it =
-    new ConverterInputStream(aStreamToWrap, converter, aBufferSize);
-  converter->Release();
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kIUnicharInputStreamIID, 
-                            (void **) aInstancePtrResult);
-}

mozilla/base/src/nsUnitConversion.h

@@ -1,182 +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.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 nsUnitConversion_h__
-#define nsUnitConversion_h__
-
-#include "nscore.h"
-#include <math.h>
-
-/// handy constants
-#define TWIPS_PER_POINT_INT           20
-#define TWIPS_PER_POINT_FLOAT         20.0f
-#define ROUND_EXCLUSIVE_CONST_FLOAT   0.4999999999999999f   // XXX this should be derived from platform FLOAT_MIN
-#define ROUND_CONST_FLOAT             0.5f
-#define CEIL_CONST_FLOAT              0.9999999999999999f   // XXX this should be derived from platform FLOAT_MIN
-
-
-/*
- * Coord Rounding Functions
- */
-inline nscoord NSToCoordFloor(float aValue)
-{
-  return ((0.0f <= aValue) ? nscoord(aValue) : nscoord(aValue - CEIL_CONST_FLOAT));
-}
-
-inline nscoord NSToCoordCeil(float aValue)
-{
-  return ((0.0f <= aValue) ? nscoord(aValue + CEIL_CONST_FLOAT) : nscoord(aValue));
-}
-
-inline nscoord NSToCoordRound(float aValue)
-{
-  return ((0.0f <= aValue) ? nscoord(aValue + ROUND_CONST_FLOAT) : nscoord(aValue - ROUND_CONST_FLOAT));
-}
-
-inline nscoord NSToCoordRoundExclusive(float aValue)
-{
-  return ((0.0f <= aValue) ? nscoord(aValue + ROUND_EXCLUSIVE_CONST_FLOAT) :
-                             nscoord(aValue - ROUND_EXCLUSIVE_CONST_FLOAT));
-}
-
-
-/*
- * Int Rounding Functions
- */
-inline PRInt32 NSToIntFloor(float aValue)
-{
-  return ((0.0f <= aValue) ? PRInt32(aValue) : PRInt32(aValue - CEIL_CONST_FLOAT));
-}
-
-inline PRInt32 NSToIntCeil(float aValue)
-{
-  return ((0.0f <= aValue) ? PRInt32(aValue + CEIL_CONST_FLOAT) : PRInt32(aValue));
-}
-
-inline PRInt32 NSToIntRound(float aValue)
-{
-  return ((0.0f <= aValue) ? PRInt32(aValue + ROUND_CONST_FLOAT) : PRInt32(aValue - ROUND_CONST_FLOAT));
-}
-
-inline PRInt32 NSToIntRoundExclusive(float aValue)
-{
-  return ((0.0f <= aValue) ? PRInt32(aValue + ROUND_EXCLUSIVE_CONST_FLOAT) :
-                             PRInt32(aValue - ROUND_EXCLUSIVE_CONST_FLOAT));
-}
-
-
-/* 
- * Twips/Points conversions
- */
-inline nscoord NSFloatPointsToTwips(float aPoints)
-{
-  return NSToCoordRound(aPoints * TWIPS_PER_POINT_FLOAT);
-}
-
-inline nscoord NSIntPointsToTwips(PRInt32 aPoints)
-{
-  return nscoord(aPoints * TWIPS_PER_POINT_INT);
-}
-
-inline PRInt32 NSTwipsToIntPoints(nscoord aTwips)
-{
-  return NSToIntRound(aTwips / TWIPS_PER_POINT_FLOAT);
-}
-
-inline PRInt32 NSTwipsToFloorIntPoints(nscoord aTwips)
-{
-  return NSToIntFloor(aTwips / TWIPS_PER_POINT_FLOAT);
-}
-
-inline PRInt32 NSTwipsToCeilIntPoints(nscoord aTwips)
-{
-  return NSToIntCeil(aTwips / TWIPS_PER_POINT_FLOAT);
-}
-
-inline float NSTwipsToFloatPoints(nscoord aTwips)
-{
-  return (float(aTwips) / TWIPS_PER_POINT_FLOAT);
-}
-
-/* 
- * Twips/Pixel conversions
- */
-inline nscoord NSFloatPixelsToTwips(float aPixels, float aTwipsPerPixel)
-{
-  return NSToCoordRound(aPixels * aTwipsPerPixel);
-}
-
-inline nscoord NSIntPixelsToTwips(PRInt32 aPixels, float aTwipsPerPixel)
-{
-  return NSToCoordRound(float(aPixels) * aTwipsPerPixel);
-}
-
-inline float NSTwipsToFloatPixels(nscoord aTwips, float aPixelsPerTwip)
-{
-  return (float(aTwips) * aPixelsPerTwip);
-}
-
-inline PRInt32 NSTwipsToIntPixels(nscoord aTwips, float aPixelsPerTwip)
-{
-  return NSToIntRound(float(aTwips) * aPixelsPerTwip);
-}
-
-/* 
- * Twips/unit conversions
- */
-inline nscoord NSUnitsToTwips(float aValue, float aPointsPerUnit)
-{
-  return NSToCoordRound(aValue * aPointsPerUnit * TWIPS_PER_POINT_FLOAT);
-}
-
-inline float NSTwipsToUnits(nscoord aTwips, float aUnitsPerPoint)
-{
-  return (aTwips * (aUnitsPerPoint / TWIPS_PER_POINT_FLOAT));
-}
-
-
-/// Unit conversion macros
-//@{
-#define NS_INCHES_TO_TWIPS(x)         NSUnitsToTwips((x), 72.0f)                      // 72 points per inch
-#define NS_FEET_TO_TWIPS(x)           NSUnitsToTwips((x), (72.0f * 12.0f))            // 12 inches per foot
-#define NS_MILES_TO_TWIPS(x)          NSUnitsToTwips((x), (72.0f * 12.0f * 5280.0f))  // 5280 feet per mile
-
-#define NS_MILLIMETERS_TO_TWIPS(x)    NSUnitsToTwips((x), (72.0f * 0.03937f))
-#define NS_CENTIMETERS_TO_TWIPS(x)    NSUnitsToTwips((x), (72.0f * 0.3937f))
-#define NS_METERS_TO_TWIPS(x)         NSUnitsToTwips((x), (72.0f * 39.37f))
-#define NS_KILOMETERS_TO_TWIPS(x)     NSUnitsToTwips((x), (72.0f * 39370.0f))
-
-#define NS_PICAS_TO_TWIPS(x)          NSUnitsToTwips((x), 12.0f)                      // 12 points per pica
-#define NS_DIDOTS_TO_TWIPS(x)         NSUnitsToTwips((x), (16.0f / 15.0f))            // 15 didots per 16 points
-#define NS_CICEROS_TO_TWIPS(x)        NSUnitsToTwips((x), (12.0f * (16.0f / 15.0f)))  // 12 didots per cicero
-
-
-#define NS_TWIPS_TO_INCHES(x)         NSTwipsToUnits((x), 1.0f / 72.0f)
-#define NS_TWIPS_TO_FEET(x)           NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f))
-#define NS_TWIPS_TO_MILES(x)          NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f * 5280.0f))
-
-#define NS_TWIPS_TO_MILLIMETERS(x)    NSTwipsToUnits((x), 1.0f / (72.0f * 0.03937f))
-#define NS_TWIPS_TO_CENTIMETERS(x)    NSTwipsToUnits((x), 1.0f / (72.0f * 0.3937f))
-#define NS_TWIPS_TO_METERS(x)         NSTwipsToUnits((x), 1.0f / (72.0f * 39.37f))
-#define NS_TWIPS_TO_KILOMETERS(x)     NSTwipsToUnits((x), 1.0f / (72.0f * 39370.0f))
-
-#define NS_TWIPS_TO_PICAS(x)          NSTwipsToUnits((x), 1.0f / 12.0f)
-#define NS_TWIPS_TO_DIDOTS(x)         NSTwipsToUnits((x), 1.0f / (16.0f / 15.0f))
-#define NS_TWIPS_TO_CICEROS(x)        NSTwipsToUnits((x), 1.0f / (12.0f * (16.0f / 15.0f)))
-//@}
-
-#endif

mozilla/base/src/nsVoidArray.cpp

@@ -1,227 +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.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 "nsVoidArray.h"
-#include "nsCRT.h"
-#include "nsISizeOfHandler.h"
-
-static PRInt32 kGrowArrayBy = 8;
-
-nsVoidArray::nsVoidArray()
-{
-  mArray = nsnull;
-  mArraySize = 0;
-  mCount = 0;
-}
-
-nsVoidArray::nsVoidArray(PRInt32 aCount)
-{
-  NS_PRECONDITION(aCount > 0, "bad count");
-  mCount = mArraySize = aCount;
-  mArray = new void*[mCount];
-  nsCRT::memset(mArray, 0, mCount * sizeof(void*));
-}
-
-nsVoidArray& nsVoidArray::operator=(const nsVoidArray& other)
-{
-  if (nsnull != mArray) {
-    delete mArray;
-  }
-  PRInt32 otherCount = other.mCount;
-  mArraySize = otherCount;
-  mCount = otherCount;
-  if (otherCount != 0) {
-    mArray = new void*[otherCount];
-    nsCRT::memcpy(mArray, other.mArray, otherCount * sizeof(void*));
-  } else {
-    mArray = nsnull;
-  }
-  return *this;
-}
-
-nsVoidArray::~nsVoidArray()
-{
-  if (nsnull != mArray) {
-    delete [] mArray;
-  }
-}
-void
-nsVoidArray::SizeOf(nsISizeOfHandler* aHandler) const
-{
-  aHandler->Add(sizeof(*this));
-  aHandler->Add(sizeof(void*) * mArraySize);
-}
-
-void* nsVoidArray::ElementAt(PRInt32 aIndex) const
-{
-  if (PRUint32(aIndex) >= PRUint32(mCount)) {
-    return nsnull;
-  }
-  return mArray[aIndex];
-}
-
-PRInt32 nsVoidArray::IndexOf(void* aPossibleElement) const
-{
-  void** ap = mArray;
-  void** end = ap + mCount;
-  while (ap < end) {
-    if (*ap == aPossibleElement) {
-      return ap - mArray;
-    }
-    ap++;
-  }
-  return -1;
-}
-
-PRBool nsVoidArray::InsertElementAt(void* aElement, PRInt32 aIndex)
-{
-  PRInt32 oldCount = mCount;
-  if (PRUint32(aIndex) > PRUint32(oldCount)) {
-    // An invalid index causes the insertion to fail
-    return PR_FALSE;
-  }
-
-  if (oldCount + 1 > mArraySize) {
-    // We have to grow the array
-    PRInt32 newCount = oldCount + kGrowArrayBy;
-    void** newArray = new void*[newCount];
-    if (mArray != nsnull && aIndex != 0)
-      nsCRT::memcpy(newArray, mArray, aIndex * sizeof(void*));
-    PRInt32 slide = oldCount - aIndex;
-    if (0 != slide) {
-      // Slide data over to make room for the insertion
-      nsCRT::memcpy(newArray + aIndex + 1, mArray + aIndex,
-                    slide * sizeof(void*));
-    }
-    if (mArray != nsnull)
-      delete [] mArray;
-    mArray = newArray;
-    mArraySize = newCount;
-  } else {
-    // The array is already large enough
-    PRInt32 slide = oldCount - aIndex;
-    if (0 != slide) {
-      // Slide data over to make room for the insertion
-      nsCRT::memmove(mArray + aIndex + 1, mArray + aIndex,
-                     slide * sizeof(void*));
-    }
-  }
-  mArray[aIndex] = aElement;
-  mCount++;
-
-  return PR_TRUE;
-}
-
-PRBool nsVoidArray::ReplaceElementAt(void* aElement, PRInt32 aIndex)
-{
-  if (PRUint32(aIndex) >= PRUint32(mArraySize)) {
-
-    PRInt32 requestedCount = aIndex + 1;
-    PRInt32 growDelta = requestedCount - mCount;
-    PRInt32 newCount = mCount + (growDelta > kGrowArrayBy ? growDelta : kGrowArrayBy);
-    void** newArray = new void*[newCount];
-    nsCRT::memset(newArray, 0, newCount * sizeof(void*));
-    if (newArray==nsnull)
-       return PR_FALSE;
-    if (mArray != nsnull && aIndex != 0) {
-      nsCRT::memcpy(newArray, mArray, mCount * sizeof(void*));
-      if (mArray != nsnull)
-         delete [] mArray;
-    }
-    mArray = newArray;
-    mArraySize = newCount;
-  }
-  mArray[aIndex] = aElement;
-  if (aIndex >= mCount)
-     mCount = aIndex+1;
-  return PR_TRUE;
-}
-
-PRBool nsVoidArray::RemoveElementAt(PRInt32 aIndex)
-{
-  PRInt32 oldCount = mCount;
-  if (PRUint32(aIndex) >= PRUint32(oldCount)) {
-    // An invalid index causes the replace to fail
-    return PR_FALSE;
-  }
-
-  // We don't need to move any elements if we're removing the
-  // last element in the array
-  if (aIndex < (oldCount - 1)) {
-    nsCRT::memmove(mArray + aIndex, mArray + aIndex + 1,
-                   (oldCount - 1 - aIndex) * sizeof(void*));
-  }
-
-  mCount--;
-  return PR_TRUE;
-}
-
-PRBool nsVoidArray::RemoveElement(void* aElement)
-{
-  void** ep = mArray;
-  void** end = ep + mCount;
-  while (ep < end) {
-    void* e = *ep++;
-    if (e == aElement) {
-      ep--;
-      return RemoveElementAt(PRInt32(ep - mArray));
-    }
-  }
-  return PR_FALSE;
-}
-
-void nsVoidArray::Clear()
-{
-  mCount = 0;
-}
-
-void nsVoidArray::Compact()
-{
-  PRInt32 count = mCount;
-  if (mArraySize != count) {
-    void** newArray = new void*[count];
-    if (nsnull != newArray) {
-      nsCRT::memcpy(newArray, mArray, count * sizeof(void*));
-      delete [] mArray;
-      mArray = newArray;
-      mArraySize = count;
-    }
-  }
-}
-
-PRBool nsVoidArray::EnumerateForwards(nsVoidArrayEnumFunc aFunc, void* aData)
-{
-  PRInt32 index = -1;
-  PRBool  running = PR_TRUE;
-
-  while (running && (++index < mCount)) {
-    running = (*aFunc)(mArray[index], aData);
-  }
-  return running;
-}
-
-PRBool nsVoidArray::EnumerateBackwards(nsVoidArrayEnumFunc aFunc, void* aData)
-{
-  PRInt32 index = mCount;
-  PRBool  running = PR_TRUE;
-
-  while (running && (0 <= --index)) {
-    running = (*aFunc)(mArray[index], aData);
-  }
-  return running;
-}
-

mozilla/base/src/nsVoidArray.h

@@ -1,74 +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.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 nsVoidArray_h___
-#define nsVoidArray_h___
-
-#include "nscore.h"
-class nsISizeOfHandler;
-
-// Enumerator callback function. Return PR_FALSE to stop
-typedef PRBool (*nsVoidArrayEnumFunc)(void* aElement, void *aData);
-
-/// A basic zero-based array of void*'s that manages its own memory
-class NS_BASE nsVoidArray {
-public:
-  nsVoidArray();
-  nsVoidArray(PRInt32 aCount);  // initial count of aCount elements set to nsnull
-  ~nsVoidArray();
-
-  nsVoidArray& operator=(const nsVoidArray& other);
-
-  void  SizeOf(nsISizeOfHandler* aHandler) const;
-
-  PRInt32 Count() const {
-    return mCount;
-  }
-
-  void* ElementAt(PRInt32 aIndex) const;
-  void* operator[](PRInt32 aIndex) const { return ElementAt(aIndex); }
-
-  PRInt32 IndexOf(void* aPossibleElement) const;
-
-  PRBool InsertElementAt(void* aElement, PRInt32 aIndex);
-
-  PRBool ReplaceElementAt(void* aElement, PRInt32 aIndex);
-
-  PRBool AppendElement(void* aElement) {
-    return InsertElementAt(aElement, mCount);
-  }
-
-  PRBool RemoveElement(void* aElement);
-  PRBool RemoveElementAt(PRInt32 aIndex);
-  void   Clear();
-
-  void Compact();
-
-  PRBool EnumerateForwards(nsVoidArrayEnumFunc aFunc, void* aData);
-  PRBool EnumerateBackwards(nsVoidArrayEnumFunc aFunc, void* aData);
-
-protected:
-  void** mArray;
-  PRInt32 mArraySize;
-  PRInt32 mCount;
-
-private:
-  /// Copy constructors are not allowed
-  nsVoidArray(const nsVoidArray& other);
-};
-
-#endif /* nsVoidArray_h___ */

mozilla/base/src/nscore.h

@@ -1,127 +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.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 nscore_h___
-#define nscore_h___
-
-#ifdef _WIN32
-#define NS_WIN32 1
-#endif
-
-#if defined(__unix)
-#define NS_UNIX 1
-#endif
-
-#include "prtypes.h"
-#include "nsDebug.h"
-
-/** ucs2 datatype for 2 byte unicode characters */
-typedef PRUint16 PRUcs2;
-
-/** ucs4 datatype for 4 byte unicode characters */
-typedef PRUint32 PRUcs4;
-
-#ifdef NS_UCS4
-typedef PRUcs4 PRUnichar;
-#else
-typedef PRUcs2 PRUnichar;
-#endif
-
-/// The preferred symbol for null.
-#define nsnull 0
-
-/* Define brackets for protecting C code from C++ */
-#ifdef __cplusplus
-#define NS_BEGIN_EXTERN_C extern "C" {
-#define NS_END_EXTERN_C }
-#else
-#define NS_BEGIN_EXTERN_C
-#define NS_END_EXTERN_C
-#endif
-
-/*----------------------------------------------------------------------*/
-/* Import/export defines */
-
-#ifdef NS_WIN32
-#define NS_IMPORT _declspec(dllimport)
-#define NS_IMPORT_(type) type _declspec(dllimport) __stdcall
-#define NS_EXPORT _declspec(dllexport)
-// XXX NS_EXPORT_ defined in nsCOm.h (xpcom) differs in where the __declspec
-// is placed. It needs to be done this way to make the 4.x compiler happy...
-#undef NS_EXPORT_
-#define NS_EXPORT_(type) type _declspec(dllexport) __stdcall
-#else
-/* XXX do something useful? */
-#define NS_IMPORT
-#define NS_IMPORT_(type) type
-#define NS_EXPORT
-#define NS_EXPORT_(type) type
-#endif
-
-#ifdef _IMPL_NS_BASE
-#define NS_BASE NS_EXPORT
-#else
-#define NS_BASE NS_IMPORT
-#endif
-
-#ifdef _IMPL_NS_NET
-#define NS_NET NS_EXPORT
-#else
-#define NS_NET NS_IMPORT
-#endif
-
-#ifdef _IMPL_NS_DOM
-#define NS_DOM NS_EXPORT
-#else
-#define NS_DOM NS_IMPORT
-#endif
-
-#ifdef _IMPL_NS_WIDGET
-#define NS_WIDGET NS_EXPORT
-#else
-#define NS_WIDGET NS_IMPORT
-#endif
-
-#ifdef _IMPL_NS_VIEW
-#define NS_VIEW NS_EXPORT
-#else
-#define NS_VIEW NS_IMPORT
-#endif
-
-#ifdef _IMPL_NS_GFXNONXP
-#define NS_GFXNONXP NS_EXPORT
-#define NS_GFXNONXP_(type) NS_EXPORT_(type)
-#else
-#define NS_GFXNONXP NS_IMPORT
-#define NS_GFXNONXP_(type) NS_IMPORT_(type)
-#endif
-
-#ifdef _IMPL_NS_GFX
-#define NS_GFX NS_EXPORT
-#define NS_GFX_(type) NS_EXPORT_(type)
-#else
-#define NS_GFX NS_IMPORT
-#define NS_GFX_(type) NS_IMPORT_(type)
-#endif
-
-#ifdef _IMPL_NS_PLUGIN
-#define NS_PLUGIN NS_EXPORT
-#else
-#define NS_PLUGIN NS_IMPORT
-#endif
-
-#endif /* nscore_h___ */

mozilla/base/src/unix/Makefile

@@ -1,43 +0,0 @@
-#!gmake
-#
-# 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 = ../../..
-
-
-LIBRARY_NAME = gmbaseunix
-
-MODULE=raptor
-
-REQUIRES=xpcom raptor 
-
-DEFINES = -D_IMPL_NS_WIDGET 
-
-CPPSRCS= \
-	nsTimer.cpp 
-
-CPP_OBJS=				\
- ./$(OBJDIR)/nsTimer.o		\
- $(NULL)
-
-include $(DEPTH)/config/config.mk
-
-TARGETS = $(LIBRARY)
-
-include $(DEPTH)/config/rules.mk
-
-

mozilla/base/src/unix/Makefile.in

@@ -1,47 +0,0 @@
-#!gmake
-#
-# 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
-
-LIBRARY_NAME = gmbaseunix
-
-MODULE=raptor
-
-REQUIRES=xpcom raptor 
-
-DEFINES = -D_IMPL_NS_WIDGET 
-
-CPPSRCS= \
-	nsTimer.cpp 
-
-CPP_OBJS=				\
- ./$(OBJDIR)/nsTimer.o		\
- $(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-TARGETS = $(LIBRARY)
-
-include $(topsrcdir)/config/rules.mk
-
-

mozilla/base/src/unix/nsTimer.cpp

@@ -1,171 +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.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 "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "nsCRT.h"
-#include "prlog.h"
-#include <stdio.h>
-#include <limits.h>
-#include "Xm/Xm.h"
-
-static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
-
-// Hack for now. This is Bad because it creates a dependency between the widget
-// library and this library. This needs to be replaced with having code 
-// to pass an interface which can be queried for the app context.
-extern XtAppContext gAppContext;
-
-extern void nsTimerExpired(XtPointer aCallData);
-
-
-/*
- * Implementation of timers using Xt timer facility 
- */
-class TimerImpl : public nsITimer {
-public:
-
-public:
-  TimerImpl();
-  virtual ~TimerImpl();
-
-  virtual nsresult Init(nsTimerCallbackFunc aFunc,
-                void *aClosure,
-//              PRBool aRepeat, 
-                PRUint32 aDelay);
-
-  virtual nsresult Init(nsITimerCallback *aCallback,
-//              PRBool aRepeat, 
-                PRUint32 aDelay);
-
-  NS_DECL_ISUPPORTS
-
-  virtual void Cancel();
-  virtual PRUint32 GetDelay() { return mDelay; }
-  virtual void SetDelay(PRUint32 aDelay) { mDelay=aDelay; };
-
-  void FireTimeout();
-
-private:
-  nsresult Init(PRUint32 aDelay);
-
-  PRUint32 mDelay;
-  nsTimerCallbackFunc mFunc;
-  void *mClosure;
-  nsITimerCallback *mCallback;
-  // PRBool mRepeat;
-  TimerImpl *mNext;
-  XtIntervalId mTimerId; 
-};
-
-void TimerImpl::FireTimeout()
-{
-  if (mFunc != NULL) {
-    (*mFunc)(this, mClosure);
-  }
-  else if (mCallback != NULL) {
-    mCallback->Notify(this); // Fire the timer
-  }
-
-// Always repeating here
-
-// if (mRepeat)
-//  mTimerId = XtAppAddTimeOut(gAppContext, GetDelay(),(XtTimerCallbackProc)nsTimerExpired, this);
-}
-
-
-TimerImpl::TimerImpl()
-{
-  NS_INIT_REFCNT();
-  mFunc = NULL;
-  mCallback = NULL;
-  mNext = NULL;
-  mTimerId = 0;
-  mDelay = 0;
-}
-
-TimerImpl::~TimerImpl()
-{
-}
-
-nsresult 
-TimerImpl::Init(nsTimerCallbackFunc aFunc,
-                void *aClosure,
-//              PRBool aRepeat, 
-                PRUint32 aDelay)
-{
-    mFunc = aFunc;
-    mClosure = aClosure;
-    // mRepeat = aRepeat;
-
-    mTimerId = XtAppAddTimeOut(gAppContext, aDelay,(XtTimerCallbackProc)nsTimerExpired, this);
-
-    return Init(aDelay);
-}
-
-nsresult 
-TimerImpl::Init(nsITimerCallback *aCallback,
-//              PRBool aRepeat, 
-                PRUint32 aDelay)
-{
-    mCallback = aCallback;
-    // mRepeat = aRepeat;
-
-    mTimerId = XtAppAddTimeOut(gAppContext, aDelay, (XtTimerCallbackProc)nsTimerExpired, this);
-
-    return Init(aDelay);
-}
-
-nsresult
-TimerImpl::Init(PRUint32 aDelay)
-{
-    mDelay = aDelay;
-    NS_ADDREF(this);
-
-    return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
-
-
-void
-TimerImpl::Cancel()
-{
-  XtRemoveTimeOut(mTimerId);
-}
-
-NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
-{
-    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-    if (nsnull == aInstancePtrResult) {
-      return NS_ERROR_NULL_POINTER;
-    }  
-
-    TimerImpl *timer = new TimerImpl();
-    if (nsnull == timer) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
-}
-
-
-void nsTimerExpired(XtPointer aCallData)
-{
-  TimerImpl* timer = (TimerImpl *)aCallData;
-  timer->FireTimeout();
-}

mozilla/base/src/windows/makefile.win

@@ -1,40 +0,0 @@
-#!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=..\..\..
-IGNORE_MANIFEST=1
-
-DEFINES=-D_IMPL_NS_BASE 
-LIBRARY_NAME=gmbase 
-MODULE=raptor 
-REQUIRES=xpcom raptor 
-
-CPPSRCS=nsTimer.cpp 
-
-CPP_OBJS=.\$(OBJDIR)\nsTimer.obj 
-
-LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor 
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        -D_IMPL_NS_BASE \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(OBJS)
-	$(MAKE_INSTALL) $(OBJDIR)\nsTimer.obj ..\$(OBJDIR)

mozilla/base/src/windows/nsTimer.cpp

@@ -1,373 +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.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 "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "nsCRT.h"
-#include "prlog.h"
-#include <stdio.h>
-#include <windows.h>
-#include <limits.h>
-
-static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
-
-/*
- * Implementation of timers lifted from Windows front-end file timer.cpp
- */
-class TimerImpl : public nsITimer {
-public:
-  static TimerImpl *gTimerList;
-  static UINT gWindowsTimer;
-  static DWORD gNextFire;
-  static DWORD gSyncHack;
-
-  static void ProcessTimeouts(DWORD aNow);
-  static void SyncTimeoutPeriod(DWORD aTickCount);
-
-public:
-  TimerImpl();
-  virtual ~TimerImpl();
-
-  virtual nsresult Init(nsTimerCallbackFunc aFunc,
-                void *aClosure,
-//              PRBool aRepeat, 
-                PRUint32 aDelay);
-
-  virtual nsresult Init(nsITimerCallback *aCallback,
-//              PRBool aRepeat, 
-                PRUint32 aDelay);
-
-  NS_DECL_ISUPPORTS
-
-  virtual void Cancel();
-  void Fire(DWORD aNow);
-
-  virtual PRUint32 GetDelay() { return mDelay; }
-  virtual void SetDelay(PRUint32 aDelay) {};
-
-private:
-  nsresult Init(PRUint32 aDelay);
-
-  PRUint32 mDelay;
-  nsTimerCallbackFunc mFunc;
-  void *mClosure;
-  nsITimerCallback *mCallback;
-  DWORD mFireTime;
-  // PRBool mRepeat;
-  TimerImpl *mNext;
-};
-
-TimerImpl *TimerImpl::gTimerList = NULL;
-UINT TimerImpl::gWindowsTimer = 0;
-DWORD TimerImpl::gNextFire = (DWORD)-1;
-DWORD TimerImpl::gSyncHack = 0;
-
-void CALLBACK FireTimeout(HWND aWindow, 
-                          UINT aMessage, 
-                          UINT aTimerID, 
-                          DWORD aTime)
-{
-  static BOOL bCanEnter = TRUE;
-
-  //  Don't allow old timer messages in here.
-  if(aMessage != WM_TIMER)    {
-    PR_ASSERT(0);
-    return;
-  }
-
-  if(aTimerID != TimerImpl::gWindowsTimer)   {
-    return;
-  }
-  
-  //  Block only one entry into this function, or else.
-  if(bCanEnter)   {
-    bCanEnter = FALSE;
-    // see if we need to fork off any timeout functions
-    if(TimerImpl::gTimerList)    {
-      TimerImpl::ProcessTimeouts(aTime);
-    }
-    bCanEnter = TRUE;
-  }
-}
-
-//  Function to correctly have the timer be set.
-void 
-TimerImpl::SyncTimeoutPeriod(DWORD aTickCount)
-{
-    //  May want us to set tick count ourselves.
-    if(aTickCount == 0)    {
-        if(gSyncHack == 0) {
-            aTickCount = ::GetTickCount();
-        }
-        else    {
-            aTickCount = gSyncHack;
-        }
-    }
-
-    //  If there's no list, we should clear the timer.
-    if(!gTimerList) {
-        if(gWindowsTimer) {
-            ::KillTimer(NULL, gWindowsTimer);
-            gWindowsTimer = 0;
-            gNextFire = (DWORD)-1;
-        }
-    }
-    else {
-        //  See if we need to clear the current timer.
-        //  Curcumstances are that if the timer will not
-        //      fire on time for the next timeout.
-        BOOL bSetTimer = FALSE;
-        TimerImpl *pTimeout = gTimerList;
-        if(gWindowsTimer)   {
-            if(pTimeout->mFireTime != gNextFire)   {
-                ::KillTimer(NULL, gWindowsTimer);
-                gWindowsTimer = 0;
-                gNextFire = (DWORD)-1;
-
-                //  Set the timer.
-                bSetTimer = TRUE;
-            }
-        }
-        else    {
-            //  No timer set, attempt.
-            bSetTimer = TRUE;
-        }
-
-        if(bSetTimer)   {
-            DWORD dwFireWhen = pTimeout->mFireTime > aTickCount ?
-                pTimeout->mFireTime - aTickCount : 0;
-            if(dwFireWhen > UINT_MAX)   {
-                dwFireWhen = UINT_MAX;
-            }
-            UINT uFireWhen = (UINT)dwFireWhen;
-
-            PR_ASSERT(gWindowsTimer == 0);
-            gWindowsTimer = ::SetTimer(NULL, 0, uFireWhen, (TIMERPROC)FireTimeout);
-
-            if(gWindowsTimer)   {
-                //  Set the fire time.
-                gNextFire = pTimeout->mFireTime;
-            }
-        }
-    }
-}
-
-// Walk down the timeout list and launch anyone appropriate
-void 
-TimerImpl::ProcessTimeouts(DWORD aNow)
-{
-    TimerImpl *p = gTimerList;
-    if(aNow == 0)   {
-        aNow = ::GetTickCount();
-    }
-
-    BOOL bCalledSync = FALSE;
-
-    //  Set the hack, such that when FE_ClearTimeout
-    //      calls SyncTimeoutPeriod, that GetTickCount()
-    //      overhead is not incurred.
-    gSyncHack = aNow;
-    
-    // loop over all entries
-    while(p) {
-        // send it
-        if(p->mFireTime < aNow) {
-            //  Make sure that the timer cannot be deleted during the
-            //  Fire(...) call which may release *all* other references
-            //  to p...
-            NS_ADDREF(p);
-            p->Fire(aNow);
-
-            //  Clear the timer.
-            //  Period synced.
-            p->Cancel();
-            bCalledSync = TRUE;
-            NS_RELEASE(p);
-
-            //  Reset the loop (can't look at p->pNext now, and called
-            //      code may have added/cleared timers).
-            //  (could do this by going recursive and returning).
-            p = gTimerList;
-        } else {
-            //  Make sure we fire an timer.
-            //  Also, we need to check to see if things are backing up (they
-            //      may be asking to be fired long before we ever get to them,
-            //      and we don't want to pass in negative values to the real
-            //      timer code, or it takes days to fire....
-            if(bCalledSync == FALSE)    {
-                SyncTimeoutPeriod(aNow);
-                bCalledSync = TRUE;
-            }
-            //  Get next timer.
-            p = p->mNext;
-        }
-    }
-    gSyncHack = 0;
-}
-
-
-TimerImpl::TimerImpl()
-{
-  NS_INIT_REFCNT();
-  mFunc = NULL;
-  mCallback = NULL;
-  mNext = NULL;
-  mClosure = nsnull;
-}
-
-TimerImpl::~TimerImpl()
-{
-    Cancel();
-    NS_IF_RELEASE(mCallback);
-}
-
-nsresult 
-TimerImpl::Init(nsTimerCallbackFunc aFunc,
-                void *aClosure,
-//              PRBool aRepeat, 
-                PRUint32 aDelay)
-{
-    mFunc = aFunc;
-    mClosure = aClosure;
-    // mRepeat = aRepeat;
-
-    return Init(aDelay);
-}
-
-nsresult 
-TimerImpl::Init(nsITimerCallback *aCallback,
-//              PRBool aRepeat, 
-                PRUint32 aDelay)
-{
-    mCallback = aCallback;
-    NS_ADDREF(mCallback);
-    // mRepeat = aRepeat;
-
-    return Init(aDelay);
-}
-
-nsresult
-TimerImpl::Init(PRUint32 aDelay)
-{
-    DWORD dwNow = ::GetTickCount();
-  
-    mDelay = aDelay;
-    mFireTime = (DWORD) aDelay + dwNow;
-    mNext = NULL;
-
-    // add it to the list
-    if(!gTimerList) {        
-        // no list add it
-        gTimerList = this;
-    } 
-    else {
-
-        // is it before everything else on the list?
-        if(mFireTime < gTimerList->mFireTime) {
-
-            mNext = gTimerList;
-            gTimerList = this;
-
-        } else {
-
-            TimerImpl * pPrev = gTimerList;
-            TimerImpl * pCurrent = gTimerList;
-
-            while(pCurrent && (pCurrent->mFireTime <= mFireTime)) {
-                pPrev = pCurrent;
-                pCurrent = pCurrent->mNext;
-            }
-
-            PR_ASSERT(pPrev);
-
-            // insert it after pPrev (this could be at the end of the list)
-            mNext = pPrev->mNext;
-            pPrev->mNext = this;
-
-        }
-
-    }
-
-    NS_ADDREF(this);
-
-    //  Sync the timer fire period.
-    SyncTimeoutPeriod(dwNow);
-    
-    return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
-
-void
-TimerImpl::Fire(DWORD aNow)
-{
-    if (mFunc != NULL) {
-        (*mFunc)(this, mClosure);
-    }
-    else if (mCallback != NULL) {
-         mCallback->Notify(this);
-    }
-}
-
-void
-TimerImpl::Cancel()
-{
-    TimerImpl *me = this;
-
-    if(gTimerList == this) {
-
-        // first element in the list lossage
-        gTimerList = mNext;
-
-    } else {
-
-        // walk until no next pointer
-        for(TimerImpl * p = gTimerList; p && p->mNext && (p->mNext != this); p = p->mNext)
-            ;
-
-        // if we found something valid pull it out of the list
-        if(p && p->mNext && p->mNext == this) {
-            p->mNext = mNext;
-
-        } else {
-            // get out before we delete something that looks bogus
-            return;
-        }
-
-    }
-
-    // if we got here it must have been a valid element so trash it
-    NS_RELEASE(me);
-
-    //  If there's now no be sure to clear the timer.
-    SyncTimeoutPeriod(0);
-}
-
-NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
-{
-    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-    if (nsnull == aInstancePtrResult) {
-      return NS_ERROR_NULL_POINTER;
-    }  
-
-    TimerImpl *timer = new TimerImpl();
-    if (nsnull == timer) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
-}

mozilla/base/tests/CvtURL.cpp

@@ -1,105 +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.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 <stdio.h>
-#include "nsIUnicharInputStream.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsString.h"
-#include "prprf.h"
-#include "prtime.h"
-
-static nsCharSetID ConvertCharacterSetName(const char* aName)
-{
-  if (nsCRT::strcasecmp(aName, "iso-latin-1") == 0) {
-    return eCharSetID_IsoLatin1;
-  }
-  return (nsCharSetID) -1;
-}
-
-int main(int argc, char** argv)
-{
-  if (3 != argc) {
-    printf("usage: CvtURL url character-set-name\n");
-    return -1;
-  }
-
-  char* characterSetName = argv[2];
-  nsCharSetID cset = ConvertCharacterSetName(characterSetName);
-  if (PRInt32(cset) < 0) {
-    printf("illegal character set name: '%s'\n", characterSetName);
-    return -1;
-  }
-
-  // Create url object
-  char* urlName = argv[1];
-  nsIURL* url;
-  nsresult rv = NS_NewURL(&url, urlName);
-  if (NS_OK != rv) {
-    printf("invalid URL: '%s'\n", urlName);
-    return -1;
-  }
-
-  // Get an input stream from the url
-  PRInt32 ec;
-  nsIInputStream* in = url->Open(&ec);
-  if (nsnull == in) {
-    printf("open of url('%s') failed: error=%x\n", urlName, ec);
-    return -1;
-  }
-
-  // Translate the input using the argument character set id into unicode
-  nsIUnicharInputStream* uin;
-  rv = NS_NewConverterStream(&uin, nsnull, in, 0, cset);
-  if (NS_OK != rv) {
-    printf("can't create converter input stream: %d\n", rv);
-    return -1;
-  }
-
-  // Read the input and write some output
-  PRTime start = PR_Now();
-  PRInt32 count = 0;
-  for (;;) {
-    PRUnichar buf[1000];
-    PRInt32 nb;
-    ec = uin->Read(buf, 0, 1000, &nb);
-    if (ec < 0) {
-      if (ec != NS_BASE_STREAM_EOF) {
-        printf("i/o error: %d\n", ec);
-      }
-      break;
-    }
-    count += nb;
-  }
-  PRTime end = PR_Now();
-  PRTime conversion, ustoms;
-  LL_I2L(ustoms, 1000);
-  LL_SUB(conversion, end, start);
-  LL_DIV(conversion, conversion, ustoms);
-  char buf[500];
-  PR_snprintf(buf, sizeof(buf),
-              "converting and discarding %d bytes took %lldms",
-              count, conversion);
-  puts(buf);
-
-  // Release the objects
-  in->Release();
-  uin->Release();
-  url->Release();
-
-  return 0;
-}

mozilla/base/tests/Makefile

@@ -1,62 +0,0 @@
-#!gmake
-#
-# 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=../..
-
-REQUIRES=xpcom netlib
-
-include $(DEPTH)/config/config.mk
-
-CPPSRCS = \
-	TestAtoms.cpp	\
-	TestCRT.cpp	\
-	$(NULL)
-
-INCLUDES+=-I../src 
-
-OBJS	= $(CPPSRCS:.cpp=.o)
-
-EX_LIBS = \
-	$(DIST)/lib/libraptorbase.a \
-	$(DIST)/lib/libxpcom.a  \
-	$(DIST)/lib/libplc21.a	\
-	$(DIST)/lib/libplds21.a	\
-	$(DIST)/lib/libnspr21.a	\
-	$(NULL)
-
-PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
-
-TARGETS = $(PROGS)
-
-include $(DEPTH)/config/rules.mk
-
-# needed for mac linux
-ifeq (linux,$(ARCH))
-OS_LIBS += /usr/lib/libdl.so
-endif
-
-$(OBJDIR)/%.o: %.cpp
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(CFLAGS) -c $*.cpp
-
-$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
-
-install:: $(TARGETS)
-	$(INSTALL) $(PROGS) $(DIST)/bin
-

mozilla/base/tests/Makefile.in

@@ -1,67 +0,0 @@
-#!gmake
-#
-# 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@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-REQUIRES=xpcom netlib
-
-include $(topsrcdir)/config/config.mk
-
-CPPSRCS = \
-	TestAtoms.cpp	\
-	TestCRT.cpp	\
-	$(NULL)
-
-INCLUDES+=-I$(srcdir)/../src 
-
-OBJS	= $(CPPSRCS:.cpp=.o)
-
-EX_LIBS = \
-	$(DIST)/lib/libraptorbase.a \
-	$(DIST)/lib/libxpcom.a  \
-	$(DIST)/lib/libplc21.a	\
-	$(DIST)/lib/libplds21.a	\
-	$(DIST)/lib/libnspr21.a	\
-	$(NULL)
-
-PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
-
-TARGETS = $(PROGS)
-
-include $(topsrcdir)/config/rules.mk
-
-# needed for mac linux
-ifeq (linux,$(ARCH))
-OS_LIBS += /usr/lib/libdl.so
-endif
-
-$(OBJDIR)/%.o: %.cpp
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(CFLAGS) -c $<
-
-$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
-
-install:: $(TARGETS)
-	$(INSTALL) $(PROGS) $(DIST)/bin
-

mozilla/base/tests/TestAtoms.cpp

@@ -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 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 "nsIAtom.h"
-#include "nsString.h"
-#include "prprf.h"
-#include "prtime.h"
-#include <stdio.h>
-
-extern "C" int _CrtSetDbgFlag(int);
-
-int main(int argc, char** argv)
-{
-  FILE* fp = fopen("words.txt", "r");
-  if (nsnull == fp) {
-    printf("can't open words.txt\n");
-    return -1;
-  }
-
-  PRInt32 count = 0;
-  PRUnichar** strings = new PRUnichar*[60000];
-  nsIAtom** ids = new nsIAtom*[60000];
-  nsAutoString s1, s2;
-  PRTime start = PR_Now();
-  for (PRInt32 i = 0; i < 60000; i++) {
-    char buf[1000];
-    char* s = fgets(buf, sizeof(buf), fp);
-    if (nsnull == s) {
-      break;
-    }
-    nsAutoString sb(buf);
-    strings[count++] = sb.ToNewUnicode();
-    sb.ToUpperCase();
-    strings[count++] = sb.ToNewUnicode();
-  }
-  PRTime end0 = PR_Now();
-
-  // Find and create idents
-  for (i = 0; i < count; i++) {
-    ids[i] = NS_NewAtom(strings[i]);
-  }
-  PRUnichar qqs[1]; qqs[0] = 0;
-  nsIAtom* qq = NS_NewAtom(qqs);
-  PRTime end1 = PR_Now();
-
-  // Now make sure we can find all the idents we just made
-  for (i = 0; i < count; i++) {
-    nsIAtom* id = NS_NewAtom(ids[i]->GetUnicode());
-    if (id != ids[i]) {
-      id->ToString(s1);
-      ids[i]->ToString(s2);
-      printf("find failed: id='%s' ids[%d]='%s'\n",
-             s1.ToNewCString(), i, s2.ToNewCString());
-      return -1;
-    }
-    NS_RELEASE(id);
-  }
-  PRTime end2 = PR_Now();
-
-  // Destroy all the atoms we just made
-  NS_RELEASE(qq);
-  for (i = 0; i < count; i++) {
-    NS_RELEASE(ids[i]);
-  }
-
-  // Print out timings
-  PRTime end3 = PR_Now();
-  PRTime creates, finds, lookups, dtor, ustoms;
-  LL_I2L(ustoms, 1000);
-  LL_SUB(creates, end0, start);
-  LL_DIV(creates, creates, ustoms);
-  LL_SUB(finds, end1, end0);
-  LL_DIV(finds, finds, ustoms);
-  LL_SUB(lookups, end2, end1);
-  LL_DIV(lookups, lookups, ustoms);
-  LL_SUB(dtor, end3, end2);
-  char buf[500];
-  PR_snprintf(buf, sizeof(buf), "making %d ident strings took %lldms",
-              count, creates);
-  puts(buf);
-  PR_snprintf(buf, sizeof(buf), "%d new idents took %lldms",
-              count, finds);
-  puts(buf);
-  PR_snprintf(buf, sizeof(buf), "%d ident lookups took %lldms",
-              count, lookups);
-  puts(buf);
-  PR_snprintf(buf, sizeof(buf), "dtor took %lldusec", dtor);
-  puts(buf);
-
-  printf("%d live atoms\n", NS_GetNumberOfAtoms());
-  NS_POSTCONDITION(0 == NS_GetNumberOfAtoms(), "dangling atoms");
-
-  return 0;
-}

mozilla/base/tests/TestCRT.cpp

@@ -1,89 +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.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 "nsCRT.h"
-#include "nsString.h"
-#include "plstr.h"
-#include <stdlib.h>
-
-// Verify that nsCRT versions of string comparison routines get the
-// same answers as the native non-unicode versions. We only pass in
-// iso-latin-1 strings, so the comparision must be valid.
-static void Check(const char* s1, const char* s2, PRIntn n)
-{
-  PRIntn clib = PL_strcmp(s1, s2);
-  PRIntn clib_n = PL_strncmp(s1, s2, n);
-  PRIntn clib_case = PL_strcasecmp(s1, s2);
-  PRIntn clib_case_n = PL_strncasecmp(s1, s2, n);
-
-  nsAutoString t1(s1), t2(s2);
-  const PRUnichar* us1 = t1.GetUnicode();
-  const PRUnichar* us2 = t2.GetUnicode();
-
-  PRIntn u = nsCRT::strcmp(us1, s2);
-  PRIntn u_n = nsCRT::strncmp(us1, s2, n);
-  PRIntn u_case = nsCRT::strcasecmp(us1, s2);
-  PRIntn u_case_n = nsCRT::strncasecmp(us1, s2, n);
-
-  PRIntn u2 = nsCRT::strcmp(us1, us2);
-  PRIntn u2_n = nsCRT::strncmp(us1, us2, n);
-  PRIntn u2_case = nsCRT::strcasecmp(us1, us2);
-  PRIntn u2_case_n = nsCRT::strncasecmp(us1, us2, n);
-
-  NS_ASSERTION(clib == u, "strcmp");
-  NS_ASSERTION(clib_n == u_n, "strncmp");
-  NS_ASSERTION(clib_case == u_case, "strcasecmp");
-  NS_ASSERTION(clib_case_n == u_case_n, "strncasecmp");
-
-  NS_ASSERTION(clib == u2, "strcmp");
-  NS_ASSERTION(clib_n == u2_n, "strncmp");
-  NS_ASSERTION(clib_case == u2_case, "strcasecmp");
-  NS_ASSERTION(clib_case_n == u2_case_n, "strncasecmp");
-}
-
-struct Test {
-  const char* s1;
-  const char* s2;
-  PRIntn n;
-};
-
-static Test tests[] = {
-  { "foo", "foo", 3 },
-  { "foo", "fo", 3 },
-
-  { "foo", "bar", 3 },
-  { "foo", "ba", 3 },
-
-  { "foo", "zap", 3 },
-  { "foo", "za", 3 },
-
-  { "bar", "foo", 3 },
-  { "bar", "fo", 3 },
-
-  { "bar", "foo", 3 },
-  { "bar", "fo", 3 },
-};
-#define NUM_TESTS (sizeof(tests) / sizeof(tests[0]))
-
-void main()
-{
-  Test* tp = tests;
-  for (PRIntn i = 0; i < NUM_TESTS; i++, tp++) {
-    Check(tp->s1, tp->s2, tp->n);
-  }
-}

mozilla/base/tests/TimerTest.cpp

@@ -1,202 +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.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 "prtypes.h"
-#include "nsVoidArray.h"
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "resources.h"
-
-#include <windows.h>
-
-static char* class1Name = "TimerTest";
-
-static HINSTANCE gInstance, gPrevInstance;
-static nsVoidArray *gTimeouts = NULL;
-
-static void CreateRepeat(PRUint32 aDelay);
-
-void
-MyCallback (nsITimer *aTimer, void *aClosure)
-{
-    printf("Timer executed with delay %d\n", (int)aClosure);
-    
-    if (gTimeouts->RemoveElement(aTimer) == PR_TRUE) {
-      NS_RELEASE(aTimer);
-    }
-}
-
-void
-MyRepeatCallback (nsITimer *aTimer, void *aClosure)
-{
-    printf("Timer executed with delay %d\n", (int)aClosure);
-    
-    if (gTimeouts->RemoveElement(aTimer) == PR_TRUE) {
-      NS_RELEASE(aTimer);
-    }
-
-    CreateRepeat((PRUint32)aClosure);
-}
-
-static void
-CreateOneShot(PRUint32 aDelay)
-{
-    nsITimer *timer;
-
-    NS_NewTimer(&timer);
-    timer->Init(MyCallback, (void *)aDelay, aDelay);
-    
-    gTimeouts->AppendElement(timer);
-}
-
-static void
-CreateRepeat(PRUint32 aDelay)
-{
-    nsITimer *timer;
-
-    NS_NewTimer(&timer);
-    timer->Init(MyRepeatCallback, (void *)aDelay, aDelay);
-    
-    gTimeouts->AppendElement(timer);
-}
-
-static void
-CancelAll()
-{
-    int i, count = gTimeouts->Count();
-
-    for (i=0; i < count; i++) {
-        nsITimer *timer = (nsITimer *)gTimeouts->ElementAt(i);
-	
-	if (timer != NULL) {
-	    timer->Cancel();
-	    NS_RELEASE(timer);
-	}
-    }
-
-    gTimeouts->Clear();
-}
-
-long PASCAL
-WndProc(HWND hWnd, UINT msg, WPARAM param, LPARAM lparam)
-{
-  HMENU hMenu;
-
-  switch (msg) {
-    case WM_COMMAND:
-      hMenu = GetMenu(hWnd);
-
-      switch (LOWORD(param)) {
-        case TIMER_EXIT:
-	  ::DestroyWindow(hWnd);
-	  exit(0);
-
-        case TIMER_1SECOND:
-	  CreateOneShot(1000);
-	  break;
-        case TIMER_5SECOND:
-	  CreateOneShot(5000);
-	  break;
-        case TIMER_10SECOND:
-	  CreateOneShot(10000);
-	  break;
-
-        case TIMER_1REPEAT:
-	  CreateRepeat(1000);
-	  break;
-        case TIMER_5REPEAT:
-	  CreateRepeat(5000);
-	  break;
-        case TIMER_10REPEAT:
-	  CreateRepeat(10000);
-	  break;
-
-        case TIMER_CANCEL:
-	  CancelAll();
-	  break;
-
-        default:
-	  break;
-    }
-
-    default:
-      break;
-  }
-
-  return DefWindowProc(hWnd, msg, param, lparam);
-}
-
-static HWND CreateTopLevel(const char* clazz, const char* title,
-                                  int aWidth, int aHeight)
-{
-  // Create a simple top level window
-  HWND window = ::CreateWindowEx(WS_EX_CLIENTEDGE,
-                                 clazz, title,
-                                 WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN,
-                                 CW_USEDEFAULT, CW_USEDEFAULT,
-                                 aWidth, aHeight,
-                                 HWND_DESKTOP,
-                                 NULL,
-                                 gInstance,
-                                 NULL);
-
-  ::ShowWindow(window, SW_SHOW);
-  ::UpdateWindow(window);
-  return window;
-}
-
-int PASCAL
-WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam, int nCmdShow)
-{
-  gInstance = instance;
-
-  if (!prevInstance) {
-    WNDCLASS wndClass;
-    wndClass.style = 0;
-    wndClass.lpfnWndProc = WndProc;
-    wndClass.cbClsExtra = 0;
-    wndClass.cbWndExtra = 0;
-    wndClass.hInstance = gInstance;
-    wndClass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-    wndClass.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wndClass.hbrBackground = (HBRUSH) GetStockObject(LTGRAY_BRUSH);
-    wndClass.lpszMenuName = class1Name;
-    wndClass.lpszClassName = class1Name;
-    RegisterClass(&wndClass);
-  }
-
-  // Create our first top level window
-  HWND window = CreateTopLevel(class1Name, "Raptor HTML Viewer", 620, 400);
-
-  gTimeouts = new nsVoidArray();
-
-  // Process messages
-  MSG msg;
-  while (GetMessage(&msg, NULL, 0, 0)) {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-  }
-  return msg.wParam;
-}
-
-void main(int argc, char **argv)
-{
-  WinMain(GetModuleHandle(NULL), NULL, 0, SW_SHOW);
-}

mozilla/base/tests/makefile.win

@@ -1,90 +0,0 @@
-#!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=..\..
-
-MAKE_OBJ_TYPE	= EXE
-PROG0 = .\$(OBJDIR)\TimerTest.exe
-PROG1 = .\$(OBJDIR)\TestAtoms.exe
-PROG2 = .\$(OBJDIR)\CvtURL.exe
-PROG3 = .\$(OBJDIR)\TestCRT.exe
-RESFILE = timer.res
-PROGRAMS = $(PROG0) $(PROG1) \
-!ifdef MODULAR_NETLIB
-        $(PROG2) \
-	$(PROG3) \
-!endif
-        $(NULL)
-
-LINCS=-I..\src -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib
-
-LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib	\
-!ifdef MODULAR_NETLIB
- $(DIST)\lib\netlib.lib         \
-!endif
- $(LIBNSPR)			\
- $(DIST)\lib\libplc21.lib	\
-!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
- $(GLOWDIR)\glowcode.lib	\
-!endif
- $(RESFILE)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(PROGRAMS)
-	$(MAKE_INSTALL) $(PROG0) $(DIST)\bin
-	$(MAKE_INSTALL) $(PROG1) $(DIST)\bin
-!ifdef MODULAR_NETLIB
-	$(MAKE_INSTALL) $(PROG2) $(DIST)\bin
-	$(MAKE_INSTALL) $(PROG3) $(DIST)\bin
-!endif
-
-clobber::
-	rm -f $(DIST)\bin\TimerTest.exe
-	rm -f $(DIST)\bin\TestAtoms.exe
-!ifdef MODULAR_NETLIB
-	rm -f $(DIST)\bin\CvtURL.exe
-	rm -f $(DIST)\bin\TestCRT.exe
-!endif
-
-# Move this into config/obj.inc when it's allowed
-.cpp{.\$(OBJDIR)\}.exe:
-    $(CC) @<<$(CFGFILE)
-        $(CFLAGS)
-        $(LCFLAGS)
-        $(LINCS)
-        $(LINCS_1)
-        $(INCS)
-        $(LLIBS)
-        $(OS_LIBS)
-        -Fd$(PBDFILE)
-        -Fe.\$(OBJDIR)\
-        -Fo.\$(OBJDIR)\
-        $(CURDIR)$(*B).cpp
-<<KEEP
-
-$(PROG0): $(OBJDIR) TimerTest.cpp $(RESFILE)
-
-$(PROG1): $(OBJDIR) TestAtoms.cpp
-
-!ifdef MODULAR_NETLIB
-$(PROG2): $(OBJDIR) CvtURL.cpp
-
-$(PROG3): $(OBJDIR) TestCRT.cpp
-!endif

mozilla/base/tests/resources.h

@@ -1,32 +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.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 resources_h___
-#define resources_h___
-
-#define TIMER_1SECOND             40000
-#define TIMER_5SECOND             40001
-#define TIMER_10SECOND            40002
-
-#define TIMER_1REPEAT             40003
-#define TIMER_5REPEAT             40004
-#define TIMER_10REPEAT            40005
-
-#define TIMER_CANCEL              40006
-#define TIMER_EXIT                40010
-
-#endif /* resources_h___ */

mozilla/base/tests/timer.rc

@@ -1,38 +0,0 @@
-/*
- * 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 "resources.h"
-
-TIMERTEST MENU DISCARDABLE
-{
-  POPUP "Debug"
-  {
-    POPUP "One Shot"
-    {
-      MENUITEM "1 second", TIMER_1SECOND
-      MENUITEM "5 second", TIMER_5SECOND
-      MENUITEM "10 second", TIMER_10SECOND
-    }
-    POPUP "Repeated"
-    {
-      MENUITEM "1 second", TIMER_1REPEAT
-      MENUITEM "5 second", TIMER_5REPEAT
-      MENUITEM "10 second", TIMER_10REPEAT
-    }
-    MENUITEM "Cancel All", TIMER_CANCEL
-    MENUITEM "Exit", TIMER_EXIT
-  }
-}

mozilla/build/autoconf/config.guess

@@ -1,696 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:*:*)
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
-	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
-    amiga:OpenBSD:*:*)
-      echo m68k-cbm-openbsd${UNAME_RELEASE}
-      exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-atari-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-sun-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-apple-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >dummy.c
-	int main (argc, argv) int argc; char **argv; {
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy \
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=4.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
-	esac
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i?86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp3[0-9][05]:OpenBSD:*:*)
-	echo m68k-hp-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo i386-pc-cygwin32
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
-	  echo "${UNAME_MACHINE}-pc-linux" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
-	  echo "${UNAME_MACHINE}-pc-linuxaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
-	  echo "${UNAME_MACHINE}-pc-linuxcoff" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
-	  echo "powerpc-unknown-linux" ; exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo alpha-unknown-linux ; exit 0
-	elif test "${UNAME_MACHINE}" = "sparc" ; then
-	  echo sparc-unknown-linux ; exit 0
-	else
-	  # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-pc-linuxoldld" && exit 0
-	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
-main(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef __ELF__
-  printf ("%s-pc-linux\n", argv[1]);
-#else
-  printf ("%s-pc-linuxaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
-	fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i?86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i?86:LynxOS:2.*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-#echo '(Unable to guess system type)' 1>&2
-
-exit 1

mozilla/build/autoconf/config.sub

@@ -1,936 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
-
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  linux-gnu*)
-    os=`echo $maybe_os | sed -e 's|linux-gnu|linux|'`
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
-		os=
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arm \
-		| arme[lb] | pyramid | mn10300 \
-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | i370 | sh \
-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparclet | sparclite | sparc64)
-		basic_machine=$basic_machine-unknown
-		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i[3456]86)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-cbm
-		;;
-	amigados)
-		basic_machine=m68k-cbm
-		os=-amigados
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i[3456]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i[3456]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i[3456]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5)
-		basic_machine=i586-intel
-		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
-		;;
-	pentium-* | p5-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=rs6000-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-       vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	mips)
-		if [ x$os = x-linux ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sparc)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-unixware* | svr4*)
-		os=-sysv4
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -linux* | -uxpv*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigados
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f301-fujitsu)
-		os=-uxpv
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os

mozilla/build/autoconf/install-sh

@@ -1,119 +0,0 @@
-#!/bin/sh
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:  no input file specified"
-	exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-	echo "install:  no destination specified"
-	exit 1
-fi
-
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
-	dst="$dst"/`basename $src`
-fi
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-$doit $instcmd $src $dsttmp
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
-
-# Now rename the file to the real destination.
-
-$doit $rmcmd $dst
-$doit $mvcmd $dsttmp $dst
-
-
-exit 0

mozilla/build/build_number

@@ -1 +1 @@
-5009821211
+5009808600

mozilla/build/mac/BuildList.pm

@@ -84,9 +84,6 @@ sub BuildMozilla()
 		
 		BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp",							"PowerPlant$D.shlb");		
 		MakeAlias(":mozilla:lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir");
-
-		BuildProject(":mozilla:modules:progress:macbuild:ProgressPPC.mcp",					"Progress$D.shlb");
-		MakeAlias(":mozilla:modules:progress:macbuild:Progress$D.shlb", "$dist_dir");
 		
 		BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",								"zlib$D.shlb");
 		MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
@@ -102,9 +99,6 @@ sub BuildMozilla()
 		BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",								"JavaScript$D.shlb");
 		MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:js:macbuild:LiveConnect.mcp",								"LiveConnect$D.shlb");
-		MakeAlias(":mozilla:js:macbuild:LiveConnect$D.shlb", "$dist_dir");
-		
 		BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp",					"NavJava$D.shlb");
 		MakeAlias(":mozilla:nav-java:stubs:macbuild:NavJava$D.shlb", "$dist_dir");
 
@@ -122,54 +116,40 @@ sub BuildMozilla()
 		
 		BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",			"Security.o");
 		BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp",					"FontBroker$D.o");
-		BuildProject(":mozilla:modules:oji:macbuild:oji.mcp",								"oji$D.o");
 		BuildProject(":mozilla:lib:libmocha:macbuild:LibMocha.mcp",							"LibMocha$D.o");	
-
-		if ( $main::MOZ_DARK == 1 )
-		{
-			BuildProject(":mozilla:network:macbuild:network.mcp",							"Network$D.o (mailnews)");
-		}
-		else
-		{
-			BuildProject(":mozilla:network:macbuild:network.mcp",							"Network$D.o");
-		}
-		BuildProject(":mozilla:caps:macbuild:Caps.mcp",										"Caps$D.o");
-
+		BuildProject(":mozilla:network:macbuild:network.mcp",								"Network$D.o");
 		BuildProject(":mozilla:modules:libimg:macbuild:png.mcp",						"png$D.o");
 		BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o");
 
 		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",							"CustomStaticLib$D.o");
 		
-		if ( $main::MOZ_LITE == 1 )
+		if ( $main::MOZ_MEDIUM == 1 || $main::MOZ_DARK == 1 )
 		{
-			BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MailNews$D.o");
-			BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"Composer$D.o");
-			BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Nav_Resources");
-		}
-		else
-		{
-			if ( $main::MOZ_MEDIUM == 1 )
+			BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",					"Composer$D.o");
+
+			if ( $main::MOZ_DARK == 1 )
 			{
-				BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MailNews$D.o");
-				BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",					"Composer$D.o");
-				BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Moz_Resources");
+				BuildProject(":mozilla:lib:libmsg:macbuild:MsgLib.mcp",							"MsgLib$D.o");
+				BuildProject(":mozilla:cmd:macfe:MailNews:build:MailNews.mcp",					"MailNews$D.o");
+				BuildProject(":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient.mcp","LDAPClient$D.o");
 			}
 			else
 			{
-				if ( $main::MOZ_DARK == 1 )
-				{
-					BuildProject(":ns:lib:libneo:mac:macbuild:NeoLib.mcp",							"NeoLib$D.o");
-					MakeAlias(   ":ns:lib:libneo:mac:macbuild:NeoLib$D.o", "$dist_dir");				
-					BuildProject(":mozilla:lib:libmsg:macbuild:MsgLib.mcp",							"MsgLib$D.o (secure)");
-					MakeAlias(   ":mozilla:lib:libmsg:macbuild:MsgLib$D.o", "$dist_dir");				
-					BuildProject(":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient.mcp","LDAPClient$D.o");
-					MakeAlias(   ":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient$D.o", "$dist_dir");				
-
-					BuildProject(":mozilla:cmd:macfe:MailNews:build:MailNews.mcp",					"MailNews$D.o");
-					BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",					"Composer$D.o");
-					BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"MozDark_Resources");
-				}
+				BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MsgLib$D.o");
+				BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MailNews$D.o");
+				BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"LDAPClient$D.o");
 			}
+
+			# Build the appropriate resources target
+			BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Moz_Resources");
+		}
+		else
+		{
+			# Build a project with dummy targets to make stub libraries
+			BuildProject("cmd:macfe:projects:dummies:MakeDummies.mcp",						"Composer$D.o");
+			
+			# Build the appropriate resources target
+			BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Nav_Resources");
 		}
 		
 		BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 						"Client$D");
@@ -180,11 +160,8 @@ sub DistMozilla()
 	{
 		mkpath([ ":mozilla:dist:", ":mozilla:dist:client:", ":mozilla:dist:client_debug:", ":mozilla:dist:client_stubs:" ]);
 
-		#CONFIG
-		InstallFromManifest(":mozilla:config:mac:MANIFEST",								":mozilla:dist:config:");
-		InstallFromManifest(":mozilla:config:mac:MANIFEST_config",						":mozilla:dist:config:");
-
 		#INCLUDE
+		InstallFromManifest(":mozilla:config:mac:MANIFEST",								":mozilla:dist:config:");
 		InstallFromManifest(":mozilla:include:MANIFEST",								":mozilla:dist:include:");
 		InstallFromManifest(":mozilla:cmd:macfe:pch:MANIFEST",							":mozilla:dist:include:");
 
@@ -224,8 +201,7 @@ sub DistMozilla()
 		InstallFromManifest(":mozilla:jpeg:MANIFEST",									":mozilla:dist:jpeg:");
 		
 		#JSJ
-		# beard: this conflicts with LiveConnect's jsjava.h.
-		#InstallFromManifest(":mozilla:js:jsj:MANIFEST",								":mozilla:dist:jsj:");
+		InstallFromManifest(":mozilla:js:jsj:MANIFEST",									":mozilla:dist:jsj:");
 		
 		#JSDEBUG
 		InstallFromManifest(":mozilla:js:jsd:MANIFEST",									":mozilla:dist:jsdebug:");
@@ -233,9 +209,6 @@ sub DistMozilla()
 		#JS
 		InstallFromManifest(":mozilla:js:src:MANIFEST",									":mozilla:dist:js:");
 		
-		#LIVECONNECT
-		InstallFromManifest(":mozilla:js:src:liveconnect:MANIFEST",						":mozilla:dist:liveconnect:");
-		
 		#RDF
 		InstallFromManifest(":mozilla:modules:rdf:include:MANIFEST",					":mozilla:dist:rdf:");
 		
@@ -252,9 +225,6 @@ sub DistMozilla()
 			{
 				InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST",	":mozilla:dist:ldap:");
 			}
-
-		#PRIVACY
-		InstallFromManifest(":mozilla:privacy:public:MANIFEST", ":mozilla:dist:privacy:");
 			
 		#SCHEDULER
 		InstallFromManifest(":mozilla:modules:schedulr:public:MANIFEST",				":mozilla:dist:schedulr:");
@@ -274,9 +244,7 @@ sub DistMozilla()
 		InstallFromManifest(":mozilla:network:protocol:ftp:MANIFEST",					":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:protocol:gopher:MANIFEST",				":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:protocol:http:MANIFEST",					":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:imap4:MANIFEST",					":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:protocol:js:MANIFEST",					":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:ldap:MANIFEST",					":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:protocol:mailbox:MANIFEST",				":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:protocol:marimba:MANIFEST",				":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:protocol:nntp:MANIFEST",					":mozilla:dist:network:");
@@ -300,8 +268,7 @@ sub DistMozilla()
 		InstallFromManifest(":mozilla:lib:libstyle:MANIFEST",							":mozilla:dist:libstyle:");
 		
 		#PLUGIN
-		InstallFromManifest(":mozilla:modules:plugin:public:MANIFEST",					":mozilla:dist:plugin:");
-		InstallFromManifest(":mozilla:modules:plugin:src:MANIFEST",						":mozilla:dist:plugin:");
+		InstallFromManifest(":mozilla:lib:plugin:MANIFEST",								":mozilla:dist:plugin:");
 		
 		#LIBHOOK
 		InstallFromManifest(":mozilla:modules:libhook:public:MANIFEST",					":mozilla:dist:libhook:");
@@ -328,18 +295,8 @@ sub DistMozilla()
 		#SUN_JAVA
 		InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST",					":mozilla:dist:sun-java:");
 		InstallFromManifest(":mozilla:sun-java:stubs:macjri:MANIFEST",					":mozilla:dist:sun-java:");
-
-		#OJI
-		InstallFromManifest(":mozilla:modules:oji:public:MANIFEST",						":mozilla:dist:oji:");
-		InstallFromManifest(":mozilla:modules:oji:src:MANIFEST",						":mozilla:dist:oji:");
-
-		#CAPS
-		InstallFromManifest(":mozilla:caps:include:MANIFEST",							":mozilla:dist:caps:");
-
-		#BASE
-		InstallFromManifest(":mozilla:base:public:MANIFEST",							":mozilla:dist:base:");
-		InstallFromManifest(":mozilla:base:src:MANIFEST",								":mozilla:dist:base:");
 	}
 
 1;
 
+

mozilla/build/mac/BuildNGLayoutDebug.pl

@@ -117,18 +117,12 @@ if ($build{all})
 
 chdir("::::");
 $MOZ_SRC = cwd();
-
 Moz::StopForErrors();
 #Moz::DontStopForErrors();
-
-#OpenErrorLog("::NGLayoutBuildLog");
-OpenErrorLog(":::Mozilla.BuildLog");		# Tinderbox requires that name
+OpenErrorLog("::NGLayoutBuildLog");
 Checkout();
-
 chdir($MOZ_SRC);
 BuildDist();
-
 chdir($MOZ_SRC);
 BuildProjects();
-
 print "Build layout complete\n";

mozilla/build/mac/CodeWarriorLib.pm

@@ -1,374 +0,0 @@
-#!perl
-package CodeWarriorLib;
-
-=pod
-
-=head1 NAME
-
-CodeWarriorLib - supply interface to CodeWarrior
-
-=head1 SYNOPSIS
-
-	#!perl
-	use CodeWarriorLib;
-	CodeWarriorLib::activate();
-	$had_errors = CodeWarriorLib::build_project(
-		$project_path, $target_name, $recent_errors_file, $clean_build
-	);
-
-=head1 DESCRIPTION
-
-Replaces the AppleScript library I<CodeWarriorLib>.
-
-=over 4
-
-=cut
-
-use strict;
-use Mac::AppleEvents::Simple;
-use Mac::AppleEvents;
-use Mac::Processes;
-use Mac::MoreFiles;
-use Mac::Types;
-use File::Basename;
-
-use vars qw($VERSION);
-$VERSION = '1.01';
-
-my($app)  = 'CWIE';
-
-# 0 == don't switch CWIE to front app in do_event(), 1 == do switch
-# note: activate() still switches when called
-$Mac::AppleEvents::Simple::SWITCH = 0;
-
-# supply your own path to the source here
-#_test('PowerPudgeIV:mozilla:mozilla:');
-
-
-=pod
-
-=item _get_project($full_path)
-
-A private routine returning a reference to the open project with the given name,
-or else the empty string (when that project is not open)
-
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-=cut
-
-sub _get_project ($) {
-	my(
-		$full_path, $candidate_projects
-	) = @_;
-	$candidate_projects = _doc_named(basename($full_path, '*'));
-	if ($candidate_projects) {
-		my($cps) = _get_dobj($candidate_projects);
-		my($num) = AECountItems($cps);
-		if ($num) {  # is a list
-			foreach (1 .. AECountItems($cps)) {
-				my($cp) = AEGetNthDesc($cps, $_);
-				if ($full_path eq _full_path($cp)) {
-					return($cp);
-				}
-			}
-		} else {     # is only one, not a list
-			if ($full_path eq _full_path($cps)) {
-				return($cps);
-			}
-		}
-	}
-	return;
-}
-
-=pod
-
-=item build_project
-
-Build a selected target of a project, saving any errors to a file, if supplied.
-	
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-If target_name is the empty string, the current target of the selected project 
-will be built, else, target_name should be a string matching a target name in 
-the selected project.
-	
-If error_path is the empty string, errors will not be saved to a file,
-else, error_path should be the full path of a file to save error messages into.
-
-=cut
-
-sub build_project ($;$$$) {
-	my(
-		$full_path, $target_name, $error_path,
-		$remove_object, $p, $project_was_closed, $had_errors
-	) = @_;
-	_close_errors_window();
-
-	while (1) {
-		$p = _get_project($full_path);
-		if (!$p) {
-			return if ($project_was_closed);
-			$project_was_closed = 1;
-			_open_file($full_path);
-		} else {
-			last;
-		}
-	}
-
-	$had_errors = 0;
-	if ($target_name eq '') {
-		if ($remove_object) {_remove_object($p)}
-		_build($p);
-	} else {
-		if ($remove_object) {_remove_object($p, $target_name)}
-		_build($p, $target_name);
-	}
-
-	if ($error_path ne '') {
-		_save_errors_window($error_path);
-	}
-	$had_errors = _close_errors_window();
-
-	if ($project_was_closed) {
-		$p = _get_project($full_path);
-		_close($p);
-	}
-
-	return($had_errors);
-}
-
-=pod
-
-=item activate()
-
-Launches CodeWarrior and brings it to the front.
-
-Once found, path will be saved in ':idepath.txt' for future reference.
-Edit or delete this file to change the location of the IDE.  If app is
-moved, C<activate()> will prompt for a new location.
-
-First looks for an open CodeWarrior app.  Second, tries to open previously
-saved location in ':idepath.txt'.  Third, tries to find it and allow user
-to choose it with Navigation Services (if present).  Fourth, uses good old
-GUSI routines built-in to MacPerl for a Choose Directory dialog box.
-
-=cut
-
-sub activate () {
-	local(*F);
-	my($filepath, $appath, $psi) = (':idepath.txt');
-
-	foreach $psi (values(%Process)) {
-		if ($psi->processSignature() eq $app) {
-			$appath = $psi->processAppSpec(), "\n";
-		}
-		_save_appath($filepath, $appath);
-	}
-
-	if ((!$appath || ! -x $appath) && open(F, $filepath)) {
-		$appath = <F>;
-		close(F);
-	}
-
-	if (!$appath || ! -x $appath) {
-		if (eval {require Mac::Navigation}) {
-			my($options, $nav);
-			Mac::Navigation->import();
-			$options = NavGetDefaultDialogOptions();
-			$options->message('Where is CodeWarrior IDE?');
-			$options->windowTitle('Find CodeWarrior IDE');
-			$nav = NavChooseObject($Application{$app}, $options);
-			die "CodeWarrior IDE not found.\n" if (!$nav || !$nav->file(1));
-			$appath = $nav->file(1);
-		} else {
-			local(*D);
-			my $cwd = `pwd`;
-			$appath = _get_folder(
-				'Where is the folder containing CodeWarrior IDE?',
-				dirname($Application{$app})
-			) . ':';
-			die "CodeWarrior IDE not found.\n" if !$appath;
-			opendir(D, $appath) or die $!;
-			chdir($appath);
-			foreach my $file (sort readdir (D)) {
-				my(@app) = MacPerl::GetFileInfo($file);
-				if ($app[0] && $app[1] &&
-					$app[1] eq 'APPL' && $app[0] eq $app
-				) {
-					$appath .= $file;
-					last;
-				}
-			}
-			chomp($cwd);
-			chdir($cwd);
-		}
-		_save_appath($filepath, $appath);
-	}
-
-	my($lp) = LaunchParam->new(
-		launchAppSpec => $appath,
-		launchControlFlags => launchContinue() + launchNoFileFlags()
-	);
-	LaunchApplication($lp) or die $^E;
-}
-
-sub _build ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm);
-	}
-}
-
-sub _remove_object ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm);
-	}
-}
-
-sub _open_file ($) {
-	my($prm) =
-		q"'----':obj {form:name, want:type(alis), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	do_event(qw/aevt odoc/, $app, $prm, $_[0]);
-}
-
-sub _doc_named ($) {
-	my($prm) =
-		q"'----':obj {form:test, want:type(docu), from:'null'(), " .
-		q"seld:cmpd{relo:'=   ', 'obj1':obj {form:prop, want:type" .
-		q"(prop), seld:type(pnam), from:'exmn'()}, 'obj2':TEXT(@)}}";
-
-	my($evt) = do_event(qw/core getd/, $app, $prm, $_[0]);
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? undef : $evt);
-}
-
-sub _full_path ($) {
-	my($obj) = $_[0];
-	my($prm) =
-		q"'----':obj {form:prop, want:type(prop), seld:type(FILE), " .
-		q"from:" . AEPrint($_[0]) . q"}, rtyp:type(TEXT)";
-	my($evt) = do_event(qw/core getd/, $app, $prm);
-
-	return MacPerl::MakePath(
-		MacUnpack('fss ', (
-			AEGetParamDesc($evt->{REP}, keyDirectObject()))->data()->get()
-		)
-	);
-}
-
-sub _save_errors_window ($) {
-	my($prm) = 
-		q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-	do_event(qw/MMPR SvMs/, $app, $prm, $_[0]);
-}
-
-
-sub _close_errors_window () {
-	my($prm) =
-		q"'----':obj {form:name, want:type(cwin), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	my($evt) = do_event(qw/core clos/, $app, $prm, 'Errors & Warnings');
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? 1 : 0);
-}
-
-sub _close () {
-	my($prm) = q"'----':" . AEPrint($_[0]);
-	do_event(qw/core clos/, $app, $prm);
-}
-
-sub _get_dobj ($) {
-	return(AEGetParamDesc($_[0]->{REP}, keyDirectObject()));
-}
-
-sub _get_folder ($$) {
-    require 'GUSI.ph';
-    my($prompt, $default) = @_;
-    MacPerl::Choose(
-        GUSI::AF_FILE(), 0, $prompt, '',
-        GUSI::CHOOSE_DIR() + ($default ? &GUSI::CHOOSE_DEFAULT : 0),
-        $default
-    );
-}
-
-sub _save_appath ($$) {
-	open(F, '>' . $_[0]) or die $!;
-	print F $_[1];
-	close(F);
-}
-
-sub _test ($) {
-	activate();
-	my($path) = $_[0];
-	build_project(
-	  "${path}modules:xml:macbuild:XML.mcp", '',
-	  "${path}build:mac:Mozilla.BuildLog.part"
-	);
-}
-
-1;
-
-=pod
-
-=back
-
-=head1 HISTORY
-
-=over 4
-
-=item v1.01, June 1, 1998
-
-Made fixes to C<chdir()> in C<activate()>, made C<activate()> more robust 
-in finding CodeWarrior IDE, added global variable to NOT switch to IDE
-for each sent event, a few other fixes.
-
-=item v1.00, May 30, 1998
-
-First shot
-
-=back
-
-
-=head1 AUTHORS
-
-Chris Nandor F<E<lt>pudge@pobox.comE<gt>>, and the author of the
-original I<CodeWarriorLib>, Scott Collins F<E<lt>scc@netscape.comE<gt>>.
-
-=head1 SEE ALSO
-
-BuildProject L<Moz>.
-
-=head1 COPYRIGHT
-
-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.
-
-=cut

mozilla/build/mac/Moz.pm

@@ -39,8 +39,6 @@ require			Exporter;
 	use File::Path;
 	use ExtUtils::Manifest 'maniread';
 
-	use CodeWarriorLib;
-
 sub current_directory()
 	{
 		my $current_directory = cwd();
@@ -76,22 +74,21 @@ Pretty much, everything is taken care of for you.
 
 sub UseCodeWarriorLib($)
 	{
-#		($CodeWarriorLib) = @_;
-#		$CodeWarriorLib = full_path_to($CodeWarriorLib);
+		($CodeWarriorLib) = @_;
+		$CodeWarriorLib = full_path_to($CodeWarriorLib);
 	}
 
 sub activate_CodeWarrior()
 	{
-#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
-#	tell (load script file "$CodeWarriorLib") to ActivateCodeWarrior()
-#END_OF_APPLESCRIPT
+MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+	tell (load script file "$CodeWarriorLib") to ActivateCodeWarrior()
+END_OF_APPLESCRIPT
 	}
 
 BEGIN
 	{
-#		UseCodeWarriorLib(":CodeWarriorLib");
-#		activate_CodeWarrior();
-		CodeWarriorLib::activate();
+		UseCodeWarriorLib(":CodeWarriorLib");
+		activate_CodeWarrior();
 	}
 
 $logging								= 0;
@@ -225,8 +222,8 @@ sub build_project($$$)
 		my ($project_path, $target_name, $clean_build) = @_;
 		$project_path = full_path_to($project_path);
 
-#		$project_path =~ m/.+:(.+)/;
-#		my $project_name = $1;
+		$project_path =~ m/.+:(.+)/;
+		my $project_name = $1;
 
 		log_message_with_time("### Building \"$project_path\"");
 
@@ -239,15 +236,10 @@ sub build_project($$$)
 		
 		print "Building \"$project_path\"\n";
 		
-		$had_errors = CodeWarriorLib::build_project(
-			$project_path, $target_name, $recent_errors_file, $clean_build
-		);
-
-
-#		$had_errors =
-#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
-#	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
-#END_OF_APPLESCRIPT
+		$had_errors =
+MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
+END_OF_APPLESCRIPT
 
 			# Append any errors to the globally accumulated log file
 		if ( $had_errors )
@@ -267,13 +259,13 @@ C<BuildProject()> and C<BuildProjectClean()> are identical, except that the latt
 sub BuildProject($;$)
 	{
 		my ($project_path, $target_name) = @_;
-		build_project($project_path, $target_name, 0);
+		build_project($project_path, $target_name, "false");
 	}
 
 sub BuildProjectClean($;$)
 	{
 		my ($project_path, $target_name) = @_;
-		build_project($project_path, $target_name, 1);
+		build_project($project_path, $target_name, "true");
 	}
 
 
@@ -299,26 +291,18 @@ sub MakeAlias($$)
 				$new_file .= $1;
 			}
 
-		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\"; because ";
-
-		die "$message \"$old_file\" doesn't exist.\n" unless -e $old_file;
-		die "$message I won't replace an existing (non-alias) file with an alias.\n" if ( -e $new_file && ! -l $new_file );
-
-			# now: $old_file exists; $new_file doesn't (or else, is an alias already)
-
-		if ( -l $new_file )
-			{
-					# ...then see if it already points to $old_file
-				my $current_target	= full_path_to(readlink($new_file));
-				my $new_target			= full_path_to($old_file);
-
-				return if ( $current_target eq $new_target );
-					# if the desired alias already exists and points to the right thing, then we're done
-				
-				unlink $new_file;
-			}
-		
-		symlink($old_file, $new_file) || die "$message symlink returned an unexpected error.\n";
+		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\";";
+		# die "$message symlink doesn't work on directories.\n" if -d $old_file;
+		die "$message because \"$old_file\" doesn't exist.\n" unless -e $old_file;
+		#check if the alias is already pointing to the right direction
+		my ($aliasto) = readlink($new_file);
+		my ($full_old_file) = ( $old_file =~ m/^:/ ) ? cwd() . $old_file : $old_file;
+		unless ($aliasto && ($aliasto eq $full_old_file))
+		{
+			unlink $new_file;
+			# print "symlink(\"$old_file\", \"$new_file\");\n";
+			symlink($old_file, $new_file) || die "$message symlink returned an unexpected error.\n";
+		}
 	}
 	
 	

mozilla/build/mac/NGLayoutBuildList.pm

@@ -108,17 +108,12 @@ sub Checkout()
 	my($cvsfile) = _pickWithMemoryFile("::nglayout.cvsloc");
 	my($session) = MacCVS->new( $cvsfile );
 	unless (defined($session)) { die "Checkout aborted. Cannot create session file: $session" }
-
-	my($LIBPREF_BRANCH) = "XPCOM_BRANCH";
-	my($IMGLIB_BRANCH) = "MODULAR_IMGLIB_BRANCH"; #// compile the "(standalone)" targets when pulling the tips
-	my($PLUGIN_BRANCH) = "OJI_19980618_BRANCH";
-
+	
 	if ($main::pull{lizard})
 	{
 		$session->checkout("mozilla/LICENSE") || die "checkout failure";
 		$session->checkout("mozilla/LEGAL") || die "checkout failure";
 		$session->checkout("mozilla/config") || die "checkout failure";
-		$session->checkout("mozilla/dbm") || die "checkout failure";
 		$session->checkout("mozilla/lib/liblayer") || die "checkout failure";
 		$session->checkout("mozilla/modules/zlib") || die "checkout failure";
 		$session->checkout("mozilla/modules/libutil") || die "checkout failure";
@@ -127,35 +122,34 @@ sub Checkout()
 		$session->checkout("mozilla/nav-java") || die "checkout failure";
 		$session->checkout("mozilla/js") || die "checkout failure";
 		$session->checkout("mozilla/modules/security/freenav") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/libparse") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/layout") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/libstyle") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/libpwcac") || die "checkout failure";
-		$session->checkout("mozilla/modules/libpref",$LIBPREF_BRANCH) || die "checkout failure";
-		#//$session->checkout("mozilla/modules/plugin",$PLUGIN_BRANCH) || die "checkout failure";
-		$session->checkout("mozilla/modules/plugin") || die "checkout failure";
+		$session->checkout("mozilla/modules/libpref") || die "checkout failure";
+		$session->checkout("mozilla/lib/libparse") || die "checkout failure";
+		$session->checkout("mozilla/lib/layout") || die "checkout failure";
+		$session->checkout("mozilla/lib/libstyle") || die "checkout failure";
+		$session->checkout("mozilla/lib/libpwcac") || die "checkout failure";
 	}
 	if ($main::pull{xpcom})
 	{
-		$session->checkout("mozilla/modules/libreg") || die "checkout failure";
+		$session->checkout("mozilla/modules/libreg ") || die "checkout failure";
 		$session->checkout("mozilla/xpcom") || die "checkout failure";
 	}
 	if ($main::pull{imglib})
 	{
-		$session->checkout("mozilla/jpeg", $IMGLIB_BRANCH) || die "checkout failure";
+		my($IMGLIB_BRANCH) = "MODULAR_IMGLIB_BRANCH";
+
+		$session->checkout("mozilla/jpeg ", $IMGLIB_BRANCH) || die "checkout failure";
 		$session->checkout("mozilla/modules/libutil", $IMGLIB_BRANCH) || die "checkout failure";
 		$session->checkout("mozilla/modules/libimg", $IMGLIB_BRANCH) || die "checkout failure";
 	}
 	if ($main::pull{netlib})
 	{
-		$session->checkout("mozilla/lib/xp") || die "checkout failure";
-		$session->checkout("mozilla/lib/libpwcac") || die "checkout failure";
+		$session->checkout("mozilla/lib/xp ") || die "checkout failure";
 		$session->checkout("mozilla/network") || die "checkout failure";
 		$session->checkout("mozilla/include") || die "checkout failure";
 	}
 	if ($main::pull{nglayout})
 	{
-		$session->checkout("mozilla/base") || die "checkout failure";
+		$session->checkout("mozilla/base ") || die "checkout failure";
 		$session->checkout("mozilla/dom") || die "checkout failure";
 		$session->checkout("mozilla/gfx") || die "checkout failure";
 		$session->checkout("mozilla/htmlparser") || die "checkout failure";
@@ -166,7 +160,7 @@ sub Checkout()
 	}
 	if ($main::pull{mac})
 	{
-		$session->checkout("mozilla/build/mac") || die "checkout failure";
+		$session->checkout("mozilla/build/mac ") || die "checkout failure";
 		$session->checkout("mozilla/cmd/macfe") || die "checkout failure";
 		$session->checkout("mozilla/lib/mac/MacMemoryAllocator") || die "checkout failure";
 		$session->checkout("mozilla/lib/mac/NSStdLib") || die "checkout failure";
@@ -196,10 +190,9 @@ sub BuildDist()
 	[":mozilla:lib:mac:Misc:MANIFEST", "$distdirectory:mac:common:"],
 	[":mozilla:lib:mac:MoreFiles:MANIFEST", "$distdirectory:mac:common:morefiles:"],
 #INCLUDE
-	[":mozilla:config:mac:MANIFEST", "$distdirectory:config:"],
-	[":mozilla:config:mac:MANIFEST_config", "$distdirectory:config:"],
-	[":mozilla:include:MANIFEST", "$distdirectory:include:"],		
-	[":mozilla:cmd:macfe:pch:MANIFEST", "$distdirectory:include:"],
+		[":mozilla:config:mac:MANIFEST", "$distdirectory:config:"],
+		[":mozilla:include:MANIFEST", "$distdirectory:include:"],		
+		[":mozilla:cmd:macfe:pch:MANIFEST", "$distdirectory:include:"],
 #NSPR	
     [":mozilla:nsprpub:pr:include:MANIFEST", "$distdirectory:nspr:"],		
     [":mozilla:nsprpub:pr:src:md:mac:MANIFEST", "$distdirectory:nspr:mac:"],		
@@ -232,18 +225,14 @@ sub BuildDist()
     [":mozilla:modules:libimg:png:MANIFEST", "$distdirectory:libimg:"],
     [":mozilla:modules:libimg:src:MANIFEST", "$distdirectory:libimg:"],
     [":mozilla:modules:libimg:public:MANIFEST", "$distdirectory:libimg:"],
-#PLUGIN
-    [":mozilla:modules:plugin:nglsrc:MANIFEST", "$distdirectory:plugin:"],
-    [":mozilla:modules:plugin:public:MANIFEST", "$distdirectory:plugin:"],
-    [":mozilla:modules:plugin:src:MANIFEST", "$distdirectory:plugin:"],
-#//PARSE
-#//	[":mozilla:lib:libparse:MANIFEST",			"$distdirectory:libparse:"],
-#//OLD LAYOUT
-#//	[":mozilla:lib:layout:MANIFEST",	"$distdirectory:layout:"],
-#//STYLE
-#//	[":mozilla:lib:libstyle:MANIFEST",	 "$distdirectory:libstyle:"],
+#PARSE
+		[":mozilla:lib:libparse:MANIFEST",			"$distdirectory:libparse:"],
+#OLD LAYOUT
+		[":mozilla:lib:layout:MANIFEST",	"$distdirectory:layout:"],
+#STYLE
+		[":mozilla:lib:libstyle:MANIFEST",	 "$distdirectory:libstyle:"],
 #LAYERS
-	[":mozilla:lib:liblayer:include:MANIFEST",	"$distdirectory:layers:"],
+		[":mozilla:lib:liblayer:include:MANIFEST",	"$distdirectory:layers:"],
 #NETWORK
     [":mozilla:network:cache:MANIFEST", "$distdirectory:network:"],
     [":mozilla:network:client:MANIFEST", "$distdirectory:network:"],
@@ -277,9 +266,6 @@ sub BuildDist()
     [":mozilla:layout:html:style:public:MANIFEST", "$distdirectory:layout:"],
     [":mozilla:layout:html:base:src:MANIFEST", "$distdirectory:layout:"],
     [":mozilla:layout:html:document:public:MANIFEST", "$distdirectory:layout:"],
-    [":mozilla:layout:base:src:MANIFEST", "$distdirectory:layout:"],
-	[":mozilla:layout:events:public:MANIFEST", "$distdirectory:layout:"],
-	[":mozilla:layout:events:src:MANIFEST", "$distdirectory:layout:"],
 #WIDGET
     [":mozilla:widget:public:MANIFEST", "$distdirectory:widget:"],
 #GFX
@@ -291,7 +277,6 @@ sub BuildDist()
    [":mozilla:dom:public:coreDom:MANIFEST", "$distdirectory:dom:"],
    [":mozilla:dom:public:coreEvents:MANIFEST", "$distdirectory:dom:"],
    [":mozilla:dom:public:events:MANIFEST", "$distdirectory:dom:"],
-   [":mozilla:dom:public:html:MANIFEST", "$distdirectory:dom:"],
 #HTMLPARSER
    [":mozilla:htmlparser:src:MANIFEST", "$distdirectory:htmlparser:"],
 
@@ -318,10 +303,9 @@ sub BuildCommonProjects()
 
 # clean projects
 
-	Moz::BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",	"Stubs");
 	Moz::BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",              	"Stubs");
 	Moz::BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",							"Stubs");
-	Moz::BuildProjectClean(":mozilla:cmd:macfe:projects:client:Navigator.mcp",    				"Stub Library");
+	Moz::BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",	"Stubs");
 
 # shared
 
@@ -344,6 +328,10 @@ sub BuildCommonProjects()
 	BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",								"NSStdLib$D.shlb");
 	MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
 	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb.xSYM", "$dist_dir") : 0;
+	
+	BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",								"xpcom$D.shlb");
+	MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb.xSYM", "$dist_dir") : 0;
 
 	BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",											"JPEG$D.shlb");
 	MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
@@ -359,16 +347,13 @@ sub BuildCommonProjects()
 	
 # static
 
-	BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",								"xpcom$D.o");
-
-	BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",	 "Security.o");
+  BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",	 "Security.o");
 
 	BuildProject(":mozilla:modules:libimg:macbuild:png.mcp",						"png$D.o");
 
 	BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o");
-	#//BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o (standalone)");
 
-	BuildProject(":mozilla:network:macbuild:network.mcp",		"NetworkModular$D.o");
+	BuildProject(":mozilla:network:macbuild:network.mcp",		"networkModular$D.o");
 
 }
 

mozilla/caps/Makefile

@@ -1,21 +0,0 @@
-#!gmake
-# 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 = ..
-
-DIRS =	include src 
-
-include $(DEPTH)/config/rules.mk

mozilla/caps/Makefile.in

@@ -1,26 +0,0 @@
-#!gmake
-# 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
-
-DIRS =	include src 
-
-include $(topsrcdir)/config/rules.mk

mozilla/caps/include/MANIFEST

@@ -1,15 +0,0 @@
-nsZig.h
-nsPrincipal.h
-nsPrivilege.h
-nsPrivilegeManager.h
-nsPrivilegeTable.h
-nsSystemPrivilegeTable.h
-nsTarget.h
-nsUserTarget.h
-jpermission.h
-nsUserDialogHelper.h
-nsZip.h
-nsLoadZig.h
-admin.h
-nsCaps.h
-nsCapsEnums.h

mozilla/caps/include/Makefile

@@ -1,24 +0,0 @@
-#!gmake
-# 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 = caps
-
-DEPTH = ../..
-
-EXPORTS	= nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h
-
-include $(DEPTH)/config/rules.mk
-

mozilla/caps/include/Makefile.in

@@ -1,31 +0,0 @@
-#!gmake
-# 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 = caps
-
-DEPTH = ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXPORTS		= nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/caps/include/admin.h

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _ADMIN_H_
-#define _ADMIN_H_
-
-PR_BEGIN_EXTERN_C
-
-PR_PUBLIC_API(const char *)
-java_netscape_security_getPrincipals(const char *charSetName);
-
-PR_PUBLIC_API(PRBool)
-java_netscape_security_removePrincipal(const char *charSetName, char *prinName);
-
-
-PR_PUBLIC_API(void)
-java_netscape_security_getPrivilegeDescs(const char *charSetName, char *prinName,
-                                         char** forever, char** session, 
-                                         char **denied);
-
-PR_PUBLIC_API(PRBool)
-java_netscape_security_removePrivilege(const char *charSetName, char *prinName, 
-                                       char *targetName);
-
-PR_END_EXTERN_C
-
-#endif /* _ADMIN_H_ */

mozilla/caps/include/jpermission.h

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _JPERMISSION_H_
-#define _JPERMISSION_H_
-
-typedef enum nsPermState {
-  nsPermState_NotSet,
-  nsPermState_AllowedForever,
-  nsPermState_AllowedSession,
-  nsPermState_ForbiddenForever,
-  nsPermState_BlankSession
-} nsPermState;
-
-PR_PUBLIC_API(void)
-java_netscape_security_savePrivilege(nsPermState permState);
-
-PR_PUBLIC_API(nsPermState)
-nsJSJavaDisplayDialog(char *prinStr, char *targetStr, char *rsikStr, PRBool isCert);
-
-PR_PUBLIC_API(void)
-java_netscape_security_getTargetDetails(const char *charSetName,
-                                        char* targetName, 
-                                        char** details, 
-                                        char **risk);
-
-#endif /* _JPERMISSION_H_ */

mozilla/caps/include/makefile.win

@@ -1,34 +0,0 @@
-#!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.
-
-
-IGNORE_MANIFEST=1
-
-#//------------------------------------------------------------------------
-#//
-#// Makefile to install CAPS/INCLUDE header files into the distribution
-#// directory.
-#//
-#//------------------------------------------------------------------------
-
-
-MODULE=caps 
-DEPTH=..\..
-EXPORTS=nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h
-
-include <$(DEPTH)/config/rules.mak>
-

mozilla/caps/include/nsCaps.h

@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_CAPS_H_
-#define _NS_CAPS_H_
-
-#include "prtypes.h"
-#include "nsCapsEnums.h"
-
-PR_BEGIN_EXTERN_C
-
-struct nsPrincipal;
-struct nsTarget;
-struct nsPrivilegeManager;
-struct nsPrivilege;
-struct nsPrivilegeTable;
-struct NSJSJavaFrameWrapper;
-
-/* wrappers for nsPrivilegeManager object */
-PR_EXTERN(PRBool) 
-nsCapsRegisterPrincipal(struct nsPrincipal *principal); 
-
-PR_EXTERN(PRBool) 
-nsCapsEnablePrivilege(void* context, struct nsTarget *target, PRInt32 callerDepth);
-
-PR_EXTERN(PRBool) 
-nsCapsIsPrivilegeEnabled(void* context, struct nsTarget *target, PRInt32 callerDepth);
-
-PR_EXTERN(PRBool) 
-nsCapsRevertPrivilege(void* context, struct nsTarget *target, PRInt32 callerDepth);
-
-PR_EXTERN(PRBool) 
-nsCapsDisablePrivilege(void* context, struct nsTarget *target, PRInt32 callerDepth);
-
-PR_EXTERN(void*) 
-nsCapsGetClassPrincipalsFromStack(void* context, PRInt32 callerDepth);
-
-PR_EXTERN(nsSetComparisonType) 
-nsCapsComparePrincipalArray(void* prin1Array, void* prin2Array);
-
-PR_EXTERN(void*) 
-nsCapsIntersectPrincipalArray(void* prin1Array, void* prin2Array);
-
-PR_EXTERN(PRBool) 
-nsCapsCanExtendTrust(void* from, void* to);
-
-
-/* wrappers for nsPrincipal object */
-PR_EXTERN(struct nsPrincipal *) 
-nsCapsNewPrincipal(nsPrincipalType type, void * key, 
-                   PRUint32 key_len, void *zig);
-
-PR_EXTERN(const char *) 
-nsCapsPrincipalToString(struct nsPrincipal *principal);
-
-PR_EXTERN(PRBool) 
-nsCapsIsCodebaseExact(struct nsPrincipal *principal);
-
-PR_EXTERN(const char *) 
-nsCapsPrincipalGetVendor(struct nsPrincipal *principal);
-
-PR_EXTERN(void *) 
-nsCapsNewPrincipalArray(PRUint32 count);
-
-PR_EXTERN(void) 
-nsCapsFreePrincipalArray(void *prinArray);
-
-PR_EXTERN(void *) 
-nsCapsGetPrincipalArrayElement(void *prinArray, PRUint32 index);
-
-PR_EXTERN(void) 
-nsCapsSetPrincipalArrayElement(void *prinArray, PRUint32 index, void *element);
-
-PR_EXTERN(PRUint32) 
-nsCapsGetPrincipalArraySize(void *prinArray);
-
-
-/* wrappers for nsTarget object */
-PR_EXTERN(struct nsTarget *) 
-nsCapsFindTarget(char *name);
-
-
-/* wrappers for nsPrivilege object */
-PR_EXTERN(nsPermissionState) 
-nsCapsGetPermission(struct nsPrivilege *privilege);
-
-
-/* wrappers for nsPrivilegeTable object */
-PR_EXTERN(struct nsPrivilege *)
-nsCapsGetPrivilege(struct nsPrivilegeTable *annotation, struct nsTarget *target);
-
-/* Methods for stack walking */
-
-extern struct NSJSJavaFrameWrapper * (*nsCapsNewNSJSJavaFrameWrapperCallback)(void *);
-PR_EXTERN(void)
-setNewNSJSJavaFrameWrapperCallback(struct NSJSJavaFrameWrapper * (*fp)(void *));
-
-extern void (*nsCapsFreeNSJSJavaFrameWrapperCallback)(struct NSJSJavaFrameWrapper *);
-PR_EXTERN(void)
-setFreeNSJSJavaFrameWrapperCallback(void (*fp)(struct NSJSJavaFrameWrapper *));
-
-extern void (*nsCapsGetStartFrameCallback)(struct NSJSJavaFrameWrapper *);
-PR_EXTERN(void)
-setGetStartFrameCallback(void (*fp)(struct NSJSJavaFrameWrapper *));
-
-extern PRBool (*nsCapsIsEndOfFrameCallback)(struct NSJSJavaFrameWrapper *);
-PR_EXTERN(void)
-setIsEndOfFrameCallback(PRBool (*fp)(struct NSJSJavaFrameWrapper *));
-
-extern PRBool (*nsCapsIsValidFrameCallback)(struct NSJSJavaFrameWrapper *);
-PR_EXTERN(void)
-setIsValidFrameCallback(PRBool (*fp)(struct NSJSJavaFrameWrapper *));
-
-extern void * (*nsCapsGetNextFrameCallback)(struct NSJSJavaFrameWrapper *, int *);
-PR_EXTERN(void)
-setGetNextFrameCallback(void * (*fp)(struct NSJSJavaFrameWrapper *, int *));
-
-extern void * (*nsCapsGetPrincipalArrayCallback)(struct NSJSJavaFrameWrapper *);
-PR_EXTERN(void)
-setOJIGetPrincipalArrayCallback(void * (*fp)(struct NSJSJavaFrameWrapper *));
-
-extern void * (*nsCapsGetAnnotationCallback)(struct NSJSJavaFrameWrapper *);
-PR_EXTERN(void)
-setOJIGetAnnotationCallback(void * (*fp)(struct NSJSJavaFrameWrapper *));
-
-extern void * (*nsCapsSetAnnotationCallback)(struct NSJSJavaFrameWrapper *, void *);
-PR_EXTERN(void)
-setOJISetAnnotationCallback(void * (*fp)(struct NSJSJavaFrameWrapper *, void *));
-
-
-PR_END_EXTERN_C
-
-#endif /* _NS_CAPS_H_ */

mozilla/caps/include/nsCapsEnums.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_CAPS_ENUMS_H_
-#define _NS_CAPS_ENUMS_H_
-
-typedef enum nsSetComparisonType {
-  nsSetComparisonType_ProperSubset=-1,
-  nsSetComparisonType_Equal=0,
-  nsSetComparisonType_NoSubset=1
-} nsSetComparisonType;
-
-/**
- * number of possible permissions (allowed, forbidden, or blank)
- */
-typedef enum nsPermissionState {
-    nsPermissionState_Forbidden = 0, 
-    nsPermissionState_Allowed,
-    nsPermissionState_Blank,
-    nsPermissionState_NumberOfPermissions
-} nsPermissionState;
-
-/**
- * number of possible durations (scope, session, or forever)
- */
-typedef enum nsDurationState {
-    nsDurationState_Scope=0, 
-    nsDurationState_Session,
-    nsDurationState_Forever, 
-    nsDurationState_NumberOfDurations
-} nsDurationState;
-
-
-/* The following should match what is in nsJVM plugin's java security code */
-typedef enum nsPrincipalType {
-  nsPrincipalType_Unknown=-1, 
-  nsPrincipalType_CodebaseExact=10,
-  nsPrincipalType_CodebaseRegexp,
-  nsPrincipalType_Cert,
-  nsPrincipalType_CertFingerPrint,
-  nsPrincipalType_CertKey
-} nsPrincipalType;
-
-#endif /* _NS_CAPS_ENUMS_H_ */

mozilla/caps/include/nsLoadZig.h

@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_LOAD_ZIG_H_
-#define _NS_LOAD_ZIG_H_
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-#include "zig.h"
-#include "nsZip.h"
-
-PR_PUBLIC_API(void *)
-nsInitializeZig(ns_zip_t *zip,
-                int (*callbackFnName) (int status, ZIG *zig, 
-                                       const char *metafile, 
-                                       char *pathname, char *errortext));
-PR_END_EXTERN_C
-
-#endif /* _NS_LOAD_ZIG_H_ */

mozilla/caps/include/nsPrincipal.h

@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_PRINCIPAL_H_
-#define _NS_PRINCIPAL_H_
-
-#include "prtypes.h"
-#include "nsHashtable.h"
-#include "nsVector.h"
-#include "nsCaps.h"
-#include "nsCapsEnums.h"
-
-
-typedef nsVector nsPrincipalArray;
-
-struct nsPrincipal {
-
-public:
-
-	/* Public Field Accessors */
-	/* Public Methods */
-
-	nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len);
-	nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len, char *stringRep);
-	virtual ~nsPrincipal();
-	nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len, void *zigObject);
-
-	PRBool equals(nsPrincipal *principal);
-
-	char * getVendor(void);
-
-	char * getCompanyName(void);
-
-	char * getSecAuth(void);
-
-	char * getSerialNo(void);
-
-	char * getExpDate(void);
-
-	char * getFingerPrint(void);
-
-	char * getNickname(void);
-
-	nsPrincipalType getType();
-
-	char *getKey();
-
-	PRUint32 getKeyLength();
-
-	PRInt32 hashCode(void);
-
-	PRBool isCodebase(void);
-
-	PRBool isCodebaseExact(void);
-
-	PRBool isCodebaseRegexp(void);
-
-	PRBool isSecurePrincipal(void);
-
-	PRBool isCert(void);
-
-	PRBool isCertFingerprint(void);
-
-	char * toString(void);
-
-	char * toVerboseString(void);
-
-	char * savePrincipalPermanently(void);
-
-
-private:
-	/* Private Field Accessors */
-	nsPrincipalType itsType;
-
-	void * itsZig;
-
-	char * itsKey;
-
-	PRUint32 itsKeyLen;
-
-	PRInt32 itsHashCode;
-
-	char * itsCompanyName;
-	char * itsCertAuth;
-	char * itsSerialNo;
-	char * itsExpDate;
-	char * itsAsciiFingerPrint;
-	char * itsNickname;
-	char * itsString;
-
-	/* Private Methods */
-	void init(nsPrincipalType type, void * key, PRUint32 key_len);
-
-	PRInt32 computeHashCode(void * key, PRUint32 key_len);
-
-	PRInt32 computeHashCode(void);
-
-	char * saveCert(void);
-
-	char * getCertAttribute(int attrib);
-};
-
-
-class PrincipalKey: public nsHashKey {
-public:
-  nsPrincipal *itsPrincipal;
-  PrincipalKey(nsPrincipal *prin) {
-    itsPrincipal = prin;
-  }
-  
-  PRUint32 HashValue(void) const {
-    return itsPrincipal->hashCode();
-  }
-
-  PRBool Equals(const nsHashKey *aKey) const {
-    return (itsPrincipal->equals(((const PrincipalKey *) aKey)->itsPrincipal));
-  }
-
-  nsHashKey *Clone(void) const {
-    return new PrincipalKey(itsPrincipal);
-  }
-};
-
-/* XXX: Hack to determine the system principal */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-nsPrincipal * CreateSystemPrincipal(char* zip_file_name, char *pathname);
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-/* XXX: end of hack to determine the system principal */
-
-#endif /* _NS_PRINCIPAL_H_ */

mozilla/caps/include/nsPrivilege.h

@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_PRIVILEGE_H_
-#define _NS_PRIVILEGE_H_
-
-#include "prtypes.h"
-#include "nsCaps.h"
-#include "nsCapsEnums.h"
-
-PRBool nsPrivilegeInitialize(void);
-
-struct nsPrivilege {
-
-public:
-	/* Public Field Accessors */
-	nsPermissionState itsPerm;
-
-	nsDurationState itsDuration;
-
-	/* Public Methods */
-	nsPrivilege(nsPermissionState perm, nsDurationState duration);
-
-	virtual ~nsPrivilege(void);
-
-	static nsPrivilege * findPrivilege(nsPermissionState permission, nsDurationState duration);
-
-	static nsPermissionState add(nsPermissionState perm1, nsPermissionState perm2);
-
-	static nsPrivilege * add(nsPrivilege *privilege1, nsPrivilege *privilege2);
-
-	PRBool samePermission(nsPrivilege *privilege);
-
-	PRBool samePermission(nsPermissionState perm);
-
-	PRBool sameDuration(nsPrivilege *privilege);
-
-	PRBool sameDuration(nsDurationState duration);
-
-	PRBool isAllowed(void);
-
-	PRBool isAllowedForever(void);
-
-	PRBool isForbidden(void);
-
-	PRBool isForbiddenForever(void);
-
-	PRBool isBlank(void);
-
-	nsPermissionState getPermission(void);
-
-	nsDurationState getDuration(void);
-
-	static nsPrivilege * findPrivilege(char *privStr);
-
-	char * toString(void);
-
-private:
-
-	/* Private Field Accessors */
-	char *itsString;
-
-	static PRBool theInited;
-
-	/* Private Methods */
-};
-
-/**
- * add() method takes two permissions and returns a new permission.
- * Permission addition follows these rules:
- * <pre>
- *   ALLOWED   + ALLOWED   = ALLOWED        1 + 1 = 1
- *   ALLOWED   + BLANK     = ALLOWED        1 + 2 = 1
- *   BLANK     + BLANK     = BLANK          2 + 2 = 2
- *   ALLOWED   + FORBIDDEN = FORBIDDEN      1 + 0 = 0
- *   BLANK     + FORBIDDEN = FORBIDDEN      2 + 0 = 0
- *   FORBIDDEN + FORBIDDEN = FORBIDDEN      0 + 0 = 0
- * </pre>
- *
- * @return the permission that results from the above rules
- * <p>
- * Note: there are two versions of add().  One adds two Privilege
- * objects.  The other just adds permissions (as returned by
- * <a href="#getPermission">getPermission()</a>).
- */
-/* XXX: Whenever you change the value of FORBIDDEN, ALLOWED and BLANK
- * make sure they obey the laws mentioned in add() method.
- */
-inline nsPermissionState nsPrivilege::add(nsPermissionState p1, nsPermissionState p2)
-{
-  if (p1 < p2)
-    return p1;
-  return p2;
-}
-
-inline nsPrivilege * nsPrivilege::add(nsPrivilege *p1, nsPrivilege *p2)
-{
-  if (p1->itsPerm < p2->itsPerm)
-    return p1;
-  return p2;
-}
-
-
-#endif /* _NS_PRIVILEGE_H_ */

mozilla/caps/include/nsPrivilegeManager.h

@@ -1,203 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_PRIVILEGE_MANAGER_H_
-#define _NS_PRIVILEGE_MANAGER_H_
-
-#include "prtypes.h"
-#include "prio.h"
-#include "prmon.h"
-#include "nsHashtable.h"
-
-#include "nsVector.h"
-#include "nsCaps.h"
-#include "nsTarget.h"
-#include "nsPrincipal.h"
-#include "nsPrivilege.h"
-#include "nsPrivilegeTable.h"
-#include "nsSystemPrivilegeTable.h"
-#include "nsCapsEnums.h"
-
-extern PRBool nsCaps_lock(void);
-extern void nsCaps_unlock(void);
-
-PR_BEGIN_EXTERN_C
-PRBool CMGetBoolPref(char * pref_name);
-PR_END_EXTERN_C
-
-PRBool nsPrivilegeManagerInitialize(void);
-
-struct nsPrivilegeManager {
-
-public:
-	/* Public Methods */
-
-	nsPrivilegeManager(void);
-	virtual ~nsPrivilegeManager(void);
-
-	void registerSystemPrincipal(nsPrincipal *principal);
-
-	void registerPrincipal(nsPrincipal *principal);
-
-	PRBool unregisterPrincipal(nsPrincipal *principal);
-
-	PRBool isPrivilegeEnabled(nsTarget *target, PRInt32 callerDepth);
-
-	PRBool isPrivilegeEnabled(void* context, nsTarget *target, PRInt32 callerDepth);
-
-	PRBool enablePrivilege(nsTarget *target, PRInt32 callerDepth);
-
-	PRBool enablePrivilege(void* context, nsTarget *target, PRInt32 callerDepth);
-
-	PRBool enablePrivilege(nsTarget *target, nsPrincipal *preferredPrincipal, PRInt32 callerDepth);
-
-	PRBool enablePrivilege(void* context, nsTarget *target, nsPrincipal *preferredPrincipal, PRInt32 callerDepth);
-
-	PRBool revertPrivilege(nsTarget *target, PRInt32 callerDepth);
-
-	PRBool revertPrivilege(void* context, nsTarget *target, PRInt32 callerDepth);
-
-	PRBool disablePrivilege(nsTarget *target, PRInt32 callerDepth);
-
-	PRBool disablePrivilege(void* context, nsTarget *target, PRInt32 callerDepth);
-
-	PRBool enablePrincipalPrivilegeHelper(nsTarget *target, PRInt32 callerDepth, nsPrincipal *preferredPrin, void * data, nsTarget *impersonator);
-
-	PRBool enablePrincipalPrivilegeHelper(void* context, nsTarget *target, PRInt32 callerDepth, nsPrincipal *preferredPrin, void * data, nsTarget *impersonator);
-
-	nsPrivilegeTable *enableScopePrivilegeHelper(nsTarget *target, PRInt32 callerDepth, void *data, PRBool helpingSetScopePrivilege, nsPrincipal *prefPrin);
-
-	nsPrivilegeTable *enableScopePrivilegeHelper(void* context, nsTarget *target, PRInt32 callerDepth, void *data, PRBool helpingSetScopePrivilege, nsPrincipal *prefPrin);
-
-	void registerPrincipalAndSetPrivileges(nsPrincipal *principal, nsTarget *target, nsPrivilege *newPrivilege);
-
-	void updatePrivilegeTable(nsTarget *target, 
-                              nsPrivilegeTable *privTable, 
-                              nsPrivilege *newPrivilege);
-
-	PRBool checkPrivilegeGranted(nsTarget *target, PRInt32 callerDepth);
-
-	PRBool checkPrivilegeGranted(void* context, nsTarget *target, PRInt32 callerDepth);
-
-	PRBool checkPrivilegeGranted(nsTarget *target, nsPrincipal *principal, void *data);
-
-	PRBool checkPrivilegeGranted(nsTarget *target, PRInt32 callerDepth, void *data);
-
-	PRBool checkPrivilegeGranted(void* context, nsTarget *target, PRInt32 callerDepth,
-                                 void *data);
-
-	nsPrivilege *getPrincipalPrivilege(nsTarget *target, nsPrincipal *prin, void *data);
-
-	static nsPrivilegeManager * getPrivilegeManager(void);
-
-	static nsPrincipalArray* getMyPrincipals(PRInt32 callerDepth);
-
-	static nsPrincipalArray* getMyPrincipals(void* context, PRInt32 callerDepth);
-
-	static nsPrincipal * getSystemPrincipal(void);
-
-	static PRBool hasSystemPrincipal(nsPrincipalArray *prinArray);
-
-	static nsPrincipal* getUnsignedPrincipal(void);
-
-	static nsPrincipal* getUnknownPrincipal(void);
-
-	nsSetComparisonType comparePrincipalArray(nsPrincipalArray* prin1Array, 
-                                              nsPrincipalArray* prin2Array);
-
-	nsPrincipalArray* intersectPrincipalArray(nsPrincipalArray* prin1Array, 
-                                              nsPrincipalArray* prin2Array);
-
-	PRBool canExtendTrust(nsPrincipalArray* prin1Array, 
-                          nsPrincipalArray* prin2Array);
-
-	PRBool checkMatchPrincipal(nsPrincipal *principal, PRInt32 callerDepth);
-
-	PRBool checkMatchPrincipal(void* context, nsPrincipal *principal, PRInt32 callerDepth);
-
-    /* Helper functions for ADMIN UI */
-	const char * getAllPrincipalsString(void);
-
-	nsPrincipal * getPrincipalFromString(char *prinName);
-
-	void getTargetsWithPrivileges(char *prinName, char** forever, 
-                                  char** session, char **denied);
-
-	PRBool removePrincipal(char *prinName);
-
-	PRBool removePrincipalsPrivilege(char *prinName, char *targetName);
-
-	void remove(nsPrincipal *prin, nsTarget *target);
-
-	/* The following are old native methods */
-	char * checkPrivilegeEnabled(nsTargetArray* targetArray, 
-                                 PRInt32 callerDepth, void *data);
-
-	char * checkPrivilegeEnabled(void* context, nsTargetArray* targetArray, 
-                                 PRInt32 callerDepth, void *data);
-
-	nsPrincipalArray* getClassPrincipalsFromStack(PRInt32 callerDepth);
-
-	nsPrincipalArray* getClassPrincipalsFromStack(void* context, PRInt32 callerDepth);
-
-	nsPrivilegeTable * getPrivilegeTableFromStack(PRInt32 callerDepth, 
-                                                  PRBool createIfNull);
-
-	nsPrivilegeTable * getPrivilegeTableFromStack(void* context, PRInt32 callerDepth, 
-                                                  PRBool createIfNull);
-
-	/* End of native methods */
-
-private:
-
-	nsHashtable *itsPrinToPrivTable;
-	nsHashtable *itsPrinToMacroTargetPrivTable;
-	nsHashtable *itsPrinNameToPrincipalTable;
-
-	static PRBool theSecurityInited;
-
-	static char * SignedAppletDBName;
-
-	static PRBool theInited;
-
-	/* Private Field Accessors */
-
-	/* Private Methods */
-
-	void addToPrinNameToPrincipalTable(nsPrincipal *prin);
-
-	PRBool enablePrivilegePrivate(void* context, nsTarget *target, 
-                                  nsPrincipal *preferredPrincipal, 
-                                  PRInt32 callerDepth);
-
-	nsPermissionState getPrincipalPrivilege(nsTarget *target, 
-                                            nsPrincipalArray* callerPrinArray, 
-                                            void *data);
-
-	PRBool isPermissionGranted(nsTarget *target, nsPrincipalArray* callerPrinArray, void *data);
-
-
-  /* The following methods are used to save and load the persistent store */
-	void save(nsPrincipal *prin, nsTarget *target, nsPrivilege *newPrivilege);
-
-	void load(void);
-
-};
-
-
-#endif /* _NS_PRIVILEGE_MANAGER_H_ */

mozilla/caps/include/nsPrivilegeTable.h

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_PRIVILEGE_TABLE_H_
-#define _NS_PRIVILEGE_TABLE_H_
-
-#include "prtypes.h"
-#include "nsHashtable.h"
-#include "nsCaps.h"
-#include "nsTarget.h"
-#include "nsPrivilege.h"
-
-struct nsPrivilegeTable {
-
-public:
-
-	/* Public Methods */
-	nsPrivilegeTable(void);
-	virtual ~nsPrivilegeTable(void);
-
-	PRInt32 size(void);
-
-	PRBool isEmpty(void);
-
-	virtual nsPrivilege * get(nsTarget *t);
-
-	nsPrivilege * put(nsTarget *a, nsPrivilege *priv);
-
-	nsPrivilege * remove(nsTarget *key);
-
-	nsPrivilegeTable * clone(void);
-
-	void clear(void);
-
-	void Enumerate(nsHashtableEnumFunc aEnumFunc);
-
-private:
-
-	/* Private Field Accessors */
-	nsHashtable * itsTable;
-};
-
-#endif /* _NS_PRIVILEGE_TABLE_H_ */

mozilla/caps/include/nsSystemPrivilegeTable.h

@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_SYSTEM_PRIVILEGE_TABLE_H_
-#define _NS_SYSTEM_PRIVILEGE_TABLE_H_
-
-#include "nsTarget.h"
-#include "nsPrivilege.h"
-#include "nsPrivilegeTable.h"
-#include "nsCom.h"
-
-
-class nsSystemPrivilegeTable : public nsPrivilegeTable {
-
-public:
-
-	/* Public Methods */
-	nsSystemPrivilegeTable(void);
-
-	virtual nsPrivilege * get(nsTarget *a);
-};
-
-#endif /* _NS_SYSTEM_PRIVILEGE_TABLE_H_ */

mozilla/caps/include/nsTarget.h

@@ -1,217 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_TARGET_H_
-#define _NS_TARGET_H_
-
-#include <string.h>
-#include "prtypes.h"
-#include "plhash.h"
-
-#include "nsHashtable.h"
-#include "nsVector.h"
-#include "nsCaps.h"
-#include "nsPrincipal.h"
-#include "nsPrivilege.h"
-#include "nsUserDialogHelper.h"
-
-typedef nsVector nsTargetArray;
-
-PR_BEGIN_EXTERN_C
-#include "jpermission.h"
-PR_PUBLIC_API(void)
-java_netscape_security_getTargetDetails(const char *charSetName, char* targetName, 
-                                        char** details, char **risk);
-PR_END_EXTERN_C
-
-extern int CAPS_TARGET_RISK_COLOR_HIGH;
-
-extern PRBool CreateSystemTargets(nsPrincipal *sysPrin);
-
-struct nsTarget {
-
-public:
-
-	/* Public Methods */
-
-	virtual ~nsTarget(void);
-
-	nsTarget(char *name, nsPrincipal *prin, 
-             PRInt32 risk = JavaSecUI_targetRiskHigh(), 
-             char *riskColor = JavaSecUI_getString(CAPS_TARGET_RISK_COLOR_HIGH), 
-             char *description = NULL, 
-             char *detailDescription = NULL,
-             char *url = NULL, 
-             nsTargetArray* targetArray = NULL)
-    {
-  		init(name, prin, targetArray, risk, riskColor, description, 
-             detailDescription, url);
-    }
-
-	nsTarget * registerTarget(void);
-
-	nsTarget * registerTarget(void* context);
-
-	static nsTarget * findTarget(nsTarget *target);
-
-	static nsTarget * findTarget(char *name);
-
-	static nsTarget * findTarget(char *name, nsPrincipal *prin);
-
-	nsPrivilege * checkPrivilegeEnabled(nsTargetArray* prinArray, void *data);
-
-	nsPrivilege * checkPrivilegeEnabled(nsTargetArray* prinArray);
-
-	nsPrivilege * checkPrivilegeEnabled(nsPrincipal *p, void *data);
-
-	virtual nsPrivilege * enablePrivilege(nsPrincipal *prin, void *data);
-
-	nsPrivilege * getPrincipalPrivilege(nsPrincipal *prin, void *data);
-
-	nsTargetArray* getFlattenedTargetArray(void);
-
-	static nsTargetArray* getAllRegisteredTargets(void);
-
-	char * getRisk(void);
-
-	char * getRiskColor(void);
-
-	char * getDescription(void);
-
-	char * getDetailDescription(void);
-
-	static nsTarget * getTargetFromDescription(char *a);
-
-	char * getHelpURL(void);
-
-	char * getDetailedInfo(void *a);
-
-	nsPrincipal * getPrincipal(void);
-
-	char * getName(void);
-
-	PRBool equals(nsTarget *a);
-
-	PRInt32 hashCode(void);
-
-	char * toString(void);
-
-	PRBool isRegistered(void);
-
-private:
-
-	/* Private Field Accessors */
-	char * itsName;
-
-	nsPrincipal * itsPrincipal;
-
-	PRInt32 itsRisk;
-
-	char * itsRiskColorStr;
-
-	char * itsDescriptionStr;
-
-	char * itsDetailDescriptionStr;
-
-	char * itsURLStr;
-
-	PRBool itsRegistered;
-
-	nsTargetArray* itsTargetArray;
-
-	nsTargetArray* itsExpandedTargetArray;
-	
-	char *itsString;
-
-	PRUint32 itsDescriptionHash;
-
-	static PRBool theInited;
-
-	/* Private Methods */
-	void init(char *name, nsPrincipal *prin, nsTargetArray* targetArray, PRInt32 risk, char *riskColor, char *description, char *detailDescription, char *url);
-
-	void getFlattenedTargets(nsHashtable *targHash, nsTargetArray* expandedTargetArray);
-
-};
-
-
-class TargetKey: public nsHashKey {
-public:
-  nsTarget *itsTarget;
-  TargetKey(nsTarget *targ) {
-    itsTarget = targ;
-  }
-  
-  PRUint32 HashValue(void) const {
-    return itsTarget->hashCode();
-  }
-
-  PRBool Equals(const nsHashKey *aKey) const {
-    return (itsTarget->equals(((const TargetKey *) aKey)->itsTarget));
-  }
-
-  nsHashKey *Clone(void) const {
-    return new TargetKey(itsTarget);
-  }
-};
-
-/* XXX: IMO, IntegerKey and StringKey should be part of xpcom */
-class IntegerKey: public nsHashKey {
-private:
-  PRUint32 itsHash;
-  
-public:
-  IntegerKey(PRUint32 hash) {
-    itsHash = hash;
-  }
-  
-  PRUint32 HashValue(void) const {
-    return itsHash;
-  }
-
-  PRBool Equals(const nsHashKey *aKey) const {
-    return (itsHash == (((const IntegerKey *) aKey)->itsHash)) ? PR_TRUE : PR_FALSE;
-  }
-
-  nsHashKey *Clone(void) const {
-    return new IntegerKey(itsHash);
-  }
-};
-
-class StringKey: public nsHashKey {
-public:
-  const char *itsString;
-
-  StringKey(const char *string) {
-    itsString = string;
-  }
-  
-  PRUint32 HashValue(void) const {
-    return PL_HashString(itsString);
-  }
-
-  PRBool Equals(const nsHashKey *aKey) const {
-    return (strcmp(itsString, (((const StringKey *) aKey)->itsString)) == 0);
-  }
-
-  nsHashKey *Clone(void) const {
-    return new StringKey(itsString);
-  }
-};
-
-#endif /* _NS_TARGET_H_ */

mozilla/caps/include/nsUserDialogHelper.h

@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_USER_DIALOG_HELPER_H_
-#define _NS_USER_DIALOG_HELPER_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "prtypes.h"
-
-typedef enum nsRiskType {
-  nsRiskType_LowRisk=10,
-  nsRiskType_MediumRisk=20,
-  nsRiskType_HighRisk=30
-} nsRiskType;
-
-extern char * JavaSecUI_targetRiskStr(int risk);
-extern int    JavaSecUI_targetRiskLow(void);
-extern int    JavaSecUI_targetRiskMedium(void);
-extern int    JavaSecUI_targetRiskHigh(void);
-
-extern char * JavaSecUI_getHelpURL(int id);
-extern char * JavaSecUI_getString(int id);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* _NS_USER_DIALOG_HELPER_H_ */

mozilla/caps/include/nsUserTarget.h

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_USER_TARGET_H_
-#define _NS_USER_TARGET_H_
-
-
-#include "prtypes.h"
-
-#include "nsTarget.h"
-#include "nsPrivilege.h"
-#include "nsPrincipal.h"
-#include "nsCom.h"
-
-/* Any methods that is not defined here is in Java */
-class nsUserTarget : public nsTarget {
-
-public:
-
-	/* Public Methods */
-
-	nsUserTarget(char *name);
-	virtual ~nsUserTarget(void);
-
-    nsUserTarget(char *name, nsPrincipal *prin, PRInt32 risk, 
-                 char *riskColor, char *description, 
-                 char *detailDescription, char *url)
-      : nsTarget(name, prin, risk, riskColor, description, detailDescription, 
-                 url, NULL)
-    {
-    }
-
-    nsUserTarget(char *name, nsPrincipal *prin, PRInt32 risk, 
-                 char *riskColor, char *description, 
-                 char *detailDescription, char *url, 
-                 nsTargetArray *targetArray) 
-      : nsTarget(name, prin, risk, riskColor, description, detailDescription, 
-                 url, targetArray)
-    {
-    }
-
-	nsPrivilege * enablePrivilege(nsPrincipal *prin, void *data);
-
-private:
-
-};
-
-#endif /* _NS_USER_TARGET_H_ */

mozilla/caps/include/nsZig.h

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 _NS_ZIG_H_
-#define _NS_ZIG_H_
-
-#include "prtypes.h"
-
-class nsZig {
-
-public:
-	/* Public Methods */
-    nsZig(void * zig);
-
-	static void destroyZignature(void * nativeZig);
-
-    ~nsZig(void);
-
-	void * GetZig(void);
-
-private:
-
-    void * itsNativeZig;
-};
-
-#endif /* _NS_ZIG_H_ */

mozilla/caps/include/nsZip.h

@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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.
- */
-
-/*
- * Prototypes for "zip" file reader support
- */
-
-#ifndef _NS_ZIP_H_
-#define _NS_ZIP_H_
-
-PR_BEGIN_EXTERN_C
-
-#include <time.h>
-#include "prtypes.h"
-
-/* XXX: IMO, the following should go into NSPR */
-#if defined(XP_PC) && !defined(_WIN32)
-#include <malloc.h> /* needed for _halloc() */
-#ifndef HUGEP
-#define HUGEP __huge
-#endif
-#ifndef CHECK_SIZE_LIMIT
-#define CHECK_SIZE_LIMIT(x) PR_ASSERT( (x) <= 0xFFFFL )
-#endif
-#else /* else for defined(XP_PC) && !defined(_WIN32) */
-#ifndef HUGEP
-#define HUGEP
-#endif
-#ifndef CHECK_SIZE_LIMIT
-#define CHECK_SIZE_LIMIT(x) ((void)0)
-#endif
-#endif /* defined(XP_PC) && !defined(_WIN32) */
-
-/* XXX: IMO, the following should go into NSPR */
-#ifndef FD_ERROR1
-#define FD_ERROR1		((PRFileDesc*)-1)
-#endif
-#ifndef FD_ERROR2
-#define FD_ERROR2		((PRFileDesc*)-2)
-#endif
-#ifndef FD_IS_ERROR
-#define FD_IS_ERROR(fd)		((fd) == NULL || fd == FD_ERROR1 || fd == FD_ERROR2)
-#endif
-
-
-/*
- * Central directory entry
- */
-typedef struct {
-    char *fn;		/* file name */
-    PRUint32 len;	/* file size */
-    PRUint32 size;	/* file compressed size */
-    int method;		/* Compression method */
-    int mod;		/* file modification time */
-    long off;		/* local file header offset */
-} direl_t;
-
-/*
- * Zip file
- */
-typedef struct {
-    char *fn;		/* zip file name */
-    PRFileDesc *fd;	/* zip file descriptor */
-    direl_t *dir;	/* zip file directory */
-    PRUint32 nel;	/* number of directory entries */
-    PRUint32 cenoff;	/* Offset of central directory (CEN) */
-    PRUint32 endoff;	/* Offset of end-of-central-directory record */
-} ns_zip_t;
-
-struct stat;
-
-PR_PUBLIC_API(PRBool)  ns_zip_lock(void);
-PR_PUBLIC_API(void)    ns_zip_unlock(void);
-PR_PUBLIC_API(ns_zip_t *) ns_zip_open(const char *fn);
-PR_PUBLIC_API(void)    ns_zip_close(ns_zip_t *zip);
-PR_PUBLIC_API(PRBool)  ns_zip_stat(ns_zip_t *zip, const char *fn, struct stat *sbuf);
-PR_PUBLIC_API(PRBool)  ns_zip_get(ns_zip_t *zip, const char *fn, void *buf, PRInt32 len);
-PR_PUBLIC_API(PRUint32) ns_zip_get_no_of_elements(ns_zip_t *zip, const char *fn_suffix);
-PR_PUBLIC_API(PRUint32) ns_zip_list_files(ns_zip_t *zip, const char *fn_suffix, void HUGEP *buf, PRUint32 len);
-
-PR_END_EXTERN_C
-
-#endif /* !_NS_ZIP_H_ */ 

mozilla/caps/macbuild/Caps.Prefix

@@ -1,9 +0,0 @@
-//
-//	Caps.Prefix
-//
-// Global prefix file for the Caps project.
-//
-//
-
-#include "MacPrefix.h"
-#include "CapsConfig.h"

mozilla/caps/macbuild/CapsConfig.h

@@ -1,3 +0,0 @@
-//
-//	CapsConfig.h
-//

mozilla/caps/macbuild/CapsDebug.Prefix

@@ -1,9 +0,0 @@
-//
-//	CapsDebug.Prefix
-//
-// Global prefix file for the debug Caps project.
-//
-//
-
-#include "MacPrefix_debug.h"
-#include "CapsConfig.h"

mozilla/caps/makefile.win

@@ -1,47 +0,0 @@
-#!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.
-
-#//------------------------------------------------------------------------
-#//
-#// Makefile to build the CAPS tree
-#//
-#//------------------------------------------------------------------------
-
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
-DEPTH=..
-
-#//------------------------------------------------------------------------
-#//
-#// Specify any "command" targets. (ie. DIRS, INSTALL_FILES, ...)
-#// (these must come before the common makefiles are included)
-#// 
-#// DIRS          - There are subdirectories to process
-#//
-#//------------------------------------------------------------------------
-DIRS=include src
-
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
-include <$(DEPTH)\config\rules.mak>

mozilla/caps/src/Makefile

@@ -1,45 +0,0 @@
-#!gmake
-# 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		= caps
-
-LIBRARY_NAME	= caps
-
-DEPTH	= ../..
-
-REQUIRES	= nspr xpcom security layer js jar zlib pref img util rdf caps 
-
-CSRCS		=	        \
-		nsZip.c                         \
-                nsUserDialogHelper.c            \
-		nsZig.c                         \
-		nsLoadZig.c                     \
-		nsPrincipal.c                   \
-		nsPrivilege.c                   \
-		nsPrivilegeManager.c            \
-		nsPrivilegeTable.c              \
-		nsSystemPrivilegeTable.c        \
-		nsTarget.c                      \
-		jpermission.c                   \
-		nsUserTarget.c                  \
-		admin.c                         \
-		nsCaps.c                        \
-		$(NULL)
-
-include $(DEPTH)/config/rules.mk
-
-INCLUDES	+= -I$(DEPTH)/include
-

mozilla/caps/src/Makefile.in

@@ -1,50 +0,0 @@
-#!gmake
-# 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		= caps
-
-LIBRARY_NAME	= caps
-
-DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-REQUIRES	= nspr xpcom security layer js jar zlib pref img util rdf caps 
-
-CSRCS		=	        \
-		nsZip.c                         \
-                nsUserDialogHelper.c            \
-		nsZig.c                         \
-		nsLoadZig.c                     \
-		nsPrincipal.c                   \
-		nsPrivilege.c                   \
-		nsPrivilegeManager.c            \
-		nsPrivilegeTable.c              \
-		nsSystemPrivilegeTable.c        \
-		nsTarget.c                      \
-		jpermission.c                   \
-		nsUserTarget.c                  \
-		admin.c                         \
-		nsCaps.c			\
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= -I$(topsrcdir)/include
-

mozilla/caps/src/admin.cpp

@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 "prtypes.h"
-#include "nspr.h"
-#include "prmem.h"
-#include "prmon.h"
-#include "prlog.h"
-
-#include "admin.h"
-#include "nsPrivilegeManager.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* 
- *             A D M I N   U I   A P I 
- *
- * All of the following methods are used by admin API (the code located
- * in security/lib/nav area).
- */
-
-PR_PUBLIC_API(const char *)
-java_netscape_security_getPrincipals(const char *charSetName)
-{
-    nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-    const char *prins = nsPrivManager->getAllPrincipalsString();
-    PRBool test_admin_api = PR_FALSE;
-    if (test_admin_api) {
-      char *a1;
-      char *a2;
-      char *a3;
-      java_netscape_security_getPrivilegeDescs(NULL, "raman tenneti", &a1, &a2, &a3);
-      java_netscape_security_removePrivilege(NULL, "raman tenneti", "Reading, modification, or deletion of any of your files");
-      java_netscape_security_removePrincipal(NULL, "raman tenneti");
-    }
-    return prins;
-}
-
-PR_PUBLIC_API(PRBool)
-java_netscape_security_removePrincipal(const char *charSetName, char *prinName)
-{
-    nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-    return nsPrivManager->removePrincipal(prinName);
-}
-
-PR_PUBLIC_API(void)
-java_netscape_security_getPrivilegeDescs(const char *charSetName, char *prinName,
-                                         char** forever, char** session, 
-                                         char **denied)
-{
-    nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-    nsPrivManager->getTargetsWithPrivileges(prinName, forever, session, denied);
-}
-
-PR_PUBLIC_API(PRBool)
-java_netscape_security_removePrivilege(const char *charSetName, char *prinName, 
-                                       char *targetName)
-{
-    nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-    return nsPrivManager->removePrincipalsPrivilege(prinName, targetName);
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */

mozilla/caps/src/jpermission.c

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 "prtypes.h"
-#include "nspr.h"
-#include "prmem.h"
-#include "prmon.h"
-#include "prlog.h"
-
-#include "structs.h"
-#include "proto.h"
-#include "secnav.h"
-
-#include "jpermission.h"
-
-static char *userTargetErrMsg;
-static nsPermState gPermState;
-
-static void
-nsUserTargetHandleMonitorError(int rv)
-{
-  if (rv == PR_FAILURE) {
-    userTargetErrMsg = "IllegalMonitorStateException current thread not owner";
-  }
-  else if (PR_GetError() == PR_PENDING_INTERRUPT_ERROR) {
-    userTargetErrMsg = "ThreadDeath: thread tried to proceed after being stopped";
-  } else {
-    userTargetErrMsg = NULL;
-  }
-}
-
-
-PR_PUBLIC_API(void)
-java_netscape_security_savePrivilege(nsPermState permState)
-{
-  PR_CEnterMonitor((void *)&gPermState);
-  gPermState = permState;
-  nsUserTargetHandleMonitorError(PR_CNotifyAll((void*)&gPermState));
-  PR_CExitMonitor((void *)&gPermState);
-}
-
-PR_PUBLIC_API(nsPermState) 
-nsJSJavaDisplayDialog(char *prinStr, char *targetStr, char *riskStr, PRBool isCert)
-{
-  void * context = XP_FindSomeContext(); 
-  PRIntervalTime sleep = (PRIntervalTime)PR_INTERVAL_NO_TIMEOUT;
-  nsPermState ret_val=nsPermState_NotSet;
-
-  SECNAV_signedAppletPrivileges(context, prinStr, targetStr, 
-                                riskStr, isCert);
-
-  PR_CEnterMonitor((void *)&gPermState);
-  nsUserTargetHandleMonitorError(PR_CWait((void*)&gPermState, sleep));
-  nsUserTargetHandleMonitorError(PR_CNotifyAll((void*)&gPermState));
-  ret_val = gPermState;
-  PR_CExitMonitor((void *)&gPermState);
-
-  PR_Sleep(500000);
-  return ret_val;
-}

mozilla/caps/src/nsCaps.cpp

@@ -1,278 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 "prtypes.h"
-#include "nspr.h"
-#include "prmem.h"
-#include "prmon.h"
-#include "prlog.h"
-
-#include "nsCaps.h"
-#include "nsPrivilegeManager.h"
-#include "nsPrivilege.h"
-#include "nsPrivilegeTable.h"
-#include "nsPrincipal.h"
-#include "nsTarget.h"
-
-PR_BEGIN_EXTERN_C
-
-
-/* 
- *             C  API  FOR  JS
- *
- * All of the following methods are used by JS (the code located
- * in lib/libmocha area).
- */
-
-/* wrappers for nsPrivilegeManager object */
-PR_IMPLEMENT(PRBool) 
-nsCapsRegisterPrincipal(struct nsPrincipal *principal) 
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  nsPrivManager->registerPrincipal(principal);
-  return PR_TRUE;
-}
-
-PR_IMPLEMENT(PRBool) 
-nsCapsEnablePrivilege(void* context, struct nsTarget *target, PRInt32 callerDepth)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return nsPrivManager->enablePrivilege(context, target, callerDepth);
-}
-
-PR_IMPLEMENT(PRBool) 
-nsCapsIsPrivilegeEnabled(void* context, struct nsTarget *target, PRInt32 callerDepth)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return nsPrivManager->isPrivilegeEnabled(context, target, callerDepth);
-}
-
-PR_IMPLEMENT(PRBool) 
-nsCapsRevertPrivilege(void* context, struct nsTarget *target, PRInt32 callerDepth)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return nsPrivManager->revertPrivilege(context, target, callerDepth);
-}
-
-PR_IMPLEMENT(PRBool) 
-nsCapsDisablePrivilege(void* context, struct nsTarget *target, PRInt32 callerDepth)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return nsPrivManager->disablePrivilege(context, target, callerDepth);
-}
-
-PR_IMPLEMENT(void*) 
-nsCapsGetClassPrincipalsFromStack(void* context, PRInt32 callerDepth)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return (void *)nsPrivManager->getClassPrincipalsFromStack(context, callerDepth);
-}
-
-PR_IMPLEMENT(nsSetComparisonType) 
-nsCapsComparePrincipalArray(void* prin1Array, void* prin2Array)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return nsPrivManager->comparePrincipalArray((nsPrincipalArray*)prin1Array, 
-                                              (nsPrincipalArray*)prin2Array);
-}
-
-PR_IMPLEMENT(void*) 
-nsCapsIntersectPrincipalArray(void* prin1Array, void* prin2Array)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return nsPrivManager->intersectPrincipalArray((nsPrincipalArray*)prin1Array, 
-                                                (nsPrincipalArray*)prin2Array);
-}
-
-PR_IMPLEMENT(PRBool) 
-nsCapsCanExtendTrust(void* from, void* to)
-{
-  nsPrivilegeManager *nsPrivManager = nsPrivilegeManager::getPrivilegeManager();
-  return nsPrivManager->canExtendTrust((nsPrincipalArray*)from, 
-                                       (nsPrincipalArray*)to);
-}
-
-/* wrappers for nsPrincipal object */
-PR_IMPLEMENT(struct nsPrincipal *) 
-nsCapsNewPrincipal(nsPrincipalType type, void * key, 
-                   PRUint32 key_len, void *zig)
-{
-  return new nsPrincipal(type, key, key_len, zig);
-}
-
-PR_IMPLEMENT(const char *) 
-nsCapsPrincipalToString(struct nsPrincipal *principal)
-{
-  return principal->toString();
-}
-
-PR_IMPLEMENT(PRBool) 
-nsCapsIsCodebaseExact(struct nsPrincipal *principal)
-{
-  return principal->isCodebaseExact();
-}
-
-PR_IMPLEMENT(const char *) 
-nsCapsPrincipalGetVendor(struct nsPrincipal *principal)
-{
-  return principal->getVendor();
-}
-
-PR_EXTERN(void *) 
-nsCapsNewPrincipalArray(PRUint32 count)
-{
-  nsPrincipalArray *prinArray = new nsPrincipalArray();
-  prinArray->SetSize(count, 1);
-  return prinArray;
-}
-
-PR_EXTERN(void) 
-nsCapsFreePrincipalArray(void *prinArrayArg)
-{
-  nsPrincipalArray *prinArray = (nsPrincipalArray *)prinArrayArg;
-  if (prinArray) {
-    prinArray->RemoveAll();
-    delete prinArray;
-  }
-}
-
-PR_EXTERN(void *) 
-nsCapsGetPrincipalArrayElement(void *prinArrayArg, PRUint32 index)
-{
-  nsPrincipalArray *prinArray = (nsPrincipalArray *)prinArrayArg;
-  if (prinArray == NULL) {
-    return NULL;
-  }
-  return prinArray->Get(index);
-}
-
-PR_EXTERN(void) 
-nsCapsSetPrincipalArrayElement(void *prinArrayArg, PRUint32 index, void *element)
-{
-  nsPrincipalArray *prinArray = (nsPrincipalArray *)prinArrayArg;
-  if (prinArray == NULL) {
-    return;
-  }
-  prinArray->Set(index, element);
-}
-
-PR_EXTERN(PRUint32) 
-nsCapsGetPrincipalArraySize(void *prinArrayArg) 
-{
-  nsPrincipalArray *prinArray = (nsPrincipalArray *)prinArrayArg;
-  if (prinArray == NULL) {
-    return 0;
-  }
-  return prinArray->GetSize();
-}
-
-/* wrappers for nsTarget object */
-PR_IMPLEMENT(struct nsTarget *) 
-nsCapsFindTarget(char *name)
-{
-  return nsTarget::findTarget(name);
-}
-
-/* wrappers for nsPrivilege object */
-PR_IMPLEMENT(nsPermissionState) 
-nsCapsGetPermission(struct nsPrivilege *privilege)
-{
-  return privilege->getPermission();
-}
-
-/* wrappers for nsPrivilegeTable object */
-PR_IMPLEMENT(struct nsPrivilege *)
-nsCapsGetPrivilege(struct nsPrivilegeTable *annotation, struct nsTarget *target)
-{
-  return annotation->get(target);
-}
-
-
-/* Methods for stack walking */
-struct NSJSJavaFrameWrapper * (*nsCapsNewNSJSJavaFrameWrapperCallback)(void *) = NULL;
-PR_IMPLEMENT(void)
-setNewNSJSJavaFrameWrapperCallback(struct NSJSJavaFrameWrapper * (*fp)(void *))
-{
-    nsCapsNewNSJSJavaFrameWrapperCallback = fp;
-}
-
-
-void (*nsCapsFreeNSJSJavaFrameWrapperCallback)(struct NSJSJavaFrameWrapper *);
-PR_IMPLEMENT(void)
-setFreeNSJSJavaFrameWrapperCallback(void (*fp)(struct NSJSJavaFrameWrapper *))
-{
-    nsCapsFreeNSJSJavaFrameWrapperCallback = fp;
-}
-
-
-void (*nsCapsGetStartFrameCallback)(struct NSJSJavaFrameWrapper *);
-PR_IMPLEMENT(void)
-setGetStartFrameCallback(void (*fp)(struct NSJSJavaFrameWrapper *))
-{
-    nsCapsGetStartFrameCallback = fp;
-}
-
-PRBool (*nsCapsIsEndOfFrameCallback)(struct NSJSJavaFrameWrapper *);
-PR_IMPLEMENT(void)
-setIsEndOfFrameCallback(PRBool (*fp)(struct NSJSJavaFrameWrapper *))
-{
-    nsCapsIsEndOfFrameCallback = fp;
-}
-
-
-PRBool (*nsCapsIsValidFrameCallback)(struct NSJSJavaFrameWrapper *);
-PR_IMPLEMENT(void)
-setIsValidFrameCallback(PRBool (*fp)(struct NSJSJavaFrameWrapper *))
-{
-    nsCapsIsValidFrameCallback = fp;
-}
-
-
-void * (*nsCapsGetNextFrameCallback)(struct NSJSJavaFrameWrapper *, int *);
-PR_IMPLEMENT(void)
-setGetNextFrameCallback(void * (*fp)(struct NSJSJavaFrameWrapper *, int *))
-{
-    nsCapsGetNextFrameCallback = fp;
-}
-
-
-void * (*nsCapsGetPrincipalArrayCallback)(struct NSJSJavaFrameWrapper *);
-PR_IMPLEMENT(void)
-setOJIGetPrincipalArrayCallback(void * (*fp)(struct NSJSJavaFrameWrapper *))
-{
-    nsCapsGetPrincipalArrayCallback = fp;
-}
-
-
-void * (*nsCapsGetAnnotationCallback)(struct NSJSJavaFrameWrapper *);
-PR_IMPLEMENT(void)
-setOJIGetAnnotationCallback(void * (*fp)(struct NSJSJavaFrameWrapper *))
-{
-    nsCapsGetAnnotationCallback = fp;
-}
-
-
-void * (*nsCapsSetAnnotationCallback)(struct NSJSJavaFrameWrapper *, void *);
-PR_IMPLEMENT(void)
-setOJISetAnnotationCallback(void * (*fp)(struct NSJSJavaFrameWrapper *, void *))
-{
-    nsCapsSetAnnotationCallback = fp;
-}
-
-PR_END_EXTERN_C