Added the memstream file.

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

mozilla/config/config.mak

@@ -0,0 +1,408 @@
+# 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.
+
+!if !defined(CONFIG_CONFIG_MAK)
+CONFIG_CONFIG_MAK=1
+
+#//------------------------------------------------------------------------
+#//
+#// Define public make variables:
+#//
+#//    OBJDIR  - Specifies the location of intermediate files (ie. objs...)
+#//              Currently, the names are WINxx_O.OBJ or WINxx_D.OBJ for
+#//              optimized and debug builds respectively.
+#//
+#//    DIST    - Specifies the location of the distribution directory where
+#//              all targets are delivered.
+#//
+#//    CFGFILE - Specifies the name of the temporary configuration file 
+#//              containing the arguments to the current command.
+#//
+#//    INCS    - Default include paths.
+#//
+#//    CFLAGS  - Default compiler options.
+#//
+#//    LFLAGS  - Default linker options.
+#//
+#//------------------------------------------------------------------------
+
+!if [$(MOZ_TOOLS)\bin\uname > osuname.inc]
+!endif
+WINOS=\
+!include "osuname.inc"
+WINOS=$(WINOS: =)^
+
+!if [del osuname.inc]
+!endif
+
+## Include support for MOZ_LITE/MOZ_MEDIUM
+include <$(DEPTH)/config/liteness.mak>
+
+!if "$(MOZ_BITS)" == "16"
+
+!if "$(MAKE_OBJ_TYPE)" == "DLL"
+OBJTYPE=D
+!else
+OBJTYPE=E
+!endif
+
+!else
+OBJTYPE=
+!endif
+
+XPDIST=$(DEPTH)\dist
+PUBLIC=$(XPDIST)\public
+
+#//-----------------------------------------------------------------------
+#// OBJDIR is NOT the same as DIST for Win16. The Win16 dist stuff can
+#// be built with EXE or DLL compiler flags, but the DIST directory
+#// has the same name no matter what
+#//-----------------------------------------------------------------------
+
+
+!ifdef NGLAYOUT_BUILD_PREFIX
+DIST_PREFIX=NGL
+!else
+!ifdef MOZ_NAV_BUILD_PREFIX
+DIST_PREFIX=NAV
+!else
+DIST_PREFIX=WIN
+!endif
+!endif
+
+!ifndef MOZ_DEBUG
+OBJDIR=$(DIST_PREFIX)$(MOZ_BITS)$(OBJTYPE)_O.OBJ
+JAVA_OPTIMIZER = -O
+!ifdef NO_CAFE
+JAVAC_OPTIMIZER =
+!else
+#JAVAC_OPTIMIZER= -O -noinline
+JAVAC_OPTIMIZER =
+!endif
+!else
+OBJDIR=$(DIST_PREFIX)$(MOZ_BITS)$(OBJTYPE)_D.OBJ
+JAVA_OPTIMIZER = -g
+JAVAC_OPTIMIZER = -g
+!endif
+
+#//
+#// DIST DEFINES SHOULD NEVER BE COMPONENT SPECIFIC.
+#//
+!ifndef MOZ_DEBUG
+DIST=$(XPDIST)\$(DIST_PREFIX)$(MOZ_BITS)_O.OBJ
+!else
+DIST=$(XPDIST)\$(DIST_PREFIX)$(MOZ_BITS)_D.OBJ
+!endif
+
+# This will always give the location of NGLayout's dist, even if "NGLAYOUT_BUILD_PREFIX" is not defined.
+!if defined(MOZ_NGLAYOUT)
+!ifndef MOZ_DEBUG
+NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_O.OBJ
+!else
+NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_D.OBJ
+!endif
+!endif
+
+
+CFGFILE=$(OBJDIR)\cmd.cfg
+
+!if "$(MOZ_BITS)" == "16"
+INCS=-I$(XPDIST)\public\win16 $(INCS) -I$(DEPTH)\include -I$(DIST)\include -I..\include
+!else
+INCS=$(INCS) -I$(DEPTH)\include -I$(DIST)\include \
+             -I$(XPDIST)\public\img -I$(XPDIST)\public\util \
+             -I$(XPDIST)\public\coreincl
+!endif # 16
+
+!ifndef NO_LAYERS
+INCS=$(INCS) -I$(DEPTH)\lib\liblayer\include
+!endif 
+
+!if "$(STAND_ALONE_JAVA)" == "1"
+LCFLAGS=$(LCFLAGS) -DSTAND_ALONE_JAVA
+!endif
+
+!if defined(MOZ_JAVA)
+MOZ_JAVA_FLAG=-DJAVA
+!if defined(MOZ_OJI)
+!error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
+!endif
+JAVA_OR_OJI=1
+!endif
+
+!if defined(MOZ_OJI)
+LCFLAGS=$(LCFLAGS) -DOJI
+JAVA_OR_OJI=1
+!endif
+
+# Perhaps we should add MOZ_LITENESS_FLAGS to 16 bit build
+!if "$(MOZ_BITS)" == "16"
+CFLAGS=$(MOZ_JAVA_FLAG) -DMOCHA -DLAYERS -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)
+!else
+CFLAGS=$(MOZ_JAVA_FLAG) -DMOCHA -DLAYERS $(OS_CFLAGS) $(MOZ_CFLAGS) $(MOZ_LITENESS_FLAGS)
+!endif
+LFLAGS=$(OS_LFLAGS) $(LLFLAGS) $(MOZ_LFLAGS)
+
+!ifdef NO_SECURITY
+CFLAGS = $(CFLAGS) -DNO_SECURITY
+!endif
+
+# This compiles in heap dumping utilities and other good stuff 
+# for developers -- maybe we only want it in for a special SDK 
+# nspr/java runtime(?):
+!if "$(MOZ_BITS)"=="32" || defined(MOZ_DEBUG)
+CFLAGS = $(CFLAGS) -DDEVELOPER_DEBUG
+!endif
+
+!ifdef STANDALONE_IMAGE_LIB
+CFLAGS=$(CFLAGS) -DSTANDALONE_IMAGE_LIB
+!endif
+
+!ifdef MODULAR_NETLIB
+CFLAGS=$(CFLAGS) -DMODULAR_NETLIB
+!else
+# Defines for new cookie management...
+CFLAGS=$(CFLAGS) -DCookieManagement -DSingleSignon
+
+!endif
+
+# TODO Remove later - Gagan
+!ifdef NU_CACHE 
+CFLAGS=$(CFLAGS) -DNU_CACHE
+!endif
+
+# always need these:
+CFLAGS = $(CFLAGS) -DNETSCAPE
+
+# Specify that we are building a client.
+# This will instruct the cross platform libraries to
+# include all the client specific cruft.
+!if defined(SERVER_BUILD)
+CFLAGS = $(CFLAGS) -DSERVER_BUILD
+!elseif defined(LIVEWIRE)
+CFLAGS = $(CFLAGS) -DLIVEWIRE
+!else
+CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT
+!endif
+
+PERL= $(MOZ_TOOLS)\perl5\perl.exe
+MASM = $(MOZ_TOOLS)\bin\ml.exe
+
+!if "$(WINOS)" == "WIN95"
+MKDIR = $(DEPTH)\config\w95mkdir
+QUIET =
+!else
+MKDIR = mkdir
+QUIET=@
+!endif
+
+
+#//------------------------------------------------------------------------
+#//
+#// Include the OS dependent configuration information
+#//
+#//------------------------------------------------------------------------
+include <$(DEPTH)/config/WIN$(MOZ_BITS)>
+
+!ifdef MOZ_DEBUG
+!ifdef USERNAME
+CFLAGS = $(CFLAGS) -DDEBUG_$(USERNAME)
+!endif
+!if defined(GLOWCODE) && defined(GLOWPROF) && "$(MOZ_BITS)"=="32"
+CFLAGS = $(CFLAGS) -Gh
+!endif
+!endif
+
+#//------------------------------------------------------------------------
+#//
+#// Define the global make commands.
+#//
+#//    MAKE_INSTALL  - Copy a target to the distribution directory.
+#//
+#//    MAKE_OBJDIRS  - Create an object directory (if necessary).
+#//
+#//     MAKE_MANGLE   - Convert all long filenames into 8.3 names
+#//
+#//     MAKE_UNMANGLE - Restore all long filenames
+#//
+#//------------------------------------------------------------------------
+!if !defined(MOZ_SRC)
+#enable builds on any drive if defined.
+MOZ_SRC=y:
+!endif
+MAKE_INSTALL=$(QUIET)$(DEPTH)\config\makecopy.exe
+MAKE_MANGLE=$(DEPTH)\config\mangle.exe
+MAKE_UNMANGLE=if exist unmangle.bat call unmangle.bat
+
+#//------------------------------------------------------------------------
+#//
+#// Common Libraries
+#//
+#//------------------------------------------------------------------------
+!ifdef NSPR20
+!if "$(MOZ_BITS)" == "16"
+LIBNSPR=$(DIST)\lib\nspr21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\msgc21.lib
+!else
+LIBNSPR=$(DIST)\lib\libnspr21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\libplds21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\libmsgc21.lib
+!endif
+!else
+LIBNSPR=$(DIST)\lib\pr$(MOZ_BITS)$(VERSION_NUMBER).lib
+!endif
+
+!ifdef NSPR20
+NSPRDIR = nsprpub
+CFLAGS = $(CFLAGS) -DNSPR20
+!else
+NSPRDIR = nspr
+!endif
+
+LIBJPEG=$(DIST)\lib\jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib
+
+######################################################################
+### Windows-Specific Java Stuff
+
+PATH_SEPARATOR = ;
+
+# where the bytecode will go
+!if "$(AWT_11)" == "1"
+JAVA_DESTPATH = $(DEPTH)\dist\classes11
+!else
+JAVA_DESTPATH = $(DEPTH)\dist\classes
+!endif
+
+# where the source are
+DEFAULT_JAVA_SOURCEPATH = $(DEPTH)\sun-java\classsrc
+!ifndef JAVA_SOURCEPATH
+!if "$(AWT_11)" == "1"
+JAVA_SOURCEPATH = $(DEPTH)\sun-java\classsrc11;$(DEFAULT_JAVA_SOURCEPATH)
+!else
+JAVA_SOURCEPATH = $(DEFAULT_JAVA_SOURCEPATH)
+!endif
+!endif
+
+JAVA_PROG=$(MOZ_TOOLS)\bin\java.exe
+#JAVA_PROG=$(DIST)\bin\java
+
+JAVAC_ZIP=$(MOZ_TOOLS)/lib/javac.zip
+
+ZIP_PROG = $(MOZ_TOOLS)\bin\zip
+UNZIP_PROG = $(MOZ_TOOLS)\bin\unzip
+ZIP_FLAGS = -0 -r -q
+
+CFLAGS = $(CFLAGS) -DOS_HAS_DLL
+
+DLL_SUFFIX	= dll
+LIB_SUFFIX	= lib
+
+!if "$(STAND_ALONE_JAVA)" == "1"
+STAND_ALONE_JAVA_DLL_SUFFIX=s
+!else
+STAND_ALONE_JAVA_DLL_SUFFIX=
+!endif
+
+MOD_JRT=jrt$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_MM =mm$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_AWT=awt$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_AWTS=awt$(MOZ_BITS)$(VERSION_NUMBER)$(STAND_ALONE_JAVA_DLL_SUFFIX)
+MOD_JIT=jit$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JSJ=jsj$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NET=net$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JBN=jbn$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NSC=nsc$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JPW=jpw$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JDB=jdb$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_ZIP=zip$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_ZPW=zpw$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_CON=con$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NPJ=npj$(MOZ_BITS)$(VERSION_NUMBER)
+
+JRTDLL=$(MOD_JRT).$(DLL_SUFFIX)
+MMDLL =$(MOD_MM).$(DLL_SUFFIX)
+AWTDLL=$(MOD_AWT).$(DLL_SUFFIX)
+AWTSDLL=$(MOD_AWT)$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+JITDLL=$(MOD_JIT).$(DLL_SUFFIX)
+JSJDLL=$(MOD_JSJ).$(DLL_SUFFIX)
+NETDLL=$(MOD_NET).$(DLL_SUFFIX)
+JBNDLL=$(MOD_JBN).$(DLL_SUFFIX)
+NSCDLL=$(MOD_NSC).$(DLL_SUFFIX)
+JPWDLL=$(MOD_JPW).$(DLL_SUFFIX)
+JDBDLL=$(MOD_JDB).$(DLL_SUFFIX)
+ZIPDLL=$(MOD_ZIP).$(DLL_SUFFIX)
+ZPWDLL=$(MOD_ZPW).$(DLL_SUFFIX)
+CONDLL=$(MOD_CON).$(DLL_SUFFIX)
+NPJDLL=$(MOD_NPJ).$(DLL_SUFFIX)
+
+ZIPLIB=$(DIST)\lib\$(MOD_ZIP).$(LIB_SUFFIX)
+AWTLIB=$(DIST)\lib\$(MOD_AWT).$(LIB_SUFFIX)
+
+######################################################################
+
+include <$(DEPTH)/config/common.mk>
+
+JAVA_DEFINES =			   \
+	-DJAR_NAME=\"$(JAR_NAME)\" \
+	-DJRTDLL=\"$(JRTDLL)\"	   \
+	-DMMDLL=\"$(MMDLL)\"	   \
+	-DAWTDLL=\"$(AWTDLL)\"	   \
+	-DAWTSDLL=\"$(AWTSDLL)\"   \
+	-DJSJDLL=\"$(JSJDLL)\"	   \
+	-DJITDLL=\"$(JITDLL)\"     \
+	-DNETDLL=\"$(NETDLL)\"     \
+	-DJBNDLL=\"$(JBNDLL)\"     \
+	-DNSCDLL=\"$(NSCDLL)\"     \
+	-DJDBDLL=\"$(JDBDLL)\"	   \
+	-DJPWDLL=\"$(JPWDLL)\"     \
+	-DZPWDLL=\"$(ZPWDLL)\"     \
+	-DCONDLL=\"$(CONDLL)\"
+!if "$(MOZ_BITS)" == "16"
+
+# Override JAVA_DEFINES to make command line short for win16.
+# Put any new defines into javadefs.h in ns/sun-java/include.
+# This is to shorten the command line in order not to break Win16.
+
+JAVA_DEFINES = -DJAR_NAME=\"$(JAR_NAME)\" -DMOZ_BITS=\"$(MOZ_BITS)\" -DVERSION_NUMBER=\"$(VERSION_NUMBER)\" -DDLL_SUFFIX=\".$(DLL_SUFFIX)\"   
+
+!endif
+
+!if "$(AWT_11)" == "1"
+JAVA_DEFINES = $(JAVA_DEFINES) -DAWT_11
+!else
+JAVA_DEFINES = $(JAVA_DEFINES) -DAWT_102
+!endif
+
+
+#JAVA_CLASSPATH = $(JAVA_CLASSPATH:/=\)
+JMCSRCDIR = $(JMCSRCDIR:/=\)
+JAVA_BOOT_CLASSPATH = $(JAVA_BOOT_CLASSPATH:/=\)
+
+NMAKE=nmake -nologo -$(MAKEFLAGS)
+
+########
+#   Get the cwd to prepend to all compiled source
+#       files.  Will allow debugger to automatically find sources
+#       instead of asking for the path info.
+#   Win16 will break if enabled, guess we continue to live in pain
+#       therein.
+########
+!if "$(MOZ_BITS)" == "32"
+CURDIR=$(MAKEDIR)^\
+!endif
+
+!endif # CONFIG_CONFIG_MAK
+

mozilla/config/config.mk

@@ -0,0 +1,632 @@
+#
+# 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.
+#
+
+#
+# config.mk
+#
+# Determines the platform and builds the macros needed to load the
+# appropriate platform-specific .mk file, then defines all (most?)
+# of the generic macros.
+#
+
+# This wastes time.
+include $(DEPTH)/config/common.mk
+
+#
+# Important internal static macros
+#
+OS_ARCH		:= $(subst /,_,$(shell uname -s))
+OS_RELEASE	:= $(shell uname -r)
+OS_TEST		:= $(shell uname -m)
+
+#
+# Tweak the default OS_ARCH and OS_RELEASE macros as needed.
+#
+ifeq ($(OS_ARCH),AIX)
+OS_RELEASE	:= $(shell uname -v).$(shell uname -r)
+endif
+ifeq ($(OS_ARCH),BSD_386)
+OS_ARCH		:= BSD_OS
+endif
+ifeq ($(OS_ARCH),IRIX64)
+OS_ARCH		:= IRIX
+endif
+ifeq ($(OS_ARCH),UNIX_SV)
+ifneq ($(findstring NCR,$(shell grep NCR /etc/bcheckrc | head -1 )),)
+OS_ARCH		:= NCR
+else
+OS_ARCH		:= UNIXWARE
+OS_RELEASE	:= $(shell uname -v)
+endif
+endif
+ifeq ($(OS_ARCH),ncr)
+OS_ARCH		:= NCR
+endif
+# This is the only way to correctly determine the actual OS version on NCR boxes.
+ifeq ($(OS_ARCH),NCR)
+OS_RELEASE	:= $(shell awk '{print $$3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$$/\2.\3/')
+endif
+ifeq ($(OS_ARCH),UNIX_System_V)
+OS_ARCH		:= NEC
+endif
+ifeq ($(OS_ARCH),QNX)
+OS_RELEASE	:= $(shell uname -v | sed 's/^\([0-9]\)\([0-9]*\)$$/\1.\2/')
+endif
+ifeq ($(OS_ARCH),SCO_SV)
+OS_ARCH		:= SCOOS
+OS_RELEASE	:= 5.0
+endif
+ifneq (,$(filter SINIX-N SINIX-Y SINIX-Z ReliantUNIX-M,$(OS_ARCH)))
+OS_ARCH		:= SINIX
+OS_TEST		:= $(shell uname -p)
+endif
+ifeq ($(OS_ARCH),UnixWare)
+OS_ARCH		:= UNIXWARE
+endif
+
+#
+# Strip off the excessively long version numbers on these platforms,
+# but save the version to allow multiple versions of the same base
+# platform to be built in the same tree.
+#
+ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OSF1 SunOS,$(OS_ARCH)))
+OS_VERS		:= $(suffix $(OS_RELEASE))
+OS_RELEASE	:= $(basename $(OS_RELEASE))
+OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
+endif
+
+OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
+
+#
+# Personal makefile customizations go in these optional make include files.
+#
+MY_CONFIG	:= $(DEPTH)/config/myconfig.mk
+MY_RULES	:= $(DEPTH)/config/myrules.mk
+
+#
+# Relative pathname from top-of-tree to current source directory
+#
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+REVDEPTH	:= $(DEPTH)/config/revdepth
+SRCDIR		= $(shell $(PERL) $(REVDEPTH).pl $(DEPTH))
+endif
+
+#
+# Define an include-at-most-once flag
+#
+NS_CONFIG_MK	= 1
+
+#
+# Provide the means to easily override our tool directory locations.
+#
+ifdef NETSCAPE_HIERARCHY
+NETSCAPE_BUILD = 1   # Defines XFEPRIVDIR, below.
+CONTRIB_BIN	:= /tools/contrib/bin/
+JAVA_BIN	:= /usr/local/java/bin/
+LOCAL_BIN	:= /usr/local/bin/
+LOCAL_SUN4	:= /usr/local/sun4/bin/
+NS_BIN		:= /tools/ns/bin/
+NS_LIB		:= /tools/ns/lib
+JAVA_LIB	:= /usr/local/netscape/java/lib
+else
+NS_LIB		:= .
+JAVA_LIB	:= .
+endif
+
+# Allow NETSCAPE_BUILD to include XFEPRIVDIR w/o NETSCAPE_HIERARCHY
+ifdef NETSCAPE_BUILD
+XFEPRIVDIR		:= $(DEPTH)/../ns/cmd/xfe/
+endif
+
+#
+# Default command macros; can be overridden in <arch>.mk.
+#
+AS		= $(CC)
+ASFLAGS		= $(CFLAGS)
+BSDECHO		= echo
+CC		= gcc
+CCC		= g++
+CCF		= $(CC) $(CFLAGS)
+LINK_EXE	= $(LINK) $(OS_LFLAGS) $(LFLAGS)
+LINK_DLL	= $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
+NFSPWD		= $(DEPTH)/config/nfspwd
+PURIFY		= purify $(PURIFYOPTIONS)
+QUANTIFY	= quantify $(QUANTIFYOPTIONS)
+RANLIB		= /bin/true
+SDKINSTALL	= $(NSINSTALL) -t
+UNZIP_PROG	= $(LOCAL_BIN)/unzip
+ZIP_PROG	= $(LOCAL_BIN)/zip
+ZIP_FLAGS	= -0rq
+
+ifeq ($(OS_ARCH),OS2)
+EMPTY		:=
+SLASH		:= /$(EMPTY)
+BSLASH		:= \$(EMPTY)
+SEMICOLON	:= ;$(EMPTY)
+SPACE		:= $(EMPTY) $(EMPTY)
+PATH_SEPARATOR	:= \;
+RC		= flipper rc$(BIN_SUFFIX)
+XP_DEFINE	= -DXP_PC
+LIB_SUFFIX	= lib
+DLL_SUFFIX	= dll
+MAP_SUFFIX	= map
+BIN_SUFFIX	= .exe
+AR		= flipper ILibo //noignorecase //nologo $@
+IMPLIB		= flipper ILibo //noignorecase //nologo $@
+DLLFLAGS	= -DLL -OUT:$@ $(XLFLAGS) -MAP:$(@:.dll=.map)
+LFLAGS		= $(OBJS) -OUT:$@ $(XLFLAGS) $(DEPLIBS) $(EXTRA_LIBS) -MAP:$(@:.dll=.map) $(DEF_FILE)
+NSINSTALL	= nsinstall
+INSTALL		= $(NSINSTALL)
+JAVA_PROG	= flipper java -norestart
+JAVAC_ZIP	= $(subst $(BSLASH),$(SLASH),$(JAVA_HOME))/lib/classes.zip
+else
+ifeq ($(OS_ARCH),WINNT)
+PATH_SEPARATOR	:= :
+RC		= rc$(BIN_SUFFIX)
+XP_DEFINE	= -DXP_PC
+LIB_SUFFIX	= lib
+DLL_SUFFIX	= dll
+BIN_SUFFIX	= .exe
+AR		= lib -NOLOGO -OUT:"$@"
+DLLFLAGS	= $(XLFLAGS) -OUT:"$@"
+LFLAGS		= $(OBJS) $(DEPLIBS) $(EXTRA_LIBS) -OUT:"$@"
+NSINSTALL	= nsinstall
+INSTALL		= $(NSINSTALL)
+JAVA_PROG	= java
+else
+PATH_SEPARATOR	:= :
+XP_DEFINE	= -DXP_UNIX
+AR		= ar cr $@
+DLL_SUFFIX	= so
+LIB_SUFFIX	= a
+ifeq ($(AWT_11),1)
+JAVA_PROG	= $(NS_BIN)java
+JAVAC_ZIP	= $(NS_LIB)/classes.zip
+else
+JAVA_PROG	= $(LOCAL_BIN)java
+JAVAC_ZIP	= $(JAVA_LIB)/javac.zip
+endif
+PERL		= $(NS_BIN)perl
+TAR		= tar
+EMACS		= xemacs
+WHOAMI		= /usr/bin/whoami
+endif
+endif
+
+#
+# Debug by default.
+#
+OBJDIR_TAG	= _DBG
+OPTIMIZER	= -g
+JAVA_OPTIMIZER	= -g
+XBCFLAGS	= -FR$*
+XCFLAGS		= $(LCFLAGS)
+XLFLAGS		= $(LLFLAGS)
+
+ifeq ($(OS_ARCH),OS2)
+OPTIMIZER	= -Ti+
+XLFLAGS		+= -DEBUG
+ifdef BUILD_PROFILE
+OPTIMIZER	+= -Gh+ 
+OBJDIR_TAG	= _PRF
+else
+OPTIMIZER	+= -DDEBUG
+ifdef BUILD_MEMDBG
+OPTIMIZER	+= -Tm+ -DXP_OS2_MEMDEBUG=1
+OBJDIR_TAG	= _MEM
+endif
+endif
+else
+ifeq ($(OS_ARCH),WINNT)
+OPTIMIZER	= -Od -Z7
+JAVA_OPTIMIZER	= $(OPTIMIZER)
+XLFLAGS		+= -DEBUG
+else
+DEFINES		= -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
+endif
+endif
+
+ifdef BUILD_OPT
+OBJDIR_TAG	= _OPT
+XBCFLAGS	=
+ifeq ($(OS_ARCH),OS2)
+OPTIMIZER	= -O+ -Oi -DNDEBUG
+else
+ifeq ($(OS_ARCH),WINNT)
+OPTIMIZER	= -O2
+else
+OPTIMIZER	= -O
+DEFINES		= -UDEBUG -DNDEBUG -DTRIMMED
+endif
+endif
+endif
+
+#
+# XXX For now, we're including $(DEPTH)/include directly instead of
+# getting this stuff from dist. This stuff is old and will eventually
+# be put in the library directories where it belongs so that it can
+# get exported to dist properly.
+#
+INCLUDES	= $(LOCAL_PREINCLUDES) $(MODULE_PREINCLUDES) -I$(DEPTH)/include $(LOCAL_INCLUDES) $(OS_INCLUDES)
+
+LIBNT		= $(DIST)/lib/libnt.$(LIB_SUFFIX)
+LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
+LIBMMEDIA	= $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
+
+#
+# NSPR 2.0 is now the default, "setenv NSPR10 1" to go back to 1.0
+#
+ifndef NSPR10
+NSPR20		= 1
+NSPRDIR		= nsprpub
+DEFINES		+= -DNSPR20
+INCLUDES	+= -I$(DIST)/include
+LIBNSPR		= $(DIST)/lib/libplds21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libmsgc21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libnspr21.$(LIB_SUFFIX)
+PURELIBNSPR	= $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/purelibmsgc21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX)
+else
+NSPRDIR		= nspr
+LIBNSPR		= $(DIST)/lib/libnspr.$(LIB_SUFFIX)
+PURELIBNSPR	= $(DIST)/lib/libpurenspr.$(LIB_SUFFIX)
+endif
+
+ifdef DBMALLOC
+LIBNSPR		+= $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX)
+endif
+
+ifeq ($(OS_ARCH),OS2)
+LIBNSJAVA	= $(DIST)/lib/jrt$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+LIBMD		= $(DIST)/lib/libjmd.$(LIB_SUFFIX)
+LIBJAVA		= $(DIST)/lib/libjrt.$(LIB_SUFFIX)
+LIBNSPR		= $(DIST)/lib/pr$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+LIBXP		= $(DIST)/lib/libxp.$(LIB_SUFFIX)
+else
+ifeq ($(OS_ARCH),WINNT)
+LIBNSJAVA	= $(DIST)/lib/jrt3221.$(LIB_SUFFIX)
+else
+LIBNSJAVA	= $(DIST)/lib/nsjava32.$(LIB_SUFFIX)
+endif
+endif
+
+CFLAGS		= $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(MDUPDATE_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROF_FLAGS)
+NOMD_CFLAGS	= $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
+
+#
+# Include the binary distrib stuff, if necessary.
+#
+ifdef NS_BUILD_CORE
+include $(DEPTH)/config/coreconf.mk
+endif
+
+#
+# Now include the platform-specific stuff.
+#
+include $(DEPTH)/config/$(OS_ARCH).mk
+
+#
+# Some platforms (Solaris) might require builds using either
+# (or both) compiler(s).
+#
+ifdef SHOW_CC_TYPE
+COMPILER	= _$(notdir $(CC))
+endif
+
+#
+# Name of the binary code directories
+#
+ifeq ($(OS_ARCH)_$(PROCESSOR_ARCHITECTURE),WINNT_x86)
+OBJDIR_NAME	= $(OS_CONFIG)$(OS_VERSION)$(OBJDIR_TAG).OBJ
+else
+OBJDIR_NAME	= $(OS_CONFIG)$(OS_VERSION)$(PROCESSOR_ARCHITECTURE)$(COMPILER)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+endif
+
+# Figure out where the binary code lives. It either lives in the src
+# tree (NSBUILDROOT is undefined) or somewhere else.
+ifdef NSBUILDROOT
+BUILD		= $(NSBUILDROOT)/$(OBJDIR_NAME)/build
+OBJDIR		= $(BUILD)/$(SRCDIR)
+XPDIST		= $(NSBUILDROOT)
+DIST		= $(NSBUILDROOT)/$(OBJDIR_NAME)/dist
+else
+BUILD		= $(OBJDIR_NAME)
+OBJDIR		= $(OBJDIR_NAME)
+XPDIST		= $(DEPTH)/dist
+DIST		= $(DEPTH)/dist/$(OBJDIR_NAME)
+endif
+
+# all public include files go in subdirectories of PUBLIC:
+PUBLIC		= $(XPDIST)/public
+
+VPATH		= $(OBJDIR)
+DEPENDENCIES	= $(OBJDIR)/.md
+
+ifneq ($(OS_ARCH),WINNT)
+MKDEPEND_DIR	= $(DEPTH)/config/mkdepend
+MKDEPEND	= $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
+MKDEPENDENCIES	= $(OBJDIR)/depend.mk
+endif
+
+#
+# Include any personal overrides the user might think are needed.
+#
+-include $(MY_CONFIG)
+
+######################################################################
+# Now test variables that might have been set or overridden by $(MY_CONFIG).
+
+DEFINES		+= -DNETSCAPE -DOSTYPE=\"$(OS_CONFIG)\"
+
+# Specify that we are building a client.
+# This will instruct the cross platform libraries to
+# include all the client specific cruft.
+ifdef SERVER_BUILD
+DEFINES		+= -DSERVER_BUILD
+ifdef LIVEWIRE
+DEFINES		+= -DLIVEWIRE
+endif
+STATIC_JAVA	= yes
+else
+MOZILLA_CLIENT	= 1
+DEFINES		+= -DMOZILLA_CLIENT
+endif
+
+ifdef MOZ_SINGLESIGNON
+DEFINES		+= -DSingleSignon
+endif
+
+ifdef MOZ_COOKIEMANAGE
+DEFINES		+= -DCookieManagement
+endif
+
+ifdef MOZ_LITE
+NO_EDITOR	= 1
+NO_UNIX_LDAP	= 1
+MOZ_JSD		= 1
+MOZ_NAV_BUILD_PREFIX = 1
+endif
+ifdef MOZ_MEDIUM
+DEFINES		+= -DEDITOR -DMOZ_COMMUNICATOR_IIDS
+EDITOR		= 1
+MOZ_JSD		= 1
+MOZ_COMMUNICATOR_IIDS	= 1
+MOZ_COMMUNICATOR_CONFIG_JS	= 1
+MOZ_COPY_ALL_JARS	= 1
+ifndef MOZ_SECURITY
+NO_SECURITY	= 1
+endif
+endif
+ifdef MOZ_DARK
+DEFINES += -DEDITOR -DMOZ_COMMUNICATOR_IIDS -DMOZ_MAIL_NEWS -DMOZ_OFFLINE \
+                   -DMOZ_TASKBAR -DMOZ_LDAP -DMOZ_NEO 
+#-DMOZ_CALENDAR
+EDITOR		= 1
+MOZ_JSD		= 1
+MOZ_COMMUNICATOR_IIDS	= 1
+MOZ_COMMUNICATOR_CONFIG_JS	= 1
+MOZ_COPY_ALL_JARS	= 1
+MOZ_OFFLINE=1
+MOZ_TASKBAR=1
+MOZ_LDAP=1
+MOZ_MAIL_NEWS=1
+#MOZ_CALENDAR=1
+MOZ_NEO=1
+endif
+ifdef MOZ_GOLD
+DEFINES		+= -DGOLD
+BUILD_GOLD	= 1
+endif
+
+ifdef NO_SECURITY
+DEFINES		+= -DNO_SECURITY
+endif
+
+# Crash-reporting system
+ifdef MOZ_FULLCIRCLE
+DEFINES		+= -DMOZ_FULLCIRCLE
+endif
+
+ifdef EDITOR
+DEFINES		+= -DEDITOR -DEDITOR_UI
+BUILD_EDITOR	= 1
+BUILD_EDITOR_UI	= 1
+BUILD_EDT	= 1
+endif
+
+# Build layers by default
+ifndef NO_LAYERS
+DEFINES		+= -DLAYERS
+endif
+
+ifdef BUILD_DEBUG_GC
+DEFINES		+= -DDEBUG_GC
+endif
+
+ifdef BUILD_UNIX_PLUGINS
+# UNIX_EMBED Should not be needed. For now these two defines go
+# together until I talk with jg.  --dp
+DEFINES		+= -DUNIX_EMBED -DX_PLUGINS
+endif
+
+ifndef NO_UNIX_LDAP
+DEFINES		+= -DUNIX_LDAP
+endif
+
+#
+# Platform dependent switching off of NSPR, JAVA and MOCHA
+#
+ifndef NO_NSPR
+DEFINES		+= -DNSPR
+endif
+
+ifdef MOZ_JAVA
+DEFINES		+= -DJAVA
+ifdef MOZ_OJI
+error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
+endif
+JAVA_OR_OJI	= 1
+endif
+
+ifdef MOZ_OJI
+DEFINES		+= -DOJI
+JAVA_OR_OJI	= 1
+endif
+
+ifdef JAVA_OR_OJI
+MOZ_SMARTUPDATE = 1
+endif
+
+ifndef NO_MOCHA
+DEFINES		+= -DMOCHA
+endif
+
+ifdef FORTEZZA
+DEFINES		+= -DFORTEZZA
+endif
+
+ifdef UNIX_SKIP_ASSERTS
+DEFINES		+= -DUNIX_SKIP_ASSERTS
+endif
+
+ifdef SHACK
+DEFINES		+= -DSHACK
+endif
+
+ifndef NO_UNIX_ASYNC_DNS
+DEFINES		+= -DUNIX_ASYNC_DNS
+endif
+
+# For profiling
+ifdef MOZILLA_GPROF
+# Don't want profiling on build tools..
+ifneq ($(SRCDIR),config)
+PROF_FLAGS	= $(OS_GPROF_FLAGS) -DMOZILLA_GPROF
+endif
+endif
+
+# This compiles in heap dumping utilities and other good stuff 
+# for developers -- maybe we only want it in for a special SDK 
+# nspr/java runtime(?):
+DEFINES		+= -DDEVELOPER_DEBUG
+
+#
+# For the standalone image lib
+#
+ifdef STANDALONE_IMAGE_LIB
+DEFINES		+= -DSTANDALONE_IMAGE_LIB
+endif
+
+ifdef MODULAR_NETLIB
+DEFINES 	+= -DMODULAR_NETLIB
+endif
+
+######################################################################
+
+GARBAGE		= $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+
+ifndef SDK
+SDK		= $(DEPTH)/dist/sdk
+endif
+
+ifneq ($(OS_ARCH),WINNT)
+NSINSTALL	= $(DEPTH)/config/$(OBJDIR_NAME)/nsinstall
+
+ifeq ($(NSDISTMODE),copy)
+# copy files, but preserve source mtime
+INSTALL		= $(NSINSTALL) -t
+else
+ifeq ($(NSDISTMODE),absolute_symlink)
+# install using absolute symbolic links
+INSTALL		= $(NSINSTALL) -L `$(NFSPWD)`
+else
+# install using relative symbolic links
+INSTALL		= $(NSINSTALL) -R
+endif
+endif
+endif
+
+######################################################################
+### Java Stuff - see common.mk
+######################################################################
+
+# where the bytecode will go
+JAVA_DESTPATH	= $(XPDIST)/classes
+
+# where the sources for the module you are compiling are
+# default is sun-java/classsrc, override for other modules
+ifndef JAVA_SOURCEPATH
+JAVA_SOURCEPATH	= $(DEPTH)/sun-java/classsrc
+endif
+
+ifndef JAVAH_IN_JAVA
+ifeq ($(OS_ARCH),OS2)
+JAVAH_PROG	= flipper $(DIST)/bin/javah
+else
+JAVAH_PROG	= $(DIST)/bin/javah
+endif
+else
+JAVAH_PROG	= $(JAVA) netscape.tools.jric.Main
+endif
+
+ifeq ($(STAND_ALONE_JAVA),1)
+STAND_ALONE_JAVA_DLL_SUFFIX	= s
+endif
+
+ifeq ($(OS_ARCH),OS2)
+AWTDLL		= awt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+AWTSDLL		= awt$(MOZ_BITS)$(VERSION_NUMBER)$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+CONDLL		= con.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JBNDLL		= jbn.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JDBCDLL		= jdb.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JITDLL		= jit.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JPWDLL		= jpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JRTDLL		= jrt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+JSJDLL		= jsj.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+MMDLL		= mm$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+NETDLL		= net.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+NSCDLL		= nsc.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+ZIPDLL		= zip.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+ZPWDLL		= zpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+else
+AWTDLL		= libawt.$(DLL_SUFFIX)
+AWTSDLL		= libawt$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+CONDLL		= libcon.$(DLL_SUFFIX)
+JBNDLL		= libjbn.$(DLL_SUFFIX)
+JDBCDLL		= libjdb.$(DLL_SUFFIX)
+JITDLL		= libjit.$(DLL_SUFFIX)
+JPWDLL		= libjpw.$(DLL_SUFFIX)
+JRTDLL		= libjrt.$(DLL_SUFFIX)
+JSJDLL		= libjsj.$(DLL_SUFFIX)
+MMDLL		= libmm.$(DLL_SUFFIX)
+NETDLL		= libnet.$(DLL_SUFFIX)
+NSCDLL		= libnsc.$(DLL_SUFFIX)
+ZIPDLL		= libzip.$(DLL_SUFFIX)
+ZPWDLL		= libzpw.$(DLL_SUFFIX)
+endif
+
+JAVA_DEFINES	+= -DAWTSDLL=\"$(AWTSDLL)\" -DCONDLL=\"$(CONDLL)\" -DJBNDLL=\"$(JBNDLL)\" -DJDBDLL=\"$(JDBDLL)\" \
+		   -DJSJDLL=\"$(JSJDLL)\" -DNETDLL=\"$(NETDLL)\" -DNSCDLL=\"$(NSCDLL)\" -DZPWDLL=\"$(ZPWDLL)\" \
+                   -DJAR_NAME=\"$(JAR_NAME)\"
+
+ifeq ($(AWT_11),1)
+JAVA_DEFINES    += -DAWT_11
+else
+JAVA_DEFINES    += -DAWT_102
+endif
+

mozilla/mailnews/base/src/nsMsgMailSession.cpp

@@ -1,298 +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 "msgCore.h" // for pre-compiled headers
-//#include "nsIMsgIdentity.h"
-#include "nsIMsgAccountManager.h"
-//#include "nsIPop3IncomingServer.h"
-#include "nsMsgMailSession.h"
-#include "nsMsgLocalCID.h"
-#include "nsMsgBaseCID.h"
-#include "nsCOMPtr.h"
-#include "nsMsgFolderCache.h"
-#include "nsIFileLocator.h"
-#include "nsFileLocations.h"
-#include "nsIMsgStatusFeedback.h"
-
-NS_IMPL_ISUPPORTS(nsMsgMailSession, nsCOMTypeInfo<nsIMsgMailSession>::GetIID());
-
-static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID);
-static NS_DEFINE_CID(kMsgFolderCacheCID, NS_MSGFOLDERCACHE_CID);
-static NS_DEFINE_IID(kIFileLocatorIID,      NS_IFILELOCATOR_IID);
-static NS_DEFINE_CID(kFileLocatorCID,       NS_FILELOCATOR_CID);
- 
-//static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
-//static NS_DEFINE_CID(kPop3IncomingServerCID, NS_POP3INCOMINGSERVER_CID);
-//static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-    
-
-nsMsgMailSession::nsMsgMailSession():
-  mRefCnt(0),
-  m_accountManager(0),
-  m_msgFolderCache(0)
-{
-
-	NS_INIT_REFCNT();
-}
-
-
-nsMsgMailSession::~nsMsgMailSession()
-{
-	Shutdown();
-}
-
-nsresult nsMsgMailSession::Init()
-{
-	nsresult rv = NS_NewISupportsArray(getter_AddRefs(mListeners));
-
-	return rv;
-
-}
-
-nsresult nsMsgMailSession::Shutdown()
-{
-  if(m_accountManager)
-  {
-	  if (m_msgFolderCache)
-		m_accountManager->WriteToFolderCache(m_msgFolderCache);
-	  m_accountManager->CloseCachedConnections();
-	  m_accountManager->UnloadAccounts();
-  }
-
-  NS_IF_RELEASE(m_accountManager);
-
-  NS_IF_RELEASE(m_msgFolderCache);
-
-  return NS_OK;
-}
-
-// nsIMsgMailSession
-nsresult nsMsgMailSession::GetCurrentIdentity(nsIMsgIdentity ** aIdentity)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIMsgAccountManager> accountManager;
-  rv = GetAccountManager(getter_AddRefs(accountManager));
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsIMsgAccount> defaultAccount;
-  rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = defaultAccount->GetDefaultIdentity(aIdentity);
-  if (NS_SUCCEEDED(rv))
-  	NS_ADDREF(*aIdentity);
-  
-  return rv;
-}
-
-nsresult nsMsgMailSession::GetCurrentServer(nsIMsgIncomingServer ** aServer)
-{
-  nsresult rv=NS_ERROR_UNEXPECTED;
-
-  nsCOMPtr<nsIMsgAccountManager> accountManager;
-  rv = GetAccountManager(getter_AddRefs(accountManager));
-  if (NS_FAILED(rv)) return rv;
-  
-  nsCOMPtr<nsIMsgAccount> defaultAccount;
-  rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
-  if (NS_FAILED(rv)) return rv;
-
-  //if successful aServer will be addref'd by GetIncomingServer
-  rv = defaultAccount->GetIncomingServer(aServer);
-
-  return rv;
-}
-
-nsresult nsMsgMailSession::GetAccountManager(nsIMsgAccountManager* *aAM)
-{
-  NS_ENSURE_ARG_POINTER(aAM);
-
-  nsresult rv;
-  
-  NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  accountManager->LoadAccounts();
-    
-  *aAM = accountManager;
-  NS_IF_ADDREF(*aAM);
-  return NS_OK;
-}
-
-nsresult nsMsgMailSession::GetFolderCache(nsIMsgFolderCache* *aFolderCache)
-{
-  if (!aFolderCache) return NS_ERROR_NULL_POINTER;
-
-  nsresult rv = NS_OK;
-
-  if (!m_msgFolderCache)
-  {
-    rv = nsComponentManager::CreateInstance(kMsgFolderCacheCID,
-                                            NULL,
-                                            nsCOMTypeInfo<nsIMsgFolderCache>::GetIID(),
-                                            (void **)&m_msgFolderCache);
-    if (NS_FAILED(rv))
-		return rv;
-
-    nsCOMPtr <nsIFileSpec> cacheFile;
-    NS_WITH_SERVICE(nsIFileLocator, locator, kFileLocatorCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = locator->GetFileLocation(nsSpecialFileSpec::App_MessengerFolderCache50, getter_AddRefs(cacheFile));
-    if (NS_FAILED(rv)) return rv;
-
-    m_msgFolderCache->Init(cacheFile);
-
-  }
-
-  *aFolderCache = m_msgFolderCache;
-  NS_IF_ADDREF(*aFolderCache);
-  return rv;
-}
-
-nsresult nsMsgMailSession::GetTemporaryMsgStatusFeedback(nsIMsgStatusFeedback* *aMsgStatusFeedback)
-{
-  if (!aMsgStatusFeedback) return NS_ERROR_NULL_POINTER;
-  
-  *aMsgStatusFeedback = m_temporaryMsgStatusFeedback;
-  NS_IF_ADDREF(*aMsgStatusFeedback);
-  return NS_OK;
-}
-
-
-nsresult nsMsgMailSession::SetTemporaryMsgStatusFeedback(nsIMsgStatusFeedback* aMsgStatusFeedback)
-{
-  m_temporaryMsgStatusFeedback = do_QueryInterface(aMsgStatusFeedback);
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsMsgMailSession::AddFolderListener(nsIFolderListener * listener)
-{
-  mListeners->AppendElement(listener);
-  return NS_OK;
-
-}
-
-NS_IMETHODIMP nsMsgMailSession::RemoveFolderListener(nsIFolderListener * listener)
-{
-  mListeners->RemoveElement(listener);
-  return NS_OK;
-
-}
-
-NS_IMETHODIMP
-nsMsgMailSession::NotifyFolderItemPropertyChanged(nsISupports *item,
-                                                  const char *property,
-                                                  const char* oldValue,
-                                                  const char* newValue)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemPropertyChanged(item, property, oldValue, newValue);
-	}
-
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP
-nsMsgMailSession::NotifyFolderItemPropertyFlagChanged(nsISupports *item,
-                                                      const char *property,
-                                                      PRUint32 oldValue,
-                                                      PRUint32 newValue)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemPropertyFlagChanged(item, property, oldValue, newValue);
-	}
-
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP nsMsgMailSession::NotifyFolderItemAdded(nsIFolder *folder, nsISupports *item)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemAdded(folder, item);
-	}
-
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP nsMsgMailSession::NotifyFolderItemDeleted(nsIFolder *folder, nsISupports *item)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemRemoved(folder, item);
-	}
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP  nsMsgMailSession::NotifyFolderLoaded(nsIFolder *folder)
-{
-
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnFolderLoaded(folder);
-	}
-	return NS_OK;
-
-
-}
-
-
-

mozilla/mailnews/base/util/Makefile.in

@@ -1,75 +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
-
-MODULE		= msgbaseutil
-LIBRARY_NAME	= msgbaseutil
-
-CPPSRCS		= \
-		nsMsgGroupRecord.cpp \
-		nsMsgLineBuffer.cpp \
-		nsMsgFolder.cpp \
-		nsMsgDBFolder.cpp \
-		nsUInt32Array.cpp \
-		nsMsgKeySet.cpp \
-		nsLocalFolderSummarySpec.cpp \
-		nsNewsSummarySpec.cpp \
-		nsMsgIdentity.cpp \
-		nsMsgIncomingServer.cpp \
-		nsMsgUtils.cpp \
-		nsMessage.cpp \
-		nsMsgProtocol.cpp \
-		nsMsgMailNewsUrl.cpp \
-		nsMsgTxn.cpp \
-		nsMsgI18N.cpp \
-		$(NULL)
-
-EXPORTS		= \
-		nsMsgGroupRecord.h \
-		nsMsgLineBuffer.h \
-		nsUInt32Array.h \
-		nsMsgKeySet.h \
-		nsMsgFolder.h \
-		nsMsgDBFolder.h \
-		nsLocalFolderSummarySpec.h \
-		nsNewsSummarySpec.h \
-		nsMsgIdentity.h \
-		nsMsgIncomingServer.h \
-		nsMsgUtils.h \
-		nsMessage.h \
-		nsMsgProtocol.h \
-		nsMsgMailNewsUrl.h \
-		nsMsgTxn.h \
-		nsMsgI18N.h \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
-	-lxpcom \
-	-lrdfutil_s \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/mailnews/base/util/makefile.win

@@ -1,87 +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=..\..\..
-MODULE= msgbsutl
-
-include <$(DEPTH)\config\config.mak>
-
-################################################################################
-## exports
-
-EXPORTS=                \
-	nsMsgLineBuffer.h	\
-	nsMsgGroupRecord.h  \
-	nsUInt32Array.h	\
-	nsMsgKeySet.h			\
-	nsMsgFolder.h			\
-	nsMsgDBFolder.h			\
-	nsLocalFolderSummarySpec.h	\
-	nsMsgIdentity.h			\
-	nsMsgIncomingServer.h	\
-	nsNewsSummarySpec.h \
-	nsMsgUtils.h \
-	nsMessage.h \
-	nsMsgProtocol.h \
-	nsMsgMailNewsUrl.h \
-	nsMsgTxn.h \
-	nsMsgI18N.h \
-	$(NULL)
-
-################################################################################
-## library
-
-LIBNAME = .\$(OBJDIR)\msgbsutl
-DLL = $(LIBNAME).dll
-
-DEFINES=-D_IMPL_NS_MSG_BASE
-
-LCFLAGS =		   \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-CPP_OBJS=                               \
-	.\$(OBJDIR)\nsMsgGroupRecord.obj    \
-	.\$(OBJDIR)\nsMsgLineBuffer.obj     \
-	.\$(OBJDIR)\nsUInt32Array.obj		\
-	.\$(OBJDIR)\nsMsgKeySet.obj			\
-	.\$(OBJDIR)\nsMsgFolder.obj			\
-	.\$(OBJDIR)\nsMsgDBFolder.obj		\
-	.\$(OBJDIR)\nsLocalFolderSummarySpec.obj	\
-	.\$(OBJDIR)\nsMsgIdentity.obj		\
-	.\$(OBJDIR)\nsMsgIncomingServer.obj	\
-	.\$(OBJDIR)\nsNewsSummarySpec.obj	\
-	.\$(OBJDIR)\nsMsgUtils.obj			\
-	.\$(OBJDIR)\nsMessage.obj			\
-	.\$(OBJDIR)\nsMsgProtocol.obj		\
-	.\$(OBJDIR)\nsMsgMailNewsUrl.obj	\
-	.\$(OBJDIR)\nsMsgTxn.obj			\
-	.\$(OBJDIR)\nsMsgI18N.obj			\
-	$(NULL)
-
-LLIBS=								\
-	$(DIST)\lib\xpcom.lib			\
-	$(DIST)\lib\rdfutil_s.lib		\
-	$(LIBNSPR)						\
-	$(NULL)
-
-include <$(DEPTH)/config/rules.mak>
-
-libs:: $(DLL)
-	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin
-	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

mozilla/mailnews/base/util/nsLocalFolderSummarySpec.cpp

@@ -1,76 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsLocalFolderSummarySpec.h"
-#include "plstr.h"
-#include "nsString.h"
-
-MOZ_DECL_CTOR_COUNTER(nsLocalFolderSummarySpec);
-
-nsLocalFolderSummarySpec::~nsLocalFolderSummarySpec()
-{
-	MOZ_COUNT_DTOR(nsLocalFolderSummarySpec);
-
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec()
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const char *folderPath, PRBool create)
-  : nsFileSpec(folderPath, create)
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const nsFileSpec& inFolderPath)
-: nsFileSpec(inFolderPath)
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const nsFilePath &inFolderPath, PRBool create) : nsFileSpec(inFolderPath, create)
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-	CreateSummaryFileName();
-}
-
-void nsLocalFolderSummarySpec::SetFolderName(const char *folderPath)
-{
-	*this = folderPath;
-}
-
-void nsLocalFolderSummarySpec::	CreateSummaryFileName()
-{
-	char *leafName = GetLeafName();
-
-	nsString fullLeafName(leafName);
-
-	// Append .msf (msg summary file) this is what windows will want.
-	// Mac and Unix can decide for themselves.
-
-	fullLeafName += ".msf";				// message summary file
-	char *cLeafName = fullLeafName.ToNewCString();
-	SetLeafName(cLeafName);
-    nsAllocator::Free(cLeafName);
-	PL_strfree(leafName);
-}
-

mozilla/mailnews/base/util/nsLocalFolderSummarySpec.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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef _nsLocalFolderSummarySpec_H
-#define _nsLocalFolderSummarySpec_H
-
-#include "msgCore.h"
-#include "nsFileSpec.h"
-
-// Class to name a summary file for a local mail folder,
-// given a full folder file spec. For windows, this just means tacking .msf on the end.
-// For Unix, it might mean something like putting a '.' on the front and .msgsummary on the end.
-// Note this class expects the invoking code to fully specify the folder path. 
-// This class does NOT prepend the local folder directory, or put .sbd on the containing
-// directory names.
-class NS_MSG_BASE nsLocalFolderSummarySpec : public nsFileSpec
-{
-public:
-			virtual ~nsLocalFolderSummarySpec();
-			nsLocalFolderSummarySpec();
-			nsLocalFolderSummarySpec(const char *folderPath, PRBool create = PR_FALSE);
-			nsLocalFolderSummarySpec(const nsFileSpec& inFolderPath);
-			nsLocalFolderSummarySpec(const nsFilePath &inFolderPath, PRBool create = PR_FALSE);
-			void SetFolderName(const char *folderPath);
-
-protected:
-	void	CreateSummaryFileName();
-
-};
-
-#endif

mozilla/mailnews/base/util/nsMessage.cpp

@@ -1,509 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"    // precompiled header...
-#include "nsMessage.h"
-#include "nsIMsgFolder.h"
-
-
-nsMessage::nsMessage(void)
-  : nsRDFResource(), mFolder(nsnull)
-{
-
-}
-
-nsMessage::~nsMessage(void)
-{
-	//Member variables are either nsCOMPtr's or ptrs we don't want to own.
-}
-
-NS_IMPL_ADDREF_INHERITED(nsMessage, nsRDFResource)
-NS_IMPL_RELEASE_INHERITED(nsMessage, nsRDFResource)                        
-
-NS_IMETHODIMP nsMessage::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-	if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
-	*aInstancePtr = nsnull;
-	if (aIID.Equals(nsCOMTypeInfo<nsIMessage>::GetIID()) || aIID.Equals(nsCOMTypeInfo<nsIDBMessage>::GetIID()))
-	{
-		*aInstancePtr = NS_STATIC_CAST(nsIDBMessage*, this);
-	}              
-	if(*aInstancePtr)
-	{
-		AddRef();
-		return NS_OK;
-	}
-
-	return nsRDFResource::QueryInterface(aIID, aInstancePtr);
-}
-
-NS_IMETHODIMP
-nsMessage::Init(const char* aURI)
-{
-
-	return nsRDFResource::Init(aURI);
-}
-
-
-NS_IMETHODIMP nsMessage::GetProperty(const char *propertyName, nsString &resultProperty)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetProperty(propertyName, resultProperty);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetProperty(const char *propertyName, nsString &propertyStr)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetProperty(propertyName, propertyStr);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetUint32Property(const char *propertyName, PRUint32 *pResult)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetUint32Property(propertyName, pResult);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetUint32Property(const char *propertyName, PRUint32 propertyVal)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetUint32Property(propertyName, propertyVal);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetNumReferences(PRUint16 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetNumReferences(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetStringReference(PRInt32 refNum, nsCString &resultReference)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetStringReference(refNum, resultReference);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetDate(PRTime *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetDate(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetDate(PRTime date)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetDate(date);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetMessageId(const char *messageId)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetMessageId(messageId);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetReferences(const char *references)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetReferences(references);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetCCList(const char *ccList)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetCCList(ccList);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetRecipients(const char *recipients, PRBool recipientsIsNewsgroup)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetRecipients(recipients, recipientsIsNewsgroup);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetRecipientsArray(const char *names, const char *addresses, PRUint32 numAddresses)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetRecipientsArray(names, addresses, numAddresses);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetCCListArray(const char *names, const char *addresses, PRUint32 numAddresses)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetCCListArray(names, addresses, numAddresses);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetAuthor(const char *author)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetAuthor(author);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetSubject(const char *subject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetSubject(subject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetStatusOffset(PRUint32 statusOffset)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetStatusOffset(statusOffset);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetAuthor(nsString *resultAuthor)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetAuthor(resultAuthor);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetSubject(nsString *resultSubject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetSubject(resultSubject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetRecipients(nsString *resultRecipients)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetRecipients(resultRecipients);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetCCList(nsString *ccList)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetCCList(ccList);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMessageId(nsCString *resultMessageId)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageId(resultMessageId);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetMime2DecodedAuthor(nsString *resultAuthor)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMime2DecodedAuthor(resultAuthor);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMime2DecodedSubject(nsString *resultSubject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMime2DecodedSubject(resultSubject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMime2DecodedRecipients(nsString *resultRecipients)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMime2DecodedRecipients(resultRecipients);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetAuthorCollationKey(nsString *resultAuthor)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetAuthorCollationKey(resultAuthor);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetSubjectCollationKey(nsString *resultSubject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetSubjectCollationKey(resultSubject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetRecipientsCollationKey(nsString *resultRecipients)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetRecipientsCollationKey(resultRecipients);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetFlags(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetFlags(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetFlags(PRUint32 flags)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetFlags(flags);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::OrFlags(PRUint32 flags, PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->OrFlags(flags, result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::AndFlags(PRUint32 flags, PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->AndFlags(flags, result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::MarkRead(PRBool bRead)
-{
-	if(mMsgHdr)
-		return mMsgHdr->MarkRead(bRead);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::MarkFlagged(PRBool bFlagged)
-{
-	if(mMsgHdr)
-		return mMsgHdr->MarkFlagged(bFlagged);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMessageKey(nsMsgKey *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageKey(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetThreadId(nsMsgKey *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetThreadId(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetThreadId(nsMsgKey inKey)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetThreadId(inKey);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetMessageKey(nsMsgKey inKey)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetMessageKey(inKey);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMessageSize(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageSize(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetLineCount(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetLineCount(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetMessageSize(PRUint32 messageSize)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetMessageSize(messageSize);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetLineCount(PRUint32 lineCount)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetLineCount(lineCount);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetPriority(nsMsgPriority priority)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetPriority(priority);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetPriority(const char *priority)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetPriority(priority);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetPriority(nsMsgPriority *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetPriority(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetMessageOffset(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageOffset(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetStatusOffset(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetStatusOffset(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetCharSet(nsString *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetCharSet(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetThreadParent(nsMsgKey *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetThreadParent(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetThreadParent(nsMsgKey inKey)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetThreadParent(inKey);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetMsgFolder(nsIMsgFolder **folder)
-{
-	if(!folder)
-		return NS_ERROR_NULL_POINTER;
-	*folder = mFolder;
-	if(mFolder)
-	{
-		NS_ADDREF(mFolder);
-		return NS_OK;
-	}
-	else
-		return NS_ERROR_NULL_POINTER;
-}
-
-
-NS_IMETHODIMP nsMessage::SetMsgFolder(nsIMsgFolder *folder)
-{
-	mFolder = folder;
-	//We don't want to own folder, so don't AddRef
-	return NS_OK;
-}
-
-
-NS_IMETHODIMP nsMessage::SetMsgDBHdr(nsIMsgDBHdr *hdr)
-{
-	mMsgHdr = dont_QueryInterface(hdr);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMessage::GetMsgDBHdr(nsIMsgDBHdr **hdr)
-{
-	*hdr = mMsgHdr;
-	if(*hdr)
-	{
-		NS_ADDREF(*hdr);
-		return NS_OK;
-	}
-	else
-		return NS_ERROR_NULL_POINTER;
-}
-

mozilla/mailnews/base/util/nsMessage.h

@@ -1,113 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/********************************************************************************************************
- 
-   Interface for representing Messenger folders.
- 
-*********************************************************************************************************/
-
-#ifndef nsMessage_h__
-#define nsMessage_h__
-
-#include "msgCore.h"
-#include "nsIMessage.h" /* include the interface we are going to support */
-#include "nsRDFResource.h"
-#include "nsIMsgHdr.h"
-#include "nsCOMPtr.h"
-
-
-class NS_MSG_BASE nsMessage: public nsRDFResource, public nsIDBMessage
-{
-public: 
-	nsMessage(void);
-	virtual ~nsMessage(void);
-
-	NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIMESSAGE
-  NS_DECL_NSIDBMESSAGE
-
-	NS_IMETHOD Init(const char *aURI);
-	//nsIMsgHdr
-	NS_IMETHOD GetProperty(const char *propertyName, nsString &resultProperty);
-    NS_IMETHOD SetProperty(const char *propertyName, nsString &propertyStr);
-    NS_IMETHOD GetUint32Property(const char *propertyName, PRUint32 *pResult);
-    NS_IMETHOD SetUint32Property(const char *propertyName, PRUint32 propertyVal);
-    NS_IMETHOD GetNumReferences(PRUint16 *result);
-    NS_IMETHOD GetStringReference(PRInt32 refNum, nsCString &resultReference);
-    NS_IMETHOD GetDate(PRTime *result);
-    NS_IMETHOD SetDate(PRTime date);
-    NS_IMETHOD SetMessageId(const char *messageId);
-    NS_IMETHOD SetReferences(const char *references);
-    NS_IMETHOD SetCCList(const char *ccList);
-    NS_IMETHOD SetRecipients(const char *recipients, PRBool recipientsIsNewsgroup);
-	NS_IMETHOD SetRecipientsArray(const char *names, const char *addresses, PRUint32 numAddresses);
-    NS_IMETHOD SetCCListArray(const char *names, const char *addresses, PRUint32 numAddresses);
-    NS_IMETHOD SetAuthor(const char *author);
-    NS_IMETHOD SetSubject(const char *subject);
-    NS_IMETHOD SetStatusOffset(PRUint32 statusOffset);
-
-	NS_IMETHOD GetAuthor(nsString *resultAuthor);
-	NS_IMETHOD GetSubject(nsString *resultSubject);
-	NS_IMETHOD GetRecipients(nsString *resultRecipients);
-	NS_IMETHOD GetCCList(nsString *ccList);
-	NS_IMETHOD GetMessageId(nsCString *resultMessageId);
-
-	NS_IMETHOD GetMime2DecodedAuthor(nsString *resultAuthor);
-	NS_IMETHOD GetMime2DecodedSubject(nsString *resultSubject);
-	NS_IMETHOD GetMime2DecodedRecipients(nsString *resultRecipients);
-
-	NS_IMETHOD GetAuthorCollationKey(nsString *resultAuthor);
-	NS_IMETHOD GetSubjectCollationKey(nsString *resultSubject);
-	NS_IMETHOD GetRecipientsCollationKey(nsString *resultRecipients);
-
-    // flag handling routines
-    NS_IMETHOD GetFlags(PRUint32 *result);
-    NS_IMETHOD SetFlags(PRUint32 flags);
-    NS_IMETHOD OrFlags(PRUint32 flags, PRUint32 *result);
-    NS_IMETHOD AndFlags(PRUint32 flags, PRUint32 *result);
-
-	// Mark message routines
-	NS_IMETHOD MarkRead(PRBool bRead);
-	NS_IMETHOD MarkFlagged(PRBool bFlagged);
-
-    NS_IMETHOD GetMessageKey(nsMsgKey *result);
-    NS_IMETHOD GetThreadId(nsMsgKey *result);
-    NS_IMETHOD SetThreadId(nsMsgKey inKey);
-    NS_IMETHOD SetMessageKey(nsMsgKey inKey);
-    NS_IMETHOD GetMessageSize(PRUint32 *result);
-    NS_IMETHOD SetMessageSize(PRUint32 messageSize);
-    NS_IMETHOD GetLineCount(PRUint32 *result);
-    NS_IMETHOD SetLineCount(PRUint32 lineCount);
-    NS_IMETHOD SetPriority(nsMsgPriority priority);
-    NS_IMETHOD SetPriority(const char *priority);
-    NS_IMETHOD GetMessageOffset(PRUint32 *result);
-    NS_IMETHOD GetStatusOffset(PRUint32 *result); 
-	NS_IMETHOD GetCharSet(nsString *result);
-    NS_IMETHOD GetPriority(nsMsgPriority *result);
-    NS_IMETHOD GetThreadParent(nsMsgKey *result);
-    NS_IMETHOD SetThreadParent(nsMsgKey inKey);
-
-protected:
-	nsIMsgFolder *mFolder;
-	nsCOMPtr<nsIMsgDBHdr> mMsgHdr;
-
-};
-
-#endif //nsMessage_h__
-

mozilla/mailnews/base/util/nsMsgDBFolder.cpp

@@ -1,530 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "nsIMessage.h"
-#include "nsMsgDBFolder.h"
-#include "nsMsgFolderFlags.h"
-#include "nsIPref.h"
-#include "nsIMsgFolderCache.h"
-#include "nsIMsgFolderCacheElement.h"
-#include "nsIMsgMailSession.h"
-#include "nsMsgBaseCID.h"
-#include "nsIMsgMailNewsUrl.h"
-
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
-
-NS_IMPL_ADDREF_INHERITED(nsMsgDBFolder, nsMsgFolder)
-NS_IMPL_RELEASE_INHERITED(nsMsgDBFolder, nsMsgFolder)
-
-NS_IMETHODIMP nsMsgDBFolder::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-	if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
-	*aInstancePtr = nsnull;
-	if (aIID.Equals(nsCOMTypeInfo<nsIDBChangeListener>::GetIID()))
-	{
-		*aInstancePtr = NS_STATIC_CAST(nsIDBChangeListener*, this);
-	}              
-	else if (aIID.Equals(nsCOMTypeInfo<nsIUrlListener>::GetIID()))
-	{
-		*aInstancePtr = NS_STATIC_CAST(nsIUrlListener*, this);
-	}              
-
-	if(*aInstancePtr)
-	{
-		AddRef();
-		return NS_OK;
-	}
-
-	return nsRDFResource::QueryInterface(aIID, aInstancePtr);
-}
-
-nsMsgDBFolder::nsMsgDBFolder(void)
-: mCharset(""), mAddListener(PR_TRUE)
-{
-
-}
-
-nsMsgDBFolder::~nsMsgDBFolder(void)
-{
-	if(mDatabase)
-	{
-		mDatabase->RemoveListener(this);
-		mDatabase->Close(PR_TRUE);
-	}
-}
-
-NS_IMETHODIMP nsMsgDBFolder::StartFolderLoading(void)
-{
-	if(mDatabase)
-		mDatabase->RemoveListener(this);
-	mAddListener = PR_FALSE;
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::EndFolderLoading(void)
-{
-	if(mDatabase)
-		mDatabase->AddListener(this);
-	mAddListener = PR_TRUE;
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::GetThreads(nsISimpleEnumerator** threadEnumerator)
-{
-	nsresult rv = GetDatabase();
-	
-	if(NS_SUCCEEDED(rv))
-		return mDatabase->EnumerateThreads(threadEnumerator);
-	else
-		return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::GetThreadForMessage(nsIMessage *message, nsIMsgThread **thread)
-{
-	nsresult rv = GetDatabase();
-	if(NS_SUCCEEDED(rv))
-	{
-		nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
-		nsCOMPtr<nsIDBMessage> dbMessage(do_QueryInterface(message, &rv));
-		if(NS_SUCCEEDED(rv))
-			rv = dbMessage->GetMsgDBHdr(getter_AddRefs(msgDBHdr));
-		if(NS_SUCCEEDED(rv))
-		{
-			rv = mDatabase->GetThreadContainingMsgHdr(msgDBHdr, thread);
-		}
-	}
-	return rv;
-
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::HasMessage(nsIMessage *message, PRBool *hasMessage)
-{
-	if(!hasMessage)
-		return NS_ERROR_NULL_POINTER;
-
-	nsresult rv = GetDatabase();
-
-	if(NS_SUCCEEDED(rv))
-	{
-		nsCOMPtr<nsIMsgDBHdr> msgDBHdr, msgDBHdrForKey;
-		nsCOMPtr<nsIDBMessage> dbMessage(do_QueryInterface(message, &rv));
-		nsMsgKey key;
-		if(NS_SUCCEEDED(rv))
-			rv = dbMessage->GetMsgDBHdr(getter_AddRefs(msgDBHdr));
-		if(NS_SUCCEEDED(rv))
-			rv = msgDBHdr->GetMessageKey(&key);
-		if(NS_SUCCEEDED(rv))
-			rv = mDatabase->ContainsKey(key, hasMessage);
-		
-	}
-	return rv;
-
-}
-
-NS_IMETHODIMP nsMsgDBFolder::GetCharset(PRUnichar * *aCharset)
-{
-	nsresult rv = NS_OK;
-	if(!aCharset)
-		return NS_ERROR_NULL_POINTER;
-
-	if(mCharset == "")
-	{
-		NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
-
-		char *prefCharset = nsnull;
-		if (NS_SUCCEEDED(rv))
-		{
-			rv = prefs->CopyCharPref("intl.character_set_name", &prefCharset);
-		}
-  
-		nsString prefCharsetStr;
-		if(prefCharset)
-		{
-			prefCharsetStr = prefCharset;
-			PR_Free(prefCharset);
-		}
-		else
-		{
-			prefCharsetStr = "us-ascii";
-		}
-		*aCharset = prefCharsetStr.ToNewUnicode();
-	}
-	else
-	{
-		*aCharset = mCharset.ToNewUnicode();
-	}
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::SetCharset(const PRUnichar * aCharset)
-{
-	nsresult rv;
-
-	nsCOMPtr<nsIDBFolderInfo> folderInfo;
-	nsCOMPtr<nsIMsgDatabase> db; 
-	rv = GetDBFolderInfoAndDB(getter_AddRefs(folderInfo), getter_AddRefs(db));
-	if(NS_SUCCEEDED(rv))
-	{
-		nsString charset(aCharset);
-		rv = folderInfo->SetCharacterSet(&charset);
-		db->Commit(nsMsgDBCommitType::kLargeCommit);
-	}
-	return rv;
-}
-
-nsresult nsMsgDBFolder::ReadDBFolderInfo(PRBool force)
-{
-	// Since it turns out to be pretty expensive to open and close
-	// the DBs all the time, if we have to open it once, get everything
-	// we might need while we're here
-
-	nsresult result;
-
-	nsCOMPtr <nsIMsgFolderCache> folderCache;
-
-	NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &result); 
-	if(NS_SUCCEEDED(result))
-	{
-		result = mailSession->GetFolderCache(getter_AddRefs(folderCache));
-		if (NS_SUCCEEDED(result) && folderCache)
-		{
-			char *uri;
-
-			result = GetURI(&uri);
-			if (NS_SUCCEEDED(result) && uri)
-			{
-				nsCOMPtr <nsIMsgFolderCacheElement> cacheElement;
-				result = folderCache->GetCacheElement(uri, PR_FALSE, getter_AddRefs(cacheElement));
-				if (NS_SUCCEEDED(result) && cacheElement)
-				{
-					result = ReadFromFolderCache(cacheElement);
-				}
-				PR_Free(uri);
-			}
-
-		}
-	}
-//	if (m_master->InitFolderFromCache (this))
-//		return err;
-
-	if (force || !(mPrefFlags & MSG_FOLDER_PREF_CACHED))
-    {
-        nsCOMPtr<nsIDBFolderInfo> folderInfo;
-        nsCOMPtr<nsIMsgDatabase> db; 
-        result = GetDBFolderInfoAndDB(getter_AddRefs(folderInfo), getter_AddRefs(db));
-        if(NS_SUCCEEDED(result))
-        {
-			mIsCachable = PR_TRUE;
-            if (folderInfo)
-            {
-
-	            folderInfo->GetFlags(&mPrefFlags);
-                mPrefFlags |= MSG_FOLDER_PREF_CACHED;
-                folderInfo->SetFlags(mPrefFlags);
-
-				folderInfo->GetNumMessages(&mNumTotalMessages);
-				folderInfo->GetNumNewMessages(&mNumUnreadMessages);
-
-				//These should be put in IMAP folder only.
-				//folderInfo->GetImapTotalPendingMessages(&mNumPendingTotalMessages);
-				//folderInfo->GetImapUnreadPendingMessages(&mNumPendingUnreadMessages);
-
-				folderInfo->GetCharacterSet(&mCharset);
-        
-				if (db) {
-					PRBool hasnew;
-					nsresult rv;
-					rv = db->HasNew(&hasnew);
-					if (NS_FAILED(rv)) return rv;
-					if (!hasnew && mNumPendingUnreadMessages <= 0) {
-						ClearFlag(MSG_FOLDER_FLAG_GOT_NEW);
-					}
-				}
-            }
-
-        }
-        if (db)
-	        db->Close(PR_FALSE);
-    }
-
-	return result;
-	
-}
-
-nsresult nsMsgDBFolder::SendFlagNotifications(nsISupports *item, PRUint32 oldFlags, PRUint32 newFlags)
-{
-	nsresult rv = NS_OK;
-
-	PRUint32 changedFlags = oldFlags ^ newFlags;
-	if((changedFlags & MSG_FLAG_READ) || (changedFlags & MSG_FLAG_REPLIED)
-		|| (changedFlags & MSG_FLAG_FORWARDED)|| (changedFlags & MSG_FLAG_NEW))
-	{
-		rv = NotifyPropertyFlagChanged(item, "Status", oldFlags, newFlags);
-	}
-	else if((changedFlags & MSG_FLAG_MARKED))
-	{
-		rv = NotifyPropertyFlagChanged(item, "Flagged", oldFlags, newFlags);
-	}
-		return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::GetMsgDatabase(nsIMsgDatabase** aMsgDatabase)
-{
-    if (!aMsgDatabase || !mDatabase)
-        return NS_ERROR_NULL_POINTER;
-    *aMsgDatabase = mDatabase;
-    NS_ADDREF(*aMsgDatabase);
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnKeyChange(nsMsgKey aKeyChanged, PRUint32 aOldFlags, PRUint32 aNewFlags, 
-                         nsIDBChangeListener * aInstigator)
-{
-	nsCOMPtr<nsIMsgDBHdr> pMsgDBHdr;
-	nsresult rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(pMsgDBHdr));
-	if(NS_SUCCEEDED(rv) && pMsgDBHdr)
-	{
-		nsCOMPtr<nsIMessage> message;
-		rv = CreateMessageFromMsgDBHdr(pMsgDBHdr, getter_AddRefs(message));
-		if(NS_SUCCEEDED(rv))
-		{
-			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message, &rv));
-			if(NS_SUCCEEDED(rv))
-			{
-				SendFlagNotifications(msgSupports, aOldFlags, aNewFlags);
-			}
-			UpdateSummaryTotals(PR_TRUE);
-		}
-	}
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnKeyDeleted(nsMsgKey aKeyChanged, nsMsgKey  aParentKey, PRInt32 aFlags, 
-                          nsIDBChangeListener * aInstigator)
-{
-	nsCOMPtr<nsIMsgDBHdr> pMsgDBHdr;
-	nsresult rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(pMsgDBHdr));
-	if(NS_SUCCEEDED(rv) && pMsgDBHdr)
-	{
-		nsCOMPtr<nsIMessage> message;
-		rv = CreateMessageFromMsgDBHdr(pMsgDBHdr, getter_AddRefs(message));
-		if(NS_SUCCEEDED(rv))
-		{
-			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message, &rv));
-			if(NS_SUCCEEDED(rv))
-			{
-				NotifyItemDeleted(msgSupports);
-			}
-			UpdateSummaryTotals(PR_TRUE);
-		}
-	}
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnKeyAdded(nsMsgKey aKeyChanged, nsMsgKey  aParentKey , PRInt32 aFlags, 
-                        nsIDBChangeListener * aInstigator)
-{
-	nsresult rv;
-	nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
-	rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(msgDBHdr));
-	if(NS_SUCCEEDED(rv) && msgDBHdr)
-	{
-		nsCOMPtr<nsIMessage> message;
-		rv = CreateMessageFromMsgDBHdr(msgDBHdr, getter_AddRefs(message));
-		if(NS_SUCCEEDED(rv))
-		{
-			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message));
-			if(msgSupports)
-			{
-				NotifyItemAdded(msgSupports);
-			}
-			UpdateSummaryTotals(PR_TRUE);
-		}
-	}
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnParentChanged(nsMsgKey aKeyChanged, nsMsgKey oldParent, nsMsgKey newParent, 
-						nsIDBChangeListener * aInstigator)
-{
-	return NS_OK;
-}
-
-
-NS_IMETHODIMP nsMsgDBFolder::OnAnnouncerGoingAway(nsIDBChangeAnnouncer *
-													 instigator)
-{
-    if (mDatabase)
-    {
-        mDatabase->RemoveListener(this);
-        mDatabase = null_nsCOMPtr();
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::ManyHeadersToDownload(PRBool *retval)
-{
-	PRInt32 numTotalMessages;
-
-	if (!retval)
-		return NS_ERROR_NULL_POINTER;
-	if (!mDatabase)
-		*retval = PR_TRUE;
-	else if (NS_SUCCEEDED(GetTotalMessages(PR_FALSE, &numTotalMessages)) && numTotalMessages <= 0)
-		*retval = PR_TRUE;
-	else
-		*retval = PR_FALSE;
-	return NS_OK;
-}
-
-
-nsresult nsMsgDBFolder::ReadFromFolderCache(nsIMsgFolderCacheElement *element)
-{
-	nsresult rv = NS_OK;
-	char *charset;
-
-	element->GetInt32Property("flags", &mPrefFlags);
-	element->GetInt32Property("totalMsgs", &mNumTotalMessages);
-	element->GetInt32Property("totalUnreadMsgs", &mNumUnreadMessages);
-
-	element->GetStringProperty("charset", &charset);
-
-#ifdef DEBUG_bienvenu1
-	char *uri;
-
-	GetURI(&uri);
-	printf("read total %ld for %s\n", mNumTotalMessages, uri);
-	PR_Free(uri);
-#endif
-	mCharset = charset;
-	PR_FREEIF(charset);
-
-    mPrefFlags |= MSG_FOLDER_PREF_CACHED;
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCache(nsIMsgFolderCache *folderCache)
-{
-	nsCOMPtr <nsIEnumerator> aEnumerator;
-
-	nsresult rv = GetSubFolders(getter_AddRefs(aEnumerator));
-	if(NS_FAILED(rv)) 
-		return rv;
-
-	char *uri = nsnull;
-	rv = GetURI(&uri);
-
-	if (folderCache)
-	{
-		nsCOMPtr <nsIMsgFolderCacheElement> cacheElement;
-		rv = folderCache->GetCacheElement(uri, PR_TRUE, getter_AddRefs(cacheElement));
-		if (NS_SUCCEEDED(rv) && cacheElement)
-			rv = WriteToFolderCacheElem(cacheElement);
-	}
-	PR_FREEIF(uri);
-
-	
-	nsCOMPtr<nsISupports> aItem;
-
-	rv = aEnumerator->First();
-	if (!NS_SUCCEEDED(rv))
-		return NS_OK;	// it's OK, there are no sub-folders.
-
-	while(NS_SUCCEEDED(rv))
-	{
-		rv = aEnumerator->CurrentItem(getter_AddRefs(aItem));
-		if (NS_FAILED(rv)) break;
-		nsCOMPtr<nsIMsgFolder> aMsgFolder(do_QueryInterface(aItem, &rv));
-		if (NS_SUCCEEDED(rv))
-		{
-			if (folderCache)
-			{
-				rv = aMsgFolder->WriteToFolderCache(folderCache);
-				if (!NS_SUCCEEDED(rv))
-					break;
-			}
-		}
-		rv = aEnumerator->Next();
-		if (!NS_SUCCEEDED(rv))
-		{
-			rv = NS_OK;
-			break;
-		}
-	}
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCacheElem(nsIMsgFolderCacheElement *element)
-{
-	nsresult rv = NS_OK;
-
-	element->SetInt32Property("flags", mPrefFlags);
-	element->SetInt32Property("totalMsgs", mNumTotalMessages);
-	element->SetInt32Property("totalUnreadMsgs", mNumUnreadMessages);
-
-	element->SetStringProperty("charset", (const char *) nsCAutoString(mCharset));
-
-#ifdef DEBUG_bienvenu1
-	char *uri;
-
-	GetURI(&uri);
-	printf("writing total %ld for %s\n", mNumTotalMessages, uri);
-	PR_Free(uri);
-#endif
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::MarkAllMessagesRead(void)
-{
-	nsresult rv = GetDatabase();
-	
-	if(NS_SUCCEEDED(rv))
-		return mDatabase->MarkAllRead(nsnull);
-
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::OnStartRunningUrl(nsIURI *aUrl)
-{
-	NS_PRECONDITION(aUrl, "just a sanity check");
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::OnStopRunningUrl(nsIURI *aUrl, nsresult aExitCode)
-{
-	NS_PRECONDITION(aUrl, "just a sanity check");
-	nsCOMPtr<nsIMsgMailNewsUrl> mailUrl = do_QueryInterface(aUrl);
-	if (mailUrl)
-	{
-		PRBool updatingFolder = PR_FALSE;
-		if (NS_SUCCEEDED(mailUrl->GetUpdatingFolder(&updatingFolder)) && updatingFolder)
-		{
-			NotifyFolderLoaded();
-		}
-	}
-    return NS_OK;
-}

mozilla/mailnews/base/util/nsMsgDBFolder.h

@@ -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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsMsgDBFolder_h__
-#define nsMsgDBFolder_h__
-
-#include "msgCore.h"
-#include "nsMsgFolder.h" 
-#include "nsIDBFolderInfo.h"
-#include "nsIMsgDatabase.h"
-#include "nsIMessage.h"
-#include "nsCOMPtr.h"
-#include "nsIDBChangeListener.h"
-#include "nsIUrlListener.h"
-
-class nsIMsgFolderCacheElement;
- /* 
-  * nsMsgDBFolder
-  * class derived from nsMsgFolder for those folders that use an nsIMsgDatabase
-  */ 
-
-class NS_MSG_BASE nsMsgDBFolder:  public nsMsgFolder,
-                                        public nsIDBChangeListener,
-                                        public nsIUrlListener
-{
-public: 
-	nsMsgDBFolder(void);
-	virtual ~nsMsgDBFolder(void);
-  NS_DECL_NSIDBCHANGELISTENER
-  
-	NS_IMETHOD  StartFolderLoading(void);
-	NS_IMETHOD  EndFolderLoading(void);
-	NS_IMETHOD GetThreads(nsISimpleEnumerator** threadEnumerator);
-	NS_IMETHOD GetThreadForMessage(nsIMessage *message, nsIMsgThread **thread);
-	NS_IMETHOD HasMessage(nsIMessage *message, PRBool *hasMessage);
-	NS_IMETHOD GetCharset(PRUnichar * *aCharset);
-	NS_IMETHOD SetCharset(const PRUnichar * aCharset);
-
-  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase** aMsgDatabase);
-
-	NS_DECL_ISUPPORTS_INHERITED
-
-	NS_DECL_NSIURLLISTENER
-
-	NS_IMETHOD WriteToFolderCache(nsIMsgFolderCache *folderCache);
-	NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element);
-	NS_IMETHOD ManyHeadersToDownload(PRBool *_retval);
-
-	NS_IMETHOD MarkAllMessagesRead(void);
-
-protected:
-	virtual nsresult ReadDBFolderInfo(PRBool force);
-	virtual nsresult GetDatabase() = 0;
-	virtual nsresult SendFlagNotifications(nsISupports *item, PRUint32 oldFlags, PRUint32 newFlags);
-	nsresult ReadFromFolderCache(nsIMsgFolderCacheElement *element);
-
-protected:
-	nsCOMPtr<nsIMsgDatabase> mDatabase;  
-	nsString mCharset;
-	PRBool mAddListener;
-
-
-};
-
-#endif

mozilla/mailnews/base/util/nsMsgFolder.h

@@ -1,268 +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.
- */
-
-/********************************************************************************************************
- 
-   Interface for representing Messenger folders.
- 
-*********************************************************************************************************/
-
-#ifndef nsMsgFolder_h__
-#define nsMsgFolder_h__
-
-#include "msgCore.h"
-#include "nsIMsgFolder.h" /* include the interface we are going to support */
-#include "nsRDFResource.h"
-#include "nsIDBFolderInfo.h"
-#include "nsIMsgDatabase.h"
-#include "nsIMsgIncomingServer.h"
-#include "nsCOMPtr.h"
-#include "nsIURL.h"
- /* 
-  * MsgFolder
-  */ 
-
-class NS_MSG_BASE nsMsgFolder: public nsRDFResource, public nsIMsgFolder
-{
-public: 
-  nsMsgFolder(void);
-  virtual ~nsMsgFolder(void);
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  NS_DECL_NSICOLLECTION
-  NS_DECL_NSIFOLDER
-  // eventually this will be an instantiable class, and we should
-  // use this macro:
-  // NS_DECL_NSIMSGFOLDER
-  
-  // right now a few of these methods are left abstract, and
-  // are commented out below
-  
-  // begin NS_DECL_NSIMSGFOLDER
-  NS_IMETHOD AddUnique(nsISupports *element);
-  NS_IMETHOD ReplaceElement(nsISupports *element, nsISupports *newElement);
-  NS_IMETHOD GetMessages(nsISimpleEnumerator **_retval);
-  NS_IMETHOD GetThreads(nsISimpleEnumerator **_retval);
-  NS_IMETHOD StartFolderLoading(void);
-  NS_IMETHOD EndFolderLoading(void);
-  NS_IMETHOD UpdateFolder(void);
-  NS_IMETHOD GetThreadForMessage(nsIMessage *message, nsIMsgThread **_retval);
-  NS_IMETHOD HasMessage(nsIMessage *message, PRBool *_retval);
-  NS_IMETHOD GetVisibleSubFolders(nsIEnumerator **_retval);
-  NS_IMETHOD GetPrettiestName(PRUnichar * *aPrettiestName);
-  NS_IMETHOD GetFolderURL(char * *aFolderURL);
-  NS_IMETHOD GetDeleteIsMoveToTrash(PRBool *aDeleteIsMoveToTrash);
-  NS_IMETHOD GetShowDeletedMessages(PRBool *aShowDeletedMessages);
-  NS_IMETHOD GetServer(nsIMsgIncomingServer * *aServer);
-  NS_IMETHOD GetIsServer(PRBool *aIsServer);
-  NS_IMETHOD OnCloseFolder(void);
-  NS_IMETHOD Delete(void);
-  NS_IMETHOD DeleteSubFolders(nsISupportsArray *folders);
-  NS_IMETHOD PropagateDelete(nsIMsgFolder *folder, PRBool deleteStorage);
-  NS_IMETHOD RecursiveDelete(PRBool deleteStorage);
-  NS_IMETHOD CreateSubfolder(const char *folderName);
-  NS_IMETHOD Compact(void);
-  NS_IMETHOD EmptyTrash(void);
-  NS_IMETHOD Rename(const char *name);
-  NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
-  NS_IMETHOD ContainsChildNamed(const char *name, PRBool *_retval);
-  NS_IMETHOD IsAncestorOf(nsIMsgFolder *folder, PRBool *_retval);
-  NS_IMETHOD GenerateUniqueSubfolderName(const char *prefix, nsIMsgFolder *otherFolder, char **_retval); 
-  NS_IMETHOD UpdateSummaryTotals(PRBool force);
-  NS_IMETHOD SummaryChanged(void);
-  NS_IMETHOD GetNumUnread(PRBool deep, PRInt32 *_retval);
-  NS_IMETHOD GetTotalMessages(PRBool deep, PRInt32 *_retval);
-  NS_IMETHOD GetExpungedBytesCount(PRUint32 *aExpungedBytesCount);
-  NS_IMETHOD GetDeletable(PRBool *aDeletable);
-  NS_IMETHOD GetCanCreateChildren(PRBool *aCanCreateChildren);
-  NS_IMETHOD GetCanBeRenamed(PRBool *aCanBeRenamed);
-  NS_IMETHOD GetRequiresCleanup(PRBool *aRequiresCleanup);
-  NS_IMETHOD ClearRequiresCleanup(void);
-  NS_IMETHOD ManyHeadersToDownload(PRBool *_retval);
-  NS_IMETHOD GetKnowsSearchNntpExtension(PRBool *aKnowsSearchNntpExtension);
-  NS_IMETHOD GetAllowsPosting(PRBool *aAllowsPosting);
-  NS_IMETHOD GetDisplayRecipients(PRBool *aDisplayRecipients);
-   NS_IMETHOD GetRelativePathName(char * *aRelativePathName);
-  NS_IMETHOD GetSizeOnDisk(PRUint32 *aSizeOnDisk);
-  NS_IMETHOD RememberPassword(const char *password);
-  NS_IMETHOD GetRememberedPassword(char * *aRememberedPassword);
-  NS_IMETHOD UserNeedsToAuthenticateForFolder(PRBool displayOnly, PRBool *_retval);
-  NS_IMETHOD GetUsername(char * *aUsername);
-  NS_IMETHOD GetHostname(char * *aHostname);
-  NS_IMETHOD SetFlag(PRUint32 flag);
-  NS_IMETHOD ClearFlag(PRUint32 flag);
-  NS_IMETHOD GetFlag(PRUint32 flag, PRBool *_retval);
-  NS_IMETHOD ToggleFlag(PRUint32 flag);
-  NS_IMETHOD OnFlagChange(PRUint32 flag);
-  NS_IMETHOD GetFlags(PRUint32 *aFlags);
-  NS_IMETHOD GetFoldersWithFlag(PRUint32 flags, nsIMsgFolder **result, PRUint32 resultsize, PRUint32 *numFolders);
-  NS_IMETHOD GetExpansionArray(nsISupportsArray *expansionArray);
-  // NS_IMETHOD DeleteMessages(nsISupportsArray *message, nsITransactionManager *txnMgr, PRBool deleteStorage);
-  NS_IMETHOD CopyMessages(nsIMsgFolder *srcFolder, nsISupportsArray *messages, PRBool isMove, nsITransactionManager *txnMgr, nsIMsgCopyServiceListener *listener);
-  NS_IMETHOD CopyFileMessage(nsIFileSpec *fileSpec, nsIMessage *msgToReplace, PRBool isDraft, nsITransactionManager *txnMgr, nsIMsgCopyServiceListener *listener);
-  NS_IMETHOD AcquireSemaphore(nsISupports *semHolder);
-  NS_IMETHOD ReleaseSemaphore(nsISupports *semHolder);
-  NS_IMETHOD TestSemaphore(nsISupports *semHolder, PRBool *_retval);
-  NS_IMETHOD GetLocked(PRBool *aLocked);
-  // NS_IMETHOD CreateMessageFromMsgDBHdr(nsIMsgDBHdr *msgDBHdr, nsIMessage **_retval);
-  NS_IMETHOD GetNewMessages(void);
-  // NS_IMETHOD WriteToFolderCache(nsIMsgFolderCache *folderCache);
-  // NS_IMETHOD GetCharset(PRUnichar * *aCharset);
-  // NS_IMETHOD SetCharset(const PRUnichar * aCharset);
-  NS_IMETHOD GetBiffState(PRUint32 *aBiffState);
-  NS_IMETHOD SetBiffState(PRUint32 aBiffState);
-  NS_IMETHOD GetNumNewMessages(PRInt32 *aNumNewMessages);
-  NS_IMETHOD SetNumNewMessages(PRInt32 aNumNewMessages);
-  NS_IMETHOD GetNewMessagesNotificationDescription(PRUnichar * *aNewMessagesNotificationDescription);
-  NS_IMETHOD GetRootFolder(nsIMsgFolder * *aRootFolder);
-  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase * *aMsgDatabase);
-  NS_IMETHOD GetPath(nsIFileSpec * *aPath);
-  NS_IMETHOD MarkMessagesRead(nsISupportsArray *messages, PRBool markRead);
-  NS_IMETHOD MarkAllMessagesRead(void);
-  NS_IMETHOD MarkMessagesFlagged(nsISupportsArray *messages, PRBool markFlagged);
-  NS_IMETHOD GetChildWithURI(const char *uri, PRBool deep, nsIMsgFolder **_retval); 
-
-  // end NS_DECL_NSIMSGFOLDER
-  
-  // nsRDFResource overrides
-  NS_IMETHOD Init(const char* aURI);
-  
-#if 0
-  static nsresult GetRoot(nsIMsgFolder* *result);
-#endif
-  // Gets the URL that represents the given message.  Returns a newly
-  // created string that must be free'd using XP_FREE().
-  // If the db is NULL, then returns a URL that represents the entire
-  // folder as a whole.
-#ifdef HAVE_DB
-  NS_IMETHOD BuildUrl(nsMsgDatabase *db, nsMsgKey key, char ** url);
-  
-  // updates num messages and num unread - should be pure virtual
-  // when I get around to implementing in all subclasses?
-  NS_IMETHOD GetTotalMessagesInDB(PRUint32 *totalMessages) const;					// How many messages in database.
-	// These functions are used for tricking the front end into thinking that we have more 
-	// messages than are really in the DB.  This is usually after and IMAP message copy where
-	// we don't want to do an expensive select until the user actually opens that folder
-	// These functions are called when MSG_Master::GetFolderLineById is populating a MSG_FolderLine
-	// struct used by the FE
-	int32			GetNumPendingUnread(PRBool deep = PR_FALSE);
-	int32			GetNumPendingTotalMessages(PRBool deep = PR_FALSE);
-	
-  void			ChangeNumPendingUnread(int32 delta);
-  void			ChangeNumPendingTotalMessages(int32 delta);
-
-
-  NS_IMETHOD SetFolderPrefFlags(PRUint32 flags);
-  NS_IMETHOD GetFolderPrefFlags(PRUint32 *flags);
-
-
-  NS_IMETHOD SetLastMessageLoaded(nsMsgKey lastMessageLoaded);
-  NS_IMETHOD GetLastMessageLoaded();
-#endif
-
-
-#ifdef HAVE_ADMINURL
-  NS_IMETHOD GetAdminUrl(MWContext *context, MSG_AdminURLType type);
-  NS_IMETHOD HaveAdminUrl(MSG_AdminURLType type, PRBool *hadAdminUrl);
-#endif
-
-
-#ifdef HAVE_PANE
-  NS_IMETHOD	MarkAllRead(MSG_Pane *pane, PRBool deep);
-  NS_IMETHOD SetFlagInAllFolderPanes(PRUint32 which);
-#endif
-
-#ifdef HAVE_NET
-  NS_IMETHOD EscapeMessageId(const char *messageId, const char **escapeMessageID);
-  NS_IMETHOD ShouldPerformOperationOffline(PRBool *performOffline);
-#endif
-
-#ifdef HAVE_CACHE
-	virtual nsresult WriteToCache(XP_File);
-	virtual nsresult ReadFromCache(char *);
-	virtual PRBool IsCachable();
-	void SkipCacheTokens(char **ppBuf, int numTokens);
-#endif
-
-#ifdef DOES_FOLDEROPERATIONS
-	int DownloadToTempFileAndUpload(MessageCopyInfo *copyInfo, nsMsgKeyArray &keysToSave, MSG_FolderInfo *dstFolder, nsMsgDatabase *sourceDB);
-	void UpdateMoveCopyStatus(MWContext *context, PRBool isMove, int32 curMsgCount, int32 totMessages);
-#endif
-
-	virtual nsresult GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) = 0;
-
-
-	NS_IMETHOD MatchName(nsString *name, PRBool *matches);
-
-
-protected:
-	nsresult NotifyPropertyChanged(char *property, char* oldValue, char* newValue);
-	nsresult NotifyPropertyFlagChanged(nsISupports *item, char *property, PRUint32 oldValue,
-												PRUint32 newValue);
-	nsresult NotifyItemAdded(nsISupports *item);
-	nsresult NotifyItemDeleted(nsISupports *item);
-
-	nsresult NotifyFolderLoaded();
-	// this is a little helper function that is not part of the public interface. 
-	// we use it to get the IID of the incoming server for the derived folder.
-	// w/out a function like this we would have to implement GetServer in each
-	// derived folder class.
-	virtual const char* GetIncomingServerType() = 0;
-
-protected:
-  PRUint32 mFlags;
-  nsIFolder *mParent;     //This won't be refcounted for ownership reasons.
-  PRInt32 mNumUnreadMessages;        /* count of unread messages (-1 means
-                                         unknown; -2 means unknown but we already
-                                         tried to find out.) */
-  PRInt32 mNumTotalMessages;         /* count of existing messages. */
-  nsCOMPtr<nsISupportsArray> mSubFolders;
-  nsVoidArray *mListeners; //This can't be an nsISupportsArray because due to
-													 //ownership issues, listeners can't be AddRef'd
-
-  PRInt32 mPrefFlags;       // prefs like MSG_PREF_OFFLINE, MSG_PREF_ONE_PANE, etc
-  nsISupports *mSemaphoreHolder; // set when the folder is being written to
-								//Due to ownership issues, this won't be AddRef'd.
-
-  nsIMsgIncomingServer* m_server; //this won't be addrefed....ownership issue here
-
-#ifdef HAVE_DB
-  nsMsgKey	m_lastMessageLoaded;
-#endif
-  // These values are used for tricking the front end into thinking that we have more 
-  // messages than are really in the DB.  This is usually after and IMAP message copy where
-  // we don't want to do an expensive select until the user actually opens that folder
-  PRInt32 mNumPendingUnreadMessages;
-  PRInt32 mNumPendingTotalMessages;
-
-  PRUint32	mBiffState;
-  PRInt32	mNumNewBiffMessages;
-
-  PRBool mIsCachable;
-
-  //
-  // stuff from the uri
-  //
-  
-  PRBool mIsServer;
-  nsString mName;
-  
-};
-
-#endif

mozilla/mailnews/base/util/nsMsgGroupRecord.cpp

@@ -1,598 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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 "msgCore.h"    // precompiled header...
-#include "prlog.h"
-
-#include "nsMsgGroupRecord.h"
-
-#include "plstr.h"
-#include "prmem.h"
-#include "nsEscape.h"
-#include "nsCRT.h"
-
-// mscott: this is lame...I know....
-#define MK_OUT_OF_MEMORY  1
-
-const PRUint32 F_ISGROUP			 = 0x00000001;
-const PRUint32 F_EXPANDED			 = 0x00000002;
-const PRUint32 F_CATCONT			 = 0x00000004;
-const PRUint32 F_VIRTUAL			 = 0x00000008;
-const PRUint32 F_DIRTY			 = 0x00000010;
-const PRUint32 F_DESCENDENTSLOADED = 0x00000020;
-const PRUint32 F_HTMLOKGROUP		 = 0x00000040;
-const PRUint32 F_HTMLOKTREE		 = 0x00000080;
-const PRUint32 F_NEEDEXTRAINFO	 = 0x00000100;
-const PRUint32 F_DOESNOTEXIST		 = 0x00000200;
-const PRUint32 RUNTIMEFLAGS =		// Flags to be sure *not* to write to disk.
-	F_DIRTY | F_DESCENDENTSLOADED | F_EXPANDED;
-
-
-
-int
-nsMsgGroupRecord::GroupNameCompare(const char* name1, const char* name2,
-								  char delimiter, PRBool caseInsensitive)
-{
-	if (caseInsensitive)
-	{
-		while (*name1 && (nsCRT::ToUpper(*name1) == nsCRT::ToUpper(*name2))) {
-			name1++;
-			name2++;
-		}		
-	}
-	else
-	{
-		while (*name1 && *name1 == *name2) {
-			name1++;
-			name2++;
-		}
-	}
-
-	if (*name1 && *name2) {
-		if (*name1 == delimiter) return -1;
-		if (*name2 == delimiter) return 1;
-	}
-
-	if (caseInsensitive)
-		return int(nsCRT::ToUpper(*name1)) - int(nsCRT::ToUpper(*name2));
-	else
-		return int(*name1) - int(*name2);
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* partname,
-						PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset)
-{
-	nsMsgGroupRecord* result = new nsMsgGroupRecord(parent, partname,
-												  aTime, uniqueid, fileoffset);
-	if (result && partname && !result->m_partname) {
-		// We ran out of memory.
-		delete result;
-		result = NULL;
-	}
-	result->InitializeSibling();
-	return result;
-}
-
-MOZ_DECL_CTOR_COUNTER(nsMsgGroupRecord);
-
-nsMsgGroupRecord::nsMsgGroupRecord(nsMsgGroupRecord* parent, const char* partname,
-								 PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset,
-								 char delimiter /* = '.' */)
-{
-	MOZ_COUNT_CTOR(nsMsgGroupRecord);
-	int length;
-	m_prettyname = NULL;
-	m_parent = parent;
-	m_children = NULL;
-	m_sibling = NULL;
-	m_flags = 0;
-	m_partname = NULL;
-	m_addtime = aTime;
-	m_uniqueId = uniqueid;
-	m_fileoffset = fileoffset;
-	m_delimiter = delimiter;
-	if (partname) {
-		length = PL_strlen(partname);
-		// PR_ASSERT(parent != NULL);
-		m_partname = new char [length + 1];
-		if (!m_partname) {
-			m_parent = NULL;
-			return;
-		}
-		PL_strcpy(m_partname, partname);
-	}
-}
-
-
-nsMsgGroupRecord::~nsMsgGroupRecord()
-{
-	MOZ_COUNT_DTOR(nsMsgGroupRecord);
-	delete [] m_partname;
-	m_partname = NULL;
-	delete [] m_prettyname;
-	m_prettyname = NULL;
-	while (m_children) {
-		delete m_children;
-	}
-	m_children = NULL;
-	if (m_parent) {
-		nsMsgGroupRecord** ptr;
-		for (ptr = &(m_parent->m_children);
-			 *ptr;
-			 ptr = &((*ptr)->m_sibling)) {
-			if (*ptr == this) {
-				*ptr = m_sibling;
-				break;
-			}
-		}
-	}
-}
-
-void nsMsgGroupRecord::InitializeSibling()
-{
-	if (m_parent) {
-		PR_ASSERT(m_partname != NULL);
-		nsMsgGroupRecord** ptr;
-		for (ptr = &(m_parent->m_children) ; *ptr ; ptr = &((*ptr)->m_sibling)) {
-			int comp = GroupNameCompare((*ptr)->m_partname, m_partname, m_delimiter, IsIMAPGroupRecord());
-			PR_ASSERT(comp != 0);
-			if (comp >= 0) break;
-		}
-		m_sibling = *ptr;
-		*ptr = this;
-	}
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::FindDescendant(const char* name)
-{
-	if (!name || !*name) return this;
-	char* ptr = PL_strchr(name, m_delimiter);
-	if (ptr) *ptr = '\0';
-	nsMsgGroupRecord* child;
-	for (child = m_children ; child ; child = child->m_sibling) {
-		if (PL_strcmp(child->m_partname, name) == 0) {
-			break;
-		}
-	}
-	if (ptr) {
-		*ptr++ = m_delimiter;
-		if (child) {
-			return child->FindDescendant(ptr);
-		}
-	}
-	return child;
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetSiblingOrAncestorSibling()
-{
-	if (m_sibling) return m_sibling;
-	if (m_parent) return m_parent->GetSiblingOrAncestorSibling();
-	return NULL;
-}
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetNextAlphabetic()
-{
-	nsMsgGroupRecord* result;
-	if (m_children) result = m_children;
-	else result = GetSiblingOrAncestorSibling();
-#ifdef DEBUG_slowAndParanoid
-	if (result) {
-		char* ptr1 = GetFullName();
-		char* ptr2 = result->GetFullName();
-		PR_ASSERT(GroupNameCompare(ptr1, ptr2) < 0);
-		delete [] ptr1;
-		delete [] ptr2;
-	}
-#endif
-	return result;
-}
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetNextAlphabeticNoCategories()
-{
-	if (IsCategoryContainer()) {
-		return GetSiblingOrAncestorSibling();
-	} else {
-		return GetNextAlphabetic();
-	}
-}
-
-
-char*
-nsMsgGroupRecord::GetFullName()
-{
-	int length = 0;
-	nsMsgGroupRecord* ptr;
-	for (ptr = this ; ptr ; ptr = ptr->m_parent) {
-		if (ptr->m_partname) length += PL_strlen(ptr->m_partname) + 1;
-	}
-	PR_ASSERT(length > 0);
-	if (length <= 0) return NULL;
-	char* result = new char [length];
-	if (result) {
-		SuckInName(result);
-		PR_ASSERT(int(PL_strlen(result)) + 1 == length);
-	}
-	return result;
-}
-
-
-char* 
-nsMsgGroupRecord::SuckInName(char* ptr)
-{
-	if (m_parent && m_parent->m_partname) {
-		ptr = m_parent->SuckInName(ptr);
-		*ptr++ = m_delimiter;
-	}
-	PL_strcpy(ptr, m_partname);
-	return ptr + PL_strlen(ptr);
-}
-
-
-
-int
-nsMsgGroupRecord::SetPrettyName(const char* name)
-{
-	if (name == NULL && m_prettyname == NULL) return 0;
-	m_flags |= F_DIRTY;
-	delete [] m_prettyname;
-	m_prettyname = NULL;
-	if (!name || !*name) {
-		return 0;
-	}
-	int length = PL_strlen(name);
-	m_prettyname = new char [length + 1];
-	if (!m_prettyname) {
-		return MK_OUT_OF_MEMORY;
-	}
-	PL_strcpy(m_prettyname, name);
-	return 1;
-}
-
-
-PRBool
-nsMsgGroupRecord::IsCategory()
-{
-	return GetCategoryContainer() != NULL;
-}
-
-PRBool
-nsMsgGroupRecord::IsCategoryContainer()
-{
-	return (m_flags & F_CATCONT) != 0;
-}
-
-PRBool
-nsMsgGroupRecord::NeedsExtraInfo()
-{
-	return (m_flags & F_NEEDEXTRAINFO) != 0;
-}
-
-int
-nsMsgGroupRecord::SetNeedsExtraInfo(PRBool value)
-{
-	return TweakFlag(F_NEEDEXTRAINFO, value);
-}
-
-
-int
-nsMsgGroupRecord::SetIsCategoryContainer(PRBool value)
-{
-	// refuse to set a group to be a category container if it has a parent
-	// that's a category container.
-	if (! (value && GetCategoryContainer()))
-		return TweakFlag(F_CATCONT, value);
-	else
-		return 0;
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetCategoryContainer()
-{
-	if (IsCategoryContainer()) return NULL;
-	for (nsMsgGroupRecord* ptr = m_parent ; ptr ; ptr = ptr->m_parent) {
-		if (ptr->IsCategoryContainer()) return ptr;
-	}
-	return NULL;
-}
-
-
-nsresult
-nsMsgGroupRecord::IsVirtual(PRBool *retval)
-{
-	*retval =( (m_flags & F_VIRTUAL) != 0);
-    return NS_OK;
-}
-
-nsresult
-nsMsgGroupRecord::SetIsVirtual(PRBool value)
-{
-	TweakFlag(F_VIRTUAL, value);
-    return NS_OK;
-}
-
-
-
-PRBool
-nsMsgGroupRecord::IsExpanded()
-{
-	return (m_flags & F_EXPANDED) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsExpanded(PRBool value)
-{
-	return TweakFlag(F_EXPANDED, value);
-}
-
-
-PRBool
-nsMsgGroupRecord::IsHTMLOKGroup()
-{
-	return (m_flags & F_HTMLOKGROUP) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsHTMLOKGroup(PRBool value)
-{
-	return TweakFlag(F_HTMLOKGROUP, value);
-}
-
-
-
-PRBool
-nsMsgGroupRecord::IsHTMLOKTree()
-{
-	return (m_flags & F_HTMLOKTREE) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsHTMLOKTree(PRBool value)
-{
-	return TweakFlag(F_HTMLOKTREE, value);
-}
-
-
-
-PRBool
-nsMsgGroupRecord::IsGroup()
-{
-	return (m_flags & F_ISGROUP) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsGroup(PRBool value)
-{
-	return TweakFlag(F_ISGROUP, value);
-}
-
-
-PRBool
-nsMsgGroupRecord::IsDescendentsLoaded()
-{
-	return (m_flags & F_DESCENDENTSLOADED) != 0;
-}
-
-
-int
-nsMsgGroupRecord::SetIsDescendentsLoaded(PRBool value)
-{
-	PR_ASSERT(value);			// No reason we'd ever unset this.
-	TweakFlag(F_DESCENDENTSLOADED, PR_TRUE);
-	nsMsgGroupRecord* child;
-	for (child = m_children ; child ; child = child->m_sibling) {
-		child->SetIsDescendentsLoaded(value);
-	}
-	return 0;
-}
-
-PRBool nsMsgGroupRecord::DoesNotExistOnServer()
-{
-	return (m_flags & F_DOESNOTEXIST) != 0;
-}
-
-int nsMsgGroupRecord::SetDoesNotExistOnServer(PRBool value)
-{
-	if (value)		// turn off group flag if doesn't exist on server.
-		TweakFlag(F_ISGROUP, PR_FALSE);
-	return TweakFlag(F_DOESNOTEXIST, value);
-}
-
-int
-nsMsgGroupRecord::TweakFlag(PRUint32 flagbit, PRBool value)
-{
-	if (value) {
-		if (!(m_flags & flagbit)) {
-			m_flags |= flagbit;
-			if (flagbit & ~RUNTIMEFLAGS)
-				m_flags |= F_DIRTY;
-			return 1;
-		}
-	} else {
-		if (m_flags & flagbit) {
-			m_flags &= ~flagbit;
-			if (flagbit & ~RUNTIMEFLAGS)
-				m_flags |= F_DIRTY;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-
-PRInt32
-nsMsgGroupRecord::GetNumKids()
-{
-	PRInt32 result = 0;
-	nsMsgGroupRecord* child;
-	for (child = m_children ; child ; child = child->m_sibling) {
-		if (IsIMAPGroupRecord())
-			result++;
-		else
-			if (child->m_flags & F_ISGROUP) result++;
-
-		if (!IsIMAPGroupRecord())
-			result += child->GetNumKids();
-	}
-	return result;
-}
-
-
-
-
-char*
-nsMsgGroupRecord::GetSaveString()
-{
-	char* pretty = NULL;
-	char* result = nsnull;
-	
-	if (m_prettyname) {
-		pretty = nsEscape(m_prettyname, url_XAlphas);
-		if (!pretty) return NULL;
-	}
-	char* fullname = GetFullName();
-	if (!fullname) return NULL; {
-		long nAddTime;
-		LL_L2I(nAddTime, m_addtime);
-        result = PR_smprintf("%s,%s,%lx,%lx,%lx" MSG_LINEBREAK,
-							   fullname, pretty ? pretty : "",
-							   (long) (m_flags & ~RUNTIMEFLAGS),
-							   nAddTime,
-							   (long) m_uniqueId);
-	}
-	delete [] fullname;
-	if (pretty) nsCRT::free(pretty);
-	m_flags &= ~F_DIRTY;
-	return result;
-}
-
-
-PRBool
-nsMsgGroupRecord::IsDirty()
-{
-	return (m_flags & F_DIRTY) != 0;
-}
-
-
-PRInt32
-nsMsgGroupRecord::GetDepth()
-{
-	PRInt32 result = 0;
-	nsMsgGroupRecord* tmp = m_parent;
-	while (tmp) {
-		tmp = tmp->m_parent;
-		result++;
-	}
-	return result;
-}
-
-
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* saveline,
-						PRInt32 savelinelength, PRInt32 fileoffset)
-{
-	char* tmp;
-	char* ptr;
-	char* endptr;
-	char* partname;
-	char* prettyname;
-	PRInt32 flags;
-	PRInt32 addtime;
-	PRInt32 uniqueid;
-	nsMsgGroupRecord* result = NULL;
-
-	if (savelinelength < 0) savelinelength = PL_strlen(saveline);
-	tmp = (char*) PR_Malloc(savelinelength + 1);
-	if (!tmp) return NULL;
-	PL_strncpy(tmp, saveline, savelinelength);
-	tmp[savelinelength] = '\0';
-	ptr = PL_strchr(tmp, ',');
-	PR_ASSERT(ptr);
-	if (!ptr) goto FAIL;
-	*ptr++ = '\0';
-	partname = PL_strrchr(tmp, '.');
-	if (!partname) partname = tmp;
-	else partname++;
-
-#ifdef DEBUG_slowAndParanoid
-	if (parent->m_partname) {
-		char* parentname = parent->GetFullName();
-		PR_ASSERT(partname > tmp && partname[-1] == '.');
-		partname[-1] = '\0';
-		PR_ASSERT(PL_strcmp(parentname, tmp) == 0);
-		partname[-1] = '.';
-		delete [] parentname;
-		parentname = NULL;
-	} else {
-		PR_ASSERT(partname == tmp);
-	}
-#endif
-
-	endptr = PL_strchr(ptr, ',');
-	PR_ASSERT(endptr);
-	if (!endptr) goto FAIL;
-	*endptr++ = '\0';
-	prettyname = nsUnescape(ptr);
-
-	ptr = endptr;
-	endptr = PL_strchr(ptr, ',');
-	PR_ASSERT(endptr);
-	if (!endptr) goto FAIL;
-	*endptr++ = '\0';
-	flags = strtol(ptr, NULL, 16);
-
-	ptr = endptr;
-	endptr = PL_strchr(ptr, ',');
-	PR_ASSERT(endptr);
-	if (!endptr) goto FAIL;
-	*endptr++ = '\0';
-	addtime = strtol(ptr, NULL, 16);
-
-	ptr = endptr;
-	uniqueid = strtol(ptr, NULL, 16);
-
-	PRInt64 llAddtime;
-	LL_I2L(llAddtime, addtime);
-	result = Create(parent, partname, llAddtime, uniqueid, fileoffset);
-	if (result) {
-		PRBool maybeCategoryContainer = flags & F_CATCONT;
-		flags &= ~F_CATCONT;
-		result->m_flags = flags;
-		if (maybeCategoryContainer)
-			result->SetIsCategoryContainer(PR_TRUE);
-		if (prettyname && *prettyname) result->SetPrettyName(prettyname);
-	}
-
-FAIL:
-	PR_Free(tmp);
-	return result;
-	
-}
-
-
-

mozilla/mailnews/base/util/nsMsgGroupRecord.h

@@ -1,160 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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 class should only be used by the subscribe UI and by newshost.cpp.
-// And, well, a bit by the category code.  Everyone else should use the stuff
-// in newshost.h.
-
-#ifndef _nsMsgGroupRecord_h_
-#define _nsMsgGroupRecord_h__
-
-#include "msgCore.h"
-#include "prtypes.h"
-#include "nsISupports.h"
-
-class nsIMAPGroupRecord;
-
-class NS_MSG_BASE nsMsgGroupRecord {
-public:
-	static nsMsgGroupRecord* Create(nsMsgGroupRecord* parent,
-								   const char* partname,
-                                   PRInt64 m_addtime,
-								   PRInt32 uniqueid,
-								   PRInt32 fileoffset);
-	static nsMsgGroupRecord* Create(nsMsgGroupRecord* parent,
-								   const char* saveline,
-								   PRInt32 savelinelength,
-								   PRInt32 fileoffset);
-
-
-	virtual void	InitializeSibling();
-	virtual PRBool IsIMAPGroupRecord() { return PR_FALSE; }
-	virtual nsIMAPGroupRecord *GetIMAPGroupRecord() { return 0; }
-	
-	// This is just like PL_strcmp(), except it works on news group names.
-	// A container groupname is always less than any contained groups.
-	// So, "netscape.devs-client-technical" > "netscape.devs.directory", even
-	// though PL_strcmp says otherwise.  (YICK!)
-	static int GroupNameCompare(const char* name1,
-								const char* name2,
-								char delimiter = '.',
-								PRBool caseInsensitive = PR_FALSE);
-
-
-	virtual ~nsMsgGroupRecord();
-
-	nsMsgGroupRecord* FindDescendant(const char* name);
-
-	nsMsgGroupRecord* GetParent() {return m_parent;}
-	nsMsgGroupRecord* GetChildren() {return m_children;}
-	nsMsgGroupRecord* GetSibling() {return m_sibling;}
-	nsMsgGroupRecord* GetSiblingOrAncestorSibling();
-	nsMsgGroupRecord* GetNextAlphabetic();
-
-	nsMsgGroupRecord* GetNextAlphabeticNoCategories();
-
-	const char* GetPartName() {return m_partname;}
-
-	// The resulting string must be free'd using delete[].
-	char* GetFullName();
-
-	const char* GetPrettyName() {return m_prettyname;}
-	int SetPrettyName(const char* prettyname);
-
-	PRInt64 GetAddTime() {return m_addtime;}
-
-	virtual PRBool IsCategory();
-	virtual PRBool IsCategoryContainer();
-	virtual int SetIsCategoryContainer(PRBool value);
-
-	nsMsgGroupRecord* GetCategoryContainer();
-
-	// Get/Set whether this is a virtual newsgroup.
-	nsresult IsVirtual(PRBool *retval);
-    nsresult SetIsVirtual(PRBool value);
-
-	// Get/Set whether this is really a newsgroup (and not just a container
-	// for newsgroups).
-	virtual PRBool IsGroup();
-	int SetIsGroup(PRBool value);
-
-	PRBool IsDescendentsLoaded();
-	int SetIsDescendentsLoaded(PRBool value);
-
-	PRBool IsExpanded();
-	int SetIsExpanded(PRBool value);
-
-	PRBool IsHTMLOKGroup();
-	int SetIsHTMLOKGroup(PRBool value);
-
-	PRBool IsHTMLOKTree();
-	int SetIsHTMLOKTree(PRBool value);
-
-	PRBool NeedsExtraInfo();
-	int SetNeedsExtraInfo(PRBool value);
-
-	PRBool DoesNotExistOnServer();
-	int SetDoesNotExistOnServer(PRBool value);
-
-	PRInt32 GetUniqueID() {return m_uniqueId;}
-
-	PRInt32 GetFileOffset() {return m_fileoffset;}
-	int SetFileOffset(PRInt32 value) {m_fileoffset = value; return 0;}
-
-	// Get the number of descendents (not including ourself) that are
-	// really newsgroups.
-	PRInt32 GetNumKids();
-
-	// Gets the string that represents this group in the save file.  The
-	// resulting string must be free'd with PR_Free().
-	char* GetSaveString();
-
-	PRBool IsDirty();			// Whether this record has had changes made
-								// to it.  Cleared by calls to GetSaveString().
-
-	PRInt32 GetDepth();			// Returns how deep in the heirarchy we are.
-								// Basically, the number of dots in the full
-								// newsgroup name, plus 1.
-	virtual char GetHierarchySeparator() { return '.'; }
-
-protected:
-	nsMsgGroupRecord(nsMsgGroupRecord* parent,
-								   const char* partname,
-								   PRInt64 m_addtime,
-								   PRInt32 uniqueid,
-								   PRInt32 fileoffset,
-								   char delimiter = '.');
-	int TweakFlag(PRUint32 flagbit, PRBool value);
-	char* SuckInName(char* ptr);
-
-	char* m_partname;
-	char* m_prettyname;
-	nsMsgGroupRecord* m_parent;
-	nsMsgGroupRecord* m_children;
-	nsMsgGroupRecord* m_sibling;
-	PRUint32 m_flags;
-	PRInt64 m_addtime;
-	PRInt32 m_uniqueId;
-	PRInt32 m_fileoffset;
-	char m_delimiter;
-};
-
-
-
-
-#endif /* _grec_h_ */

mozilla/mailnews/base/util/nsMsgI18N.cpp

@@ -1,363 +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.
- */ 
-
-// as does this
-#define NS_IMPL_IDS
-#include "nsIServiceManager.h"
-#include "nsICharsetConverterManager.h"
-
-#include "nsISupports.h"
-#include "nsIPref.h"
-#include "nsIMimeConverter.h"
-#include "msgCore.h"
-#include "rosetta_mailnews.h"
-#include "nsMsgI18N.h"
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsMsgMimeCID.h"
-#include "nsMimeTypes.h"
-#include "nsIEntityConverter.h"
-#include "nsISaveAsCharset.h"
-
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
-static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
-static NS_DEFINE_CID(kEntityConverterCID, NS_ENTITYCONVERTER_CID);
-static NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID);
-
-//
-// International functions necessary for composition
-//
-
-// Convert an unicode string to a C string with a given charset.
-nsresult ConvertFromUnicode(const nsString& aCharset, 
-                            const nsString& inString,
-                            char** outCString)
-{
-  nsresult res;
-
-  NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); 
-
-  if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
-    nsIUnicodeEncoder* encoder = nsnull;
-    nsString convCharset;
-
-    // map to converter charset
-    if (aCharset.EqualsIgnoreCase("us-ascii")) {
-      convCharset.SetString("iso-8859-1");
-    }
-    else {
-      convCharset = aCharset; 
-    }
-
-    // get an unicode converter
-    res = ccm->GetUnicodeEncoder(&convCharset, &encoder);
-    if(NS_SUCCEEDED(res) && (nsnull != encoder)) {
-      PRUnichar *unichars = (PRUnichar *) inString.GetUnicode();
-      PRInt32 unicharLength = inString.Length();
-      PRInt32 dstLength;
-      res = encoder->GetMaxLength(unichars, unicharLength, &dstLength);
-      // allocale an output buffer
-      *outCString = (char *) PR_Malloc(dstLength + 1);
-      if (nsnull != *outCString) {
-        PRInt32 oldUnicharLength = unicharLength;
-        char *tempCString = *outCString;
-        PRInt32 totalCLength = 0;
-        while (1) {
-          res = encoder->Convert(unichars, &unicharLength, tempCString, &dstLength);
-
-          // increment for destination
-          tempCString += dstLength;
-          totalCLength += dstLength;
-
-          // break: this is usually the case
-          // source length <= zero and no error or unrecoverable error
-          if (0 >= unicharLength || NS_ERROR_UENC_NOMAPPING != res) {
-            break;
-          }
-          // could not map unicode to the destination charset, skip one unichar and continue
-          // increment for source unicode, skip one unichar
-          unichars += unicharLength + 1;
-          oldUnicharLength -= (unicharLength + 1);
-          unicharLength = oldUnicharLength;
-          // estimate target length again
-          (void) encoder->GetMaxLength(unichars, unicharLength, &dstLength);
-        }
-        (*outCString)[totalCLength] = '\0';
-      }
-      else {
-        res = NS_ERROR_OUT_OF_MEMORY;
-      }
-      NS_IF_RELEASE(encoder);
-    }    
-  }
-  return res;
-}
-
-// Convert a C string to an unicode string.
-nsresult ConvertToUnicode(const nsString& aCharset, 
-                          const char* inCString, 
-                          nsString& outString)
-{
-  nsresult res;
-  NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); 
-
-  if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
-    nsIUnicodeDecoder* decoder = nsnull;
-    PRUnichar *unichars;
-    PRInt32 unicharLength;
-    nsString convCharset;
-
-    // map to converter charset
-    if (aCharset.EqualsIgnoreCase("us-ascii")) {
-      convCharset.SetString("iso-8859-1");
-    }
-    else {
-      convCharset = aCharset; 
-    }
-    // get an unicode converter
-    res = ccm->GetUnicodeDecoder(&convCharset, &decoder);
-    if(NS_SUCCEEDED(res) && (nsnull != decoder)) {
-      PRInt32 srcLen = PL_strlen(inCString);
-      res = decoder->GetMaxLength(inCString, srcLen, &unicharLength);
-      // allocale an output buffer
-      unichars = (PRUnichar *) PR_Malloc(unicharLength * sizeof(PRUnichar));
-      if (unichars != nsnull) {
-        // convert to unicode
-        res = decoder->Convert(inCString, &srcLen, unichars, &unicharLength);
-        outString.SetString(unichars, unicharLength);
-        PR_Free(unichars);
-      }
-      else {
-        res = NS_ERROR_OUT_OF_MEMORY;
-      }
-      NS_IF_RELEASE(decoder);
-    }    
-  }  
-  return res;
-}
-
-// Charset to be used for the internatl processing.
-const char *msgCompHeaderInternalCharset()
-{
-  // UTF-8 is a super set of us-ascii. 
-  // We can use the same string manipulation methods as us-ascii without breaking non us-ascii characters. 
-  return "UTF-8";
-}
-
-// MIME encoder, output string should be freed by PR_FREE
-char * nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime) 
-{
-  // No MIME, just duplicate the string.
-  if (PR_FALSE == bUseMime) {
-    return PL_strdup(header);
-  }
-
-  char *encodedString = nsnull;
-  nsIMimeConverter *converter;
-  nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull, 
-                                           nsCOMTypeInfo<nsIMimeConverter>::GetIID(), (void **)&converter);
-  if (NS_SUCCEEDED(res) && nsnull != converter) {
-    res = converter->EncodeMimePartIIStr_UTF8(header, charset, kMIME_ENCODED_WORD_SIZE, &encodedString);
-    NS_RELEASE(converter);
-  }
-  return NS_SUCCEEDED(res) ? encodedString : nsnull;
-}
-
-// MIME decoder
-nsresult nsMsgI18NDecodeMimePartIIStr(const nsString& header, nsString& charset, nsString& decodedString)
-{
-  nsIMimeConverter *converter;
-  nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull, 
-                                                    nsCOMTypeInfo<nsIMimeConverter>::GetIID(), (void **)&converter);
-  if (NS_SUCCEEDED(res) && nsnull != converter) {
-    res = converter->DecodeMimePartIIStr(header, charset, decodedString);
-    NS_RELEASE(converter);
-  }
-  return res;
-}
-
-// Get a default mail character set.
-char * nsMsgI18NGetDefaultMailCharset()
-{
-  nsresult res = NS_OK;
-  char * retVal = nsnull;
-  NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); 
-  if (nsnull != prefs && NS_SUCCEEDED(res))
-  {
-      char *prefValue;
-	  res = prefs->CopyCharPref("intl.character_set_name", &prefValue);
-	  
-	  if (NS_SUCCEEDED(res)) 
-	  {
-  		//TODO: map to mail charset (e.g. Shift_JIS -> ISO-2022-JP) bug#3941.
-  		 retVal = prefValue;
-	  }
-	  else 
-		  retVal = PL_strdup("iso-8859-1");
-  }
-
-  return (nsnull != retVal) ? retVal : PL_strdup("iso-8859-1");
-}
-
-// Return True if a charset is stateful (e.g. JIS).
-PRBool nsMsgI18Nstateful_charset(const char *charset)
-{
-  //TODO: use charset manager's service
-  return (PL_strcasecmp(charset, "iso-2022-jp") == 0);
-}
-
-// Check 7bit in a given buffer.
-// This is expensive (both memory and performance).
-// The check would be very simple if applied to an unicode text (e.g. nsString or utf-8).
-// Possible optimazaion is to search ESC(0x1B) in case of iso-2022-jp and iso-2022-kr.
-// Or convert and check line by line.
-PRBool nsMsgI18N7bit_data_part(const char *charset, const char *inString, const PRUint32 size)
-{
-  char *aCString;
-  nsString aCharset(charset);
-  nsString outString;
-  nsresult res;
-  
-  aCString = (char *) PR_Malloc(size + 1);
-  if (nsnull != aCString) {
-    PL_strncpy(aCString, inString, size); // make a C string
-    res = ConvertToUnicode(aCharset, aCString, outString);
-    PR_Free(aCString);
-    if (NS_SUCCEEDED(res)) {
-      for (PRInt32 i = 0; i < outString.Length(); i++) {
-        if (outString.CharAt(i) > 127) {
-          return PR_FALSE;
-        }
-      }
-    }
-  }
-  return PR_TRUE;  // all 7 bit
-}
-
-// Simple parser to parse META charset. 
-// It only supports the case when the description is within one line. 
-const char * 
-nsMsgI18NParseMetaCharset(nsFileSpec* fileSpec) 
-{ 
-  static char charset[65]; 
-  char buffer[512]; 
-  nsInputFileStream fileStream(*fileSpec); 
-
-  *charset = '\0'; 
-
-  while (!fileStream.eof() && !fileStream.failed() && 
-         fileStream.is_open()) { 
-    fileStream.readline(buffer, 512); 
-    if (*buffer == CR || *buffer == LF || *buffer == 0) 
-      continue; 
-
-    for (int i = 0; i < (int)PL_strlen(buffer); i++) { 
-      buffer[i] = toupper(buffer[i]); 
-    } 
-
-    if (PL_strstr(buffer, "/HEAD")) 
-      break; 
-
-    if (PL_strstr(buffer, "META") && 
-        PL_strstr(buffer, "HTTP-EQUIV") && 
-        PL_strstr(buffer, "CONTENT-TYPE") && 
-        PL_strstr(buffer, "CHARSET") 
-        ) 
-    { 
-      char *cp = PL_strstr(PL_strstr(buffer, "CHARSET"), "=") + 1; 
-      char seps[]   = " \"\'"; 
-      char *token; 
-      char* newStr; 
-      token = nsCRT::strtok(cp, seps, &newStr); 
-      if (token != NULL) 
-      { 
-        PL_strcpy(charset, token); 
-      } 
-    } 
-  } 
-
-  return charset; 
-} 
-
-nsresult nsMsgI18NConvertToEntity(const nsString& inString, nsString* outString)
-{
-  nsresult res;
-
-  outString->SetString("");
-  nsCOMPtr <nsIEntityConverter> entityConv;
-  res = nsComponentManager::CreateInstance(kEntityConverterCID, NULL, 
-                                           nsIEntityConverter::GetIID(), getter_AddRefs(entityConv));
-  if(NS_SUCCEEDED(res)) {
-    PRUnichar *entities = NULL;
-    res = entityConv->ConvertToEntities(inString.GetUnicode(), nsIEntityConverter::html40Latin1, &entities);
-    if (NS_SUCCEEDED(res) && (NULL != entities)) {
-      outString->SetString(entities);
-      nsAllocator::Free(entities);
-     }
-   }
- 
-  return res;
-}
-
-nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char *charset, const PRUnichar* inString, char** outString)
-{
-  NS_ASSERTION(contentType, "null ptr- contentType");
-  NS_ASSERTION(charset, "null ptr- charset");
-  NS_ASSERTION(outString, "null ptr- outString");
-  if(!contentType || !charset || !outString)
-    return NS_ERROR_NULL_POINTER;
-  *outString = NULL;
-
-  PRBool bTEXT_HTML = PR_FALSE;
-  nsresult res;
-
-  if (!nsCRT::strcasecmp(contentType, TEXT_HTML)) {
-    bTEXT_HTML = PR_TRUE;
-  }
-  else if (nsCRT::strcasecmp(contentType, TEXT_PLAIN)) {
-    return NS_ERROR_ILLEGAL_VALUE;  // not supported type
-  }
-
-  nsCOMPtr <nsISaveAsCharset> aConv;  // charset converter plus entity, NCR generation
-  res = nsComponentManager::CreateInstance(kSaveAsCharsetCID, NULL, 
-                                           nsISaveAsCharset::GetIID(), getter_AddRefs(aConv));
-  if(NS_SUCCEEDED(res)) {
-    // attribute: 
-    // html text - charset conv then fallback to entity or NCR
-    // plain text - charset conv then fallback to '?'
-    res = aConv->Init(charset, 
-                      bTEXT_HTML ? 
-                      nsISaveAsCharset::attr_EntityAfterCharsetConv + nsISaveAsCharset::attr_FallbackDecimalNCR : 
-                      nsISaveAsCharset::attr_plainTextDefault + nsISaveAsCharset::attr_FallbackQuestionMark, 
-                      nsIEntityConverter::html40);
-    if (NS_SUCCEEDED(res)) {
-      res = aConv->Convert(inString, outString);
-    }
-  }
- 
-  return res;
-}
-
-// RICHIE - not sure about this one?? need to see what it did in the old
-// world.
-char *
-nsMsgI18NGetAcceptLanguage(void)
-{
-  return "en";
-}

mozilla/mailnews/base/util/nsMsgI18N.h

@@ -1,49 +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 _nsMsgI18N_H_
-#define _nsMsgI18N_H_
-
-#include "nscore.h"
-#include "msgCore.h"
-
-
-NS_MSG_BASE char      *nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime);
-NS_MSG_BASE PRBool    nsMsgI18Nstateful_charset(const char *charset);
-NS_MSG_BASE PRBool    nsMsgI18N7bit_data_part(const char *charset, const char *string, const PRUint32 size);
-NS_MSG_BASE char      *nsMsgI18NGetAcceptLanguage(void); 
-
-NS_MSG_BASE const char *msgCompHeaderInternalCharset(void);
-
-NS_MSG_BASE char * nsMsgI18NGetDefaultMailCharset(void);
-NS_MSG_BASE nsresult ConvertFromUnicode(const nsString& aCharset, 
-                                   const nsString& inString,
-                                   char** outCString);
-NS_MSG_BASE nsresult ConvertToUnicode(const nsString& aCharset, 
-                                 const char* inCString, 
-                                 nsString& outString);
-
-NS_MSG_BASE nsresult nsMsgI18NDecodeMimePartIIStr(const nsString& header, nsString& charset, nsString& decodedString);
-
-NS_MSG_BASE const char *nsMsgI18NParseMetaCharset(nsFileSpec* fileSpec);
-
-NS_MSG_BASE nsresult nsMsgI18NConvertToEntity(const nsString& inString, nsString* outString);
-
-NS_MSG_BASE nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char* charset, const PRUnichar* inString, char** outString);
-
-#endif /* _nsMsgI18N_H_ */

mozilla/mailnews/base/util/nsMsgIdentity.cpp

@@ -1,356 +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 "msgCore.h" // for pre-compiled headers
-#include "nsMsgIdentity.h"
-#include "nsIPref.h"
-#include "nsXPIDLString.h"
-
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-
-NS_IMPL_ISUPPORTS2(nsMsgIdentity,
-                   nsIMsgIdentity,
-                   nsIShutdownListener)
-
-nsMsgIdentity::nsMsgIdentity():
-  m_signature(0),
-  m_vCard(0),
-  m_identityKey(0),
-  m_prefs(0)
-{
-	NS_INIT_REFCNT();
-}
-
-nsMsgIdentity::~nsMsgIdentity()
-{
-  PR_FREEIF(m_identityKey);
-  if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID,
-                                                m_prefs,
-                                                nsnull);
-}
-
-nsresult
-nsMsgIdentity::getPrefService()
-{
-  if (m_prefs) return NS_OK;
-  return nsServiceManager::GetService(kPrefServiceCID,
-                                      nsCOMTypeInfo<nsIPref>::GetIID(),
-                                      (nsISupports**)&m_prefs,
-                                      this);
-}
-
-
-/* called if the prefs service goes offline */
-NS_IMETHODIMP
-nsMsgIdentity::OnShutdown(const nsCID& aClass, nsISupports *service)
-{
-  if (aClass.Equals(kPrefServiceCID)) {
-    if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID, m_prefs);
-    m_prefs = nsnull;
-  }
-
-  return NS_OK;
-}
-
-/*
- * accessors for pulling values directly out of preferences
- * instead of member variables, etc
- */
-
-/* convert an identity key and preference name
-   to mail.identity.<identityKey>.<prefName>
-*/
-char *
-nsMsgIdentity::getPrefName(const char *identityKey,
-                           const char *prefName)
-{
-  return PR_smprintf("mail.identity.%s.%s", identityKey, prefName);
-}
-
-// this will be slightly faster than the above, and allows
-// the "default" identity preference root to be set in one place
-char *
-nsMsgIdentity::getDefaultPrefName(const char *fullPrefName)
-{
-  return PR_smprintf("mail.identity.default.%s", fullPrefName);
-}
-
-/* The following are equivalent to the nsIPref's Get/CopyXXXPref
-   except they construct the preference name with the above function
-*/
-nsresult
-nsMsgIdentity::getBoolPref(const char *prefname,
-                           PRBool *val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-    rv = getDefaultBoolPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getDefaultBoolPref(const char *prefname,
-                                        PRBool *val) {
-  
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = PR_FALSE;
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::setBoolPref(const char *prefname,
-                           PRBool val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *prefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->SetBoolPref(prefName, val);
-  PR_Free(prefName);
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getCharPref(const char *prefname,
-                           char **val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-    rv = getDefaultCharPref(prefname, val);
-
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getDefaultCharPref(const char *prefname,
-                                        char **val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = nsnull;              // null is ok to return here
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::setCharPref(const char *prefname,
-                           const char *val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = NS_OK;
-  char *prefName = getPrefName(m_identityKey, prefname);
-  if (val) 
-    rv = m_prefs->SetCharPref(prefName, val);
-  else
-    m_prefs->ClearUserPref(prefName);
-  PR_Free(prefName);
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getIntPref(const char *prefname,
-                                PRInt32 *val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-	rv = getDefaultIntPref(prefname, val);
-
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getDefaultIntPref(const char *prefname,
-                                        PRInt32 *val) {
-  
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = 0;
-    rv = NS_OK;
-  }
-  
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::setIntPref(const char *prefname,
-                                 PRInt32 val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *prefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->SetIntPref(prefName, val);
-  PR_Free(prefName);
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::SetKey(const char* identityKey)
-{
-  PR_FREEIF(m_identityKey);
-  m_identityKey = PL_strdup(identityKey);
-  return NS_OK;
-}
-
-nsresult
-nsMsgIdentity::GetIdentityName(char **idName) {
-  if (!idName) return NS_ERROR_NULL_POINTER;
-
-  *idName = nsnull;
-  nsresult rv = getCharPref("identityName",idName);
-  if (NS_FAILED(rv)) return rv;
-
-  // there's probably a better way of doing this
-  // thats unicode friendly?
-  if (!(*idName)) {
-    nsXPIDLCString fullName;
-    rv = GetFullName(getter_Copies(fullName));
-    if (NS_FAILED(rv)) return rv;
-    
-    nsXPIDLCString email;
-    rv = GetEmail(getter_Copies(email));
-    if (NS_FAILED(rv)) return rv;
-    
-    *idName = PR_smprintf("%s <%s>", (const char*)fullName,
-                          (const char*)email);
-    rv = NS_OK;
-  }
-
-  return rv;
-}
-
-nsresult nsMsgIdentity::SetIdentityName(const char *idName) {
-  return setCharPref("identityName", idName);
-}
-
-NS_IMETHODIMP
-nsMsgIdentity::ToString(PRUnichar **aResult)
-{
-  nsString idname("[nsIMsgIdentity: ");
-  idname += m_identityKey;
-  idname += "]";
-
-  *aResult = idname.ToNewUnicode();
-  return NS_OK;
-}
-
-/* Identity attribute accessors */
-
-// XXX - these are a COM objects, use NS_ADDREF
-//NS_IMPL_GETSET(nsMsgIdentity, Signature, nsIMsgSignature*, m_signature);
-NS_IMETHODIMP
-nsMsgIdentity::GetSignature(nsIFileSpec **sig) {
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *prefName = getPrefName(m_identityKey, "sig_file");
-  rv = m_prefs->GetFilePref(prefName, sig);
-  if (NS_FAILED(rv))
-    *sig = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIdentity::SetSignature(nsIFileSpec *sig)
-{
-
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = NS_OK;
-  char *prefName = getPrefName(m_identityKey, "sig_file");
-  if (sig) 
-    rv = m_prefs->SetFilePref(NS_CONST_CAST(const char*,prefName), sig,
-                              PR_FALSE);
-  /*
-  else
-    m_prefs->ClearFilePref(prefName);
-  */
-  PR_Free(prefName);
-  return rv;
-  
-  return NS_OK;
-}
-
-NS_IMPL_GETSET(nsMsgIdentity, VCard, nsIMsgVCard*, m_vCard);
-  
-NS_IMPL_GETTER_STR(nsMsgIdentity::GetKey, m_identityKey);
-
-NS_IMPL_IDPREF_STR(FullName, "fullName");
-NS_IMPL_IDPREF_STR(Email, "useremail");
-NS_IMPL_IDPREF_STR(ReplyTo, "reply_to");
-NS_IMPL_IDPREF_STR(Organization, "organization");
-NS_IMPL_IDPREF_BOOL(ComposeHtml, "compose_html");
-NS_IMPL_IDPREF_BOOL(AttachVCard, "attach_vcard");
-NS_IMPL_IDPREF_BOOL(AttachSignature, "attach_signature");
-
-NS_IMPL_IDPREF_BOOL(DoFcc, "fcc");
-NS_IMPL_IDPREF_STR(FccFolder, "fcc_folder");
-
-NS_IMPL_IDPREF_BOOL(BccSelf, "bcc_self");
-NS_IMPL_IDPREF_BOOL(BccOthers, "bcc_other");
-NS_IMPL_IDPREF_STR (BccList, "bcc_other_list");
-
-NS_IMPL_IDPREF_STR (DraftFolder, "draft_folder");
-NS_IMPL_IDPREF_STR (StationaryFolder, "stationary_folder");
-NS_IMPL_IDPREF_STR (JunkMailFolder, "spam_folder");
-
-

mozilla/mailnews/base/util/nsMsgIdentity.h

@@ -1,110 +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 nsMsgIdentity_h___
-#define nsMsgIdentity_h___
-
-#include "nsIMsgIdentity.h"
-#include "nsIPref.h"
-#include "msgCore.h"
-
-///////////////////////////////////////////////////////////////////////////////////
-// an identity is an object designed to encapsulate all the information we need 
-// to know about a user identity. I expect this interface to grow and change a lot
-// as we flesh out our thoughts on multiple identities and what properties go into
-// these identities.
-//////////////////////////////////////////////////////////////////////////////////
-
-
-class NS_MSG_BASE nsMsgIdentity : public nsIMsgIdentity,
-                                  public nsIShutdownListener
-{
-public:
-  nsMsgIdentity();
-  virtual ~nsMsgIdentity();
-  
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIMSGIDENTITY
-
-  // nsIShutdownListener
-  
-  NS_IMETHOD OnShutdown(const nsCID& aClass, nsISupports *service);
-  
-private:
-  nsIMsgSignature* m_signature;
-  nsIMsgVCard* m_vCard;
-  char *m_identityKey;
-  nsIPref *m_prefs;
-
-protected:
-  nsresult getPrefService();
-  char *getPrefName(const char *identityKey, const char *pref);
-  char *getDefaultPrefName(const char *pref);
-  nsresult getCharPref(const char *pref, char **);
-  nsresult getDefaultCharPref(const char *pref, char **);
-  nsresult setCharPref(const char *pref, const char *);
-
-  nsresult getBoolPref(const char *pref, PRBool *);
-  nsresult getDefaultBoolPref(const char *pref, PRBool *);
-  nsresult setBoolPref(const char *pref, PRBool);
-
-  nsresult getIntPref(const char *pref, PRInt32 *);
-  nsresult getDefaultIntPref(const char *pref, PRInt32 *);
-  nsresult setIntPref(const char *pref, PRInt32);
-
-};
-
-
-#define NS_IMPL_IDPREF_STR(_postfix, _prefname)	\
-NS_IMETHODIMP								   	\
-nsMsgIdentity::Get##_postfix(char **retval)   	\
-{											   	\
-  return getCharPref(_prefname, retval);		\
-}												\
-NS_IMETHODIMP	   								\
-nsMsgIdentity::Set##_postfix(const char *value)		\
-{												\
-  return setCharPref(_prefname, value);\
-}
-
-#define NS_IMPL_IDPREF_BOOL(_postfix, _prefname)\
-NS_IMETHODIMP								   	\
-nsMsgIdentity::Get##_postfix(PRBool *retval)   	\
-{											   	\
-  return getBoolPref(_prefname, retval);		\
-}												\
-NS_IMETHODIMP	   								\
-nsMsgIdentity::Set##_postfix(PRBool value)		\
-{												\
-  return setBoolPref(_prefname, value);			\
-}
-
-#define NS_IMPL_IDPREF_INT(_postfix, _prefname) \
-NS_IMETHODIMP								   	\
-nsMsgIdentity::Get##_postfix(PRInt32 *retval)   \
-{											   	\
-  return getIntPref(_prefname, retval);		\
-}												\
-NS_IMETHODIMP	   								\
-nsMsgIdentity::Set##_postfix(PRInt32 value)		\
-{												\
-  return setIntPref(_prefname, value);			\
-}
-
-
-#endif /* nsMsgIdentity_h___ */

mozilla/mailnews/base/util/nsMsgIncomingServer.cpp

@@ -1,603 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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 "nsMsgIncomingServer.h"
-#include "nscore.h"
-#include "nsCom.h"
-#include "plstr.h"
-#include "prmem.h"
-#include "prprf.h"
-
-#include "nsIServiceManager.h"
-#include "nsIPref.h"
-#include "nsCOMPtr.h"
-#include "nsIMsgFolder.h"
-#include "nsIMsgFolderCache.h"
-#include "nsIMsgFolderCacheElement.h"
-#include "nsINetSupportDialogService.h"
-#include "nsIPrompt.h"
-#include "nsXPIDLString.h"
-#include "nsIRDFService.h"
-#include "nsIMsgProtocolInfo.h"
-#include "nsRDFCID.h"
-
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
-static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-
-MOZ_DECL_CTOR_COUNTER(nsMsgIncomingServer);
-
-nsMsgIncomingServer::nsMsgIncomingServer():
-    m_prefs(0),
-    m_serverKey(0),
-    m_rootFolder(0)
-{
-  MOZ_COUNT_CTOR(nsMsgIncomingServer);
-
-  NS_INIT_REFCNT();
-  m_serverBusy = PR_FALSE;
-  m_password = "";
-}
-
-nsMsgIncomingServer::~nsMsgIncomingServer()
-{
-	
-	MOZ_COUNT_DTOR(nsMsgIncomingServer);
-
-    if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID,
-                                                  m_prefs,
-                                                  nsnull);
-    PR_FREEIF(m_serverKey)
-}
-
-NS_IMPL_ISUPPORTS1(nsMsgIncomingServer, nsIMsgIncomingServer)
-
-NS_IMPL_GETSET(nsMsgIncomingServer, ServerBusy, PRBool, m_serverBusy)
-NS_IMPL_GETTER_STR(nsMsgIncomingServer::GetKey, m_serverKey)
-
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetKey(const char * serverKey)
-{
-    nsresult rv = NS_OK;
-    // in order to actually make use of the key, we need the prefs
-    if (!m_prefs)
-        rv = nsServiceManager::GetService(kPrefServiceCID,
-                                          nsCOMTypeInfo<nsIPref>::GetIID(),
-                                          (nsISupports**)&m_prefs);
-
-    PR_FREEIF(m_serverKey);
-    m_serverKey = PL_strdup(serverKey);
-    return rv;
-}
-    
-NS_IMETHODIMP
-nsMsgIncomingServer::SetRootFolder(nsIFolder * aRootFolder)
-{
-	m_rootFolder = aRootFolder;
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetRootFolder(nsIFolder * *aRootFolder)
-{
-	if (!aRootFolder)
-		return NS_ERROR_NULL_POINTER;
-    if (m_rootFolder) {
-      *aRootFolder = m_rootFolder;
-      NS_ADDREF(*aRootFolder);
-    } else {
-      nsresult rv = CreateRootFolder();
-      if (NS_FAILED(rv)) return rv;
-      
-      *aRootFolder = m_rootFolder;
-      NS_IF_ADDREF(*aRootFolder);
-    }
-	return NS_OK;
-}
-  
-NS_IMETHODIMP
-nsMsgIncomingServer::PerformBiff()
-{
-	//This had to be implemented in the derived class, but in case someone doesn't implement it
-	//just return not implemented.
-	return NS_ERROR_NOT_IMPLEMENTED;	
-}
-
-NS_IMETHODIMP nsMsgIncomingServer::WriteToFolderCache(nsIMsgFolderCache *folderCache)
-{
-	nsresult rv = NS_OK;
-	if (m_rootFolder)
-	{
-		nsCOMPtr <nsIMsgFolder> msgFolder = do_QueryInterface(m_rootFolder, &rv);
-		if (NS_SUCCEEDED(rv) && msgFolder)
-			rv = msgFolder->WriteToFolderCache(folderCache);
-	}
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::CloseCachedConnections()
-{
-	// derived class should override if they cache connections.
-	return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetServerURI(char **)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult
-nsMsgIncomingServer::CreateRootFolder()
-{
-	nsresult rv;
-			  // get the URI from the incoming server
-  nsXPIDLCString serverUri;
-  rv = GetServerURI(getter_Copies(serverUri));
-  if (NS_FAILED(rv)) return rv;
-
-  NS_WITH_SERVICE(nsIRDFService, rdf,
-                        kRDFServiceCID, &rv);
-
-  // get the corresponding RDF resource
-  // RDF will create the server resource if it doesn't already exist
-  nsCOMPtr<nsIRDFResource> serverResource;
-  rv = rdf->GetResource(serverUri, getter_AddRefs(serverResource));
-  if (NS_FAILED(rv)) return rv;
-
-  // make incoming server know about its root server folder so we 
-  // can find sub-folders given an incoming server.
-  m_rootFolder = do_QueryInterface(serverResource, &rv);
-  return rv;
-}
-
-char *
-nsMsgIncomingServer::getPrefName(const char *serverKey,
-                                 const char *fullPrefName)
-{
-  return PR_smprintf("mail.server.%s.%s", serverKey, fullPrefName);
-}
-
-// this will be slightly faster than the above, and allows
-// the "default" server preference root to be set in one place
-char *
-nsMsgIncomingServer::getDefaultPrefName(const char *fullPrefName)
-{
-  return PR_smprintf("mail.server.default.%s", fullPrefName);
-}
-
-
-nsresult
-nsMsgIncomingServer::GetBoolValue(const char *prefname,
-                                 PRBool *val)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-  
-  if (NS_FAILED(rv))
-    rv = getDefaultBoolPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::getDefaultBoolPref(const char *prefname,
-                                        PRBool *val) {
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  nsresult rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = PR_FALSE;
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetBoolValue(const char *prefname,
-                                 PRBool val)
-{
-  nsresult rv;
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-
-  PRBool defaultValue;
-  rv = getDefaultBoolPref(prefname, &defaultValue);
-
-  if (NS_SUCCEEDED(rv) &&
-      val == defaultValue)
-    m_prefs->ClearUserPref(fullPrefName);
-  else
-    rv = m_prefs->SetBoolPref(fullPrefName, val);
-  
-  PR_Free(fullPrefName);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::GetIntValue(const char *prefname,
-                                PRInt32 *val)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-    rv = getDefaultIntPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::GetFileValue(const char* prefname,
-                                  nsIFileSpec **spec)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->GetFilePref(fullPrefName, spec);
-  PR_Free(fullPrefName);
-
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetFileValue(const char* prefname,
-                                    nsIFileSpec *spec)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->SetFilePref(fullPrefName, spec, PR_FALSE);
-  PR_Free(fullPrefName);
-
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::getDefaultIntPref(const char *prefname,
-                                        PRInt32 *val) {
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  nsresult rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = 0;
-    rv = NS_OK;
-  }
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetIntValue(const char *prefname,
-                                 PRInt32 val)
-{
-  nsresult rv;
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  
-  PRInt32 defaultVal;
-  rv = getDefaultIntPref(prefname, &defaultVal);
-  
-  if (NS_SUCCEEDED(rv) && defaultVal == val)
-    m_prefs->ClearUserPref(fullPrefName);
-  else
-    rv = m_prefs->SetIntPref(fullPrefName, val);
-  
-  PR_Free(fullPrefName);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::GetCharValue(const char *prefname,
-                                 char  **val)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-  
-  if (NS_FAILED(rv))
-    rv = getDefaultCharPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::getDefaultCharPref(const char *prefname,
-                                        char **val) {
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  nsresult rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = nsnull;              // null is ok to return here
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetCharValue(const char *prefname,
-                                 const char * val)
-{
-  nsresult rv;
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-
-  if (!val) {
-    m_prefs->ClearUserPref(fullPrefName);
-    return NS_OK;
-  }
-  
-  char *defaultVal=nsnull;
-  rv = getDefaultCharPref(prefname, &defaultVal);
-  
-  if (NS_SUCCEEDED(rv) &&
-      PL_strcmp(defaultVal, val) == 0)
-    m_prefs->ClearUserPref(fullPrefName);
-  else
-    rv = m_prefs->SetCharPref(fullPrefName, val);
-  
-  PR_FREEIF(defaultVal);
-  PR_Free(fullPrefName);
-  
-  return rv;
-}
-
-// pretty name is the display name to show to the user
-NS_IMETHODIMP
-nsMsgIncomingServer::GetPrettyName(PRUnichar **retval) {
-
-  char *val=nsnull;
-  nsresult rv = GetCharValue("name", &val);
-  if (NS_FAILED(rv)) return rv;
-
-  nsString prettyName;
-  
-  // if there's no name, then just return the hostname
-  if (val) {
-    prettyName = val;
-  } else {
-    
-    nsXPIDLCString username;
-    rv = GetUsername(getter_Copies(username));
-    if (NS_FAILED(rv)) return rv;
-    if ((const char*)username &&
-        PL_strcmp((const char*)username, "")!=0) {
-      prettyName = username;
-      prettyName += " on ";
-    }
-    
-    nsXPIDLCString hostname;
-    rv = GetHostName(getter_Copies(hostname));
-    if (NS_FAILED(rv)) return rv;
-
-
-    prettyName += hostname;
-  }
-
-  *retval = prettyName.ToNewUnicode();
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetPrettyName(const PRUnichar *value) {
-  // this is lossy. Not sure what to do.
-  nsCString str(value);
-  return SetCharValue("name", str.GetBuffer());
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::ToString(PRUnichar** aResult) {
-  nsString servername("[nsIMsgIncomingServer: ");
-  servername += m_serverKey;
-  servername += "]";
-  
-  *aResult = servername.ToNewUnicode();
-  NS_ASSERTION(*aResult, "no server name!");
-  return NS_OK;
-}
-  
-
-NS_IMETHODIMP nsMsgIncomingServer::SetPassword(const char * aPassword)
-{
-	// if remember password is turned on, write the password to preferences
-	// otherwise, just set the password so we remember it for the rest of the current
-	// session.
-
-	PRBool rememberPassword = PR_FALSE;
-	GetRememberPassword(&rememberPassword);
-	
-	if (rememberPassword)
-	{
-		SetPrefPassword((char *) aPassword);
-	}
-
-	m_password = aPassword;
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgIncomingServer::GetPassword(char ** aPassword)
-{
-	nsresult rv = NS_OK;
-	PRBool rememberPassword = PR_FALSE;
-	// okay, here's the scoop for this messs...
-	// (1) if we have a password already, go ahead and use it!
-	// (2) if remember password is turned on, try reading in from the prefs and if we have one, go ahead
-	//	   and use it
-	// (3) otherwise prompt the user for a password and then remember that password in the server
-
-	if (m_password.IsEmpty())
-	{
-
-		// case (2)
-		GetRememberPassword(&rememberPassword);
-		if (rememberPassword)
-		{
-			nsXPIDLCString password;
-			GetPrefPassword(getter_Copies(password));
-			m_password = password;
-		}
-	}
-    
-	*aPassword = m_password.ToNewCString();
-    return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetPasswordWithUI(const PRUnichar * aPromptMessage, char **aPassword) 
-{
-
-    nsXPIDLCString prefvalue;
-    GetPassword(getter_Copies(prefvalue));
-
-    nsresult rv = NS_OK;
-    if (m_password.IsEmpty()) {
-		// prompt the user for the password
-		NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv);
-		if (NS_SUCCEEDED(rv))
-		{
-			PRUnichar * uniPassword;
-			PRBool okayValue = PR_TRUE;
-			dialog->PromptPassword(aPromptMessage, &uniPassword, &okayValue);
-				
-			if (!okayValue) // if the user pressed cancel, just return NULL;
-			{
-				*aPassword = nsnull;
-				return rv;
-			}
-
-			// we got a password back...so remember it
-			nsCString aCStr(uniPassword); 
-
-			SetPassword((const char *) aCStr);
-		} // if we got a prompt dialog
-	} // if the password is empty
-
-	*aPassword = m_password.ToNewCString();
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetDefaultLocalPath(nsIFileSpec *aDefaultLocalPath)
-{
-    nsresult rv;
-    nsXPIDLCString type;
-    GetType(getter_Copies(type));
-
-    nsCAutoString progid(NS_MSGPROTOCOLINFO_PROGID_PREFIX);
-    progid += type;
-
-    NS_WITH_SERVICE(nsIMsgProtocolInfo, protocolInfo, progid, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = protocolInfo->SetDefaultLocalPath(aDefaultLocalPath);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetLocalPath(nsIFileSpec **aLocalPath)
-{
-    nsresult rv;
-
-    // if the local path has already been set, use it
-    rv = GetFileValue("directory", aLocalPath);
-    if (NS_SUCCEEDED(rv) && *aLocalPath) return rv;
-    
-    // otherwise, create the path using.  note we are using the
-    // server key instead of the hostname
-    //
-    // TODO:  handle the case where they migrated a server of hostname "server4"
-    // and we create a server (with the account wizard) with key "server4"
-    // we'd get a collision.
-    // need to modify the code that creates keys to check for disk collision
-    nsXPIDLCString type;
-    GetType(getter_Copies(type));
-
-    nsCAutoString progid(NS_MSGPROTOCOLINFO_PROGID_PREFIX);
-    progid += type;
-
-    NS_WITH_SERVICE(nsIMsgProtocolInfo, protocolInfo, progid, &rv);
-    if (NS_FAILED(rv)) return rv;
-    
-    nsCOMPtr<nsIFileSpec> path;
-    rv = protocolInfo->GetDefaultLocalPath(getter_AddRefs(path));
-    if (NS_FAILED(rv)) return rv;
-    
-    path->CreateDir();
-    
-    nsXPIDLCString key;
-    rv = GetKey(getter_Copies(key));
-    if (NS_FAILED(rv)) return rv;
-    rv = path->AppendRelativeUnixPath(key);
-    if (NS_FAILED(rv)) return rv;
-    rv = SetLocalPath(path);
-    if (NS_FAILED(rv)) return rv;
-
-    *aLocalPath = path;
-    NS_ADDREF(*aLocalPath);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetLocalPath(nsIFileSpec *spec)
-{
-    if (spec) {
-        spec->CreateDir();
-        return SetFileValue("directory", spec);
-    }
-    else {
-        return NS_ERROR_NULL_POINTER;
-    }
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetRememberPassword(PRBool value)
-{
-    if (value)
-        SetPrefPassword(m_password);
-    else
-        SetPrefPassword(nsnull);
-    return SetBoolValue("remember_password", value);
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetRememberPassword(PRBool* value)
-{
-    return GetBoolValue("remember_password", value);
-}
-
-// use the convenience macros to implement the accessors
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, HostName, "hostname");
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Username, "userName");
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, PrefPassword, "password");
-NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer, DoBiff, "check_new_mail");
-NS_IMPL_SERVERPREF_INT(nsMsgIncomingServer, BiffMinutes, "check_time");
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Type, "type");
-
-/* what was this called in 4.x? */
-// pref("mail.pop3_gets_new_mail",				true);
-
-NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer, DownloadOnBiff, "download_on_biff");

mozilla/mailnews/base/util/nsMsgIncomingServer.h

@@ -1,70 +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 nsMsgIncomingServer_h__
-#define nsMsgIncomingServer_h__
-
-#include "nsIMsgIncomingServer.h"
-#include "nsIPref.h"
-#include "msgCore.h"
-#include "nsIFolder.h"
-#include "nsCOMPtr.h"
-
-class nsIMsgFolderCache;
-
-/*
- * base class for nsIMsgIncomingServer - derive your class from here
- * if you want to get some free implementation
- * 
- * this particular implementation is not meant to be used directly.
- */
-
-class NS_MSG_BASE nsMsgIncomingServer : public nsIMsgIncomingServer {
- public:
-  nsMsgIncomingServer();
-  virtual ~nsMsgIncomingServer();
-
-  NS_DECL_ISUPPORTS
-
-  NS_DECL_NSIMSGINCOMINGSERVER
-  
-private:
-  nsIPref *m_prefs;
-  char *m_serverKey;
-  nsCString m_password;
-  PRBool m_serverBusy;
-
-protected:
-  char *getPrefName(const char *serverKey, const char *pref);
-  char *getDefaultPrefName(const char *pref);
-
-  // these are private pref getters and setters for the password
-  // field. Callers should be using Get/Set Password
-  NS_IMETHOD GetPrefPassword(char * *aPassword);
-  NS_IMETHOD SetPrefPassword(const char * aPassword);
-  
-  nsCOMPtr <nsIFolder> m_rootFolder;
-  nsresult getDefaultCharPref(const char *pref, char **);
-  nsresult getDefaultBoolPref(const char *pref, PRBool *);
-  nsresult getDefaultIntPref(const char *pref, PRInt32 *);
-  
-  nsresult CreateRootFolder();
-
-};
-
-#endif // nsMsgIncomingServer_h__

mozilla/mailnews/base/util/nsMsgKeySet.h

@@ -1,115 +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 _nsMsgKeySet_H_
-#define _nsMsgKeySet_H_
-
-#include "msgCore.h"
-
-// nsMsgKeySet represents a set of articles.  Typically, it is the set of
-// read articles from a .newsrc file, but it can be used for other purposes
-// too.
-
-#if 0
-// If a MSG_NewsHost* is supplied to the creation routine, then that
-// MSG_NewsHost will be notified whenever a change is made to set.
-class MSG_NewsHost;
-#endif
-
-class NS_MSG_BASE nsMsgKeySet {
-public:
-  // Creates an empty set.
-  static nsMsgKeySet* Create(/* MSG_NewsHost* host = NULL*/);
-
-  // Creates a set from the list of numbers, as might be found in a
-  // newsrc file.
-  static nsMsgKeySet* Create(const char* str/* , MSG_NewsHost* host = NULL*/);
-  ~nsMsgKeySet();
-  
-  // FirstNonMember() returns the lowest non-member of the set that is
-  // greater than 0.
-  PRInt32 FirstNonMember();
-
-  // Output() converts to a string representation suitable for writing to a
-  // .newsrc file.  (The result must be freed by the caller using delete[].)
-  char* Output();		
-
-  // IsMember() returns whether the given article is a member of this set.
-  PRBool IsMember(PRInt32 art);
-  
-  // Add() adds the given article to the set.  (Returns 1 if a change was
-  // made, 0 if it was already there, and negative on error.)
-  int Add(PRInt32 art);
-  
-  // Remove() removes the given article from the set. 
-  int Remove(PRInt32 art);
-  
-  // AddRange() adds the (inclusive) given range of articles to the set.
-  int AddRange(PRInt32 first, PRInt32 last);
-  
-  // CountMissingInRange() takes an inclusive range of articles and returns
-  // the number of articles in that range which are not in the set.
-  PRInt32 CountMissingInRange(PRInt32 start, PRInt32 end);
-  
-  // FirstMissingRange() takes an inclusive range and finds the first range
-  // of articles that are not in the set.  If none, return zeros. 
-  int FirstMissingRange(PRInt32 min, PRInt32 max, PRInt32* first, PRInt32* last);
-  
-
-  // LastMissingRange() takes an inclusive range and finds the last range
-  // of articles that are not in the set.  If none, return zeros. 
-  int LastMissingRange(PRInt32 min, PRInt32 max, PRInt32* first, PRInt32* last);
-  
-  PRInt32 GetLastMember();
-  PRInt32 GetFirstMember();
-  void  SetLastMember(PRInt32 highWaterMark);
-  // For debugging only...
-  PRInt32 getLength() {return m_length;}
-  
-#ifdef DEBUG
-  static void RunTests();
-#endif
-
-protected:
-  nsMsgKeySet(/* MSG_NewsHost* host */);
-  nsMsgKeySet(const char* /* , MSG_NewsHost* host */);
-  PRBool Grow();
-  PRBool Optimize();
-  
-#ifdef DEBUG
-  static void test_decoder(const char*);
-  static void test_adder();
-  static void test_ranges();
-  static void test_member(PRBool with_cache);
-#endif
-  
-  PRInt32 *m_data;					/* the numbers composing the `chunks' */
-  PRInt32 m_data_size;				/* size of that malloc'ed block */
-  PRInt32 m_length;				/* active area */
-  
-  PRInt32 m_cached_value;			/* a potential set member, or -1 if unset*/
-  PRInt32 m_cached_value_index;		/* the index into `data' at which a search
-									   to determine whether `cached_value' was
-									   a member of the set ended. */
-#ifdef NEWSRC_DOES_HOST_STUFF
-  MSG_NewsHost* m_host;
-#endif
-};
-
-
-#endif /* _nsMsgKeySet_H_ */

mozilla/mailnews/base/util/nsMsgLineBuffer.cpp

@@ -1,384 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "prlog.h"
-#include "nsMsgLineBuffer.h"
-
-#include "nsIInputStream.h" // used by nsMsgLineStreamBuffer
-
-MOZ_DECL_CTOR_COUNTER(nsByteArray);
-
-nsByteArray::nsByteArray()
-{
-	MOZ_COUNT_CTOR(nsByteArray);
-	m_buffer = NULL;
-	m_bufferSize = 0;
-	m_bufferPos = 0;
-}
-
-nsByteArray::~nsByteArray()
-{
-	MOZ_COUNT_DTOR(nsByteArray);
-	PR_FREEIF(m_buffer);
-}
-
-nsresult nsByteArray::GrowBuffer(PRUint32 desired_size, PRUint32 quantum)
-{
-	if (m_bufferSize < desired_size)
-	{
-		char *new_buf;
-		PRUint32 increment = desired_size - m_bufferSize;
-		if (increment < quantum) /* always grow by a minimum of N bytes */
-			increment = quantum;
-
-
-		new_buf = (m_buffer
-				 ? (char *) PR_REALLOC (m_buffer, (m_bufferSize + increment))
-				 : (char *) PR_MALLOC (m_bufferSize + increment));
-		if (! new_buf)
-			return NS_ERROR_OUT_OF_MEMORY;
-		m_buffer = new_buf;
-		m_bufferSize += increment;
-	}
-  return 0;
-}
-
-nsresult nsByteArray::AppendString(const char *string)
-{
-	PRUint32 strLength = (string) ? PL_strlen(string) : 0;
-	return AppendBuffer(string, strLength);
-
-}
-
-nsresult nsByteArray::AppendBuffer(const char *buffer, PRUint32 length)
-{
-	nsresult ret = NS_OK;
-	if (m_bufferPos + length > m_bufferSize)
-		ret = GrowBuffer(m_bufferPos + length, 1024);
-	if (ret == NS_OK)
-	{
-		memcpy(m_buffer + m_bufferPos, buffer, length);
-		m_bufferPos += length;
-	}
-	return ret;
-}
-
-MOZ_DECL_CTOR_COUNTER(nsMsgLineBuffer);
-
-nsMsgLineBuffer::nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP)
-{
-	MOZ_COUNT_CTOR(nsMsgLineBuffer);
-	m_handler = handler;
-	m_convertNewlinesP = convertNewlinesP;
-    m_lookingForCRLF = PR_TRUE;
-}
-
-nsMsgLineBuffer::~nsMsgLineBuffer()
-{
-	MOZ_COUNT_DTOR(nsMsgLineBuffer);
-}
-
-void
-nsMsgLineBuffer::SetLookingForCRLF(PRBool b)
-{
-  m_lookingForCRLF = b;
-}
-
-PRInt32	nsMsgLineBuffer::BufferInput(const char *net_buffer, PRInt32 net_buffer_size)
-{
-    int status = 0;
-    if (m_bufferPos > 0 && m_buffer && m_buffer[m_bufferPos - 1] == CR &&
-        net_buffer_size > 0 && net_buffer[0] != LF) {
-        /* The last buffer ended with a CR.  The new buffer does not start
-           with a LF.  This old buffer should be shipped out and discarded. */
-        PR_ASSERT(m_bufferSize > m_bufferPos);
-        if (m_bufferSize <= m_bufferPos) return -1;
-        status = ConvertAndSendBuffer();
-        if (status < 0) 
-			return status;
-        m_bufferPos = 0;
-    }
-    while (net_buffer_size > 0)
-	{
-        const char *net_buffer_end = net_buffer + net_buffer_size;
-        const char *newline = 0;
-        const char *s;
-        
-        
-        for (s = net_buffer; s < net_buffer_end; s++)
-		{
-          if (m_lookingForCRLF) {
-            /* Move forward in the buffer until the first newline.
-               Stop when we see CRLF, CR, or LF, or the end of the buffer.
-               *But*, if we see a lone CR at the *very end* of the buffer,
-               treat this as if we had reached the end of the buffer without
-               seeing a line terminator.  This is to catch the case of the
-               buffers splitting a CRLF pair, as in "FOO\r\nBAR\r" "\nBAZ\r\n".
-            */
-            if (*s == CR || *s == LF) {
-              newline = s;
-              if (newline[0] == CR) {
-                if (s == net_buffer_end - 1) {
-                  /* CR at end - wait for the next character. */
-                  newline = 0;
-                  break;
-                }
-                else if (newline[1] == LF) {
-                  /* CRLF seen; swallow both. */
-                  newline++;
-                }
-              }
-              newline++;
-              break;
-			}
-          }
-          else {
-            /* if not looking for a CRLF, stop at CR or LF.  (for example, when parsing the newsrc file).  this fixes #9896, where we'd lose the last line of anything we'd parse that used CR as the line break. */
-            if (*s == CR || *s == LF) {
-              newline = s;
-              newline++;
-              break;
-            }
-          }
-		}
-        
-        /* Ensure room in the net_buffer and append some or all of the current
-           chunk of data to it. */
-        {
-            const char *end = (newline ? newline : net_buffer_end);
-            PRUint32 desired_size = (end - net_buffer) + m_bufferPos + 1;
-            
-            if (desired_size >= m_bufferSize)
-            {
-                status = GrowBuffer (desired_size, 1024);
-                if (status < 0) 
-					return status;
-            }
-            memcpy (m_buffer + m_bufferPos, net_buffer, (end - net_buffer));
-            m_bufferPos += (end - net_buffer);
-        }
-        
-        /* Now m_buffer contains either a complete line, or as complete
-           a line as we have read so far.
-           
-           If we have a line, process it, and then remove it from `m_buffer'.
-           Then go around the loop again, until we drain the incoming data.
-           */
-        if (!newline)
-            return 0;
-        
-        status = ConvertAndSendBuffer();
-        if (status < 0) return status;
-        
-        net_buffer_size -= (newline - net_buffer);
-        net_buffer = newline;
-        m_bufferPos = 0;
-	}
-#ifdef DEBUG_bienvenu
-	printf("returning from buffer input m_bufferPos = %ld\n", m_bufferPos);
-#endif	
-    return 0;
-}
-
-PRInt32 nsMsgLineBuffer::HandleLine(char *line, PRUint32 line_length)
-{
-	NS_ASSERTION(PR_FALSE, "must override this method if you don't provide a handler");
-	return 0;
-}
-
-PRInt32 nsMsgLineBuffer::ConvertAndSendBuffer()
-{
-    /* Convert the line terminator to the native form.
-     */
-
-	char *buf = m_buffer;
-	PRInt32 length = m_bufferPos;
-
-    char* newline;
-    
-    PR_ASSERT(buf && length > 0);
-    if (!buf || length <= 0) 
-		return -1;
-    newline = buf + length;
-    
-    PR_ASSERT(newline[-1] == CR || newline[-1] == LF);
-    if (newline[-1] != CR && newline[-1] != LF)
-		return -1;
-    
-    if (!m_convertNewlinesP)
-	{
-	}
-#if (MSG_LINEBREAK_LEN == 1)
-    else if ((newline - buf) >= 2 &&
-             newline[-2] == CR &&
-             newline[-1] == LF)
-	{
-        /* CRLF -> CR or LF */
-        buf [length - 2] = MSG_LINEBREAK[0];
-        length--;
-	}
-    else if (newline > buf + 1 &&
-             newline[-1] != MSG_LINEBREAK[0])
-	{
-        /* CR -> LF or LF -> CR */
-        buf [length - 1] = MSG_LINEBREAK[0];
-	}
-#else
-    else if (((newline - buf) >= 2 && newline[-2] != CR) ||
-             ((newline - buf) >= 1 && newline[-1] != LF))
-	{
-        /* LF -> CRLF or CR -> CRLF */
-        length++;
-        buf[length - 2] = MSG_LINEBREAK[0];
-        buf[length - 1] = MSG_LINEBREAK[1];
-	}
-#endif
-    
-    return (m_handler) ? m_handler->HandleLine(buf, length) : HandleLine(buf, length);
-}
-
-// If there's still some data (non CRLF terminated) flush it out
-PRInt32 nsMsgLineBuffer::FlushLastLine()
-{
-	char *buf = m_buffer + m_bufferPos;
-	PRInt32 length = m_bufferPos - 1;
-	if (length > 0)
-		return (m_handler) ? m_handler->HandleLine(buf, length) : HandleLine(buf, length);
-	else
-		return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// This is a utility class used to efficiently extract lines from an input stream by buffering
-// read but unprocessed stream data in a buffer. 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-nsMsgLineStreamBuffer::nsMsgLineStreamBuffer(PRUint32 aBufferSize, const char * aEndOfLineToken, 
-											 PRBool aAllocateNewLines, PRBool aEatCRLFs) 
-											: m_eatCRLFs(aEatCRLFs), m_allocateNewLines(aAllocateNewLines),
-											  m_endOfLineToken(aEndOfLineToken)
-{
-	NS_PRECONDITION(aBufferSize > 0, "invalid buffer size!!!");
-	m_dataBuffer = nsnull;
-	m_startPos = nsnull;
-
-	// used to buffer incoming data by ReadNextLineFromInput
-	if (aBufferSize > 0)
-	{
-		m_dataBuffer = (char *) PR_CALLOC(sizeof(char) * aBufferSize);
-		m_startPos = m_dataBuffer;
-	}
-
-	m_dataBufferSize = aBufferSize;
-}
-
-nsMsgLineStreamBuffer::~nsMsgLineStreamBuffer()
-{
-	PR_FREEIF(m_dataBuffer); // release our buffer...
-}
-
-// the design for this method has an inherit bug: if the length of the line is greater than the size of m_dataBufferSize, 
-// then we'll never find the next line because we can't hold the whole line in memory. 
-// aInputStream - the input stream we want to read a line from
-// aPauseForMoreData is returned as PR_TRUE if the stream does not yet contain a line and we must wait for more
-// data to come into the stream.
-
-// Note to people wishing to modify this function: Be *VERY CAREFUL* this is a critical function used by all of
-// our mail protocols including imap, nntp, and pop. If you screw it up, you could break a lot of stuff.....
-
-char * nsMsgLineStreamBuffer::ReadNextLine(nsIInputStream * aInputStream, PRUint32 &aNumBytesInLine, PRBool &aPauseForMoreData)
-{
-	// try to extract a line from m_inputBuffer. If we don't have an entire line, 
-	// then read more bytes out from the stream. If the stream is empty then wait
-	// on the monitor for more data to come in.
-
-	NS_PRECONDITION(m_startPos && m_dataBufferSize > 0, "invalid input arguments for read next line from input");
-	
-	// initialize out values
-	aPauseForMoreData = PR_FALSE;
-	aNumBytesInLine = 0;
-	char * endOfLine = nsnull;
-
-	PRUint32 numBytesInBuffer = PL_strlen(m_startPos);
-	
-	if (numBytesInBuffer > 0) // any data in our internal buffer?
-		endOfLine = PL_strstr(m_startPos, m_endOfLineToken); // see if we already have a line ending...
-
-	// it's possible that we got here before the first time we receive data from the server
-	// so aInputStream will be nsnull...
-	if (!endOfLine && aInputStream) // get some more data from the server
-	{
-		PRUint32 numBytesInStream = 0;
-		PRUint32 numBytesCopied = 0;
-		aInputStream->Available(&numBytesInStream);
-		// if the number of bytes we want to read from the stream, is greater than the number
-		// of bytes left in our buffer, then we need to shift the start pos and its contents
-		// down to the beginning of m_dataBuffer...
-		PRUint32 numFreeBytesInBuffer = (m_dataBuffer + m_dataBufferSize) - (m_startPos + numBytesInBuffer);
-		if (numBytesInStream >= numFreeBytesInBuffer)
-		{
-			nsCRT::memcpy(m_dataBuffer, m_startPos, numBytesInBuffer);
-			m_dataBuffer[numBytesInBuffer] = '\0'; // make sure the end of the buffer is terminated
-			m_startPos = m_dataBuffer; // update the new start position
-			// update the number of free bytes in the buffer
-			numFreeBytesInBuffer = m_dataBufferSize - numBytesInBuffer;
-		}
-
-		PRUint32 numBytesToCopy = PR_MIN(numFreeBytesInBuffer - 1 /* leave one for a null terminator */, numBytesInStream);
-		// read the data into the end of our data buffer
-		if (numBytesToCopy > 0)
-		{
-			aInputStream->Read(m_startPos + numBytesInBuffer, numBytesToCopy, &numBytesCopied);
-			m_startPos[numBytesInBuffer + numBytesCopied] = '\0';
-		}
-
-		// okay, now that we've tried to read in more data from the stream, look for another end of line 
-		// character 
-		endOfLine = PL_strstr(m_startPos, m_endOfLineToken);
-
-	}
-
-	// okay, now check again for endOfLine.
-	if (endOfLine)
-	{
-		if (!m_eatCRLFs)
-			endOfLine += PL_strlen(m_endOfLineToken); // count for CRLF
-
-		// PR_CALLOC zeros out the allocated line
-		char* newLine = (char*) PR_CALLOC(endOfLine-m_startPos+1);
-		if (!newLine)
-			return nsnull;
-
-		nsCRT::memcpy(newLine, m_startPos, endOfLine-m_startPos); // copy the string into the new line buffer
-		aNumBytesInLine = endOfLine - m_startPos;
-
-		if (m_eatCRLFs)
-			endOfLine += PL_strlen(m_endOfLineToken); // advance past CRLF if we haven't already done so...
-
-		// now we need to update the data buffer to go past the line we just read out. 
-		if (PL_strlen(endOfLine) <= 0) // if no more data in the buffer, then just zero out the buffer...
-			m_startPos[0] = '\0';
-		else  // advance 
-			m_startPos = endOfLine; // move us up to the end of the line
-		return newLine;
-	}
-
-	aPauseForMoreData = PR_TRUE;
-	return nsnull; // if we somehow got here. we don't have another line in the buffer yet...need to wait for more data...
-}

mozilla/mailnews/base/util/nsMsgLineBuffer.h

@@ -1,113 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef _nsMsgLineBuffer_H
-#define _nsMsgLineBuffer_H
-
-#include "msgCore.h"    // precompiled header...
-
-// I can't believe I have to have this stupid class, but I can't find
-// anything suitable (nsStrImpl might be, when its done). nsIByteBuffer
-// would do, if I had a stream for input, which I don't.
-
-class NS_MSG_BASE nsByteArray 
-{
-public:
-	nsByteArray();
-	virtual ~nsByteArray();
-	PRUint32	GetSize() {return m_bufferSize;}
-	PRUint32	GetBufferPos() {return m_bufferPos;}
-	nsresult	GrowBuffer(PRUint32 desired_size, PRUint32 quantum = 1024);
-	nsresult	AppendString(const char *string);
-	nsresult	AppendBuffer(const char *buffer, PRUint32 length);
-	void		ResetWritePos() {m_bufferPos = 0;}
-	char		*GetBuffer() {return m_buffer;}
-protected:
-	char		*m_buffer;
-	PRUint32	m_bufferSize;
-	PRUint32	m_bufferPos;	// write Pos in m_buffer - where the next byte should go.
-};
-
-
-class NS_MSG_BASE nsMsgLineBufferHandler : public nsByteArray
-{
-public:
-	virtual PRInt32 HandleLine(char *line, PRUint32 line_length) = 0;
-};
-
-class NS_MSG_BASE nsMsgLineBuffer : public nsByteArray
-{
-public:
-	nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP);
-
-	virtual ~nsMsgLineBuffer();
-	PRInt32	BufferInput(const char *net_buffer, PRInt32 net_buffer_size);
-	// Not sure why anyone cares, by NNTPHost seems to want to know the buf pos.
-	PRUint32	GetBufferPos() {return m_bufferPos;}
-
-	virtual PRInt32 HandleLine(char *line, PRUint32 line_length);
-	// flush last line, though it won't be CRLF terminated.
-	virtual PRInt32 FlushLastLine();
-protected:
-	nsMsgLineBuffer(PRBool convertNewlinesP);
-
-	PRInt32 ConvertAndSendBuffer();
-    void SetLookingForCRLF(PRBool b);
-
-	nsMsgLineBufferHandler *m_handler;
-	PRBool		m_convertNewlinesP;
-    PRBool      m_lookingForCRLF; 
-};
-
-// I'm adding this utility class here for lack of a better place. This utility class is similar to nsMsgLineBuffer
-// except it works from an input stream. It is geared towards efficiently parsing new lines out of a stream by storing
-// read but unprocessed bytes in a buffer. I envision the primary use of this to be our mail protocols such as imap, news and
-// pop which need to process line by line data being returned in the form of a proxied stream from the server.
-
-class nsIInputStream;
-
-class NS_MSG_BASE nsMsgLineStreamBuffer
-{
-public:
-	// aBufferSize -- size of the buffer you want us to use for buffering stream data
-	// aEndOfLinetoken -- The delimeter string to be used for determining the end of line. This 
-	//				      allows us to parse platform specific end of line endings by making it
-	//					  a parameter.
-	// aAllocateNewLines -- PR_TRUE if you want calls to ReadNextLine to allocate new memory for the line. 
-	//						if false, the char * returned is just a ptr into the buffer. Subsequent calls to
-	//						ReadNextLine will alter the data so your ptr only has a life time of a per call.
-	// aEatCRLFs  -- PR_TRUE if you don't want to see the CRLFs on the lines returned by ReadNextLine. 
-	//				 PR_FALSE if you do want to see them.
-	nsMsgLineStreamBuffer(PRUint32 aBufferSize, const char * aEndOfLineToken, PRBool aAllocateNewLines, PRBool aEatCRLFs = PR_TRUE); // specify the size of the buffer you want the class to use....
-	virtual ~nsMsgLineStreamBuffer();
-
-	// Caller must free the line returned using PR_Free
-	// aEndOfLinetoken -- delimeter used to denote the end of a line.
-	// aNumBytesInLine -- The number of bytes in the line returned
-	// aPauseForMoreData -- There is not enough data in the stream to make a line at this time...
-	char * ReadNextLine(nsIInputStream * aInputStream, PRUint32 &anumBytesInLine, PRBool &aPauseForMoreData);
-protected:
-	PRBool m_eatCRLFs;
-	PRBool m_allocateNewLines;
-	char * m_dataBuffer;
-	char * m_startPos;
-	const char * m_endOfLineToken;
-	PRUint32 m_dataBufferSize;
-};
-
-
-#endif

mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -1,399 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "nsMsgMailNewsUrl.h"
-#include "nsMsgBaseCID.h"
-#include "nsIMsgMailSession.h"
-#include "nsXPIDLString.h"
-
-static NS_DEFINE_CID(kUrlListenerManagerCID, NS_URLLISTENERMANAGER_CID);
-static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID);
-static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
-
-nsMsgMailNewsUrl::nsMsgMailNewsUrl()
-{
-    NS_INIT_REFCNT();
- 
-	// nsIURI specific state
-	m_errorMessage = nsnull;
-	m_runningUrl = PR_FALSE;
-	m_updatingFolder = PR_FALSE;
-
-	nsComponentManager::CreateInstance(kUrlListenerManagerCID, nsnull, nsCOMTypeInfo<nsIUrlListenerManager>::GetIID(), (void **) getter_AddRefs(m_urlListeners));
-	nsComponentManager::CreateInstance(kStandardUrlCID, nsnull, nsCOMTypeInfo<nsIURL>::GetIID(), (void **) getter_AddRefs(m_baseURL));
-}
- 
-nsMsgMailNewsUrl::~nsMsgMailNewsUrl()
-{
-	PR_FREEIF(m_errorMessage);
-}
-  
-NS_IMPL_ADDREF(nsMsgMailNewsUrl);
-NS_IMPL_RELEASE(nsMsgMailNewsUrl);
-
-nsresult nsMsgMailNewsUrl::QueryInterface(const nsIID &aIID, void** aInstancePtr)
-{
-    if (NULL == aInstancePtr) {
-        return NS_ERROR_NULL_POINTER;
-    }
-    if (aIID.Equals(nsCOMTypeInfo<nsIURI>::GetIID())) {
-        *aInstancePtr = (void*) ((nsIURI*)this);
-        NS_ADDREF_THIS();
-        return NS_OK;
-    }
-	if (aIID.Equals(nsCOMTypeInfo<nsIURL>::GetIID())) {
-        *aInstancePtr = (void*) ((nsIURL*)this);
-        NS_ADDREF_THIS();
-        return NS_OK;
-    }
-	if (aIID.Equals(nsCOMTypeInfo<nsIMsgMailNewsUrl>::GetIID()))
-	{
-		*aInstancePtr = (void *) ((nsIMsgMailNewsUrl*) this);
-		NS_ADDREF_THIS();
-		return NS_OK;
-	}
- 
-	if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))    
-	{
-		*aInstancePtr = (void *) ((nsIMsgMailNewsUrl*) this);
-		NS_ADDREF_THIS();
-		return NS_OK;
-	}
-#if defined(NS_DEBUG)
-    /*
-     * Check for the debug-only interface indicating thread-safety
-     */
-    static NS_DEFINE_IID(kIsThreadsafeIID, NS_ISTHREADSAFE_IID);
-    if (aIID.Equals(kIsThreadsafeIID)) {
-        return NS_OK;
-    }
-#endif
-    return NS_NOINTERFACE;
-}
-
-////////////////////////////////////////////////////////////////////////////////////
-// Begin nsIMsgMailNewsUrl specific support
-////////////////////////////////////////////////////////////////////////////////////
-
-nsresult nsMsgMailNewsUrl::GetUrlState(PRBool * aRunningUrl)
-{
-	if (aRunningUrl)
-		*aRunningUrl = m_runningUrl;
-
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::SetUrlState(PRBool aRunningUrl, nsresult aExitCode)
-{
-	m_runningUrl = aRunningUrl;
-	nsCOMPtr <nsIMsgStatusFeedback> statusFeedback;
-
-	if (NS_SUCCEEDED(GetStatusFeedback(getter_AddRefs(statusFeedback))) && statusFeedback)
-	{
-		if (m_runningUrl)
-			statusFeedback->StartMeteors();
-		else
-		{
-			statusFeedback->ShowProgress(0);
-			statusFeedback->StopMeteors();
-		}
-	}
-	if (m_urlListeners)
-	{
-		if (m_runningUrl)
-		{
-			m_urlListeners->OnStartRunningUrl(this);
-		}
-		else
-		{
-			m_urlListeners->OnStopRunningUrl(this, aExitCode);
-		}
-	}
-
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::RegisterListener (nsIUrlListener * aUrlListener)
-{
-	if (m_urlListeners)
-		m_urlListeners->RegisterListener(aUrlListener);
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::UnRegisterListener (nsIUrlListener * aUrlListener)
-{
-	if (m_urlListeners)
-		m_urlListeners->UnRegisterListener(aUrlListener);
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::SetErrorMessage (const char * errorMessage)
-{
-	// functionality has been moved to nsIMsgStatusFeedback
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult nsMsgMailNewsUrl::GetErrorMessage (char ** errorMessage)
-{
-	// functionality has been moved to nsIMsgStatusFeedback
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetServer(nsIMsgIncomingServer ** aIncomingServer)
-{
-	// mscott --> we could cache a copy of the server here....but if we did, we run
-	// the risk of leaking the server if any single url gets leaked....of course that
-	// shouldn't happen...but it could. so i'm going to look it up every time and
-	// we can look at caching it later.
-
-	nsXPIDLCString host;
-	nsXPIDLCString scheme;
-
-	nsresult rv = GetHost(getter_Copies(host));
-	rv = GetScheme(getter_Copies(scheme));
-    if (NS_SUCCEEDED(rv))
-    {
-        NS_WITH_SERVICE(nsIMsgMailSession, session, kMsgMailSessionCID, &rv); 
-        if (NS_FAILED(rv)) return rv;
-        
-        nsCOMPtr<nsIMsgAccountManager> accountManager;
-        rv = session->GetAccountManager(getter_AddRefs(accountManager));
-        if(NS_FAILED(rv)) return rv;
-        
-        nsCOMPtr<nsIMsgIncomingServer> server;
-        rv = accountManager->FindServer(GetUserName(),
-                                        host,
-                                        scheme,
-                                        aIncomingServer);
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetStatusFeedback(nsIMsgStatusFeedback *aMsgFeedback)
-{
-	if (aMsgFeedback)
-		m_statusFeedback = do_QueryInterface(aMsgFeedback);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetStatusFeedback(nsIMsgStatusFeedback **aMsgFeedback)
-{
-	nsresult rv = NS_OK;
-	// note: it is okay to return a null status feedback and not return an error
-	// it's possible the url really doesn't have status feedback
-	if (!m_statusFeedback)
-	{
-		NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); 
-
-		if(NS_SUCCEEDED(rv))
-			mailSession->GetTemporaryMsgStatusFeedback(getter_AddRefs(m_statusFeedback));
-	}
-	if (aMsgFeedback)
-	{
-		*aMsgFeedback = m_statusFeedback;
-		NS_IF_ADDREF(*aMsgFeedback);
-	}
-	else
-		rv = NS_ERROR_NULL_POINTER;
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetUpdatingFolder(PRBool *aResult)
-{
-	if (!aResult)
-		return NS_ERROR_NULL_POINTER;
-	*aResult = m_updatingFolder;
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetUpdatingFolder(PRBool updatingFolder)
-{
-	m_updatingFolder = updatingFolder;
-	return NS_OK;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////
-// End nsIMsgMailNewsUrl specific support
-////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////
-// Begin nsIURI support
-////////////////////////////////////////////////////////////////////////////////////
-
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetSpec(char * *aSpec)
-{
-	return m_baseURL->GetSpec(aSpec);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetSpec(const char * aSpec)
-{
-	return m_baseURL->SetSpec(aSpec);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetScheme(char * *aScheme)
-{
-	return m_baseURL->GetScheme(aScheme);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetScheme(const char * aScheme)
-{
-	return m_baseURL->SetScheme(aScheme);
-}
-
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetPreHost(char * *aPreHost)
-{
-	return m_baseURL->GetPreHost(aPreHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetPreHost(const char * aPreHost)
-{
-	return m_baseURL->SetPreHost(aPreHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetHost(char * *aHost)
-{
-	return m_baseURL->GetHost(aHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetHost(const char * aHost)
-{
-	return m_baseURL->SetHost(aHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetPort(PRInt32 *aPort)
-{
-	return m_baseURL->GetPort(aPort);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetPort(PRInt32 aPort)
-{
-	return m_baseURL->SetPort(aPort);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetPath(char * *aPath)
-{
-	return m_baseURL->GetPath(aPath);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetPath(const char * aPath)
-{
-	return m_baseURL->SetPath(aPath);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::Equals(nsIURI *other, PRBool *_retval)
-{
-	return m_baseURL->Equals(other, _retval);
-}
-
-
-NS_IMETHODIMP nsMsgMailNewsUrl::Clone(nsIURI **_retval)
-{
-	return m_baseURL->Clone(_retval);
-}	
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetRelativePath(const char *i_RelativePath)
-{
-	return m_baseURL->SetRelativePath(i_RelativePath);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetDirectory(char * *aDirectory)
-{
-	return m_baseURL->GetDirectory(aDirectory);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetDirectory(const char *aDirectory)
-{
-
-	return m_baseURL->SetDirectory(aDirectory);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFileName(char * *aFileName)
-{
-	return m_baseURL->GetFileName(aFileName);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFileBaseName(char * *aFileBaseName)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFileBaseName(const char * aFileBaseName)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFileExtension(char * *aFileExtension)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFileExtension(const char * aFileExtension)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFileName(const char * aFileName)
-{
-	return m_baseURL->SetFileName(aFileName);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetParam(char * *aParam)
-{
-	return m_baseURL->GetParam(aParam);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetParam(const char *aParam)
-{
-	return m_baseURL->SetParam(aParam);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetQuery(char * *aQuery)
-{
-	return m_baseURL->GetQuery(aQuery);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetQuery(const char *aQuery)
-{
-	return m_baseURL->SetQuery(aQuery);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetRef(char * *aRef)
-{
-	return m_baseURL->GetRef(aRef);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetRef(const char *aRef)
-{
-	return m_baseURL->SetRef(aRef);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFilePath(char **o_DirFile)
-{
-	return m_baseURL->GetFilePath(o_DirFile);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFilePath(const char *i_DirFile)
-{
-	return m_baseURL->SetFilePath(i_DirFile);
-}
-

mozilla/mailnews/base/util/nsMsgMailNewsUrl.h

@@ -1,66 +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 nsMsgMailNewsUrl_h___
-#define nsMsgMailNewsUrl_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-#include "nsIUrlListener.h"
-#include "nsIUrlListenerManager.h"
-#include "nsIMsgStatusFeedback.h"
-#include "nsCOMPtr.h"
-#include "nsIMsgMailNewsUrl.h"
-#include "nsIURL.h"
-
-///////////////////////////////////////////////////////////////////////////////////
-// Okay, I found that all of the mail and news url interfaces needed to support
-// several common interfaces (in addition to those provided through nsIURI). 
-// So I decided to group them all in this implementation so we don't have to
-// duplicate the code.
-//
-//////////////////////////////////////////////////////////////////////////////////
-
-class NS_MSG_BASE nsMsgMailNewsUrl : public nsIMsgMailNewsUrl
-{
-public:
-	nsMsgMailNewsUrl();
-
-	NS_DECL_ISUPPORTS
-    NS_DECL_NSIMSGMAILNEWSURL
-    NS_DECL_NSIURI
-    NS_DECL_NSIURL
-
-protected:
-	virtual ~nsMsgMailNewsUrl();
-
-	// a helper function I needed from derived urls...
-	virtual const char * GetUserName() = 0;
-
-	nsCOMPtr<nsIURL> m_baseURL;
-	nsCOMPtr<nsIMsgStatusFeedback> m_statusFeedback;
-	char		*m_errorMessage;
-	PRBool		m_runningUrl;
-	PRBool		m_updatingFolder;
-
-	// manager of all of current url listeners....
-	nsCOMPtr<nsIUrlListenerManager> m_urlListeners;
-};
-
-
-#endif /* nsMsgMailNewsUrl_h___ */

mozilla/mailnews/base/util/nsMsgProtocol.cpp

@@ -1,369 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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 "msgCore.h"
-#include "nsMsgProtocol.h"
-#include "nsIMsgMailNewsUrl.h"
-#include "nsISocketTransportService.h"
-#include "nsXPIDLString.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsILoadGroup.h"
-#include "nsIIOService.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-
-NS_IMPL_ISUPPORTS3(nsMsgProtocol, nsIStreamListener, nsIStreamObserver, nsIChannel)
-
-nsMsgProtocol::nsMsgProtocol()
-{
-	NS_INIT_REFCNT();
-	m_flags = 0;
-	m_startPosition = 0;
-	m_readCount = 0;
-	m_socketIsOpen = PR_FALSE;
-		
-	m_tempMsgFileSpec = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-	m_tempMsgFileSpec += "tempMessage.eml";
-}
-
-nsMsgProtocol::~nsMsgProtocol()
-{}
-
-nsresult nsMsgProtocol::OpenNetworkSocket(nsIURI * aURL) // open a connection on this url
-{
-	nsresult rv = NS_OK;
-	nsXPIDLCString hostName;
-	PRInt32 port = 0;
-
-	m_readCount = -1; // with socket connections we want to read as much data as arrives
-	m_startPosition = 0;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-
-	if (NS_SUCCEEDED(rv) && aURL)
-	{
-		aURL->GetPort(&port);
-		aURL->GetHost(getter_Copies(hostName));
-
-		rv = socketService->CreateTransport(hostName, port, nsnull, getter_AddRefs(m_channel));
-		if (NS_SUCCEEDED(rv) && m_channel)
-		{
-			m_socketIsOpen = PR_FALSE;
-			rv = SetupTransportState();
-		}
-	}
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::OpenFileSocket(nsIURI * aURL, const nsFileSpec * aFileSpec, PRUint32 aStartPosition, PRInt32 aReadCount)
-{
-	// mscott - file needs to be encoded directly into aURL. I should be able to get
-	// rid of this method completely.
-
-	nsresult rv = NS_OK;
-	m_startPosition = aStartPosition;
-	m_readCount = aReadCount;
-
-    NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv);
-	if (NS_SUCCEEDED(rv) && aURL)
-	{
-		// extract the file path from the uri...
-		nsXPIDLCString filePath;
-		aURL->GetPath(getter_Copies(filePath));
-		char * urlSpec = PR_smprintf("file://%s", (const char *) filePath);
-
-		rv = netService->NewChannel("Load", urlSpec, 
-                                    nsnull,     // null base URI
-                                    nsnull,     // null load group
-                                    nsnull,     // null eventsink getter
-                                    getter_AddRefs(m_channel));
-		PR_FREEIF(urlSpec);
-
-		if (NS_SUCCEEDED(rv) && m_channel)
-		{
-			m_socketIsOpen = PR_FALSE;
-			// rv = SetupTransportState();
-		}
-	}
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::SetupTransportState()
-{
-	nsresult rv = NS_OK;
-
-	if (!m_socketIsOpen && m_channel)
-	{
-		rv = m_channel->OpenOutputStream(0 /* start position */, getter_AddRefs(m_outputStream));
-
-		NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create an output stream");
-		// we want to open the stream 
-	} // if m_transport
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::CloseSocket()
-{
-	// release all of our socket state
-	m_socketIsOpen = PR_FALSE;
-	m_outputStream = null_nsCOMPtr();
-	m_channel = null_nsCOMPtr();
-
-	return NS_OK;
-}
-
-/*
- * Writes the data contained in dataBuffer into the current output stream. It also informs
- * the transport layer that this data is now available for transmission.
- * Returns a positive number for success, 0 for failure (not all the bytes were written to the
- * stream, etc). We need to make another pass through this file to install an error system (mscott)
- */
-
-PRInt32 nsMsgProtocol::SendData(nsIURI * aURL, const char * dataBuffer)
-{
-	PRUint32 writeCount = 0; 
-	PRInt32 status = 0; 
-
-//	NS_PRECONDITION(m_outputStream, "oops....we don't have an output stream...how did that happen?");
-	if (dataBuffer && m_outputStream)
-	{
-		status = m_outputStream->Write(dataBuffer, PL_strlen(dataBuffer), &writeCount);
-	}
-
-	return status;
-}
-
-// Whenever data arrives from the connection, core netlib notifices the protocol by calling
-// OnDataAvailable. We then read and process the incoming data from the input stream. 
-NS_IMETHODIMP nsMsgProtocol::OnDataAvailable(nsIChannel * /* aChannel */, nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
-{
-	// right now, this really just means turn around and churn through the state machine
-	nsCOMPtr<nsIURI> uri = do_QueryInterface(ctxt);
-	return ProcessProtocolState(uri, inStr, sourceOffset, count);
-}
-
-NS_IMETHODIMP nsMsgProtocol::OnStartRequest(nsIChannel * aChannel, nsISupports *ctxt)
-{
-	nsresult rv = NS_OK;
-	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(ctxt, &rv);
-	if (NS_SUCCEEDED(rv) && aMsgUrl)
-		rv = aMsgUrl->SetUrlState(PR_TRUE, NS_OK);
-
-	// if we are set up as a channel, we should notify our channel listener that we are starting...
-	// so pass in ourself as the channel and not the underlying socket or file channel the protocol
-	// happens to be using
-	if (m_channelListener)
-		rv = m_channelListener->OnStartRequest(this, m_channelContext);
-
-	return rv;
-}
-
-// stop binding is a "notification" informing us that the stream associated with aURL is going away. 
-NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIChannel * aChannel, nsISupports *ctxt, nsresult aStatus, const PRUnichar* aMsg)
-{
-	nsresult rv = NS_OK;
-	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(ctxt, &rv);
-	if (NS_SUCCEEDED(rv) && aMsgUrl)
-		rv = aMsgUrl->SetUrlState(PR_FALSE, aStatus);
-
-	// if we are set up as a channel, we should notify our channel listener that we are starting...
-	// so pass in ourself as the channel and not the underlying socket or file channel the protocol
-	// happens to be using
-	if (m_channelListener)
-		rv = m_channelListener->OnStopRequest(this, m_channelContext, aStatus, aMsg);
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer)
-{
-	// okay now kick us off to the next state...
-	// our first state is a process state so drive the state machine...
-	nsresult rv = NS_OK;
-	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(aURL);
-
-	if (NS_SUCCEEDED(rv))
-	{
-		rv = aMsgUrl->SetUrlState(PR_TRUE, NS_OK); // set the url as a url currently being run...
-
-    // if the url is given a stream consumer then we should use it to forward calls to...
-    if (!m_channelListener && aConsumer) // if we don't have a registered listener already
-    {
-      m_channelListener = do_QueryInterface(aConsumer);
-      if (!m_channelContext)
-        m_channelContext = do_QueryInterface(aURL);
-    }
-
-		if (!m_socketIsOpen)
-		{
-			nsCOMPtr<nsISupports> urlSupports = do_QueryInterface(aURL);
-
-			// put us in a state where we are always notified of incoming data
-			m_channel->AsyncRead(m_startPosition, m_readCount, urlSupports ,this /* stream observer */);
-			m_socketIsOpen = PR_TRUE; // mark the channel as open
-		} // if we got an event queue service
-		else  // the connection is already open so we should begin processing our new url...
-			rv = ProcessProtocolState(aURL, nsnull, 0, 0); 
-	}
-
-	return rv;
-}
-
-///////////////////////////////////////////////////////////////////////
-// The rest of this file is mostly nsIChannel mumbo jumbo stuff
-///////////////////////////////////////////////////////////////////////
-
-nsresult nsMsgProtocol::SetUrl(nsIURI * aURL)
-{
-	m_url = dont_QueryInterface(aURL);
-	return NS_OK;
-}
-
-nsresult nsMsgProtocol::SetLoadGroup(nsILoadGroup * aLoadGroup)
-{
-	m_loadGroup = dont_QueryInterface(aLoadGroup);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetURI(nsIURI * *aURI)
-{
-	nsresult rv = NS_OK;
-	if (aURI)
-	{
-		if (m_url)
-			rv = m_url->QueryInterface(NS_GET_IID(nsIURI), (void **) aURI);
-		else
-			*aURI = nsnull;
-	}
-	else
-		rv = NS_ERROR_NULL_POINTER;
-	return rv;
-}
- 
-NS_IMETHODIMP nsMsgProtocol::OpenInputStream(PRUint32 startPosition, PRInt32 readCount, nsIInputStream **_retval)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::OpenOutputStream(PRUint32 startPosition, nsIOutputStream **_retval)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::AsyncRead(PRUint32 startPosition, PRInt32 readCount, nsISupports *ctxt, nsIStreamListener *listener)
-{
-	// set the stream listener and then load the url
-	m_channelContext = ctxt;
-	m_channelListener = listener;
-
-	// the following load group code is completely bogus....
-	nsresult rv = NS_OK;
-	if (m_loadGroup)
-	{
-		nsCOMPtr<nsILoadGroupListenerFactory> factory;
-		//
-		// Create a load group "proxy" listener...
-		//
-		rv = m_loadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-		if (factory) 
-		{
-			nsCOMPtr<nsIStreamListener> newListener;
-			rv = factory->CreateLoadGroupListener(m_channelListener, getter_AddRefs(newListener));
-			if (NS_SUCCEEDED(rv)) 
-				m_channelListener = newListener;
-		}
-	} // if aLoadGroup
-
-	return LoadUrl(m_url, nsnull);
-}
-
-NS_IMETHODIMP nsMsgProtocol::AsyncWrite(nsIInputStream *fromStream, PRUint32 startPosition, PRInt32 writeCount, nsISupports *ctxt, nsIStreamObserver *observer)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetContentType(char * *aContentType)
-{
-	*aContentType = nsCRT::strdup("message/rfc822");
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetContentLength(PRInt32 * aContentLength)
-{
-  *aContentLength = -1;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetOwner(nsISupports * *aPrincipal)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::SetOwner(nsISupports * aPrincipal)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetLoadGroup(nsILoadGroup * *aLoadGroup)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// From nsIRequest
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP nsMsgProtocol::IsPending(PRBool *result)
-{
-    *result = PR_TRUE;
-    return NS_OK; 
-}
-
-NS_IMETHODIMP nsMsgProtocol::Cancel()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::Suspend()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::Resume()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/mailnews/base/util/nsMsgProtocol.h

@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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 nsMsgProtocol_h__
-#define nsMsgProtocol_h__
-
-#include "nsIStreamListener.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsIEventQueue.h"
-#include "nsIChannel.h"
-#include "nsIURL.h"
-#include "nsILoadGroup.h"
-#include "nsCOMPtr.h"
-
-// This is a helper class used to encapsulate code shared between all of the
-// mailnews protocol objects (imap, news, pop, smtp, etc.) In particular,
-// it unifies the core networking code for the protocols. My hope is that
-// this will make unification with Necko easier as we'll only have to change
-// this class and not all of the mailnews protocols.
-class NS_MSG_BASE nsMsgProtocol : public nsIStreamListener, public nsIChannel
-{
-public:
-	nsMsgProtocol();
-	virtual ~nsMsgProtocol();
-
-	NS_DECL_ISUPPORTS
-	// nsIChannel support
-	NS_DECL_NSICHANNEL
-	NS_DECL_NSIREQUEST
-  
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSISTREAMOBSERVER
-
-	// LoadUrl -- A protocol typically overrides this function, sets up any local state for the url and
-	// then calls the base class which opens the socket if it needs opened. If the socket is 
-	// already opened then we just call ProcessProtocolState to start the churning process.
-	// aConsumer is the consumer for the url. It can be null if this argument is not appropriate
-	virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nsnull);
-
-	virtual nsresult SetUrl(nsIURI * aURL); // sometimes we want to set the url before we load it
-	virtual nsresult SetLoadGroup(nsILoadGroup * aLoadGroup);
-
-	// Flag manipulators
-	PRBool TestFlag  (PRUint32 flag) {return flag & m_flags;}
-	void   SetFlag   (PRUint32 flag) { m_flags |= flag; }
-	void   ClearFlag (PRUint32 flag) { m_flags &= ~flag; }
-
-protected:
-	// methods for opening and closing a socket with core netlib....
-	// mscott -okay this is lame. I should break this up into a file protocol and a socket based
-	// protocool class instead of cheating and putting both methods here...
-	virtual nsresult OpenNetworkSocket(nsIURI * aURL); // open a connection on this url
-	virtual nsresult OpenFileSocket(nsIURI * aURL, const nsFileSpec * aFileSpec, PRUint32 aStartPosition, PRInt32 aReadCount); // used to open a file socket connection
-
-	// a Protocol typically overrides this method. They free any of their own connection state and then
-	// they call up into the base class to free the generic connection objects
-	virtual nsresult CloseSocket(); 
-
-	virtual nsresult SetupTransportState(); // private method used by OpenNetworkSocket and OpenFileSocket
-
-	// ProcessProtocolState - This is the function that gets churned by calls to OnDataAvailable. 
-	// As data arrives on the socket, OnDataAvailable calls ProcessProtocolState.
-	
-	virtual nsresult ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream, 
-									      PRUint32 sourceOffset, PRUint32 length) = 0;
-
-	// SendData -- Writes the data contained in dataBuffer into the current output stream. 
-	// It also informs the transport layer that this data is now available for transmission.
-	// Returns a positive number for success, 0 for failure (not all the bytes were written to the
-	// stream, etc). 
-	virtual PRInt32 SendData(nsIURI * aURL, const char * dataBuffer);
-
-	// Ouput stream for writing commands to the socket
-	nsCOMPtr<nsIChannel>		m_channel; 
-	nsCOMPtr<nsIOutputStream>	m_outputStream;   // this will be obtained from the transport interface
-
-	PRBool	  m_socketIsOpen; // mscott: we should look into keeping this state in the nsSocketTransport...
-							  // I'm using it to make sure I open the socket the first time a URL is loaded into the connection
-	PRUint32	m_flags; // used to store flag information
-	PRUint32	m_startPosition;
-	PRInt32		m_readCount;
-
-	nsFileSpec	m_tempMsgFileSpec;  // we currently have a hack where displaying a msg involves writing it to a temp file first
-
-	// the following is a catch all for nsIChannel related data
-	nsCOMPtr<nsIURI>  m_url; // the running url
-	nsCOMPtr<nsIStreamListener> m_channelListener;
-	nsCOMPtr<nsISupports>		m_channelContext;
-	nsCOMPtr<nsILoadGroup>		m_loadGroup;
-};
-
-#endif /* nsMsgProtocol_h__ */

mozilla/mailnews/base/util/nsMsgTxn.cpp

@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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, 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsMsgTxn.h"
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kITransactionIID, NS_ITRANSACTION_IID);
-
-NS_IMPL_ADDREF(nsMsgTxn)
-NS_IMPL_RELEASE(nsMsgTxn)
-
-// note that aEditor is not refcounted
-nsMsgTxn::nsMsgTxn()
-{
-  NS_INIT_REFCNT();
-}
-
-nsMsgTxn::~nsMsgTxn()
-{
-}
-
-NS_IMETHODIMP nsMsgTxn::Do(void)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgTxn::GetIsTransient(PRBool *aIsTransient)
-{
-  if (nsnull!=aIsTransient)
-    *aIsTransient = PR_FALSE;
-  else
-	  return NS_ERROR_NULL_POINTER;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgTxn::Write(nsIOutputStream *aOutputStream)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgTxn::GetUndoString(nsString *aString)
-{
-  if (nsnull!=aString)
-    *aString="Undo";
-  else
-	  return NS_ERROR_NULL_POINTER;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgTxn::GetRedoString(nsString *aString)
-{
-  if (nsnull!=aString)
-    *aString="Redo";
-  else
-	  return NS_ERROR_NULL_POINTER;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kITransactionIID)) {
-    *aInstancePtr = (void*)(nsITransaction*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  *aInstancePtr = 0;
-  return NS_NOINTERFACE;
-}
-
-
-

mozilla/mailnews/base/util/nsMsgTxn.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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, 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsMsgTxn_h__
-#define nsMsgTxn_h__
-
-#include "nsITransaction.h"
-#include "msgCore.h"
-
-#define NS_MESSAGETRANSACTION_IID \
-{ /* da621b30-1efc-11d3-abe4-00805f8ac968 */ \
-    0xda621b30, 0x1efc, 0x11d3, \
-	{ 0xab, 0xe4, 0x00, 0x80, 0x5f, 0x8a, 0xc9, 0x68 } }
-/**
- * base class for all message undo/redo transactions.
- */
-class NS_MSG_BASE nsMsgTxn : public nsITransaction
-{
-    NS_DECL_ISUPPORTS 
-
-    nsMsgTxn();
-    virtual ~nsMsgTxn();
-
-    NS_IMETHOD Do(void);
-    
-    NS_IMETHOD Undo(void) = 0;
-    
-    NS_IMETHOD Redo(void) = 0;
-    
-    NS_IMETHOD GetIsTransient(PRBool *aIsTransient);
-
-    NS_IMETHOD Merge(PRBool *aDidMerge, nsITransaction *aTransaction);
-
-    NS_IMETHOD Write(nsIOutputStream *aOutputStream);
-
-    NS_IMETHOD GetUndoString(nsString *aString);
-
-    NS_IMETHOD GetRedoString(nsString *aString);
-
-};
-
-#endif

mozilla/mailnews/base/util/nsMsgUtils.cpp

@@ -1,326 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "nsIMessage.h"
-#include "nsIMsgHdr.h"
-#include "nsMsgUtils.h"
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsIImapUrl.h"
-#include "nsIMailboxUrl.h"
-#include "nsINntpUrl.h"
-#include "nsMsgNewsCID.h"
-#include "nsMsgLocalCID.h"
-#include "nsMsgBaseCID.h"
-#include "nsMsgImapCID.h"
-
-static NS_DEFINE_CID(kImapUrlCID, NS_IMAPURL_CID);
-static NS_DEFINE_CID(kCMailboxUrl, NS_MAILBOXURL_CID);
-static NS_DEFINE_CID(kCNntpUrlCID, NS_NNTPURL_CID);
-
-#if defined(DEBUG_sspitzer_) || defined(DEBUG_seth_)
-#define DEBUG_NS_MsgHashIfNecessary 1
-#endif
-
-nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID)
-{
-
-	nsresult rv = NS_OK;
-	//Find protocol
-	nsString uriStr = uri;
-	PRInt32 pos = uriStr.FindChar(':');
-	if(pos == -1)
-		return NS_ERROR_FAILURE;
-	nsString protocol;
-	uriStr.Left(protocol, pos);
-
-	//Build message service progid
-	progID = "component://netscape/messenger/messageservice;type=";
-	progID += protocol;
-
-	return rv;
-}
-
-nsresult GetMessageServiceFromURI(const char *uri, nsIMsgMessageService **messageService)
-{
-
-	nsAutoString progID;
-	nsresult rv;
-
-	rv = GetMessageServiceProgIDForURI(uri, progID);
-
-	if(NS_SUCCEEDED(rv))
-	{
-		rv = nsServiceManager::GetService((const char *) nsCAutoString(progID), nsCOMTypeInfo<nsIMsgMessageService>::GetIID(),
-		           (nsISupports**)messageService, nsnull);
-	}
-
-	return rv;
-}
-
-
-nsresult ReleaseMessageServiceFromURI(const char *uri, nsIMsgMessageService *messageService)
-{
-	nsAutoString progID;
-	nsresult rv;
-
-	rv = GetMessageServiceProgIDForURI(uri, progID);
-	if(NS_SUCCEEDED(rv))
-		rv = nsServiceManager::ReleaseService(nsCAutoString(progID), messageService);
-	return rv;
-}
-
-
-nsresult CreateStartupUrl(char *uri, nsIURI** aUrl)
-{
-    nsresult rv = NS_ERROR_NULL_POINTER;
-    if (!uri || !*uri || !aUrl) return rv;
-    *aUrl = nsnull;
-    if (PL_strncasecmp(uri, "imap", 4) == 0)
-    {
-        nsCOMPtr<nsIImapUrl> imapUrl;
-        rv = nsComponentManager::CreateInstance(kImapUrlCID, nsnull,
-                                                nsIImapUrl::GetIID(),
-                                                getter_AddRefs(imapUrl));
-        if (NS_SUCCEEDED(rv) && imapUrl)
-            rv = imapUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
-                                         (void**) aUrl);
-    }
-    else if (PL_strncasecmp(uri, "mailbox", 7) == 0)
-    {
-        nsCOMPtr<nsIMailboxUrl> mailboxUrl;
-        rv = nsComponentManager::CreateInstance(kCMailboxUrl, nsnull,
-                                                nsIMailboxUrl::GetIID(),
-                                                getter_AddRefs(mailboxUrl));
-        if (NS_SUCCEEDED(rv) && mailboxUrl)
-            rv = mailboxUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
-                                            (void**) aUrl);
-    }
-    else if (PL_strncasecmp(uri, "news", 4) == 0)
-    {
-        nsCOMPtr<nsINntpUrl> nntpUrl;
-        rv = nsComponentManager::CreateInstance(kCNntpUrlCID, nsnull,
-                                                nsINntpUrl::GetIID(),
-                                                getter_AddRefs(nntpUrl));
-        if (NS_SUCCEEDED(rv) && nntpUrl)
-            rv = nntpUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
-                                         (void**) aUrl);
-    }
-    if (*aUrl)
-        (*aUrl)->SetSpec(uri);
-    return rv;
-}
-
-
-NS_IMPL_ISUPPORTS(nsMessageFromMsgHdrEnumerator, nsCOMTypeInfo<nsISimpleEnumerator>::GetIID())
-
-nsMessageFromMsgHdrEnumerator::nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
-															 nsIMsgFolder *folder)
-{
-    NS_INIT_REFCNT();
-
-	mSrcEnumerator = dont_QueryInterface(srcEnumerator);
-	mFolder = dont_QueryInterface(folder);
-
-}
-
-nsMessageFromMsgHdrEnumerator::~nsMessageFromMsgHdrEnumerator()
-{
-	//member variables are nsCOMPtr's
-}
-
-
-NS_IMETHODIMP nsMessageFromMsgHdrEnumerator::GetNext(nsISupports **aItem)
-{
-	nsCOMPtr<nsISupports> currentItem;
-	nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
-	nsCOMPtr<nsIMessage> message;
-	nsresult rv;
-
-	rv = mSrcEnumerator->GetNext(getter_AddRefs(currentItem));
-	if(NS_SUCCEEDED(rv))
-	{
-		msgDBHdr = do_QueryInterface(currentItem, &rv);
-	}
-
-	if(NS_SUCCEEDED(rv))
-	{
-		rv = mFolder->CreateMessageFromMsgDBHdr(msgDBHdr, getter_AddRefs(message));
-	}
-
-	if(NS_SUCCEEDED(rv))
-	{
-		currentItem = do_QueryInterface(message, &rv);
-		*aItem = currentItem;
-		NS_IF_ADDREF(*aItem);
-	}
-
-	NS_ASSERTION(NS_SUCCEEDED(rv),"getnext shouldn't fail");
-	return rv;
-}
-
-NS_IMETHODIMP nsMessageFromMsgHdrEnumerator::HasMoreElements(PRBool *aResult)
-{
-	return mSrcEnumerator->HasMoreElements(aResult);
-}
-
-nsresult NS_NewMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
-										   nsIMsgFolder *folder,	
-										   nsMessageFromMsgHdrEnumerator **messageEnumerator)
-{
-	if(!messageEnumerator)
-		return NS_ERROR_NULL_POINTER;
-
-	*messageEnumerator =	new nsMessageFromMsgHdrEnumerator(srcEnumerator, folder);
-
-	if(!messageEnumerator)
-		return NS_ERROR_OUT_OF_MEMORY;
-
-	NS_ADDREF(*messageEnumerator);
-	return NS_OK;
-
-}
-
-// Where should this live? It's a utility used to convert a string priority, e.g., "High, Low, Normal" to an enum.
-// Perhaps we should have an interface that groups together all these utilities...
-nsresult NS_MsgGetPriorityFromString(const char *priority, nsMsgPriority *outPriority)
-{
-	if (!outPriority)
-		return NS_ERROR_NULL_POINTER;
-
-	nsMsgPriority retPriority = nsMsgPriorityNormal;
-
-	if (PL_strcasestr(priority, "Normal") != NULL)
-		retPriority = nsMsgPriorityNormal;
-	else if (PL_strcasestr(priority, "Lowest") != NULL)
-		retPriority = nsMsgPriorityLowest;
-	else if (PL_strcasestr(priority, "Highest") != NULL)
-		retPriority = nsMsgPriorityHighest;
-	else if (PL_strcasestr(priority, "High") != NULL || 
-			 PL_strcasestr(priority, "Urgent") != NULL)
-		retPriority = nsMsgPriorityHigh;
-	else if (PL_strcasestr(priority, "Low") != NULL ||
-			 PL_strcasestr(priority, "Non-urgent") != NULL)
-		retPriority = nsMsgPriorityLow;
-	else if (PL_strcasestr(priority, "1") != NULL)
-		retPriority = nsMsgPriorityHighest;
-	else if (PL_strcasestr(priority, "2") != NULL)
-		retPriority = nsMsgPriorityHigh;
-	else if (PL_strcasestr(priority, "3") != NULL)
-		retPriority = nsMsgPriorityNormal;
-	else if (PL_strcasestr(priority, "4") != NULL)
-		retPriority = nsMsgPriorityLow;
-	else if (PL_strcasestr(priority, "5") != NULL)
-	    retPriority = nsMsgPriorityLowest;
-	else
-		retPriority = nsMsgPriorityNormal;
-	*outPriority = retPriority;
-	return NS_OK;
-		//return nsMsgNoPriority;
-}
-
-
-nsresult NS_MsgGetUntranslatedPriorityName (nsMsgPriority p, nsString *outName)
-{
-	if (!outName)
-		return NS_ERROR_NULL_POINTER;
-	switch (p)
-	{
-	case nsMsgPriorityNotSet:
-	case nsMsgPriorityNone:
-		*outName = "None";
-		break;
-	case nsMsgPriorityLowest:
-		*outName = "Lowest";
-		break;
-	case nsMsgPriorityLow:
-		*outName = "Low";
-		break;
-	case nsMsgPriorityNormal:
-		*outName = "Normal";
-		break;
-	case nsMsgPriorityHigh:
-		*outName = "High";
-		break;
-	case nsMsgPriorityHighest:
-		*outName = "Highest";
-		break;
-	default:
-		NS_ASSERTION(PR_FALSE, "invalid priority value");
-	}
-	return NS_OK;
-}
-
-/* this used to be XP_StringHash2 from xp_hash.c */
-/* phong's linear congruential hash  */
-static PRUint32 StringHash(const char *ubuf)
-{
-  unsigned char * buf = (unsigned char*) ubuf;
-  PRUint32 h=1;
-  while(*buf) {
-    h = 0x63c63cd9*h + 0x9c39c33d + (int32)*buf;
-    buf++;
-  }
-  return h;
-}
-
-nsresult NS_MsgHashIfNecessary(nsCAutoString &name)
-{
-#if defined(XP_WIN16) || defined(XP_OS2)
-  const PRUint32 MAX_LEN = 8;
-#elif defined(XP_MAC)
-  const PRUint32 MAX_LEN = 25;
-#elif defined(XP_UNIX) || defined(XP_PC) || defined(XP_BEOS)
-  const PRUint32 MAX_LEN = 55;
-#else
-#error need_to_define_your_max_filename_length
-#endif
-  nsCAutoString str(name);
-
-#ifdef DEBUG_NS_MsgHashIfNecessary
-  printf("in: %s\n",str.GetBuffer());
-#endif
-
-  // Given a name, use either that name, if it fits on our
-  // filesystem, or a hashified version of it, if the name is too
-  // long to fit.
-  char hashedname[MAX_LEN + 1];
-  PRBool needshash = PL_strlen(str.GetBuffer()) > MAX_LEN;
-#if defined(XP_WIN16)  || defined(XP_OS2)
-  if (!needshash) {
-    needshash = PL_strchr(str.GetBuffer(), '.') != NULL ||
-      PL_strchr(str.GetBuffer(), ':') != NULL;
-  }
-#endif
-  PL_strncpy(hashedname, str.GetBuffer(), MAX_LEN + 1);
-  if (needshash) {
-    PR_snprintf(hashedname + MAX_LEN - 8, 9, "%08lx",
-                (unsigned long) StringHash(str.GetBuffer()));
-  }
-  name = hashedname;
-#ifdef DEBUG_NS_MsgHashIfNecessary
-  printf("out: %s\n",hashedname);
-#endif
-  
-  return NS_OK;
-}
-

mozilla/mailnews/base/util/nsMsgUtils.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef _NSMSGUTILS_H
-#define _NSMSGUTILS_H
-
-#include "nsIURL.h"
-#include "nsIMsgMessageService.h"
-#include "nsString.h"
-#include "nsIEnumerator.h"
-#include "nsIMsgFolder.h"
-#include "msgCore.h"
-#include "nsCOMPtr.h"
-
-//These are utility functions that can used throughout the mailnews code
-
-//Utilities for getting a message service.
-NS_MSG_BASE nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID);
-//Use ReleaseMessageServiceFromURI to release the service.
-NS_MSG_BASE nsresult GetMessageServiceFromURI(const char *uri, nsIMsgMessageService **messageService);
-NS_MSG_BASE nsresult ReleaseMessageServiceFromURI(const char *uri, nsIMsgMessageService *messageService);
-
-NS_MSG_BASE nsresult CreateStartupUrl(char *uri, nsIURI** aUrl);
-
-//An enumerator for converting nsIMsgHdrs to nsIMessages.
-class NS_MSG_BASE nsMessageFromMsgHdrEnumerator: public nsISimpleEnumerator
-{
-protected:
-	nsCOMPtr<nsISimpleEnumerator> mSrcEnumerator;
-	nsCOMPtr<nsIMsgFolder> mFolder;
-
-public:
-	NS_DECL_ISUPPORTS
-	nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator, nsIMsgFolder *folder);
-	nsMessageFromMsgHdrEnumerator(){} //Default constructor that does nothing so nsComPtr will work.
-	virtual ~nsMessageFromMsgHdrEnumerator();
-
-  NS_DECL_NSISIMPLEENUMERATOR
-};
-
-NS_MSG_BASE nsresult NS_NewMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
-										   nsIMsgFolder *folder,	
-										   nsMessageFromMsgHdrEnumerator **messageEnumerator);
-
-NS_MSG_BASE nsresult NS_MsgGetPriorityFromString(const char *priority, nsMsgPriority *outPriority);
-
-NS_MSG_BASE nsresult NS_MsgGetUntranslatedPriorityName (nsMsgPriority p, nsString *outName);
-
-NS_MSG_BASE nsresult NS_MsgHashIfNecessary(nsCAutoString &name);
-
-#endif
-

mozilla/mailnews/base/util/nsNewsSummarySpec.cpp

@@ -1,71 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsNewsSummarySpec.h"
-#include "plstr.h"
-#include "nsString.h"
-
-MOZ_DECL_CTOR_COUNTER(nsNewsSummarySpec);
-
-nsNewsSummarySpec::~nsNewsSummarySpec()
-{
-	MOZ_COUNT_DTOR(nsNewsSummarySpec);
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec()
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec(const char *folderPath)
-  : nsFileSpec(folderPath)
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec(const nsFileSpec& inFolderPath)
-: nsFileSpec(inFolderPath)
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec(const nsFilePath &inFolderPath) : nsFileSpec(inFolderPath)
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-	CreateSummaryFileName();
-}
-
-void nsNewsSummarySpec::SetFolderName(const char *folderPath)
-{
-	*this = folderPath;
-}
-
-void nsNewsSummarySpec::CreateSummaryFileName()
-{
-	char *leafName = GetLeafName();
-
-    nsCAutoString fullLeafName((const char*)leafName);
-
-	// Append .msf (message summary file) 
-	fullLeafName += ".msf";	
-
-	SetLeafName(fullLeafName.GetBuffer());
-	PL_strfree(leafName);
-}

mozilla/mailnews/base/util/nsNewsSummarySpec.h

@@ -1,45 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef _nsNewsSummarySpec_H
-#define _nsNewsSummarySpec_H
-
-#include "nsFileSpec.h"
-#include "msgCore.h"
-
-// Class to name a summary file for a newsgroup,
-// given a full folder file spec. 
-// Note this class expects the invoking code to fully specify the folder path. 
-// This class does NOT prepend the local folder directory, or put .sbd on the containing
-// directory names.
-class NS_MSG_BASE nsNewsSummarySpec : public nsFileSpec
-{
-public:
-  nsNewsSummarySpec();
-  nsNewsSummarySpec(const char *folderPath);
-  nsNewsSummarySpec(const nsFileSpec& inFolderPath);
-  nsNewsSummarySpec(const nsFilePath &inFolderPath);
-  ~nsNewsSummarySpec();
-  void SetFolderName(const char *folderPath);
-
-protected:
-  void	CreateSummaryFileName();
-  
-};
-
-#endif /* _nsNewsSummarySpec_H */

mozilla/mailnews/base/util/nsUInt32Array.cpp

@@ -1,277 +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 "msgCore.h"    // precompiled header...
-#include "prlog.h"
-
-#include "MailNewsTypes.h"
-#include "nsUInt32Array.h"
-#include "nsQuickSort.h"
-
-MOZ_DECL_CTOR_COUNTER(nsUInt32Array);
-
-nsUInt32Array::nsUInt32Array()
-{
-	MOZ_COUNT_CTOR(nsUInt32Array);
-	m_nSize = 0;
-	m_nMaxSize = 0;
-	m_nGrowBy = 0;
-	m_pData = NULL;
-}
-
-nsUInt32Array::~nsUInt32Array()
-{
-	MOZ_COUNT_DTOR(nsUInt32Array);
-	SetSize(0);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-PRUint32 nsUInt32Array::GetSize() const
-{
-	return m_nSize;
-}
-
-PRBool nsUInt32Array::SetSize(PRUint32 nSize,
-                              PRBool adjustGrowth,
-                              PRUint32 nGrowBy)
-{
-	if (adjustGrowth)
-		m_nGrowBy = nGrowBy;
-
-#ifdef MAX_ARR_ELEMS
-	if (nSize > MAX_ARR_ELEMS);
-	{
-		PR_ASSERT(nSize <= MAX_ARR_ELEMS); // Will fail
-		return PR_FALSE;
-	}
-#endif
-
-	if (nSize == 0)
-	{
-		// Remove all elements
-		PR_Free(m_pData);
-		m_nSize = 0;
-		m_nMaxSize = 0;
-		m_pData = NULL;
-	}
-	else if (m_pData == NULL)
-	{
-		// Create a new array
-		m_nMaxSize = PR_MAX(8, nSize);
-		m_pData = (PRUint32 *)PR_Calloc(1, m_nMaxSize * sizeof(PRUint32));
-		if (m_pData)
-			m_nSize = nSize;
-		else
-			m_nSize = m_nMaxSize = 0;
-	}
-	else if (nSize <= m_nMaxSize)
-	{
-		// The new size is within the current maximum size, make sure new
-		// elements are to initialized to zero
-		if (nSize > m_nSize)
-			nsCRT::memset(&m_pData[m_nSize], 0, (nSize - m_nSize) * sizeof(PRUint32));
-
-		m_nSize = nSize;
-	}
-	else
-	{
-		// The array needs to grow, figure out how much
-		PRUint32 nMaxSize;
-		nGrowBy  = PR_MAX(m_nGrowBy, PR_MIN(1024, PR_MAX(8, m_nSize / 8)));
-		nMaxSize = PR_MAX(nSize, m_nMaxSize + nGrowBy);
-#ifdef MAX_ARR_ELEMS
-		nMaxSize = PR_MIN(MAX_ARR_ELEMS, nMaxSize);
-#endif
-
-		PRUint32 *pNewData = (PRUint32 *)PR_Malloc(nMaxSize * sizeof(PRUint32));
-		if (pNewData)
-		{
-			// Copy the data from the old array to the new one
-			nsCRT::memcpy(pNewData, m_pData, m_nSize * sizeof(PRUint32));
-
-			// Zero out the remaining elements
-			nsCRT::memset(&pNewData[m_nSize], 0, (nSize - m_nSize) * sizeof(PRUint32));
-			m_nSize = nSize;
-			m_nMaxSize = nMaxSize;
-
-			// Free the old array
-			PR_Free(m_pData);
-			m_pData = pNewData;
-		}
-	}
-
-	return nSize == m_nSize;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-PRUint32 &nsUInt32Array::ElementAt(PRUint32 nIndex)
-{
-	PR_ASSERT(nIndex < m_nSize);
-	return m_pData[nIndex];
-}
-
-PRUint32 nsUInt32Array::GetAt(PRUint32 nIndex) const
-{
-	PR_ASSERT(nIndex < m_nSize);
-	return m_pData[nIndex];
-}
-
-PRUint32 *nsUInt32Array::GetData() 
-{
-	return m_pData;
-}
-
-void nsUInt32Array::SetAt(PRUint32 nIndex, PRUint32 newElement)
-{
-	PR_ASSERT(nIndex < m_nSize);
-	m_pData[nIndex] = newElement;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-PRUint32 nsUInt32Array::Add(PRUint32 newElement)
-{
-	PRUint32 nIndex = m_nSize;
-
-#ifdef MAX_ARR_ELEMS
-	if (nIndex >= MAX_ARR_ELEMS) 
-		return -1;	     
-#endif			
-
-	SetAtGrow(nIndex, newElement);
-	return nIndex;
-}
-
-PRUint32 nsUInt32Array::Add(PRUint32 *elementPtr, PRUint32 numElements) 
-{ 
-	if (SetSize(m_nSize + numElements))
-		nsCRT::memcpy(m_pData + m_nSize, elementPtr, numElements * sizeof(PRUint32)); 
-
-	return m_nSize; 
-} 
-
-PRUint32 *nsUInt32Array::CloneData() 
-{ 
-	PRUint32 *copyOfData = (PRUint32 *)PR_Malloc(m_nSize * sizeof(PRUint32)); 
-	if (copyOfData) 
-		nsCRT::memcpy(copyOfData, m_pData, m_nSize * sizeof(PRUint32)); 
-
-	return copyOfData; 
-} 
-
-void nsUInt32Array::InsertAt(PRUint32 nIndex, PRUint32 newElement, PRUint32 nCount)
-{
-	PR_ASSERT(nCount > 0);
-
-	if (nIndex >= m_nSize)
-	{
-		// If the new element is after the end of the array, grow the array
-		SetSize(nIndex + nCount);
-	}
-	else
-	{
-		// The element is being insert inside the array
-		int nOldSize = m_nSize;
-		SetSize(m_nSize + nCount);
-
-		// Move the data after the insertion point
-		nsCRT::memmove(&m_pData[nIndex + nCount], &m_pData[nIndex],
-			       (nOldSize - nIndex) * sizeof(PRUint32));
-	}
-
-	// Insert the new elements
-	PR_ASSERT(nIndex + nCount <= m_nSize);
-	while (nCount--)
-		m_pData[nIndex++] = newElement;
-}
-
-void nsUInt32Array::InsertAt(PRUint32 nStartIndex, const nsUInt32Array *pNewArray)
-{
-	PR_ASSERT(pNewArray != NULL);
-
-	if (pNewArray->GetSize() > 0)
-	{
-		InsertAt(nStartIndex, pNewArray->GetAt(0), pNewArray->GetSize());
-		for (PRUint32 i = 1; i < pNewArray->GetSize(); i++)
-			m_pData[nStartIndex + i] = pNewArray->GetAt(i);
-	}
-}
-
-void nsUInt32Array::RemoveAll()
-{
-	SetSize(0);
-}
-
-void nsUInt32Array::RemoveAt(PRUint32 nIndex, PRUint32 nCount)
-{
-	PR_ASSERT(nIndex + nCount <= m_nSize);
-
-	if (nCount > 0)
-	{
-		// Make sure not to overstep the end of the array
-		int nMoveCount = m_nSize - (nIndex + nCount);
-		if (nCount && nMoveCount)
-			nsCRT::memmove(&m_pData[nIndex], &m_pData[nIndex + nCount],
-		               nMoveCount * sizeof(PRUint32));
-
-		m_nSize -= nCount;
-	}
-}
-
-void nsUInt32Array::SetAtGrow(PRUint32 nIndex, PRUint32 newElement)
-{
-	if (nIndex >= m_nSize)
-		SetSize(nIndex+1);
-	m_pData[nIndex] = newElement;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-void nsUInt32Array::CopyArray(nsUInt32Array *oldA)
-{
-	CopyArray(*oldA);
-}
-
-void nsUInt32Array::CopyArray(nsUInt32Array &oldA)
-{
-	if (m_pData)
-		PR_Free(m_pData);
-	m_nSize = oldA.m_nSize;
-	m_nMaxSize = oldA.m_nMaxSize;
-	m_pData = (PRUint32 *)PR_Malloc(m_nSize * sizeof(PRUint32));
-	if (m_pData)
-		nsCRT::memcpy(m_pData, oldA.m_pData, m_nSize * sizeof(PRUint32));
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-static int CompareDWord (const void *v1, const void *v2, void *)
-{
-	// QuickSort callback to compare array values
-	PRUint32 i1 = *(PRUint32 *)v1;
-	PRUint32 i2 = *(PRUint32 *)v2;
-	return i1 - i2;
-}
-
-void nsUInt32Array::QuickSort (int (*compare) (const void *elem1, const void *elem2, void *data))
-{
-	if (m_nSize > 1)
-		NS_QuickSort(m_pData, m_nSize, sizeof(void*), compare ? compare : CompareDWord, nsnull);
-}

mozilla/mailnews/base/util/nsUInt32Array.h

@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.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 _nsUInt32Array_H_
-#define _nsUInt32Array_H_
-
-#include "nscore.h"
-#include "nsCRT.h"
-#include "prmem.h"
-#include "msgCore.h"
-
-class NS_MSG_BASE nsUInt32Array
-{
-public:
-	// Construction/destruction
-    nsUInt32Array();
-    virtual ~nsUInt32Array();
-
-	// State/attribute member functions
-	PRUint32          GetSize() const;
-	PRBool            SetSize(PRUint32 nNewSize, PRBool AdjustGrowth=PR_FALSE, PRUint32 nGrowBy = 0);
-
-	// Accessor member functions
-	PRUint32            &ElementAt(PRUint32 nIndex);
-	PRUint32             GetAt(PRUint32 nIndex) const;
-	PRUint32            *GetData();
-	void               SetAt(PRUint32 nIndex, PRUint32 newElement);
-
-	// Insertion/deletion member functions
-	PRUint32			Add(PRUint32 newElement);
-	PRUint32           Add(PRUint32 *elementPtr, PRUint32 numElements); 
-	void	           InsertAt(PRUint32 nIndex, PRUint32 newElement, PRUint32 nCount = 1);
-	void               InsertAt(PRUint32 nStartIndex, const nsUInt32Array *pNewArray);
-	void               RemoveAll();
-	void               RemoveAt(PRUint32 nIndex, PRUint32 nCount = 1);
-	void               SetAtGrow(PRUint32 nIndex, PRUint32 newElement);
-
-	// Sorting member functions
-	void               QuickSort(int (*compare) (const void *elem1, const void *elem2, void *) = NULL);
-
-	// Overloaded operators
-	PRUint32             operator[](PRUint32 nIndex) const { return GetAt(nIndex); }
-	PRUint32            &operator[](PRUint32 nIndex) { return ElementAt(nIndex); }
-
-	// Miscellaneous member functions
-	PRUint32            *CloneData(); 
-	void               CopyArray(nsUInt32Array *oldA);
-	void               CopyArray(nsUInt32Array &oldA);
-
-protected:
-    // Member data
-	PRUint32 m_nSize;
-	PRUint32 m_nMaxSize;
-	PRUint32 m_nGrowBy;
-	PRUint32* m_pData;
-};
-
-
-#endif // _DWordArray_H_

mozilla/network/Makefile

@@ -1,3 +1,5 @@
+#! 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
@@ -12,24 +14,26 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-#
-# This is a list of local files which get copied to the mozilla:dist:mailnews directory
+
+#  
 #
 
-nsMsgLineBuffer.h
-nsMsgGroupRecord.h
-nsUInt32Array.h
-nsMsgKeySet.h
-nsMsgFolder.h
-nsMsgDBFolder.h
-nsLocalFolderSummarySpec.h
-nsMsgIdentity.h
-nsMsgIncomingServer.h
-nsNewsSummarySpec.h
-nsMsgUtils.h
-nsMessage.h
-nsMsgProtocol.h
-nsMsgTxn.h
-nsMsgMailNewsUrl.h
-nsMsgI18N.h
+DEPTH	= ..
+
+DIRS	= \
+	cache		\
+	client		\
+	cnvts		\
+	mimetype	\
+	main		\
+	protocol	\
+	util
+
+ifdef MODULAR_NETLIB
+DIRS	+= module
+endif
+
+include $(DEPTH)/config/rules.mk
+
+INCLUDE += $(PUBLIC)\ldap $(PUBLIC)\security
 

mozilla/network/cache/MANIFEST

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

mozilla/network/cache/Makefile

@@ -0,0 +1,42 @@
+#!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		= ../..
+
+MODULE		= netcache
+LIBRARY_NAME	= netcache
+
+CSRCS		= \
+	cachedump.c	\
+	extcache.c	\
+	mkcache.c	\
+	mkextcac.c	\
+	mkmemcac.c	\
+	$(NULL)
+
+ifdef NU_CACHE
+CSRCS += \
+	nucacheproto.c	\
+	$(NULL)
+endif
+
+EXPORTS= netcache.h mkcache.h mkmemcac.h extcache.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl security layer img jtools cachelib
+
+include $(DEPTH)/config/rules.mk
+

mozilla/network/cache/cachedump.c

@@ -0,0 +1,139 @@
+/* -*- 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.
+ */
+/* this little program will sequentially dump out
+ * every record in the database
+ */
+#include "mkcache.h"
+#include "extcache.h"
+#include "plstr.h"
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <assert.h>
+
+#ifdef _sgi
+#include <sys/endian.h> 
+#endif /* _sgi */
+
+/* URL methods
+ */
+#define URL_GET_METHOD  0
+#define URL_POST_METHOD 1
+#define URL_HEAD_METHOD 2
+
+static DB *
+net_OpenExtCacheFatDB(char *filename)
+{
+	DB *rv;
+    HASHINFO hash_info = {
+        16*1024,  /* bucket size */
+        0,        /* fill factor */
+        0,        /* number of elements */
+        0,        /* bytes to cache */
+        0,        /* hash function */
+        0};       /* byte order */
+
+
+	rv = dbopen(filename,
+									O_RDWR | O_CREAT,
+									0644,
+									DB_HASH,
+				&hash_info);
+
+	if(!rv)
+	  {
+		printf("Could not open cache database: %s\n", filename);
+		exit(1);
+	  }
+	
+	return(rv);
+}
+
+int main(int argc, char **argv)
+{
+    char url[4028];
+    struct stat stat_s;
+    net_CacheObject * cache_obj;
+	DB * ext_cache_database=0;
+	DBT key;
+	DBT data;
+    int len;
+    char *end;
+
+    memset(&cache_obj, 0, sizeof(net_CacheObject));
+
+    if(argc != 2)
+      {
+        printf("Usage:\n"
+                "%s database\n"
+                "\n"
+                "database: path and name of the database\n", argv[0]);
+        exit(1);
+      }
+
+    /* open the cache database */
+    ext_cache_database = net_OpenExtCacheFatDB(argv[1]);
+
+	if(!ext_cache_database)
+	  {
+		perror("Could not open cache database");
+		exit(1);
+	  }
+
+	while(!(ext_cache_database->seq)(ext_cache_database, &key, &data, 0))
+	  {
+
+        if(key.size == PL_strlen(EXT_CACHE_NAME_STRING)
+            && !PL_strcmp(key.data, EXT_CACHE_NAME_STRING))
+          {
+            /* make sure it's a terminated string */
+            if(((char *)data.data)[data.size-1] == '\0')
+                printf("\n\nDatabase Name: %s\n", (char*)data.data);
+            else
+                 printf("\n\nDatabase Name is corrupted!\n");
+			printf("\n--------------------------------------\n");
+			continue;
+		  }
+
+		/* try and convert the db struct to a cache struct */
+	    cache_obj = net_DBDataToCacheStruct(&data);
+
+		if(!cache_obj)
+		  {
+			printf("Malformed database entry:\n");
+			printf("key: ");
+			fwrite(key.data, 1, key.size, stdout);
+			printf("\ndata: ");
+			fwrite(data.data, 1, data.size, stdout);
+			printf("\n");
+			printf("--------------------------------------\n");
+			continue;
+		  }
+
+	    /* the URL is 8 bytes into the key struct
+	     */
+	    printf("URL: %s\n",(char*)key.data+8);
+	    printf("file: %s\n", cache_obj->filename);
+	    printf("is_relative_path: %s\n", cache_obj->is_relative_path ? "TRUE" : "FALSE");
+	    printf("content_type: %s\n", cache_obj->content_type);
+	    printf("content_length: %d\n", cache_obj->content_length);
+	    printf("last_modified: %s\n", ctime(&cache_obj->last_modified));
+		printf("--------------------------------------\n");
+	  }
+}
+

mozilla/network/cache/cacheutils.h

@@ -0,0 +1,21 @@
+
+#ifndef CACHEUTILS_H
+#define CACHEUTILS_H
+
+/* Find an actively-loading cache file for URL_s in context, and copy the first
+ * nbytes of it to a new cache file.  Return a cache converter stream by which
+ * the caller can append to the cloned cache file.
+ */
+extern NET_VoidStreamClass *
+NET_CloneWysiwygCacheFile(MWContext *context, URL_Struct *URL_s,
+                          uint32 nbytes, const char * wysiwyg_url,
+                          const char * base_href);
+
+/* Create a wysiwyg cache converter to a copy of the current entry for URL_s.
+ */
+extern NET_VoidStreamClass *
+net_CloneWysiwygMemCacheEntry(MWContext *window_id, URL_Struct *URL_s,
+                              uint32 nbytes, const char * wysiwyg_url,
+                              const char * base_href);
+
+#endif /* CACHEUTILS_H */

mozilla/network/cache/export.mac

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

mozilla/network/cache/extcache.c

@@ -0,0 +1,857 @@
+/* -*- 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.
+ */
+
+/* Please leave outside of ifdef for window precompiled headers */
+#include "mkcache.h"
+
+#ifdef MOZILLA_CLIENT
+#include "mktrace.h"
+#include "prmem.h"
+#include "plstr.h"
+
+/* Publicly released Netscape cache access routines.
+ *
+ * These routines are shared between the netscape executable
+ * and the programs released as a cache developers kit.
+ *
+ * Created: Lou Montulli <montulli@netscape.com>, July-95.
+ * Modifications/Addition: Gagan Saksena, 97
+ */
+
+#include "rosetta.h"
+
+#ifndef EXT_DB_ROUTINES
+#include "secnav.h"
+#include "sechash.h"
+#endif
+
+#include "extcache.h"  /* include this for everything */
+
+#ifdef EXT_DB_ROUTINES
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <assert.h>
+
+typedef struct {
+	int32 len;
+	char *data;
+} SECItem;
+
+#ifdef _sgi
+#include <sys/endian.h>
+#endif /* _sgi */
+
+
+/* URL methods
+ */
+ #define URL_GET_METHOD  0
+ #define URL_POST_METHOD 1
+ #define URL_HEAD_METHOD 2
+
+#endif /* DB_STORE */
+
+
+MODULE_PRIVATE DBT *
+net_CacheDBTDup(DBT *obj)
+{
+	DBT * rv = PR_NEW(DBT);
+
+	if(!rv)
+		return(NULL);
+
+	rv->size = obj->size;
+	rv->data = PR_Malloc(rv->size);
+
+	if(!rv->data)
+	  {
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	memcpy(rv->data, obj->data, rv->size);
+
+	return(rv);
+
+}
+
+/* free the cache object
+ */
+MODULE_PRIVATE void net_freeCacheObj (net_CacheObject * cache_obj)
+{
+
+    PR_FREEIF(cache_obj->address);
+    PR_FREEIF(cache_obj->post_data);
+    PR_FREEIF(cache_obj->post_headers);
+    PR_FREEIF(cache_obj->content_type);
+    PR_FREEIF(cache_obj->charset);
+    PR_FREEIF(cache_obj->content_encoding);
+    PR_FREEIF(cache_obj->page_services_url);
+    PR_FREEIF(cache_obj->filename);
+	
+#ifndef EXT_DB_ROUTINES
+    PR_FREEIF(cache_obj->sec_info);
+#endif
+	
+    PR_Free(cache_obj);
+}
+
+/* returns true if this DBT looks like a valid
+ * entry.  It looks at the checksum and the
+ * version number to see if it's valid
+ */
+#define MAX_VALID_DBT_SIZE 10000
+
+MODULE_PRIVATE PRBool
+net_IsValidCacheDBT(DBT *obj)
+{
+    char *cur_ptr, *max_ptr;
+    uint32 len;
+
+	if(!obj || obj->size < 9 || obj->size > MAX_VALID_DBT_SIZE)
+		return(FALSE);
+
+    cur_ptr = (char *)obj->data;
+    max_ptr = cur_ptr+obj->size;
+
+    /* get the total size of the struct out of
+     * the first field to check it
+     */
+    COPY_INT32(&len, cur_ptr);
+    cur_ptr += sizeof(int32);
+
+    if(len != obj->size)
+      {
+        TRACEMSG(("Size going in is not the same as size coming out"));
+        return(FALSE);
+      }
+
+    /* get the version number of the written structure
+     */
+    if(cur_ptr > max_ptr)
+        return(FALSE);
+    COPY_INT32(&len, cur_ptr);
+    cur_ptr += sizeof(int32);
+
+    if(len != CACHE_FORMAT_VERSION)
+      {
+        TRACEMSG(("Version of cache structure is wrong!: %d", len));
+        return(FALSE);
+      }
+
+	/* looks good to me... */
+	return(TRUE);
+}
+
+
+/* takes a cache object and returns a malloc'd 
+ * (void *) suitible for passing in as a database
+ * data storage object
+ */
+MODULE_PRIVATE DBT *
+net_CacheStructToDBData(net_CacheObject * old_obj)
+{
+    int32 len;
+	char *cur_ptr;
+	void *new_obj;
+	int32 total_size;
+	DBT *rv;
+
+	rv = PR_NEW(DBT);
+
+	if(!rv)
+		return(NULL);
+
+	total_size = sizeof(net_CacheObject);
+
+#define ADD_STRING_SIZE(string) \
+total_size += old_obj->string ? PL_strlen(old_obj->string)+1 : 0
+
+	ADD_STRING_SIZE(address);
+	total_size += old_obj->post_data_size+1;
+	ADD_STRING_SIZE(post_headers);
+	ADD_STRING_SIZE(content_type);
+	ADD_STRING_SIZE(content_encoding);
+	ADD_STRING_SIZE(charset);
+	ADD_STRING_SIZE(filename);
+    total_size += sizeof(uint32); /* size of secinfo */
+	total_size += HG73653(old_obj->sec_info);
+	ADD_STRING_SIZE(page_services_url);
+
+#undef ADD_STRING_SIZE
+	
+	new_obj = PR_Malloc(total_size * sizeof(char));
+
+	if(!new_obj)
+	  {
+		PR_Free(rv);
+		return NULL;
+	  }
+
+	memset(new_obj, 0, total_size * sizeof(char));
+
+	/*
+	 * order is:
+	 * int32	size of the entire structure;
+	 *
+	 * int32    version of the structure format (CACHE_FORMAT_VERSION)
+	 *
+     * time_t                  last_modified;
+     * time_t                  last_accessed;
+     * time_t                  expires;
+     * uint32                  content_length;
+     * XP_Bool                    is_netsite;
+	 *
+ 	 * time_t                  lock_date;
+	 *
+     * char                  * filename;
+     * int32                   filename_len;
+	 *
+     * int32                   HG52242;
+     * unsigned char         * HG42320;
+	 *
+     * int32                   method;
+	 *
+	 * # don't store address, or post_data stuff
+	 * # char                  * address;
+     * # uint32                  post_data_size;
+     * # char                  * post_data;
+	 *
+     * char                  * post_headers;
+     * char                  * content_type;
+     * char                  * content_encoding;
+     * char                  * charset;
+	 *
+	 * XP_Bool                    incomplete_file;
+	 * uint32                  total_content_length;
+	 *
+	 * char                  * page_services_url;
+ 	 * 
+	 * string lengths all include null terminators
+	 * all integer constants are stored as 4 bytes
+	 * all booleans are stored as one byte
+	 */
+
+	/* VERY VERY IMPORTANT.  Whenever the
+	 * format of the record structure changes
+ 	 * you must verify that the byte positions	
+	 * in extcache.h are updated
+	 */
+
+#define STUFF_STRING(string) 									\
+{	 															\
+  len = (old_obj->string ? PL_strlen(old_obj->string)+1 : 0);	\
+  COPY_INT32((void *)cur_ptr, &len);							\
+  cur_ptr = cur_ptr + sizeof(int32);							\
+  if(len)														\
+      memcpy((void *)cur_ptr, old_obj->string, len);			\
+  cur_ptr += len;												\
+}
+
+#define STUFF_NUMBER(number) 									\
+{ 																\
+  COPY_INT32((void *)cur_ptr, &old_obj->number);				\
+  cur_ptr = cur_ptr + sizeof(int32);							\
+}
+
+#define STUFF_TIMET(number) 									\
+{ 																\
+  COPY_INT32((void *)cur_ptr, &old_obj->number);				\
+  cur_ptr = cur_ptr + sizeof(time_t);							\
+}
+
+#define STUFF_BOOL(bool_val)	 									\
+{ 																	\
+  if(old_obj->bool_val)												\
+    ((char *)(cur_ptr))[0] = 1;										\
+  else																\
+    ((char *)(cur_ptr))[0] = 0;										\
+  cur_ptr = cur_ptr + sizeof(char);									\
+}
+
+	cur_ptr = (char *)new_obj;
+
+	/* put the total size of the struct into
+	 * the first field so that we have
+	 * a cross check against corruption
+	 */
+  	COPY_INT32((void *)cur_ptr, &total_size);
+  	cur_ptr = cur_ptr + sizeof(int32);
+
+	HG73209
+	/* put the version number of the structure
+	 * format that we are using
+	 * By using a version string when writting
+	 * we can support backwards compatibility
+	 * in our reading code
+	 * (use "len" as a temp variable)
+	 */
+	len = CACHE_FORMAT_VERSION;
+  	COPY_INT32((void *)cur_ptr, &len);
+  	cur_ptr = cur_ptr + sizeof(int32);
+
+	STUFF_TIMET(last_modified);
+	STUFF_TIMET(last_accessed);
+	STUFF_TIMET(expires);
+	STUFF_NUMBER(content_length);
+	STUFF_BOOL(is_netsite);
+
+	STUFF_TIMET(lock_date);
+
+	STUFF_STRING(filename);
+	STUFF_NUMBER(filename_len);
+
+	STUFF_BOOL(is_relative_path);
+
+	STUFF_NUMBER(security_on);
+
+#ifndef EXT_DB_ROUTINES
+    HG42539
+    /* save the security info */
+    if ( old_obj->sec_info ) {
+		len = HG65293(old_obj->sec_info);
+		COPY_INT32((void *)cur_ptr, &len);
+		cur_ptr = cur_ptr + sizeof(int32);
+
+		memcpy((void *)cur_ptr, old_obj->sec_info, len);
+		cur_ptr += len;
+	} else
+#endif
+    {
+		len = 0;
+		COPY_INT32((void *)cur_ptr, &len);
+		cur_ptr = cur_ptr + sizeof(int32);
+	}
+
+    STUFF_NUMBER(method);
+
+#ifdef STORE_ADDRESS_AND_POST_DATA
+
+	STUFF_STRING(address);
+	STUFF_NUMBER(post_data_size);
+	
+	/* post_data 
+	 * this is special since it not necessarily a string
+	 */
+	if(old_obj->post_data_size)
+	  {
+	    memcpy(cur_ptr, old_obj->post_data, old_obj->post_data_size+1);
+	    cur_ptr += old_obj->post_data_size+1;
+	  }
+
+#endif /* STORE_ADDRESS_AND_POST_DATA */
+
+	STUFF_STRING(post_headers);
+
+	STUFF_STRING(content_type);
+	STUFF_STRING(content_encoding);
+	STUFF_STRING(charset);
+
+	STUFF_BOOL(incomplete_file);
+	STUFF_NUMBER(real_content_length);
+
+	STUFF_STRING(page_services_url);
+
+#undef STUFF_STRING
+#undef STUFF_NUMBER
+#undef STUFF_BOOL
+
+	rv->data = new_obj;
+	rv->size = total_size;
+
+	return(rv);
+
+}
+
+/* takes a database storage object and returns a malloc'd
+ * cache data object.  The cache object needs all of
+ * it's parts free'd.
+ *
+ * returns NULL on parse error 
+ */
+MODULE_PRIVATE net_CacheObject *
+net_DBDataToCacheStruct(DBT * db_obj)
+{
+	net_CacheObject * rv = PR_NEW(net_CacheObject);
+	char * cur_ptr;
+	char * max_ptr;
+	uint32 len;
+	int32 version;
+
+	if(!rv)
+		return NULL;
+
+	memset(rv, 0, sizeof(net_CacheObject));
+
+/* if any strings are larger than this then
+ * there was a serious database error
+ */
+#define MAX_HUGE_STRING_SIZE 10000
+
+#define RETRIEVE_STRING(string)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+	  {					 						\
+		net_freeCacheObj(rv);				 	\
+        return(NULL);                           \
+	  }											\
+	COPY_INT32(&len, cur_ptr);					\
+	cur_ptr += sizeof(int32);					\
+	if(len)										\
+	  {											\
+		if(len > MAX_HUGE_STRING_SIZE)			\
+	      {				 						\
+		    net_freeCacheObj(rv);				\
+			return(NULL);						\
+	      }										\
+	    rv->string = (char*)PR_Malloc(len);		\
+		if(!rv->string)							\
+	      {				 						\
+		    net_freeCacheObj(rv);				\
+			return(NULL);						\
+	      }										\
+	    memcpy(rv->string, cur_ptr, len);	\
+	    cur_ptr += len;							\
+	  }											\
+}											
+
+#define RETRIEVE_NUMBER(number)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+        return(rv);                             \
+	COPY_INT32(&rv->number, cur_ptr);			\
+	cur_ptr += sizeof(int32);					\
+}
+
+#define RETRIEVE_TIMET(number)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+        return(rv);                             \
+    COPY_INT32(&rv->number, cur_ptr);			\
+	cur_ptr += sizeof(time_t);					\
+}
+
+#define RETRIEVE_BOOL(bool)				\
+{										\
+  if(cur_ptr > max_ptr)                 \
+    return(rv);                         \
+  if(((char *)(cur_ptr))[0])			\
+	rv->bool = TRUE;					\
+  else 									\
+	rv->bool = FALSE;					\
+  cur_ptr += sizeof(char);				\
+}
+
+	cur_ptr = (char *)db_obj->data;
+
+	max_ptr = cur_ptr+db_obj->size;
+
+	/* get the total size of the struct out of
+	 * the first field to check it
+	 */
+	COPY_INT32(&len, cur_ptr);
+	cur_ptr += sizeof(int32);
+
+	if(len != db_obj->size)
+	  {
+		TRACEMSG(("Size going in is not the same as size coming out"));
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	/* get the version number of the written structure
+	 */
+    if(cur_ptr > max_ptr)
+        return(rv);
+	COPY_INT32(&version, cur_ptr);
+	cur_ptr += sizeof(int32);
+
+	if(version != CACHE_FORMAT_VERSION)
+	  {
+		TRACEMSG(("Version of cache structure is wrong!: %d", version));
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	HG32839
+	RETRIEVE_TIMET(last_modified);
+	RETRIEVE_TIMET(last_accessed);
+	RETRIEVE_TIMET(expires);
+	RETRIEVE_NUMBER(content_length);
+	RETRIEVE_BOOL(is_netsite);
+
+	RETRIEVE_TIMET(lock_date);
+
+	RETRIEVE_STRING(filename);
+	RETRIEVE_NUMBER(filename_len);
+
+	RETRIEVE_BOOL(is_relative_path);
+
+	HG72761 
+
+	RETRIEVE_NUMBER(method);
+
+#ifdef STORE_ADDRESS_AND_POST_DATA
+
+	RETRIEVE_STRING(address);
+	RETRIEVE_NUMBER(post_data_size);
+	
+	/* post_data 
+	 * this is special since it not necessarily a string
+	 */
+	if(rv->post_data_size)
+	  {
+		rv->post_data = PR_Malloc(rv->post_data_size+1);
+		if(rv->post_data)
+			memcpy(rv->post_data, cur_ptr, rv->post_data_size+1);
+		cur_ptr += rv->post_data_size+1;
+	  }
+
+#endif /* STORE_ADDRESS_AND_POST_DATA */
+
+	RETRIEVE_STRING(post_headers);
+
+	RETRIEVE_STRING(content_type);
+	RETRIEVE_STRING(content_encoding);
+	RETRIEVE_STRING(charset);
+
+	RETRIEVE_BOOL(incomplete_file);
+	RETRIEVE_NUMBER(real_content_length);
+
+	RETRIEVE_STRING(page_services_url);
+#undef RETRIEVE_STRING
+#undef RETRIEVE_NUMBER
+#undef RETRIEVE_BOOL
+
+	return(rv);
+}
+
+#if defined(DEBUG) && defined(UNIX)
+int
+cache_test_me()
+{
+
+	net_CacheObject test;
+	net_CacheObject *rv;
+	int32 total_size;
+	DBT *db_obj;
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test1");
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test1: %s\n", rv->address);
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test2");
+	StrAllocCopy(test.charset, "test2");
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test2: %s	%s\n", rv->address, rv->charset);
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test3");
+	StrAllocCopy(test.charset, "test3");
+	test.content_length = 3 ;
+	test.method = 3 ;
+	test.is_netsite = 3 ;
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test3: %s	%s	%d	%d	%s\n", 
+			rv->address, rv->charset,
+			rv->content_length, rv->method, 
+			(rv->is_netsite == 3 ? "TRUE" : "FALSE"));
+
+}
+#endif
+
+/* generates a key for use in the cache database
+ * from a CacheObject struct
+ * 
+ * Key is based on the address and the post_data
+ *
+ * looks like:
+ *  size checksum | size of address | ADDRESS | size of post data | POST DATA
+ */
+MODULE_PRIVATE DBT *
+net_GenCacheDBKey(char *address, char *post_data, int32 post_data_size)
+{
+	DBT *rv = PR_NEW(DBT);
+	char *hash;
+	char *data_ptr;
+	int32 str_len;
+	int32 size;
+
+#define MD5_HASH_SIZE 16 /* always 16 due to md5 hash type */
+	
+	if(!rv)
+		return(NULL);
+	
+	if(!address)
+	  {
+		PR_ASSERT(0);
+		rv->size = 0;
+		return(rv);
+	  } 
+
+	hash = PL_strchr(address, '#');
+
+	/* don't include '#' in a key */
+	if(hash)
+		*hash = '\0';
+
+	str_len = PL_strlen(address)+1;
+
+	size  = sizeof(int32);  /* for check sum */
+	size += sizeof(int32);  /* for size of address */
+	size += str_len;        /* for address string */
+	size += sizeof(int32);  /* for size of post_data */
+
+	HG42490
+
+	rv->size = size;
+	rv->data = PR_Malloc(size);
+
+	if(!rv->data)
+	  {
+		PR_Free(rv);
+		return NULL;
+	  }
+
+	data_ptr = (char *) rv->data;
+
+	/* put in the checksum size */
+	COPY_INT32(data_ptr, &size);
+	data_ptr = data_ptr + sizeof(int32);
+	HG83777
+	
+	/* put in the size of the address string */
+	COPY_INT32(data_ptr, &str_len);
+	data_ptr = data_ptr + sizeof(int32);
+
+	/* put in the address string data */
+	memcpy(data_ptr, address, str_len);
+	data_ptr = data_ptr + str_len;
+
+	/* set the address back to it's original form */
+	if(hash)
+		*hash = '#';
+
+	/* put in the size of the post data */
+	HG73699
+	  {
+		COPY_INT32(data_ptr, &post_data_size);
+		data_ptr = data_ptr + sizeof(int32);
+	  }
+
+	return(rv);
+}
+
+/* returns a static string that contains the
+ * URL->address of the key
+ * 
+ * returns NULL on error
+ */
+MODULE_PRIVATE char *
+net_GetAddressFromCacheKey(DBT *key)
+{
+	uint32 size;
+	char *data;
+
+	/* check for minimum size */
+	if(key->size < 10)
+		return(NULL);
+	HG72873
+
+	/* validate size checksum */
+	data = (char *)key->data;
+	COPY_INT32(&size, data);
+	data += sizeof(int32);
+
+	if(size != key->size)
+		return(NULL);
+
+	/* get size of address string */
+	COPY_INT32(&size, data);
+	data += sizeof(int32);
+
+	/* make sure it's a valid c string */
+	if(data[size] != '\0')
+		return(NULL);
+		
+	/* it's valid return it */
+	return(data);
+}
+
+
+/* checks a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ * 
+ * returns 0 on error
+ */
+MODULE_PRIVATE time_t 
+net_GetTimeInCacheDBT(DBT *data, int byte_position)
+{
+	time_t date;
+	char *ptr = (char *)data->data;
+
+	if(data->size < byte_position+sizeof(time_t))
+		return(0);
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+	COPY_INT32(&date, ptr+byte_position);
+
+	/* TRACEMSG(("Got date from cache DBT: %d", date)); */
+	
+	return(date);
+
+}
+
+/* Sets a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ * 
+ * returns 0 on error
+ */
+MODULE_PRIVATE void
+net_SetTimeInCacheDBT(DBT *data, int byte_position, time_t date)
+{
+	char *ptr = (char *)data->data;
+
+    if(data->size < byte_position+sizeof(time_t))
+        return;
+
+	if(!net_IsValidCacheDBT(data))
+		return;
+
+    COPY_INT32(ptr+byte_position, &date);
+
+    return;
+
+}
+
+/* Gets the filename within a cache DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns NULL on error
+ */
+#define MAX_FILE_SIZE 2048
+MODULE_PRIVATE char *
+net_GetFilenameInCacheDBT(DBT *data)
+{
+	int32 size;
+	char *rv;
+	char *ptr = (char*)data->data;
+
+    if(data->size < FILENAME_BYTE_POSITION)
+        return(NULL);
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+    COPY_INT32(&size, ptr+FILENAME_SIZE_BYTE_POSITION);
+
+    if(data->size < FILENAME_BYTE_POSITION+size 
+		|| size > MAX_FILE_SIZE)
+        return(NULL);
+
+	rv = (char *)PR_Malloc(size);
+	if(!rv)
+		return(NULL);
+    memcpy(rv, ptr+FILENAME_BYTE_POSITION, size);
+
+	TRACEMSG(("Got filename: %s from DBT", rv));
+
+    return(rv);
+}
+
+/* Gets a int32 within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+MODULE_PRIVATE time_t
+net_GetInt32InCacheDBT(DBT *data, int byte_position)
+{
+    int32 num;
+	char *ptr = (char *)data->data;
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+    if(data->size < byte_position+sizeof(time_t))
+        return(0);
+
+    COPY_INT32(&num, ptr+byte_position);
+
+    /* TRACEMSG(("Got int32 from cache DBT: %d", num)); */
+   
+    return(num);
+
+}
+
+MODULE_PRIVATE void
+net_FreeCacheDBTdata(DBT *stuff)
+{
+	if(stuff)
+	  {
+		PR_Free(stuff->data);
+		PR_Free(stuff);
+	  }
+}
+
+/* takes a database storage object and returns an un-malloc'd
+ * cache data object. The structure returned has pointers
+ * directly into the database memory and are only valid
+ * until the next call to any database function
+ *
+ * do not free anything returned by this structure
+ */
+MODULE_PRIVATE net_CacheObject *
+net_Fast_DBDataToCacheStruct(DBT *obj)
+{
+	static net_CacheObject *rv=0;
+
+	/* free any previous one */
+	if(rv)
+		net_freeCacheObj(rv);
+
+	rv = net_DBDataToCacheStruct(obj);
+
+	return(rv);
+
+}
+
+#endif /* MOZILLA_CLIENT */

mozilla/network/cache/extcache.h

@@ -0,0 +1,272 @@
+/* -*- 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 EXT_CACHE_H
+#define EXT_CACHE_H
+
+#ifndef EXT_DB_ROUTINES
+#include "mcom_db.h"
+#endif
+
+#ifdef EXT_DB_ROUTINES
+#define PRBool char
+#define uint32 unsigned int
+#define int32  int
+#define PR_NEW(structure)  ((structure *) malloc(sizeof(structure)))
+#define PR_Malloc   (void *) malloc
+#define memcpy  memcpy
+#define memset  memset
+#define TRACEMSG(x) printf x
+#define FREEIF(x)  do { if(x) free(x); } while(0)
+#define FREE free
+#define PL_strlen  strlen
+#define PL_strchr  strchr
+#define PL_strcmp  strcmp
+#define PR_ASSERT  assert
+#define MODULE_PRIVATE
+#define PRIVATE static
+#define TRUE  !0
+#define FALSE 0
+
+#include <stdio.h>
+#include <string.h>
+#include <db.h>
+#endif 
+
+#ifndef EXT_DB_ROUTINES
+
+#ifndef NSPR20
+#include "prosdep.h"  /* for IS_LITTLE_ENDIAN / IS_BIG_ENDIAN */
+#else
+#include "prtypes.h"
+#endif
+
+#endif /* EXT_DB_ROUTINES */
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32));
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+#define EXT_CACHE_NAME_STRING "INT_ExternalCacheNameString"
+
+/* Internal WARNING!!  Some slots of this structure 
+ * are shared with URL_Struct and
+ * History_entry.  If you add a slot, decide whether it needs to be shared
+ * as well.
+ */
+typedef struct _net_CacheObject {
+    time_t  last_modified;
+    time_t  last_accessed;
+    time_t  expires;
+    PRBool    is_netsite;
+    uint32  content_length;
+
+    char    * filename;                 /* cache file name */
+    int32     filename_len;             /* optimization */
+    PRBool      is_relative_path;         /* is the path relative? */
+
+    /* Security information */
+    int32   security_on;                /* is security on? */
+    unsigned char *sec_info;
+
+    time_t  lock_date;                  /* the file is locked if this
+                                         * is non-zero.  The date
+                                         * represents the time the
+                                         * lock was put in place.
+                                         * Locks are only valid for
+                                         * one session
+                                         */
+
+    int32       method;
+    char    * address;
+    uint32    post_data_size;
+    char    * post_data;
+    char    * post_headers;
+    char    * content_type;
+    char    * content_encoding;
+    char    * charset;
+
+    PRBool      incomplete_file;          /* means that the whole
+                                         * file is not there.
+                                         * This can only be true
+                                         * if the server supports byteranges
+                                         */
+    uint32    real_content_length;      /* the whole content length
+                                         * i.e. the server size of a truncated 
+                                         * client file
+                                         */
+    char    * page_services_url;
+    char    * etag;			/* HTTP/1.1 Etag */
+
+} net_CacheObject;
+
+/* this is the version number of the cache database entry.
+ * It should be incremented in integer ingrements up
+ * to MAXINT32
+ */
+#define CACHE_FORMAT_VERSION 5
+
+/* these defines specify the exact byte position
+ * of the first 4 elements in the DBT data struct
+ * Change these if you change the order of entry into
+ * the DBT
+ */
+#define LAST_MODIFIED_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)
+#define LAST_ACCESSED_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)
+#define EXPIRES_BYTE_POSITION         \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t)
+#define CONTENT_LENGTH_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)
+#define IS_NETSITE_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(int32)
+
+#define LOCK_DATE_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(int32)+sizeof(char)
+
+#define FILENAME_SIZE_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(uint32)+sizeof(char)+sizeof(time_t)
+#define FILENAME_BYTE_POSITION        \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(uint32)+sizeof(char)+sizeof(time_t) \
+                +sizeof(int32)
+
+/* generates a key for use in the cache database
+ * from a CacheObject struct
+ *
+ * Key is based on the address and the post_data
+ */
+extern DBT *
+net_GenCacheDBKey(char *address, char *post_data, int32 post_data_size);
+
+/* returns a static string that contains the
+ * URL->address of the key
+ *
+ * returns NULL on error
+ */
+extern char *
+net_GetAddressFromCacheKey(DBT *key);
+
+
+/* allocs and copies a new DBT from an existing DBT
+ */
+extern DBT * net_CacheDBTDup(DBT *obj);
+
+/* free the cache object
+ */
+extern void net_freeCacheObj (net_CacheObject * cache_obj);
+
+/* takes a cache object and returns a malloc'd
+ * (void *) suitible for passing in as a database
+ * data storage object
+ */
+extern DBT * net_CacheStructToDBData(net_CacheObject * old_obj);
+
+/* takes a database storage object and returns a malloc'd
+ * cache data object.  The cache object needs all of
+ * it's parts free'd.
+ *
+ * returns NULL on parse error
+ */
+extern net_CacheObject * net_DBDataToCacheStruct(DBT * db_obj);
+
+/* checks a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern time_t net_GetTimeInCacheDBT(DBT *data, int byte_position);
+
+/* Sets a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern void net_SetTimeInCacheDBT(DBT *data, int byte_position, time_t date);
+
+/* Gets the filename within a cache DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns NULL on error
+ */
+extern char * net_GetFilenameInCacheDBT(DBT *data);
+
+/* Gets a int32 within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern time_t net_GetInt32InCacheDBT(DBT *data, int byte_position);
+
+/* free's a DBT struct
+ */
+extern void net_FreeCacheDBTdata(DBT *stuff);
+
+/* stores a cache object in the DBM database
+ */
+extern void net_ExtCacheStore(DB *database, net_CacheObject * obj);
+
+/* takes a database storage object and returns an un-malloc'd
+ * cache data object. The structure returned has pointers
+ * directly into the database memory and are only valid
+ * until the next call to any database function
+ *
+ * do not free anything returned by this structure
+ */
+extern net_CacheObject * net_Fast_DBDataToCacheStruct(DBT *obj);
+
+/* returns true if this DBT looks like a valid
+ * entry.  It looks at the checksum and the
+ * version number to see if it's valid
+ */
+extern PRBool net_IsValidCacheDBT(DBT *obj);
+
+#endif /* EXT_CACHE_H */

mozilla/network/cache/makefile.win

@@ -0,0 +1,105 @@
+#!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.
+
+IGNORE_MANIFEST=1
+#
+
+#------------------------------------------------------------------------
+#
+# Makefile to build the cache LIB
+#
+#------------------------------------------------------------------------
+
+#!ifdef MOZ_JAVA
+#LOCAL_JMC_SUBDIR = .
+#!endif
+
+#
+# Make sure we have MOZILLA_CLIENT defined so we get the
+#   proper JS includes
+#
+LCFLAGS		= $(LCFLAGS)  -DMOZILLA_CLIENT
+
+!ifdef BUILD_DEBUG_GC
+LCFLAGS		= $(LCFLAGS) -DDEBUG_GC
+!endif
+
+LLIBS=  \
+	$(NULL)
+MISCDEP=$(LLIBS)
+OBJS=   \
+	.\$(OBJDIR)\extcache.obj		\
+	.\$(OBJDIR)\mkcache.obj		\
+	.\$(OBJDIR)\mkextcac.obj		\
+	.\$(OBJDIR)\mkmemcac.obj		\
+!ifdef NU_CACHE
+	.\$(OBJDIR)\nucacheproto.obj		\
+!endif
+	$(NULL)
+	
+
+CSRCS =	\
+	cachedump.c	\
+	extcache.c	\
+	mkcache.c	\
+	mkextcac.c	\
+	mkmemcac.c	\
+!ifdef NU_CACHE
+	nucacheproto.c	\
+!endif
+	$(NULL)
+
+
+LIBRARY_NAME=netcache
+
+MODULE=netcache 
+DEPTH=..\..
+
+EXTRA_LIBS=
+
+REQUIRES= network nspr2 cachelib
+EXPORTS= netcache.h
+
+C_OBJS = \
+	$(NULL)
+	
+
+# use LINCS on win32 for now since REQUIRES seems to be broken
+#!if "$(MOZ_BITS)" != "16"
+LINCS= \
+    -I$(XPDIST)\public\nspr2 	\
+    -I$(XPDIST)\public\dbm 	\
+    -I$(XPDIST)\public\util	\
+    -I$(XPDIST)\public\pref 	\
+    -I$(XPDIST)\public\network 	\
+    -I$(XPDIST)\public\js 	\
+    -I$(XPDIST)\public\java 	\
+    -I$(XPDIST)\public\fileurl 	\
+    -I$(XPDIST)\public\security \
+    -I$(XPDIST)\public\cache 	\
+    -I$(XPDIST)\public\jtools
+#!endif
+
+include <$(DEPTH)\config\rules.mak> 
+
+libs:: $(LIBRARY)
+    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+
+symbols::
+	@echo "LIBRARY_NAME     is $(LIBRARY_NAME)"
+	@echo "LIBRARY          is $(LIBRARY)"

mozilla/network/cache/mkcache.h

@@ -0,0 +1,40 @@
+/* -*- 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 MKCACHE_H
+#define MKCACHE_H
+
+#include "xp.h"
+
+#ifndef EXT_CACHE_H
+#include "extcache.h"
+#endif
+
+#ifndef NU_CACHE
+/* trace variable for cache testing */
+extern PRBool NET_CacheTraceOn;
+#endif /* This is handled by CacheTrace_Enable() and CacheTrace_IsEnabled() in the NU world */
+
+PR_BEGIN_EXTERN_C
+#ifndef NU_CACHE
+/* public accessor function for netcaster */
+extern PRBool NET_CacheStore(net_CacheObject *cacheObject, URL_Struct *url_s, PRBool accept_partial_files);
+#endif
+PR_END_EXTERN_C
+
+#endif /* MKCACHE_H */

mozilla/network/cache/mkextcac.h

@@ -0,0 +1,22 @@
+/* -*- 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 MKEXTCACHE_H
+#define MKEXTCACHE_H
+
+#endif /* MKEXTCACHE_H */

mozilla/network/cache/mkmemcac.h

@@ -0,0 +1,61 @@
+/* -*- 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 MK_MEMORY_CACHE_H
+
+#include "mkgeturl.h"
+
+/* A pointer to this struct is passed as the converter_obj argument to
+ * NET_MemCacheConverter.
+ */
+typedef struct net_MemCacheConverterObject {
+    NET_StreamClass *next_stream;
+	PRBool         dont_hold_URL_s;
+} net_MemCacheConverterObject;
+
+extern NET_StreamClass * 
+NET_MemCacheConverter (FO_Present_Types format_out,
+                    void       *converter_obj,
+                    URL_Struct *URL_s,
+                    MWContext  *window_id);
+
+/* remove a URL from the memory cache
+ */
+extern void
+NET_RemoveURLFromMemCache(URL_Struct *URL_s);
+
+/* set or unset a lock on a memory cache object
+ */
+extern void
+NET_ChangeMemCacheLock(URL_Struct *URL_s, PRBool set);
+
+/* Create a wysiwyg cache converter to a copy of the current entry for URL_s.
+ */
+extern NET_StreamClass *
+net_CloneWysiwygMemCacheEntry(MWContext *window_id, URL_Struct *URL_s,
+			      uint32 nbytes, const char * wysiwyg_url,
+			      const char * base_href);
+/* return the first cache object in memory */
+extern net_CacheObject * 
+NET_FirstMemCacheObject(XP_List* list_ptr);
+
+/* return the next cache object in memory */
+extern net_CacheObject * 
+NET_NextMemCacheObject(XP_List* list_ptr);
+
+#endif /* MK_MEMORY_CACHE_H */

mozilla/network/cache/netcache.h

@@ -0,0 +1,79 @@
+/* -*- 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 NETCACHE_H
+#define NETCACHE_H
+
+#include "mkgeturl.h"
+
+PR_BEGIN_EXTERN_C
+
+/* Initialization */
+extern void     NET_CacheInit(void);
+/* Shutdown */
+extern void     NET_CleanupCache(void); 
+
+/* create an HTML stream and push a bunch of HTML about
+ * the cache
+ */
+extern void     NET_DisplayCacheInfoAsHTML(ActiveEntry * cur_entry);
+
+/* create an HTML stream and push a bunch of HTML about
+ * the memory cache - TODO consolidate these two into one function! - Gagan
+ */
+extern void     NET_DisplayMemCacheInfoAsHTML(ActiveEntry * cur_entry);
+
+extern int      NET_FindURLInCache(URL_Struct * URL_s, MWContext *ctxt);
+
+#ifdef NU_CACHE
+extern void     NET_InitNuCacheProtocol(void);
+#else
+extern void     NET_InitMemCacProtocol(void);
+#endif
+
+/* Will go away later */
+extern PRBool   NET_IsCacheTraceOn(void);
+
+/* return TRUE if the URL is in the cache and
+ * is a partial cache file - TODO- only used in HTTP- cleanup - Gagan 
+ */ 
+extern PRBool   NET_IsPartialCacheFile(URL_Struct *URL_s);
+
+/* Update cache entry on a 304 return*/
+extern void     NET_RefreshCacheFileExpiration(URL_Struct * URL_s);
+
+/* remove a URL from the cache */
+extern void     NET_RemoveURLFromCache(URL_Struct *URL_s);
+
+/* Removed in NU_Cache, SAR should go through new api. - Gagan */
+#ifndef NU_CACHE
+extern void     NET_OpenExtCacheFAT(MWContext *ctxt, char * cache_name, char * instructions);
+extern void     CACHE_CloseAllOpenSARCache();
+extern void     CACHE_OpenAllSARCache();
+extern int      NET_FindURLInMemCache(URL_Struct * URL_s, MWContext *ctxt);
+/* lookup routine
+ *
+ * builds a key and looks for it in the database.  Returns an access
+ * method and sets a filename in the URL struct if found
+ */
+extern int      NET_FindURLInExtCache(URL_Struct * URL_s, MWContext *ctxt);
+#endif
+
+PR_END_EXTERN_C
+
+#endif /* NETCACHE_H */

mozilla/network/cache/nu/Makefile

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

mozilla/network/cache/nu/include/Makefile

@@ -0,0 +1,24 @@
+#!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	= ../../../..
+
+MODULE	= cache
+
+include $(DEPTH)/config/rules.mk

mozilla/network/cache/nu/include/makefile.win

@@ -0,0 +1,18 @@
+#!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.
+
+!include $(MOZ_SRC)\ns\config\rules.mak

mozilla/network/cache/nu/include/nsCacheTrace.h

@@ -0,0 +1,65 @@
+/* -*- 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 _nsCacheTrace_H_
+#define _nsCacheTrace_H_
+/* 
+* nsCacheTrace
+*
+* Gagan Saksena
+* 02/02/98
+* 
+*/
+#ifndef CRLF
+#	define CRLF "\r\n"
+#endif
+
+#include "prtypes.h"
+#include "prlog.h"
+
+class nsCacheTrace 
+{
+
+public:
+		nsCacheTrace(void);
+    static void Enable(PRBool bEnable);
+    static PRBool IsEnabled(void);
+    static void	Trace(const char* msg);
+    static void	Traceln(const char* msg);
+    static void Use(char* buffer);
+    static char* m_TraceBuffer;
+private:
+    PRBool m_bEnabled;
+};
+
+inline void nsCacheTrace::Trace(const char* msg) 
+{
+	PR_ASSERT(msg);
+    //Do log stuff here TODO
+}
+
+inline void nsCacheTrace::Traceln(const char* msg)
+{
+	Trace(msg);
+	Trace(CRLF);
+}
+
+inline void nsCacheTrace::Use(char* buffer) 
+{
+	m_TraceBuffer = buffer;
+}
+#endif

mozilla/network/cache/nu/include/nsFFEntry.h

@@ -0,0 +1,132 @@
+/* -*- 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 nsFFEntry_h__
+#define nsFFEntry_h__
+
+#include "nsFFObject.h"
+//#include "nsISupports.h"
+/** An FFEntry consists of several objects, all io takes place 
+  * through the FFEntry's read and write functions */
+
+class nsFFEntry//: public nsISupports
+{
+
+public:
+            nsFFEntry();
+            nsFFEntry(const PRUint32 i_ID);
+            //Single block entries can use this constructor
+            nsFFEntry(const PRUint32 i_ID, const PRUint32 i_offset, const PRUint32 i_size);
+    virtual ~nsFFEntry();
+
+    /*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+    */
+
+    PRBool      AddObject(const nsFFObject* i_object);
+
+    //Appends an entry to the list
+    PRBool      AddEntry(const nsFFEntry* i_pEntry);
+
+    nsFFObject* FirstObject(void) const;
+    void        FirstObject(const nsFFObject* i_object);
+
+    PRUint32    ID(void) const;
+    void        ID(const PRUint32 i_ID);
+
+    nsFFEntry*  NextEntry(void) const;
+    void        NextEntry(const nsFFEntry* i_pEntry);
+
+    //Returns the number of objects in this entry. 
+    PRUint32    Objects(void) const;
+
+    PRBool      Remove(void);
+
+    PRUint32    Size(void) const;
+
+protected:
+
+private:
+    nsFFEntry(const nsFFEntry& o);
+    nsFFEntry& operator=(const nsFFEntry& o);
+
+    nsFFObject* m_pFirstObject;
+    nsFFEntry* m_pNextEntry;
+
+    PRUint32 m_ID;
+    PRUint32 m_Objects;
+};
+
+inline
+PRBool nsFFEntry::AddEntry(const nsFFEntry* i_Entry)
+{
+    if (!i_Entry)
+        return PR_FALSE;
+    if (m_pNextEntry)
+        return m_pNextEntry->AddEntry(i_Entry);
+    m_pNextEntry = (nsFFEntry*) i_Entry;
+    return PR_TRUE;
+}
+
+inline
+nsFFObject* nsFFEntry::FirstObject(void) const
+{
+    return m_pFirstObject;
+}
+
+inline
+PRUint32 nsFFEntry::ID(void) const
+{
+    return m_ID;
+}
+
+inline
+void nsFFEntry::ID(const PRUint32 i_id)
+{
+    m_ID = i_id;
+}
+
+inline
+nsFFEntry* nsFFEntry::NextEntry(void) const
+{
+    return m_pNextEntry;
+}
+
+inline
+void nsFFEntry::NextEntry(const nsFFEntry* i_pEntry)
+{
+    m_pNextEntry = (nsFFEntry*) i_pEntry;
+}
+
+inline
+PRUint32 nsFFEntry::Objects(void) const
+{
+    return m_Objects;
+}
+
+inline
+PRUint32 nsFFEntry::Size(void) const
+{
+    return m_pFirstObject ? m_pFirstObject->TotalSize() : 0; // Assumption that there is no zero length files //TODO
+}
+
+#endif // nsFFEntry_h__
+

mozilla/network/cache/nu/include/nsFFObject.h

@@ -0,0 +1,125 @@
+/* -*- 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 nsFFObject_h__
+#define nsFFObject_h__
+
+#include "prtypes.h"
+
+class nsFFObject
+{
+
+public:
+            nsFFObject(
+                PRUint32 i_ID, 
+                PRUint32 i_Offset, 
+                PRUint32 i_Size = 0);
+
+    virtual ~nsFFObject();
+
+    PRBool      Add(const nsFFObject* i_object);
+
+    PRUint32    ID(void) const;
+    void        ID(const PRUint32 i_ID);
+
+    nsFFObject* Next(void) const;
+    void        Next(nsFFObject* io_pNext);
+
+    PRUint32    Offset(void) const;
+    void        Offset(const PRUint32 i_offset);
+
+    PRUint32    Size(void) const;
+    void        Size(const PRUint32 i_Size);
+
+    PRUint32    TotalSize(void) const;
+
+protected:
+
+private:
+    nsFFObject(const nsFFObject& o);
+    nsFFObject& operator=(const nsFFObject& o);
+    
+    PRUint32 m_ID;
+    PRUint32 m_Offset;
+    PRUint32 m_Size;
+
+    nsFFObject* m_pNext;
+};
+
+inline
+PRUint32 nsFFObject::ID(void) const
+{
+    return m_ID;
+}
+
+inline
+void nsFFObject::ID(const PRUint32 i_ID)
+{
+    m_ID = i_ID;
+}
+
+inline
+nsFFObject* nsFFObject::Next(void) const
+{
+    return m_pNext;
+}
+
+inline 
+void nsFFObject::Next(nsFFObject* io_pNext)
+{
+    if (io_pNext)
+        io_pNext->ID(m_ID);
+    m_pNext = io_pNext;
+    // Overlap check! //TODO
+    //PR_ASSERT(io_pNext->Offset() > m_Offset + m_Size) ||
+        // (io_pNext->Offset() + io_pNext->Size() < m_Offset)
+}
+
+inline
+PRUint32 nsFFObject::Offset(void) const
+{
+    return m_Offset;
+}
+
+inline
+void nsFFObject::Offset(const PRUint32 i_Offset)
+{
+    m_Offset = i_Offset;
+    //TODO - overlap check. 
+}
+
+inline
+PRUint32 nsFFObject::Size(void) const
+{
+    return m_Size;
+}
+
+inline
+void nsFFObject::Size(const PRUint32 i_Size)
+{
+    m_Size = i_Size;
+    //TODO - Overlap check. 
+}
+
+inline 
+PRUint32 nsFFObject::TotalSize(void) const
+{
+    return m_Size + (m_pNext ? m_pNext->TotalSize() : 0);
+}
+#endif // nsFFObject_h__
+

mozilla/network/cache/nu/include/nsFlatFile.h

@@ -0,0 +1,107 @@
+/* -*- 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 nsFlatFile_h__
+#define nsFlatFile_h__
+
+#include "prtypes.h"
+#include "prio.h"
+
+//#include "nsISupports.h"
+
+#ifdef IS_LITTLE_ENDIAN
+#ifndef COPY_INT32
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+#endif
+
+/** A class to handle flat file storage mechanism */
+static const PRUint32 kPAGE_SIZE =4096; 
+
+class nsFlatFile //: public nsISupports
+{
+public:
+
+            nsFlatFile(const char* i_pFilename, 
+                const PRUint32 i_FileSize= 5242880); // 5 meg
+            // TODO think if we want to substract the toc size from this?
+
+    virtual ~nsFlatFile();
+
+    const char*     Filename(void) const;
+
+    PRUint32        HeaderSize(void) const;
+
+    void            Init(void);
+
+    PRBool          IsValid(void) const;
+    
+    PRUint32        Size(void) const;
+    /*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+    */
+protected:
+
+private:
+    nsFlatFile(const nsFlatFile& o);
+    nsFlatFile& operator=(const nsFlatFile& o);
+
+    PRBool      m_bIsValid;
+    char*       m_pFilename;
+    PRUint32    m_Size;
+
+    PRFileDesc* m_pFD;
+    PRUint32    m_HeaderSize;
+};
+
+inline
+const char* nsFlatFile::Filename(void) const
+{
+    return m_pFilename;
+}
+
+inline
+PRUint32 nsFlatFile::HeaderSize(void) const
+{
+    return m_HeaderSize;
+}
+
+inline
+PRBool nsFlatFile::IsValid(void) const
+{
+    return m_bIsValid;
+}
+
+inline
+PRUint32 nsFlatFile::Size(void) const
+{
+    return m_Size;
+}
+#endif // nsFlatFile_h__
+

mozilla/network/cache/nu/include/nsTOC.h

@@ -0,0 +1,108 @@
+/* -*- 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 nsTOC_h__
+#define nsTOC_h__
+
+//#include "nsISupports.h"
+
+#include "nsFlatFile.h"
+#include "nsFFEntry.h"
+
+class nsTOC//: public nsISupports
+{
+
+public:
+            nsTOC(const char* i_pFilename, nsFlatFile* i_pFlatFile);
+    virtual ~nsTOC();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+
+    nsFFEntry*  AddEntry(PRUint32 i_size = kPAGE_SIZE);
+
+    PRUint32    Entries(void) const;
+
+    const char* Filename(void) const;
+    
+    nsFFEntry*  FirstDataEntry(void) const;
+    
+    nsFFEntry*  FreeEntry(void) const;
+
+    void        Init(void);
+
+    PRBool      IsValid(void) const;
+    
+protected:
+    PRUint32    NextID(void) const;
+    
+    PRBool      Serialize(nsFFEntry* io_Entry, PRBool bRead = PR_FALSE);
+    
+
+private:
+    nsTOC(const nsTOC& o);
+    nsTOC& operator=(const nsTOC& o);
+
+    nsFFEntry*      m_pContents; // The first entry is reserved for free space list
+    PRUint32        m_Entries;
+    char*           m_pFilename;
+    nsFlatFile*     m_pFlatFile;
+    PRFileDesc*     m_pFD;
+    PRBool          m_bIsValid;
+};
+
+inline
+PRUint32 nsTOC::Entries(void) const
+{
+    return m_Entries;
+}
+
+inline
+const char* nsTOC::Filename(void) const
+{
+    return m_pFilename;
+}
+
+inline
+nsFFEntry*  nsTOC::FirstDataEntry(void) const
+{
+    return m_pContents ? m_pContents->NextEntry() : 0;
+}
+    
+inline
+nsFFEntry* nsTOC::FreeEntry(void) const
+{
+    return m_pContents;
+}
+
+inline
+PRBool nsTOC::IsValid(void) const
+{
+    return m_bIsValid;
+}
+
+inline
+PRUint32 nsTOC::NextID(void) const
+{
+    return m_Entries + 1;
+}
+#endif // nsTOC_h__
+

mozilla/network/cache/nu/include/nsTimeIt.h

@@ -0,0 +1,25 @@
+/* A class to time excursion events */
+/* declare an object of this class within the scope to be timed. */
+#include "prtypes.h"
+#include "prinrval.h"
+
+class nsTimeIt
+{
+public:
+    nsTimeIt(PRUint32& tmp);
+    ~nsTimeIt();
+private:
+    PRIntervalTime t;
+    PRUint32& dest;
+};
+
+inline
+nsTimeIt::nsTimeIt(PRUint32& tmp):t(PR_IntervalNow()), dest(tmp)
+{
+}
+
+inline
+nsTimeIt::~nsTimeIt()
+{
+    dest = PR_IntervalToMicroseconds(PR_IntervalNow()-t);
+}

mozilla/network/cache/nu/macbuild/nuCache.Prefix

@@ -0,0 +1,27 @@
+/* -*- 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.
+ */
+ 
+//
+//	nuCache.Prefix
+//
+// Global prefix file for the nuCache project.
+//
+//
+
+#include "MacPrefix_debug.h"
+#include "nuCacheConfig.h"

mozilla/network/cache/nu/macbuild/nuCacheConfig.h

@@ -15,7 +15,4 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-
-
-
-#include "MacPrefix.h"
+#define CGLUESUPPORTED 0 // turn off C glue support to avoid conflict on create() in RDF

mozilla/network/cache/nu/macbuild/nuCacheDebug.Prefix

@@ -16,6 +16,12 @@
  * Reserved.
  */
 
-
+//
+//	RDFDebug.Prefix
+//
+// Global prefix file for the nuCache project.
+//
+//
 
 #include "MacPrefix_debug.h"
+#include "nuCacheConfig.h"

mozilla/network/cache/nu/makefile.win

@@ -0,0 +1,22 @@
+#!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  
+
+include <$(DEPTH)\config\rules.mak>

mozilla/network/cache/nu/nsGeneric.cpp

@@ -0,0 +1,50 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#include "nsGeneric.h"
+
+nsGeneric::nsGeneric()
+{
+}
+
+nsGeneric::~nsGeneric()
+{
+}
+
+nsrefcnt nsGeneric::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsGeneric::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsGeneric::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+
+nsGeneric::

mozilla/network/cache/nu/nsGeneric.h

@@ -0,0 +1,45 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsGeneric_h__
+#define nsGeneric_h__
+
+#include "nsISupports.h"
+
+class nsGeneric: public nsISupports
+{
+
+public:
+            nsGeneric();
+    virtual ~nsGeneric();
+
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+
+protected:
+
+private:
+    nsGeneric(const nsGeneric& o);
+    nsGeneric& operator=(const nsGeneric& o);
+};
+
+#endif // nsGeneric_h__
+

mozilla/network/cache/nu/public/CacheStubs.h

@@ -0,0 +1,130 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* Design and original implementation by Gagan Saksena '98 */
+
+/* Ideally we should be using the C++ api directly, but since the core of
+   Netlib is still in C, this file uses the stub functions that call the C++
+   API internally, allowing C programs to use the new cache architecture.
+   If you are accessing the cache, see if you can directly use the C++ api. */
+
+#ifndef CacheStubs_h__
+#define CacheStubs_h__
+
+#include "prtypes.h"
+#include "prinrval.h"
+
+#define MEM_MODULE_ID 0
+#define DISK_MODULE_ID 1
+
+PR_BEGIN_EXTERN_C
+ 
+    /* General mapped functions which resolve to a bunch of internal calls. */
+    extern void             Cache_Init(void);
+    extern void             Cache_Shutdown(void);
+
+    /* Cache Manager stub functions
+       Does not include some functions not required in the current 
+       design like AddModule etc... If you need to these functions, try
+       accessing them directly thru the C++ api or let me know. 
+       Check nsCacheManager.h for details on these functions.*/
+    extern PRBool           CacheManager_Contains(const char* i_url);
+    extern PRInt16          CacheManager_Entries(void);
+    extern void*            CacheManager_GetObject(const char* i_url);
+    extern PRBool           CacheManager_IsOffline(void);
+    extern void             CacheManager_Offline(PRBool bSet);
+    extern PRBool           CacheManager_Remove(const char* i_url);
+    extern PRUint32         CacheManager_WorstCaseTime(void);
+
+    /* Cache Object- check nsCacheObject.h for details on these functions */
+    extern void*            CacheObject_Create(const char* i_url);
+    extern void             CacheObject_Destroy(void* pThis);
+    extern const char*      CacheObject_GetAddress(const void* pThis);
+    extern const char*      CacheObject_GetCharset(void* pThis);
+    extern const char*      CacheObject_GetContentEncoding(void* pThis);
+    extern PRUint32         CacheObject_GetContentLength(void* pThis);
+    extern const char*      CacheObject_GetContentType(void* pThis);
+    extern const char*      CacheObject_GetEtag(const void* pThis);
+    extern PRIntervalTime   CacheObject_GetExpires(const void* pThis);
+    extern const char*      CacheObject_GetFilename(const void* pThis);
+    extern PRIntervalTime   CacheObject_GetLastAccessed(const void* pThis);
+    extern PRIntervalTime   CacheObject_GetLastModified(const void* pThis);
+    extern PRInt16          CacheObject_GetModule(const void* pThis);
+    extern const char*      CacheObject_GetPageServicesURL(void* pThis);
+    extern const char*      CacheObject_GetPostData(const void* pThis);
+    extern PRUint32         CacheObject_GetPostDataLen(const void* pThis);
+    extern PRUint32         CacheObject_GetSize(const void* pThis);
+    extern PRUint32         CacheObject_Hits(const void* pThis);
+    extern PRBool           CacheObject_IsExpired(const void* pThis);
+    extern PRBool           CacheObject_IsPartial(const void* pThis);
+    extern PRUint32         CacheObject_Read(const void* pThis, char* o_Destination, PRUint32 i_Len);
+    extern void             CacheObject_SetAddress(void* pThis, const char* i_Address);
+    extern void             CacheObject_SetCharset(void* pThis, const char* i_CharSet);
+    extern void             CacheObject_SetContentEncoding(void* pThis, const char* i_Encoding);
+    extern void             CacheObject_SetContentLength(void* pThis, PRUint32 i_Len);
+    extern void             CacheObject_SetContentType(void* pThis, const char* i_Type);
+    extern void             CacheObject_SetEtag(void* pThis, const char* i_Etag);
+    extern void             CacheObject_SetExpires(void *pThis, const PRIntervalTime i_Time);
+    extern void             CacheObject_SetFilename(void *pThis, const char* i_Filename);
+    extern void             CacheObject_SetLastModified(void* pThis, const PRIntervalTime i_Time);
+    extern void             CacheObject_SetModule(void* pThis, const PRInt16 i_Module);
+    extern void             CacheObject_SetPageServicesURL(void* pThis, const char* i_Url);
+    extern void             CacheObject_SetPostData(void* pThis, const char* i_PostData, const PRUint32 i_Len);
+    extern void             CacheObject_SetSize(void* pThis, const PRUint32 i_Size);
+    extern PRBool           CacheObject_Synch(void* pThis);
+    extern PRUint32         CacheObject_Write(void* pThis, const char* i_buffer, const PRUint32 i_length);
+
+    /* Cache Prefs- check nsCachePref.h for details on these functions */
+    extern PRUint32         CachePref_GetDiskCacheSize(void);
+    extern PRBool           CachePref_GetDiskCacheSSL(void);
+    extern PRUint32         CachePref_GetMemCacheSize(void);
+    extern void             CachePref_SetDiskCacheSize(const PRUint32 i_Size);
+    extern void             CachePref_SetDiskCacheSSL(PRBool bSet);
+    extern void             CachePref_SetMemCacheSize(const PRUint32 i_Size);
+    
+    /* Cache Trace- Check nsCacheTrace.h for details on these functions */
+    extern void             CacheTrace_Enable(PRBool bEnable);
+    extern PRBool           CacheTrace_IsEnabled(void);
+    
+    /* Disk Module- Check nsDiskModule.h for details on these functions */
+    extern PRBool           DiskModule_AddObject(void* pCacheObject);
+    extern PRBool           DiskModule_Contains(const char* i_url);
+    extern PRUint32         DiskModule_Entries(void);
+    extern PRUint32         DiskModule_GetSize(void); /* Should be the same as CachePref_DiskCacheSize */
+    extern PRUint32         DiskModule_GetSizeInUse(void);
+    extern PRBool           DiskModule_IsEnabled(void);
+    extern PRBool           DiskModule_Remove(const char* i_url);
+    extern PRBool           DiskModule_RemoveAll(void);
+    extern void             DiskModule_SetSize(PRUint32 i_Size);
+
+    /* Mem Module- Check nsMemModule.h for details on these functions */
+    extern PRBool           MemModule_AddObject(void* pCacheObject); 
+    extern PRBool           MemModule_Contains(const char* i_url);
+    extern PRUint32         MemModule_Entries(void);
+    extern PRUint32         MemModule_GetSize(void); /* Should be the same as CachePref_MemCacheSize */
+    extern PRUint32         MemModule_GetSizeInUse(void);
+    extern PRBool           MemModule_IsEnabled(void);
+    extern PRBool           MemModule_Remove(const char* i_url);
+    extern PRBool           MemModule_RemoveAll(void);
+    extern void             MemModule_SetSize(PRUint32 i_Size);
+
+PR_END_EXTERN_C     
+
+#endif // CacheStubs_h__
+

mozilla/network/cache/nu/public/Makefile

@@ -0,0 +1,35 @@
+#!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=../../../..
+
+EXPORTS =               \
+	nsMonitorable.h		\
+	nsMemModule.h 		\
+	nsCacheManager.h 	\
+    nsDiskModule.h 		\
+	nsCacheModule.h 	\
+	nsMemCacheObject.h  \
+	nsCacheObject.h	    \
+	nsCachePref.h		\
+        $(NULL)
+
+MODULE = cache
+
+include $(DEPTH)/config/config.mk
+
+include $(DEPTH)/config/rules.mk

mozilla/network/cache/nu/public/makefile.win

@@ -0,0 +1,32 @@
+#!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
+
+MODULE=cache 
+
+EXPORTS=nsCacheObject.h nsMemModule.h nsCacheManager.h  \
+    nsDiskModule.h nsCacheModule.h nsMemCacheObject.h   \
+    nsCachePref.h nsCacheBkgThd.h nsBkgThread.h         \
+    CacheStubs.h nsCacheIterator.h nsIterator.h         \
+    nsMonitorable.h nsStream.h nsFileStream.h           \
+    nsMemStream.h                                       \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/network/cache/nu/public/nsBkgThread.h

@@ -0,0 +1,64 @@
+/* -*- 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 nsBkgThread_h__
+#define nsBkgThread_h__
+
+//#include "nsISupports.h"
+#include "prthread.h"
+#include "prinrval.h"
+
+/*
+    Creates a background thread that maintains odd 
+    tasks like updating, expiration, validation and 
+    garbage collection. 
+    
+    Note that this is a noop active when the cache 
+    manager is offline. 
+
+    In PRThread terms, this is a PR_USER_THREAD with 
+    local scope.
+*/
+class nsBkgThread//: public nsISupports
+{
+
+public:
+            nsBkgThread(PRIntervalTime iSleepTime, PRBool bStart=PR_TRUE);
+    virtual ~nsBkgThread();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    void            Process(void);
+    virtual void    Run(void) = 0;
+    void            Stop(void);
+protected:
+    PRThread*       m_pThread;
+    PRBool          m_bContinue;
+    PRIntervalTime  m_SleepTime;
+
+private:
+    nsBkgThread(const nsBkgThread& o);
+    nsBkgThread& operator=(const nsBkgThread& o);
+
+};
+
+#endif // nsBkgThread_h__
+

mozilla/network/cache/nu/public/nsCacheBkgThd.h

@@ -0,0 +1,46 @@
+/* -*- 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 nsCacheBkgThd_h__
+#define nsCacheBkgThd_h__
+
+#include "nsBkgThread.h"
+
+class nsCacheBkgThd: public nsBkgThread
+{
+
+public:
+            nsCacheBkgThd(PRIntervalTime iSleepTime);
+    virtual ~nsCacheBkgThd();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    void        Run(void);
+
+protected:
+
+private:
+    nsCacheBkgThd(const nsCacheBkgThd& o);
+    nsCacheBkgThd& operator=(const nsCacheBkgThd& o);
+};
+
+#endif // nsCacheBkgThd_h__
+

mozilla/network/cache/nu/public/nsCacheIterator.h

@@ -0,0 +1,74 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsCacheIterator_h__
+#define nsCacheIterator_h__
+
+#include "nsIterator.h"
+#include "prtypes.h"
+#include "nsCacheModule.h"
+
+class nsCacheIterator: public nsIterator
+{
+
+public:
+            nsCacheIterator(nsCacheModule* i_pModule);
+    virtual ~nsCacheIterator();
+
+    virtual PRBool          IsDone(void) const;
+    virtual nsCacheObject*  Current(void) const;
+
+private:
+    nsCacheIterator(const nsCacheIterator& o);
+    nsCacheIterator& operator=(const nsCacheIterator& o);
+    nsCacheModule*    m_pModule;
+};
+
+inline
+nsCacheIterator::nsCacheIterator(nsCacheModule* i_pModule): m_pModule(i_pModule)
+{
+}
+
+inline
+nsCacheIterator::~nsCacheIterator()
+{
+}
+
+inline
+PRBool nsCacheIterator::IsDone(void) const
+{
+    if (m_pModule)
+    {
+        return m_pModule->Entries() <= m_Index;
+    }
+    else
+        return PR_FALSE;
+}
+
+inline
+nsCacheObject* nsCacheIterator::Current(void) const
+{
+    if (m_pModule)
+    {
+        return m_pModule->GetObject(m_Index);
+    }
+    return 0;
+}
+#endif // nsCacheIterator_h__
+

mozilla/network/cache/nu/public/nsCacheManager.h

@@ -0,0 +1,168 @@
+/* -*- 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 _CacheManager_H_
+#define _CacheManager_H_
+/* 
+ * nsCacheManager
+ * Design and original implementation 
+ * by Gagan Saksena 02/02/98
+ * 
+ */
+
+#if 0
+#   include "nsISupports.h"
+#endif
+
+#include "prlog.h"
+
+#include "nsMonitorable.h"
+#include "nsCacheModule.h"
+#include "nsCacheObject.h"
+
+class nsMemModule;
+class nsDiskModule;
+class nsCachePref;
+class nsCacheBkgThd;
+
+class nsCacheManager : public nsMonitorable //: public nsISupports
+{
+
+public:
+
+    //Reserved modules
+    enum modules
+    {
+       MEM =0,
+       DISK=1
+    };
+
+    nsCacheManager();
+    ~nsCacheManager();
+
+    PRInt32                 AddModule(nsCacheModule* i_cacheModule);
+                            // InsertModule
+    PRBool                  Contains(const char* i_url) const;
+    
+    /* Number of modules in the cache manager */
+    PRInt16                 Entries() const;
+    
+    /* Singleton */
+    static nsCacheManager*  GetInstance();
+    
+    nsCacheObject*          GetObj(const char* i_url) const;
+
+    nsCacheModule*          GetModule(PRInt16 i_index) const;
+
+    nsMemModule*            GetMemModule() const;
+    nsDiskModule*           GetDiskModule() const;
+
+    PRBool                  IsOffline(void) const;
+
+    void                    Offline(PRBool bSet);
+
+    PRBool                  Remove(const char* i_url);
+
+    const char*             Trace() const;
+
+    /* Performance measure- microseconds */
+    PRUint32                WorstCaseTime(void) const;
+
+protected:
+    
+    PRBool                  ContainsExactly(const char* i_url) const;
+
+    void                    Init();
+  
+    nsCacheModule*          LastModule() const;
+    //PRBool                  Lock(void);
+    //void                    Unlock(void);
+
+/*
+    class MgrMonitor
+    {
+    public:
+        MgrMonitor() { nsCacheManager::GetInstance()->Lock();}
+        ~MgrMonitor() { nsCacheManager::GetInstance()->Unlock();}
+    };
+
+    friend MgrMonitor;
+*/
+
+private:
+    nsCacheModule*      m_pFirstModule;
+    PRMonitor*          m_pMonitor;
+
+    nsCacheManager(const nsCacheManager& cm);
+    nsCacheManager& operator=(const nsCacheManager& cm);
+    nsCacheBkgThd*  m_pBkgThd;
+    PRBool          m_bOffline;
+};
+
+inline
+nsDiskModule* nsCacheManager::GetDiskModule() const
+{
+    PR_ASSERT(m_pFirstModule && m_pFirstModule->NextModule());
+    return (m_pFirstModule) ? (nsDiskModule*) m_pFirstModule->NextModule() : NULL;
+}
+
+inline
+nsMemModule* nsCacheManager::GetMemModule() const
+{
+    PR_ASSERT(m_pFirstModule);
+    return (nsMemModule*) m_pFirstModule;
+}
+
+inline
+PRBool nsCacheManager::IsOffline(void) const
+{
+    return m_bOffline;
+}
+
+/*
+inline
+PRBool nsCacheManager::Lock(void)
+{
+    if (!m_pMonitor)
+    {
+        m_pMonitor = PR_NewMonitor();
+        if (!m_pMonitor)
+            return PR_FALSE;
+    }
+    PR_EnterMonitor(m_pMonitor);
+    return PR_TRUE;
+}
+*/
+
+inline
+void  nsCacheManager::Offline(PRBool i_bSet) 
+{
+    m_bOffline = i_bSet;
+}
+
+/*
+inline
+void nsCacheManager::Unlock(void)
+{
+    PR_ASSERT(m_pMonitor);
+    if (m_pMonitor)
+        PR_ExitMonitor(m_pMonitor);
+}
+*/
+
+#endif

mozilla/network/cache/nu/public/nsCacheModule.h

@@ -0,0 +1,194 @@
+/* -*- 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 nsCacheModule_h__
+#define nsCacheModule_h__
+
+/* 
+ * nsCacheModule
+ *
+ * Gagan Saksena 02/03/98
+ * 
+ */
+//#include <nsISupports.h>
+#include "nsCacheObject.h"
+#include "nsEnumeration.h"
+#include "nsMonitorable.h"
+
+/* Why in the world is forward decl. not working? */
+//class nsCacheObject;
+
+/*
+// {5D51B24F-E6C2-11d1-AFE5-006097BFC036}
+static const NS_CACHEMODULE_ID = 
+{ 0x5d51b24f, 0xe6c2, 0x11d1, { 0xaf, 0xe5, 0x0, 0x60, 0x97, 0xbf, 0xc0, 0x36 } };
+*/
+
+class nsCacheIterator;
+class nsCacheModule : public nsMonitorable /*: public nsISupports */
+{
+
+public:
+    nsCacheModule(const PRUint32 i_size /*= DEFAULT_SIZE */);
+
+    virtual
+        ~nsCacheModule();
+
+    virtual 
+        PRBool          AddObject(nsCacheObject* i_pObject)=0;
+    
+    virtual
+        PRBool          Contains(const char* i_url) const=0;
+    virtual 
+        PRBool          Contains(nsCacheObject* i_pObject) const=0;
+    
+    void                Enable(PRBool i_Enable);
+    
+    const PRUint32      Entries(void) const;
+
+    nsEnumeration*      Enumeration(void) const;
+    /* Enumerations wiht a function pointer - TODO */
+
+    //TODO move to own interface for both Garbage Collection and Revalidation
+    virtual
+        void            GarbageCollect(void);
+
+    virtual
+        nsCacheObject*  GetObject(const char* i_url) const=0;
+
+    virtual
+        nsCacheObject*  GetObject(const PRUint32 i_index) const =0;
+
+    virtual
+        nsStream*       GetStreamFor(const nsCacheObject* i_pObject)=0;
+
+    PRBool              IsEnabled(void) const;
+
+    /* Cant do additions, deletions, validations, expirations */
+    PRBool              IsReadOnly(void) const; 
+
+    nsCacheModule*      NextModule(void) const;
+    void                NextModule(nsCacheModule*);
+
+    virtual
+        PRBool          Remove(const char* i_url) = 0;
+
+    virtual
+        PRBool          Remove(const PRUint32 i_index) = 0;
+
+    virtual
+        PRBool          RemoveAll(void);
+
+    virtual
+        PRBool          Revalidate(void) = 0;
+
+    const PRUint32      Size(void) const;
+
+    virtual
+        void            SetSize(const PRUint32 i_size);
+
+    PRUint32            SizeInUse(void) const;
+
+    const char*         Trace(void) const;
+
+protected:
+
+    virtual
+        PRBool          ReduceSizeTo(const PRUint32 i_NewSize);
+
+    PRUint32            m_Entries;
+    PRUint32            m_Size;
+    PRUint32            m_SizeInUse;
+    PRBool              m_Enabled;
+    nsEnumeration*      m_pEnumeration;
+    nsCacheIterator*    m_pIterator;
+    nsCacheModule*      m_pNext;
+
+private:
+    nsCacheModule(const nsCacheModule& cm);
+    nsCacheModule& operator=(const nsCacheModule& cm);
+};
+
+inline void nsCacheModule::Enable(PRBool i_Enable)
+{
+    m_Enabled = i_Enable;
+}
+
+inline const PRUint32 nsCacheModule::Entries() const 
+{
+    return m_Entries;
+}
+
+inline 
+nsEnumeration* nsCacheModule::Enumeration(void) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (!m_pEnumeration)
+    {
+        PR_ASSERT(m_pIterator);
+        ((nsCacheModule*)this)->m_pEnumeration = new nsEnumeration((nsIterator*)m_pIterator); 
+    }
+    else
+        ((nsCacheModule*)this)->m_pEnumeration->Reset();
+    return m_pEnumeration;
+}
+
+inline PRBool nsCacheModule::IsEnabled(void) const
+{
+    return m_Enabled;
+}
+
+inline PRBool nsCacheModule::IsReadOnly(void) const
+{
+    return PR_FALSE;
+}
+
+inline nsCacheModule* nsCacheModule::NextModule(void) const 
+{
+    return m_pNext;
+}
+
+inline void nsCacheModule::NextModule(nsCacheModule* pNext) 
+{
+    /* No overwriting */
+    PR_ASSERT(m_pNext == 0);
+    if (m_pNext)
+    {
+        /* ERROR */
+        delete m_pNext; //Worst case. 
+
+    }
+    m_pNext = pNext;
+}
+
+inline const PRUint32 nsCacheModule::Size() const
+{
+    return m_Size;
+}
+
+inline void nsCacheModule::SetSize(const PRUint32 size)
+{
+    m_Size = size;
+}
+
+inline PRUint32 nsCacheModule::SizeInUse(void) const
+{
+    return m_SizeInUse;
+}
+
+#endif // nsCacheModule_h__

mozilla/network/cache/nu/public/nsCacheObject.h

@@ -0,0 +1,288 @@
+/* -*- 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 nsCacheObject_h__
+#define nsCacheObject_h__
+
+#if 0
+#include "nsISupports.h"
+#endif
+
+#include "prtypes.h"
+#include "prinrval.h"
+
+static const PRUint32 kCACHE_VERSION = 5;
+
+class nsStream;
+
+class nsCacheObject //: public nsISupports
+{
+
+public:
+
+    enum state_flags 
+    {
+        INIT=0x000000,
+        PARTIAL=0x000001
+    };
+
+    nsCacheObject();
+    nsCacheObject(const nsCacheObject& another);
+    nsCacheObject(const char* i_url);
+
+    virtual ~nsCacheObject();
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+
+*/
+
+    void            Address(const char* i_url);
+    const char*     Address(void) const;
+
+    void            Charset(const char* i_Charset);
+    const char*     Charset(void) const;
+
+    void            ContentEncoding(const char* i_Encoding);
+    const char*     ContentEncoding(void) const;
+
+    void            ContentLength(PRUint32 i_len);
+    PRUint32        ContentLength(void) const;
+    
+    void            ContentType(const char* i_Type);
+    const char*     ContentType(void) const;
+
+    void            Etag(const char* i_etag);
+    const char*     Etag(void) const;
+
+    void            Expires(PRIntervalTime i_Expires);
+    PRIntervalTime  Expires(void) const;
+
+    void            Filename(const char* i_Filename);
+    const char*     Filename(void) const;
+
+    PRUint16        Hits(void) const;
+
+    /* Read and write info about this cache object */
+    void*           Info(void) const;
+    PRBool          Info(void* /*, PRUint32 len */);
+
+    PRUint32        InfoSize(void) const;
+
+    PRBool          IsExpired(void) const;
+
+    PRBool          IsPartial(void) const;
+
+    PRIntervalTime  LastAccessed(void) const;
+
+    PRIntervalTime  LastModified(void) const;
+    void            LastModified(const PRIntervalTime i_lastModified);
+
+    PRInt16         Module(void) const;
+    void            Module(PRUint16 i_m);
+
+    void            PageServicesURL(const char* i_Url);
+    const char*     PageServicesURL(void) const;
+
+    const char*     PostData(void) const;
+    void            PostData(const char* i_data, const PRUint32 i_Len);
+
+    PRUint32        PostDataLen(void) const;
+
+    PRUint32        Read(char* o_Buffer, PRUint32 len);
+
+    PRUint32        Size(void) const;
+    void            Size(PRUint32 i_Size);
+
+    const char*     Trace() const;
+
+    PRUint32        Write(const char* i_Buffer, const PRUint32 len);
+
+protected:
+
+    void            Init();
+
+    char*           m_Charset;
+    char*           m_ContentEncoding;
+    PRUint32        m_ContentLength;
+    char*           m_ContentType;
+    char*           m_Etag;
+    PRIntervalTime  m_Expires;
+    int             m_Flags;
+    char*           m_Filename;
+    PRUint16        m_Hits;
+    PRUint32        m_info_size;
+    PRIntervalTime  m_LastAccessed, m_LastModified;
+    void*           m_pInfo;
+    char*           m_PageServicesURL;
+    char*           m_PostData;
+    PRUint32        m_PostDataLen;
+    PRInt16         m_Module;
+    PRUint32        m_Size;
+    nsStream*       m_pStream;
+    char*           m_URL;
+    
+
+private:
+    nsCacheObject& operator=(const nsCacheObject& x);
+};
+
+inline 
+const char* nsCacheObject::Address(void) const
+{
+	return m_URL;
+};
+
+inline
+const char* nsCacheObject::Charset(void) const
+{
+    return m_Charset;
+}
+
+inline
+const char* nsCacheObject::ContentEncoding(void) const
+{
+    return m_ContentEncoding;
+}
+
+inline 
+PRUint32 nsCacheObject::ContentLength(void) const
+{
+	return m_ContentLength;
+};
+
+inline 
+void nsCacheObject::ContentLength(PRUint32 i_Size)
+{
+	m_ContentLength = i_Size;
+};
+
+inline 
+const char* nsCacheObject::ContentType(void) const
+{
+	return m_ContentType;
+};
+
+inline 
+const char* nsCacheObject::Etag(void) const 
+{
+	return m_Etag;
+};
+
+inline 
+PRIntervalTime nsCacheObject::Expires(void) const
+{
+	return m_Expires;
+};
+
+inline 
+void nsCacheObject::Expires(PRIntervalTime i_Expires)
+{
+	m_Expires = i_Expires;
+};
+
+inline
+const char* nsCacheObject::Filename(void) const
+{
+    return m_Filename;
+}
+
+inline 
+PRUint16 nsCacheObject::Hits(void) const
+{
+	return m_Hits;
+};
+
+inline 
+PRBool nsCacheObject::IsExpired(void) const
+{
+	PRIntervalTime now = PR_IntervalNow();
+	return (m_Expires <= now);
+};
+
+inline 
+PRBool nsCacheObject::IsPartial(void) const
+{
+	return (m_Flags & nsCacheObject::PARTIAL);
+};
+
+inline 
+PRIntervalTime nsCacheObject::LastAccessed(void) const
+{
+	return m_LastAccessed;
+};
+
+inline 
+PRIntervalTime nsCacheObject::LastModified(void) const
+{
+	return m_LastModified;
+};
+
+inline 
+void nsCacheObject::LastModified(const PRIntervalTime i_LastModified)
+{
+	m_LastModified = i_LastModified;
+};
+
+inline 
+PRInt16 nsCacheObject::Module(void) const
+{
+    return m_Module;
+};
+
+inline 
+void nsCacheObject::Module(PRUint16 i_Module) 
+{
+    m_Module = i_Module;
+};
+
+inline
+const char* nsCacheObject::PageServicesURL(void) const
+{
+    return m_PageServicesURL;
+}
+
+inline
+const char* nsCacheObject::PostData(void) const
+{
+    return m_PostData;
+}
+
+inline
+PRUint32 nsCacheObject::PostDataLen(void) const
+{
+    return m_PostDataLen;
+}
+
+inline 
+PRUint32 nsCacheObject::Size(void) const
+{
+	return m_Size;
+};
+
+inline 
+void nsCacheObject::Size(PRUint32 i_Size)
+{
+	m_Size = i_Size;
+};
+
+#endif // nsCacheObject_h__
+

mozilla/network/cache/nu/public/nsCachePref.h

@@ -0,0 +1,84 @@
+/* -*- 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 nsCachePref_h__
+#define nsCachePref_h__
+
+//#include "nsISupports.h"
+#include "prtypes.h"
+
+class nsCachePref //: public nsISupports
+{
+
+public:
+    static nsCachePref* GetInstance(void);
+    
+    nsCachePref(void);
+    ~nsCachePref();
+
+    enum Refresh 
+    {
+        NEVER,
+        ONCE,
+        ALWAYS
+    } r;
+
+    const PRUint32   BkgSleepTime(void);
+    
+    const char*      DiskCacheDBFilename(void); /* like Fat.db */
+    const char*      DiskCacheFolder(void);   /* Cache dir */
+
+    PRBool           DiskCacheSSL(void);
+    void             DiskCacheSSL(PRBool bSet);
+
+    PRUint32         DiskCacheSize(void);
+    void             DiskCacheSize(const PRUint32 i_Size);
+
+    PRUint32         MemCacheSize(void);
+    void             MemCacheSize(const PRUint32 i_Size);
+
+    nsCachePref::Refresh
+                            Frequency(void);
+
+    /* Revalidating in background, makes IMS calls in the bkg thread to 
+       update cache entries. TODO, this should be at a bigger time period
+       than the cache cleanup routine */
+    PRBool           RevalidateInBkg(void);
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+private:
+    nsCachePref(const nsCachePref& o);
+    nsCachePref& operator=(const nsCachePref& o);
+
+    PRBool                  m_bRevalidateInBkg;
+    PRBool                  m_bDiskCacheSSL;
+    nsCachePref::Refresh    m_RefreshFreq;
+    PRUint32                m_MemCacheSize;
+    PRUint32                m_DiskCacheSize;
+    char*                   m_DiskCacheDBFilename;
+    char*                   m_DiskCacheFolder;
+    PRUint32                m_BkgSleepTime;
+};
+
+#endif // nsCachePref_h__
+

mozilla/network/cache/nu/public/nsDiskModule.h

@@ -0,0 +1,77 @@
+/* -*- 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 _nsDiskModule_H_
+#define _nsDiskModule_H_
+/* 
+* nsDiskModule
+*
+* Gagan Saksena 02/03/98
+* 
+*/
+#include "nsCacheModule.h"
+#include "nsCachePref.h"
+#include "mcom_db.h"
+
+class nsDiskModule : public nsCacheModule
+{
+
+public:
+    nsDiskModule(const PRUint32 size = nsCachePref::GetInstance()->DiskCacheSize());
+    ~nsDiskModule();
+
+    // Cache module interface
+    PRBool          AddObject(nsCacheObject* io_pObject);
+    
+    PRBool          Contains(nsCacheObject* io_pObject) const;
+    PRBool          Contains(const char* i_url) const;
+    
+    void            GarbageCollect(void);
+
+    nsCacheObject*  GetObject(const PRUint32 i_index) const;
+    nsCacheObject*  GetObject(const char* i_url) const;
+
+    nsStream*       GetStreamFor(const nsCacheObject* i_pObject)=0;
+
+    PRBool          ReduceSizeTo(const PRUint32 i_NewSize);
+
+    PRBool          Remove(const char* i_url);
+    PRBool          Remove(const PRUint32 i_index);
+
+    // To do cleanup set size to zero. Else initialize disk cache
+    void            SetSize(const PRUint32 i_size);
+
+    PRBool          Revalidate(void);
+
+private:
+    enum sync_frequency
+    {
+        EVERYTIME,
+        IDLE,
+        NEVER
+    } m_Sync;
+
+    PRBool          InitDB(void);
+
+    nsDiskModule(const nsDiskModule& dm);
+    nsDiskModule& operator=(const nsDiskModule& dm);
+
+    DB* m_pDB;
+};
+
+#endif

mozilla/network/cache/nu/public/nsEnumeration.h

@@ -0,0 +1,93 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsEnumeration_h__
+#define nsEnumeration_h__
+
+//#include "nsISupports.h"
+#include "nsIterator.h"
+#include "prlog.h"
+
+class nsEnumeration //: public nsISupports
+{
+
+public:
+            nsEnumeration(nsIterator* iter);
+    virtual ~nsEnumeration();
+
+    PRBool  HasMoreElements(void);
+    void*   NextElement(void);
+    void    Reset(void);
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+protected:
+    nsIterator* m_pIter;
+private:
+    nsEnumeration(const nsEnumeration& o);
+    nsEnumeration& operator=(const nsEnumeration& o);
+};
+
+inline 
+nsEnumeration::nsEnumeration(nsIterator* iter):m_pIter(iter)
+{
+    PR_ASSERT(iter);
+    if (m_pIter)
+        m_pIter->First();
+}
+
+inline
+nsEnumeration::~nsEnumeration()
+{
+}
+
+inline
+PRBool nsEnumeration::HasMoreElements(void)
+{
+    if (m_pIter) //remove this check for optimization?
+        return m_pIter->IsDone() ? PR_FALSE : PR_TRUE;
+    return PR_FALSE;
+}
+
+inline
+void* nsEnumeration::NextElement(void)
+{
+    if (m_pIter)
+    {
+        void* pTemp = m_pIter->CurrentItem();
+        m_pIter->Next();
+        return pTemp;
+    }
+    return 0;
+}
+
+inline
+void nsEnumeration::Reset(void)
+{
+    if (m_pIter)
+    {
+        m_pIter->First();
+    }
+}
+
+#endif // nsEnumeration_h__
+

mozilla/network/cache/nu/public/nsFileStream.h

@@ -0,0 +1,52 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsFileStream_h__
+#define nsFileStream_h__
+
+//#include "nsISupports.h"
+#include "nsStream.h"
+#include "xp.h" // Reqd. for xp_file.h
+#include "xp_file.h" // Cuz we don't have a better choice, as yet
+
+class nsFileStream: public nsStream
+{
+
+public:
+            nsFileStream(XP_File* i_pFile);
+    virtual ~nsFileStream();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    PRInt32     Read(void* o_Buffer, PRUint32 i_Len);
+    PRInt32     Write(const void* i_Buffer, PRUint32 i_Len);
+
+protected:
+
+private:
+    nsFileStream(const nsFileStream& o);
+    nsFileStream& operator=(const nsFileStream& o);
+    XP_File* m_pFile;
+};
+
+#endif // nsFileStream_h__
+

mozilla/network/cache/nu/public/nsHash.h

@@ -0,0 +1,53 @@
+/* -*- 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 nsHash_h__
+#define nsHash_h__
+
+#include "plhash.h"
+
+class nsHashKey {
+protected:
+  nsHashKey(void);
+public:
+  virtual ~nsHashKey(void);
+  virtual PRUint32 HashValue(void) const = 0;
+  virtual PRBool Equals(const nsHashKey *aKey) const = 0;
+  virtual nsHashKey *Clone(void) const = 0;
+};
+
+// Enumerator callback function. Use
+
+typedef PRBool (*nsHashEnumFunc)(nsHashKey *aKey, void *aData);
+
+class nsHash {
+private:
+  // members  
+  PLHashTable *hashtable;
+
+public:
+  nsHash(PRUint32 aSize = 256);
+  ~nsHash();
+
+  void *Put(nsHashKey *aKey, void *aData);
+  void *Get(nsHashKey *aKey);
+  void *Remove(nsHashKey *aKey);
+  void Enumerate(nsHashEnumFunc aEnumFunc);
+};
+
+#endif

mozilla/network/cache/nu/public/nsIterator.h

@@ -0,0 +1,67 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsIterator_h__
+#define nsIterator_h__
+
+//#include "nsISupports.h"
+#include "prtypes.h"
+
+class nsIterator //:public nsISupports
+{
+
+public:
+
+    virtual void    First(void);
+    virtual PRBool  IsDone(void) const = 0;
+    virtual void    Next(void);
+    virtual void*   CurrentItem(void) const;
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+
+protected:
+    nsIterator() {m_Index = 0;};
+
+    PRUint32    m_Index;
+
+};
+
+inline 
+void nsIterator::First(void)
+{
+    m_Index = 0;
+}
+
+inline
+void nsIterator::Next(void)
+{
+    ++m_Index;
+}
+
+inline
+void* nsIterator::CurrentItem(void) const
+{
+    return 0;
+}
+#endif // nsIterator_h__
+

mozilla/network/cache/nu/public/nsMemCacheObject.h

@@ -0,0 +1,101 @@
+/* -*- 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 _nsMemCacheObject_h_
+#define _nsMemCacheObject_h_
+
+#include "prtypes.h"
+
+#include "nsCacheObject.h"
+
+class nsMemCacheObject
+{
+public:
+
+    nsMemCacheObject(void);
+    nsMemCacheObject(nsCacheObject* io_pObject);
+    nsMemCacheObject(const char* i_url); 
+    ~nsMemCacheObject();
+
+    void*               Data(void) const;
+    
+    void                Next(nsMemCacheObject* pObject);
+    void                Next(nsCacheObject* io_pObject);
+    
+    nsMemCacheObject*   Next(void) const;
+    
+    nsCacheObject*      ThisObject(void) const;
+    
+private:
+    nsMemCacheObject* m_pNextObject;
+    nsCacheObject*  m_pObject;
+    void* m_pData;
+
+    nsMemCacheObject& operator=(const nsMemCacheObject& mco);
+    nsMemCacheObject(const nsMemCacheObject&);
+
+};
+
+inline nsMemCacheObject::nsMemCacheObject(void):
+    m_pObject(new nsCacheObject()), 
+    m_pNextObject(0),
+    m_pData(0)
+{
+}
+
+inline nsMemCacheObject::nsMemCacheObject(nsCacheObject* io_pObject):
+    m_pObject(io_pObject),
+    m_pNextObject(0),
+    m_pData(0)
+{
+}
+
+inline nsMemCacheObject::nsMemCacheObject(const char* i_url):
+    m_pObject(new nsCacheObject(i_url)), 
+    m_pNextObject(0),
+    m_pData(0)
+{
+}
+
+inline void* nsMemCacheObject::Data(void) const
+{
+//    PR_ASSERT(m_pData);
+    return m_pData;
+}
+
+inline nsMemCacheObject* nsMemCacheObject::Next(void) const
+{
+    return m_pNextObject;
+}
+
+inline void nsMemCacheObject::Next(nsMemCacheObject* pObject)
+{
+    m_pNextObject = pObject;
+}
+
+inline void nsMemCacheObject::Next(nsCacheObject* pObject)
+{
+    m_pNextObject = new nsMemCacheObject(pObject);
+}
+
+inline nsCacheObject* nsMemCacheObject::ThisObject(void) const
+{
+   return m_pObject;
+}
+
+#endif //_nsMemCacheObject_h_

mozilla/network/cache/nu/public/nsMemModule.h

@@ -0,0 +1,112 @@
+/* -*- 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 _nsMemModule_H_
+#define _nsMemModule_H_
+/* 
+* nsMemModule
+*
+* Gagan Saksena
+* 02/03/98
+* 
+*/
+
+#include "nsCacheModule.h"
+#include "nsMemCacheObject.h"
+#include "nsCachePref.h"
+
+//#include "nsHash.h" // TODO - replace with nsHashtable when the XPCOM_BRANCH merges
+
+//#include "nsHashtable.h"
+/*
+// {5D51B250-E6C2-11d1-AFE5-006097BFC036}
+static const NS_MEMMODULE_IID = 
+{ 0x5d51b250, 0xe6c2, 0x11d1, { 0xaf, 0xe5, 0x0, 0x60, 0x97, 0xbf, 0xc0, 0x36 } };
+*/
+
+class nsMemModule : public nsCacheModule
+{
+
+public:
+    nsMemModule(const PRUint32 size=nsCachePref::GetInstance()->MemCacheSize());
+    ~nsMemModule();
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+
+*/
+    PRBool          AddObject(nsCacheObject* io_pObject);
+    
+    PRBool          Contains(nsCacheObject* io_pObject) const;
+    PRBool          Contains(const char* i_url) const;
+    
+    void            GarbageCollect(void);
+
+    nsCacheObject*  GetObject(const PRUint32 i_index) const;
+    nsCacheObject*  GetObject(const char* i_url) const;
+
+    nsStream*       GetStreamFor(const nsCacheObject* i_pObject);
+
+    PRBool          ReduceSizeTo(const PRUint32 i_NewSize);
+
+    PRBool          Remove(const char* i_url);
+    PRBool          Remove(const PRUint32 i_index);
+
+//    PRBool          RemoveAll(void);
+    
+    PRBool          Revalidate(void);
+
+
+    // Start of nsMemModule specific stuff...
+    // Here is a sample implementation using linked list
+protected:
+    nsMemCacheObject* LastObject(void) const;
+
+private:
+    nsMemCacheObject* m_pFirstObject;
+
+    //nsHash m_ht; //TODO replace with nsHashtable
+    //Optimization
+    nsMemCacheObject* m_pLastObject;
+
+    nsMemModule(const nsMemModule& mm);
+    nsMemModule& operator=(const nsMemModule& mm);
+
+/*    
+    class nsMemKey : public nsHashKey
+    {
+    public:
+                    nsMemKey();
+                    ~nsMemKey();
+      PRUint32      HashValue();
+      PRBool        Equals(nsHashKey *aKey);
+      nsHashKey*    Clone();
+    };
+*/    
+};
+
+inline
+PRBool nsMemModule::Revalidate(void)
+{
+    /* Mem module elements are never revalidated */
+    return PR_FALSE; 
+}
+
+#endif

mozilla/network/cache/nu/public/nsMemStream.h

@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this Mem are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this Mem except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsMemStream_h__
+#define nsMemStream_h__
+
+//#include "nsISupports.h"
+#include "nsStream.h"
+
+class nsMemStream: public nsStream
+{
+
+public:
+            nsMemStream();
+    virtual ~nsMemStream();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    PRInt32     Read(void* o_Buffer, PRUint32 i_Len);
+    PRInt32     Write(const void* i_Buffer, PRUint32 i_Len);
+
+protected:
+
+private:
+    nsMemStream(const nsMemStream& o);
+    nsMemStream& operator=(const nsMemStream& o);
+    void*       m_pCurrent;
+    void*       m_pStart;
+    PRUint32    m_Size;
+};
+
+#endif // nsMemStream_h__
+

mozilla/network/cache/nu/public/nsMonitorable.h

@@ -0,0 +1,106 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsMonitorable_h__
+#define nsMonitorable_h__
+
+//#include "nsISupports.h"
+
+#include "prmon.h"
+
+class nsMonitorable//: public nsISupports
+{
+
+public:
+            nsMonitorable();
+    virtual ~nsMonitorable();
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    PRBool      Lock(void);
+    void        Unlock(void);
+
+protected:
+
+    class MonitorLocker
+    {
+    public:
+        MonitorLocker(nsMonitorable* i_pThis): 
+            m_pMonitorable(i_pThis) 
+        { 
+            if (m_pMonitorable) m_pMonitorable->Lock();
+        }
+        ~MonitorLocker() 
+        { 
+            if (m_pMonitorable) m_pMonitorable->Unlock();
+        }
+    private:
+        nsMonitorable* m_pMonitorable;
+    };
+
+    PRMonitor*          m_pMonitor;
+
+private:
+    nsMonitorable(const nsMonitorable& o);
+    nsMonitorable& operator=(const nsMonitorable& o);
+};
+
+inline
+nsMonitorable::nsMonitorable(void):m_pMonitor(PR_NewMonitor())
+{
+}
+
+inline
+nsMonitorable::~nsMonitorable()
+{
+    if (m_pMonitor)
+    {
+    PR_DestroyMonitor(m_pMonitor);
+    m_pMonitor = 0;
+    }
+}
+
+inline
+PRBool nsMonitorable::Lock(void)
+{
+    if (!m_pMonitor)
+    {
+        m_pMonitor = PR_NewMonitor();
+        if (!m_pMonitor)
+            return PR_FALSE;
+    }
+    PR_EnterMonitor(m_pMonitor);
+    return PR_TRUE;
+}
+
+
+inline
+void nsMonitorable::Unlock(void)
+{
+    PR_ASSERT(m_pMonitor);
+    if (m_pMonitor)
+        PR_ExitMonitor(m_pMonitor);
+}
+
+#endif // nsMonitorable_h__
+

mozilla/network/cache/nu/public/nsStream.h

@@ -0,0 +1,51 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsStream_h__
+#define nsStream_h__
+
+//#include "nsISupports.h"
+
+#include "prtypes.h"
+
+class nsStream//: public nsISupports
+{
+
+public:
+            nsStream();
+    virtual ~nsStream();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    virtual
+        PRInt32     Read(void* o_Buffer, PRUint32 i_Len) = 0;
+    virtual
+        PRInt32     Write(const void* i_Buffer, PRUint32 i_Len) = 0;
+protected:
+
+private:
+    nsStream(const nsStream& o);
+    nsStream& operator=(const nsStream& o);
+};
+
+#endif // nsStream_h__
+

mozilla/network/cache/nu/src/CacheStubs.cpp

@@ -0,0 +1,493 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* Design and original implementation by Gagan Saksena '98 */
+
+#include "CacheStubs.h"
+#include "nsCacheManager.h"
+#include "nsDiskModule.h"
+#include "nsMemModule.h"
+#include "nsCacheTrace.h"
+#include "prlog.h"
+
+#define CACHEMGR nsCacheManager::GetInstance()
+
+void
+Cache_Init(void)
+{
+    /* Most of the initilization gets done in the constructor for the 
+     * nsCacheManager class. */ 
+}
+
+void 
+Cache_Shutdown(void)
+{
+    /* todo- Should the destructor for nsCacheManager object be forced here?*/
+}
+
+/* CacheManager functions */
+PRBool
+CacheManager_Contains(const char* i_url)
+{
+    return CACHEMGR->Contains(i_url);
+}
+
+PRInt16 
+CacheManager_Entries()
+{
+    return CACHEMGR->Entries();
+}
+
+void*
+CacheManager_GetObject(const char* i_url)
+{
+    return CACHEMGR->GetObj(i_url);
+}
+
+PRBool
+CacheManager_IsOffline(void)
+{
+    return CACHEMGR->IsOffline();
+}
+
+void
+CacheManager_Offline(PRBool bSet)
+{
+    CACHEMGR->Offline(bSet);
+}
+
+PRBool
+CacheManager_Remove(const char* i_url)
+{
+    return CACHEMGR->Remove(i_url);
+}
+
+PRUint32
+CacheManager_WorstCaseTime(void)
+{
+    return CACHEMGR->WorstCaseTime();
+}
+
+/* CacheObject functions */
+void*
+CacheObject_Create(const char* i_url)
+{
+    return new nsCacheObject(i_url);
+}
+
+const char*
+CacheObject_GetAddress(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Address() : 0;
+}
+
+const char*
+CacheObject_GetCharset(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Charset() : 0;
+}
+
+const char*
+CacheObject_GetContentEncoding(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->ContentEncoding() : 0;
+}
+
+PRUint32
+CacheObject_GetContentLength(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->ContentLength() : 0;
+}
+
+const char*
+CacheObject_GetContentType(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->ContentType() : 0;
+}
+
+const char*
+CacheObject_GetEtag(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Etag() : 0;
+}
+
+PRIntervalTime
+CacheObject_GetExpires(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Expires() : 0;
+}
+
+const char*      
+CacheObject_GetFilename(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Filename() : 0;
+}
+    
+PRIntervalTime
+CacheObject_GetLastAccessed(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->LastAccessed() : 0;
+}
+
+PRIntervalTime
+CacheObject_GetLastModified(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->LastModified() : 0;
+}
+
+PRInt16 
+CacheObject_GetModule(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Module() : -1;
+}
+
+const char*
+CacheObject_GetPageServicesURL(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->PageServicesURL() : 0;
+}
+
+const char*
+CacheObject_GetPostData(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->PostData() : 0;
+}
+
+PRUint32
+CacheObject_GetPostDataLen(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->PostDataLen() : 0;
+}
+
+PRUint32
+CacheObject_GetSize(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Size() : 0;
+}
+
+PRUint32
+CacheObject_Hits(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Hits() : 0;
+}
+
+PRBool
+CacheObject_IsExpired(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->IsExpired() : PR_FALSE;
+}
+
+PRBool
+CacheObject_IsPartial(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->IsPartial() : PR_FALSE;
+}
+
+PRUint32
+CacheObject_Read(const void* pThis, char* o_Buffer, PRUint32 i_Len)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Read(o_Buffer, i_Len) : 0;
+}
+
+void
+CacheObject_SetAddress(void* pThis, const char* i_Address)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Address(i_Address);
+}
+
+void
+CacheObject_SetCharset(void* pThis, const char* i_Charset)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Charset(i_Charset);
+}
+
+void
+CacheObject_SetContentEncoding(void* pThis, const char* i_Encoding)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->ContentEncoding(i_Encoding);
+}
+
+void
+CacheObject_SetContentLength(void* pThis, PRUint32 i_ContentLen)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->ContentLength(i_ContentLen);
+}
+
+void
+CacheObject_SetContentType(void* pThis, const char* i_ContentType)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->ContentType(i_ContentType);
+}
+
+void
+CacheObject_SetEtag(void* pThis, const char* i_Etag)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Etag(i_Etag);
+}
+
+void
+CacheObject_SetExpires(void *pThis, const PRIntervalTime i_Time)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Expires(i_Time);
+}
+
+void
+CacheObject_SetFilename(void* pThis, const char* i_Filename)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Filename(i_Filename);
+}
+
+void
+CacheObject_SetLastModified(void* pThis, const PRIntervalTime i_Time)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->LastModified(i_Time);   
+}
+
+void
+CacheObject_SetModule(void* pThis, const PRInt16 i_Module)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Module(i_Module);
+}
+
+void
+CacheObject_SetPageServicesURL(void* pThis, const char* i_Url)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->PageServicesURL(i_Url);
+}
+
+void
+CacheObject_SetPostData(void* pThis, const char* i_PostData, const PRUint32 i_Len)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->PostData(i_PostData, i_Len);
+}
+
+void
+CacheObject_SetSize(void* pThis, const PRUint32 i_Size)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Size(i_Size);
+}
+
+PRBool
+CacheObject_Synch(void* pThis)
+{
+    if (pThis)
+    {
+        nsCacheObject* pObj = (nsCacheObject*) pThis;
+        PRBool bStatus = CACHEMGR->GetModule(pObj->Module())->AddObject(pObj);
+        return bStatus;
+    }
+    return PR_FALSE;
+}
+
+PRUint32
+CacheObject_Write(void* pThis, const char* i_buffer, const PRUint32 i_length)
+{
+    return i_length;
+}
+
+void
+CacheObject_Destroy(void* pThis)
+{
+    if (pThis)
+    {
+        ((nsCacheObject*)pThis)->~nsCacheObject();
+        pThis = 0;
+    }
+}
+
+/* CachePref functions */
+PRUint32
+CachePref_GetDiskCacheSize(void)
+{
+    return nsCachePref::GetInstance()->DiskCacheSize();
+}
+
+PRBool
+CachePref_GetDiskCacheSSL(void)
+{
+    return nsCachePref::GetInstance()->DiskCacheSSL();
+}
+
+PRUint32
+CachePref_GetMemCacheSize(void)
+{
+    return nsCachePref::GetInstance()->MemCacheSize();
+}
+
+void
+CachePref_SetDiskCacheSize(const PRUint32 i_Size)
+{
+    nsCachePref::GetInstance()->DiskCacheSize(i_Size);
+}
+
+void
+CachePref_SetDiskCacheSSL(PRBool bSet)
+{
+    nsCachePref::GetInstance()->DiskCacheSSL(bSet);
+}
+
+void
+CachePref_SetMemCacheSize(const PRUint32 i_Size)
+{
+    nsCachePref::GetInstance()->MemCacheSize(i_Size);
+}
+
+/* CacheTrace functions */
+void
+CacheTrace_Enable(PRBool bEnable)
+{
+    nsCacheTrace::Enable(bEnable);
+}
+
+PRBool
+CacheTrace_IsEnabled(void)
+{
+    return nsCacheTrace::IsEnabled();
+}
+
+/* DiskModule functions */
+#define DISKMOD nsCacheManager::GetInstance()->GetDiskModule()
+
+PRBool
+DiskModule_AddObject(void* pObject)
+{
+    return DISKMOD->AddObject((nsCacheObject*)pObject);
+}
+
+PRBool
+DiskModule_Contains(const char* i_url)
+{
+    return DISKMOD->Contains(i_url);
+}
+
+PRUint32
+DiskModule_Entries(void)
+{
+    return DISKMOD->Entries();
+}
+
+PRUint32
+DiskModule_GetSize(void)
+{
+    return DISKMOD->Size();
+}
+
+PRUint32
+DiskModule_GetSizeInUse(void)
+{
+    return DISKMOD->SizeInUse(); 
+}
+
+PRBool
+DiskModule_IsEnabled(void)
+{
+    return DISKMOD->IsEnabled();
+}
+
+PRBool
+DiskModule_Remove(const char* i_url)
+{
+    return DISKMOD->Remove(i_url);
+}
+
+PRBool
+DiskModule_RemoveAll(void)
+{
+    return DISKMOD->RemoveAll();
+}
+
+void
+DiskModule_SetSize(PRUint32 i_Size)
+{
+    DISKMOD->SetSize(i_Size);
+}
+
+/* MemModule functions */
+#define MEMMOD nsCacheManager::GetInstance()->GetMemModule()
+
+PRBool
+MemModule_AddObject(void* pObject)
+{
+    return MEMMOD->AddObject((nsCacheObject*)pObject);
+}
+
+PRBool
+MemModule_Contains(const char* i_url)
+{
+    return MEMMOD->Contains(i_url);
+}
+
+PRUint32
+MemModule_Entries(void)
+{
+    return MEMMOD->Entries();
+}
+
+PRUint32
+MemModule_GetSize(void)
+{
+    return MEMMOD->Size();
+}
+
+PRUint32
+MemModule_GetSizeInUse(void)
+{
+    return MEMMOD->SizeInUse() ;
+}
+
+PRBool
+MemModule_IsEnabled(void)
+{
+    return MEMMOD->IsEnabled();
+}
+
+PRBool
+MemModule_Remove(const char* i_url)
+{
+    return MEMMOD->Remove(i_url);
+}
+
+PRBool
+MemModule_RemoveAll(void)
+{
+    return MEMMOD->RemoveAll();
+}
+
+void
+MemModule_SetSize(PRUint32 i_Size)
+{
+    MEMMOD->SetSize(i_Size);
+}
+
+#undef MEMMOD
+#undef DISKMOD
+#undef CACHEMGR

mozilla/network/cache/nu/src/Makefile

@@ -0,0 +1,62 @@
+#!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=../../../..
+
+TARGET = $(LIBRARY)
+
+LIBRARY_NAME=cachelib
+
+MISCDEP = 		    \
+    $(LIBNSPR)  	    \
+    $(DIST)/lib/dbm32.lib \
+    $(DIST)/lib/libplc21.lib \
+    $(DIST)/lib/xpcom32.lib \
+    $(NULL)
+
+MODULE = cache
+
+CPPSRCS	= nsCacheObject.cpp 	\
+		  nsCacheModule.cpp 	\
+		  nsCacheManager.cpp 	\
+		  nsMemModule.cpp 		\
+		  nsDiskModule.cpp 		\
+		  nsCacheTrace.cpp 		\
+		  nsCachePref.cpp 		\
+		  nsMemCacheObject.cpp	\
+		  nsBkgThread.cpp		\
+		  nsCacheBkgThd.cpp		\
+		  CacheStubs.cpp		\
+		  nsFileStream.cpp		\
+		  nsMemStream.cpp		\
+	 	  $(NULL)
+
+REQUIRES = dbm nspr pref xpcom 
+
+LLIBS =				 \
+    $(DIST)/lib/dbm32.lib 		\
+    $(DIST)/lib/libplc21.lib 	\
+ 	$(DIST)/lib/xpcom32.lib  	\
+	$(LIBNSPR)		 			\
+	$(NULL)
+
+include $(DEPTH)/config/rules.mk
+
+INCLUDES += -I../include	\
+			-I../public		\
+			$(NULL)
+

mozilla/network/cache/nu/src/makefile.win

@@ -0,0 +1,81 @@
+#!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.
+
+IGNORE_MANIFEST = 1
+
+DEPTH=..\..\..\..
+
+MAKE_OBJ_TYPE = EXE
+DLLNAME = cachelib
+#DLL = .\$(OBJDIR)\$(DLLNAME).dll
+
+LIBRARY_NAME=cachelib
+
+#
+# Remember to change libplc21 to $whatever it is...
+#
+LLIBS =				 \
+	$(LIBNSPR)		 \
+	$(DIST)\lib\libplc21.lib \
+	$(DIST)\lib\dbm32.lib    \
+ 	$(DIST)\lib\xpcom32.lib  \
+	$(NULL)
+
+MISCDEP = $(LLIBS)
+
+MODULE = cache
+
+OBJS =						\
+	.\$(OBJDIR)\nsCacheObject.obj 		\
+	.\$(OBJDIR)\nsCacheModule.obj 		\
+	.\$(OBJDIR)\nsMemModule.obj 		\
+	.\$(OBJDIR)\nsDiskModule.obj 		\
+	.\$(OBJDIR)\nsCacheTrace.obj 		\
+	.\$(OBJDIR)\nsCacheManager.obj 		\
+	.\$(OBJDIR)\nsCachePref.obj 		\
+	.\$(OBJDIR)\nsMemCacheObject.obj 	\
+	.\$(OBJDIR)\nsBkgThread.obj	 	\
+	.\$(OBJDIR)\nsCacheBkgThd.obj	 	\
+	.\$(OBJDIR)\CacheStubs.obj	 	\
+	.\$(OBJDIR)\nsFileStream.obj	 	\
+	.\$(OBJDIR)\nsMemStream.obj	 	\
+	$(NULL)
+
+#	.\$(OBJDIR)\nsHash.obj 			\
+
+LINCS = 			\
+	-I$(PUBLIC)\xpcom	\
+	-I$(PUBLIC)\dbm		\
+	-I$(PUBLIC)\pref	\
+	-I..\public		\
+	-I..\include		\
+	$(NULL)
+
+LCFLAGS =				\
+	$(LCFLAGS)			\
+	$(NULL)
+	#-DNS_DLLNAME=$(DLLNAME).dll	\
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(EXE)
+        $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).$(LIB_SUFFIX) $(DIST)\lib
+# $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).$(DLL_SUFFIX) $(DIST)\bin
+
+clobber::
+	rm -f $(DIST)\lib\$(DLLNAME).$(LIB_SUFFIX)
+

mozilla/network/cache/nu/src/nsBkgThread.cpp

@@ -0,0 +1,92 @@
+/* -*- 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 "nsBkgThread.h"
+#include "prlog.h"
+
+static void PR_CALLBACK RunFunction(void* arg);
+
+static void PR_CALLBACK RunFunction(void* arg)
+{
+    nsBkgThread* pBT = (nsBkgThread*) arg;
+    if (pBT)
+    {
+        pBT->Process();
+    }
+}
+
+nsBkgThread::nsBkgThread(PRIntervalTime iSleepTime, PRBool bStart /* =PR_TRUE */)
+{
+    m_SleepTime = iSleepTime;
+    m_bContinue = bStart;
+    m_pThread = PR_CreateThread(
+        PR_USER_THREAD,
+        RunFunction,
+        this,
+        PR_PRIORITY_NORMAL,
+        PR_LOCAL_THREAD,
+        PR_JOINABLE_THREAD,
+        0);
+    PR_ASSERT(NULL != m_pThread);
+}
+
+nsBkgThread::~nsBkgThread()
+{
+    m_bContinue = PR_FALSE;
+    if (m_pThread != NULL)
+    {
+        Stop();
+    }
+}
+/*
+nsrefcnt nsBkgThread::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsBkgThread::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsBkgThread::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+
+*/
+void nsBkgThread::Process(void)
+{
+    while (m_bContinue)
+    {
+        PR_Sleep(m_SleepTime);
+        Run();
+    }
+}
+
+void nsBkgThread::Stop(void)
+{
+    m_bContinue = PR_FALSE;
+    PRStatus status = PR_Interrupt(m_pThread);
+    PR_ASSERT(PR_SUCCESS == status);
+}

mozilla/network/cache/nu/src/nsCacheBkgThd.cpp

@@ -0,0 +1,78 @@
+/* -*- 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 "prlog.h"
+#include "nsCacheBkgThd.h"
+#include "nsCacheManager.h"
+#include "nsCacheModule.h"
+#include "nsCachePref.h"
+
+nsCacheBkgThd::nsCacheBkgThd(PRIntervalTime iSleepTime):
+    nsBkgThread(iSleepTime)
+{
+}
+
+nsCacheBkgThd::~nsCacheBkgThd()
+{
+}
+
+/*
+nsrefcnt nsCacheBkgThd::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsCacheBkgThd::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsCacheBkgThd::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+*/
+
+void nsCacheBkgThd::Run(void)
+{
+    /* Step thru all the modules and call cleanup on each */
+    nsCacheManager* pCM = nsCacheManager::GetInstance();
+    PR_ASSERT(pCM);
+    if (pCM->IsOffline())
+        return; /* Dont update entries if offline */
+    PRInt16 i = pCM->Entries();
+    while (i>0)
+    {
+        nsCacheModule* pModule = pCM->GetModule(--i);
+        PR_ASSERT(pModule);
+        /* TODO change this based on if it supports garbage cleaning */
+        if (!pModule->IsReadOnly())
+        {
+            pModule->GarbageCollect();
+            if (nsCachePref::GetInstance()->RevalidateInBkg())
+            {
+                pModule->Revalidate();
+            }
+        }
+    }
+}

mozilla/network/cache/nu/src/nsCacheManager.cpp

@@ -0,0 +1,249 @@
+/* -*- 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.
+ */
+
+/*
+ * Gagan Saksena  02/02/98
+ * 
+ */
+
+#include "prtypes.h"
+#include "prinrval.h"
+
+#include "nsCacheManager.h"
+#include "nsCacheTrace.h"
+#include "nsCachePref.h"
+#include "nsCacheModule.h"
+#include "nsMemModule.h"
+#include "nsDiskModule.h"
+#include "nsCacheBkgThd.h"
+
+/* TODO move this to InitNetLib */
+static nsCacheManager TheManager;
+
+nsCacheManager::nsCacheManager(): m_pFirstModule(0), m_bOffline(PR_FALSE)
+{
+    Init();
+}
+
+nsCacheManager::~nsCacheManager()
+{
+    if (m_pBkgThd)
+    {
+        m_pBkgThd->Stop();
+        delete m_pBkgThd;
+        m_pBkgThd = 0;
+    }
+    if (m_pFirstModule)
+    {
+        delete m_pFirstModule;
+        m_pFirstModule = 0;
+    }
+}
+
+nsCacheManager* 
+nsCacheManager::GetInstance()
+{
+    return &TheManager;
+}
+
+#if 0
+/* Caller must free returned char* */
+const char* 
+nsCacheManager::Trace() const
+{
+
+    char linebuffer[128];
+    char* total;
+
+    sprintf(linebuffer, "nsCacheManager: Modules = %d\n", Entries());
+
+    total = new char[strlen(linebuffer) + 1];
+    strcpy(total, linebuffer);
+    return total;
+}
+#endif
+
+PRInt32 
+nsCacheManager::AddModule(nsCacheModule* pModule)
+{
+    MonitorLocker ml(this);
+    if (pModule) 
+    {
+        if (m_pFirstModule)
+            LastModule()->NextModule(pModule);
+        else
+            m_pFirstModule = pModule;
+
+        return Entries()-1;
+    }
+    else
+        return -1;
+}
+
+PRBool 
+nsCacheManager::Contains(const char* i_url) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    // Add logic to check for IMAP type URLs, byteranges, and search with / appended as well...
+    // TODO 
+    PRBool bStatus = ContainsExactly(i_url);
+    if (!bStatus)
+    {
+        // try alternate stuff
+        /*
+        char* extraBytes;
+        char extraBytesSeparator;
+        */
+    }
+    return bStatus;
+}
+
+PRBool
+nsCacheManager::ContainsExactly(const char* i_url) const
+{
+    if (m_pFirstModule)
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        while (pModule)
+        {
+            if (pModule->Contains(i_url))
+            {
+                return PR_TRUE;
+            }
+            pModule = pModule->NextModule();
+        }
+    }
+    return PR_FALSE;
+}
+
+nsCacheObject* 
+nsCacheManager::GetObj(const char* i_url) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (m_pFirstModule) 
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        nsCacheObject* obj = 0;
+        while (pModule)
+        {
+            obj = pModule->GetObject(i_url);
+            if (obj)
+                return obj;
+            pModule = pModule->NextModule();
+        }
+    }
+    return 0;
+}
+
+PRInt16 
+nsCacheManager::Entries() const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (m_pFirstModule) 
+    {
+        PRInt16 count=1;
+        nsCacheModule* pModule = m_pFirstModule;
+        while (pModule = pModule->NextModule()) 
+        {
+            count++;
+        }
+        return count;
+    }
+    return 0;
+}
+
+nsCacheModule* 
+nsCacheManager::GetModule(PRInt16 i_index) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if ((i_index < 0) || (i_index >= Entries()))
+        return 0;
+    nsCacheModule* pModule = m_pFirstModule;
+    PR_ASSERT(pModule);
+    for (PRInt16 i=0; i<i_index; pModule = pModule->NextModule())
+    {
+        i++;
+        PR_ASSERT(pModule);
+    }
+    return pModule;
+}
+
+void 
+nsCacheManager::Init() 
+{
+    MonitorLocker ml(this);
+    if (m_pFirstModule)
+        delete m_pFirstModule;
+
+    m_pFirstModule = new nsMemModule(nsCachePref::GetInstance()->MemCacheSize());
+    PR_ASSERT(m_pFirstModule);
+    if (m_pFirstModule)
+    {
+        nsDiskModule* pTemp = new nsDiskModule(nsCachePref::GetInstance()->DiskCacheSize());
+        PR_ASSERT(pTemp);
+        m_pFirstModule->NextModule(pTemp);
+        m_pBkgThd = new nsCacheBkgThd(PR_SecondsToInterval(nsCachePref::GetInstance()->BkgSleepTime()));
+        PR_ASSERT(m_pBkgThd);
+    }
+}
+
+nsCacheModule* 
+nsCacheManager::LastModule() const 
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (m_pFirstModule) 
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        while(pModule->NextModule()) {
+            pModule = pModule->NextModule();
+        }
+        return pModule;
+    }
+    return 0;
+}
+
+PRBool
+nsCacheManager::Remove(const char* i_url)
+{
+    MonitorLocker ml(this);
+    PRBool bStatus = PR_FALSE;
+    if (m_pFirstModule)
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        bStatus |= pModule->Remove(i_url);
+        if (bStatus)
+            return bStatus;
+        while(pModule->NextModule()) {
+            pModule = pModule->NextModule();
+            if (bStatus)
+                return bStatus;
+        }
+    }
+    return bStatus;
+}
+
+PRUint32 
+nsCacheManager::WorstCaseTime(void) const 
+{
+    PRIntervalTime start = PR_IntervalNow();
+    if (this->Contains("a vague string that should not be in any of the modules"))
+    {
+        PR_ASSERT(0);
+    }
+    return PR_IntervalToMicroseconds(PR_IntervalNow() - start);
+}

mozilla/network/cache/nu/src/nsCacheModule.cpp

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsCacheModule.h"
+#include "nsCacheTrace.h"
+#include "nsCacheIterator.h"
+
+/* 
+ * nsCacheModule
+ *
+ * Gagan Saksena 02/02/98
+ * 
+ */
+
+
+#define DEFAULT_SIZE 10*0x100000L
+
+nsCacheModule::nsCacheModule(const PRUint32 i_size=DEFAULT_SIZE):
+    m_Size(i_size),
+    m_pEnumeration(0),
+    m_pNext(0),
+    m_Entries(0)
+{
+    m_pIterator = new nsCacheIterator(this);
+}
+
+nsCacheModule::~nsCacheModule()
+{
+    if (m_pNext)
+    {
+        delete m_pNext;
+        m_pNext = 0;
+    }
+    if (m_pIterator)
+    {
+        delete m_pIterator;
+        m_pIterator = 0;
+    }
+    if (m_pEnumeration)
+    {
+        delete m_pEnumeration;
+        m_pEnumeration = 0;
+    }
+}
+
+void nsCacheModule::GarbageCollect(void) 
+{
+}
+
+PRBool nsCacheModule::ReduceSizeTo(const PRUint32 i_NewSize)
+{
+	MonitorLocker ml(this);
+    //TODO
+    return PR_TRUE;
+}
+
+PRBool nsCacheModule::RemoveAll(void)
+{
+	MonitorLocker ml(this);
+    PRBool status = PR_TRUE;
+    while (m_Entries > 0)
+    {
+        status &= Remove(--m_Entries);
+    }
+    return status;
+}
+
+#if 0
+// Caller must free this 
+const char* nsCacheModule::Trace() const
+{
+    char linebuffer[128];
+    char* total;
+
+    PR_sprintf(linebuffer, "nsCacheModule: Objects = %d\n", Entries());
+
+    total = new char[PR_strlen(linebuffer) + 1];
+    strcpy(total, linebuffer);
+
+    return total;
+}
+#endif

mozilla/network/cache/nu/src/nsCacheObject.cpp

@@ -0,0 +1,580 @@
+/* -*- 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 <memory.h>
+#include "prmem.h"
+#include "prprf.h"
+#include "plstr.h"
+
+#include "nsCacheObject.h"
+#include "nsCacheTrace.h"
+#include "nsCacheModule.h"
+#include "nsCacheManager.h"
+#include "nsStream.h"
+
+/* 
+ * nsCacheObject
+ *
+ * Gagan Saksena 02/02/98
+ * 
+ */
+
+static const PRIntervalTime DEFAULT_EXPIRES = PR_SecondsToInterval(86400);
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+/* Convenient macros used in stuffing and reading back cache object to a void * */
+/* TODO: Change these to file scope functions */
+#define STUFF_STRING(string)                 \
+{                                            \
+  len = (string ? PL_strlen(string)+1 : 0);  \
+  COPY_INT32((void *)cur_ptr, &len);         \
+  cur_ptr = cur_ptr + sizeof(int32);         \
+  if(len)                                    \
+      memcpy((void *)cur_ptr, string, len);  \
+  cur_ptr += len;                            \
+}
+
+#define STUFF_NUMBER(number)                \
+{                                           \
+  COPY_INT32((void *)cur_ptr, &number);     \
+  cur_ptr = cur_ptr + sizeof(PRUint32);        \
+}
+
+#define STUFF_TIME(number)                      \
+{                                               \
+  COPY_INT32((void *)cur_ptr, &number);         \
+  cur_ptr = cur_ptr + sizeof(PRIntervalTime);   \
+}
+
+#define STUFF_BOOL(bool_val)                \
+{                                           \
+  if(bool_val)                              \
+    ((char *)(cur_ptr))[0] = 1;             \
+  else                                      \
+    ((char *)(cur_ptr))[0] = 0;             \
+  cur_ptr = cur_ptr + sizeof(char);         \
+}
+
+/* if any strings are larger than this then
+ * there was a serious database error
+ */
+#define MAX_HUGE_STRING_SIZE 10000
+
+#define RETRIEVE_STRING(string)     \
+{                                   \
+    if(cur_ptr > max_ptr)           \
+    {                               \
+        return PR_TRUE;             \
+    }                               \
+    COPY_INT32(&len, cur_ptr);      \
+    cur_ptr += sizeof(int32);       \
+    if(len)                         \
+    {                               \
+        if(len > MAX_HUGE_STRING_SIZE)  \
+        {                               \
+            return PR_FALSE;            \
+        }                               \
+        string = new char[len]; \
+        if(!string)                     \
+        {                               \
+            return PR_FALSE;            \
+        }                               \
+        memcpy(string, cur_ptr, len);   \
+        cur_ptr += len;                 \
+   }                                    \
+}
+
+#define RETRIEVE_NUMBER(number)     \
+{                                   \
+    if(cur_ptr > max_ptr)           \
+        return PR_TRUE;             \
+    COPY_INT32(&number, cur_ptr);   \
+    cur_ptr += sizeof(int32);       \
+}
+
+#define RETRIEVE_TIME(number)           \
+{                                       \
+    if(cur_ptr > max_ptr)               \
+        return PR_TRUE;                 \
+    COPY_INT32(&number, cur_ptr);       \
+    cur_ptr += sizeof(PRIntervalTime);  \
+}
+
+#define RETRIEVE_BOOL(bool)         \
+{                                   \
+  if(cur_ptr > max_ptr)             \
+    return PR_TRUE;                 \
+  if(((char *)(cur_ptr))[0])        \
+    bool = TRUE;                    \
+  else                              \
+    bool = FALSE;                   \
+  cur_ptr += sizeof(char);          \
+}
+
+/*  TODO- Further optimization, initialize these to null, 
+    but that will add more work on copy constructor which is ok */
+nsCacheObject::nsCacheObject():
+    m_Charset(new char[1]),
+    m_ContentEncoding(new char[1]),
+    m_ContentType(new char[1]),
+    m_Etag(new char[1]),
+    m_Filename(new char[1]),
+    m_Flags(INIT), 
+    m_Module(-1),
+    m_pInfo(0),
+    m_PageServicesURL(new char[1]),
+    m_PostData(new char[1]),
+    m_PostDataLen(0),
+    m_pStream(0),
+    m_URL(new char[1]) 
+{
+    Init();
+    *m_Charset = '\0';
+    *m_ContentEncoding = '\0';
+    *m_ContentType = '\0';
+    *m_Etag = '\0';
+    *m_Filename = '\0';
+    *m_PageServicesURL = '\0';
+    *m_PostData = '\0';
+    *m_URL = '\0';
+}
+
+nsCacheObject::~nsCacheObject() 
+{
+    if (m_Charset)
+        delete[] m_Charset;
+    if (m_ContentEncoding)
+        delete[] m_ContentEncoding;
+    if (m_ContentType)
+        delete[] m_ContentType;
+    if (m_Etag)
+        delete[] m_Etag;
+    if (m_Filename)
+        delete[] m_Filename;
+    if (m_PageServicesURL)
+        delete[] m_PageServicesURL;
+    if (m_PostData)
+        delete[] m_PostData;
+    if (m_URL)
+        delete[] m_URL;
+    if (m_pStream)
+        delete m_pStream;
+}
+
+nsCacheObject::nsCacheObject(const nsCacheObject& another):
+    m_Charset(new char[PL_strlen(another.m_Charset)+1]), 
+    m_ContentEncoding(new char[PL_strlen(another.m_ContentEncoding)+1]),
+    m_ContentType(new char[PL_strlen(another.m_ContentType)+1]),
+    m_Etag(new char[PL_strlen(another.m_Etag)+1]),
+    m_Filename(new char[PL_strlen(another.m_Filename)+1]),
+    m_Flags(another.m_Flags),
+    m_PageServicesURL(new char[PL_strlen(another.m_PageServicesURL)+1]),
+    m_PostDataLen(another.m_PostDataLen),
+    m_PostData(new char[another.m_PostDataLen+1]),
+    m_URL(new char[PL_strlen(another.m_URL)+1]), 
+    m_pStream(0),
+    m_pInfo(0) /* Should this be copied as well? */
+{
+    PL_strncpy(m_Charset, another.m_Charset, PL_strlen(another.m_Charset));
+    PL_strncpy(m_ContentEncoding, another.m_ContentEncoding, PL_strlen(another.m_ContentEncoding));
+    PL_strncpy(m_ContentType, another.m_ContentType, PL_strlen(another.m_ContentType));
+    PL_strncpy(m_Etag, another.m_Etag, PL_strlen(another.m_Etag));
+    PL_strncpy(m_Filename, another.m_Filename, PL_strlen(another.m_Filename));
+    PL_strncpy(m_PageServicesURL, another.m_PageServicesURL, PL_strlen(another.m_PageServicesURL));
+    PL_strncpy(m_PostData, another.m_PostData, another.m_PostDataLen);
+    PL_strncpy(m_URL, another.m_URL, PL_strlen(another.m_URL));
+
+    m_Hits = another.m_Hits;
+    m_LastAccessed = another.m_LastAccessed;
+    m_LastModified = another.m_LastModified;
+    m_Size = another.m_Size;
+    m_Module = another.m_Module;
+}
+
+nsCacheObject::nsCacheObject(const char* i_url):
+    m_Charset(new char[1]),
+    m_ContentEncoding(new char[1]),
+    m_ContentType(new char[1]),
+    m_Etag(new char[1]),
+    m_Filename(new char[1]),
+    m_Flags(INIT), 
+    m_PageServicesURL(new char[1]),
+    m_PostData(new char[1]),
+    m_PostDataLen(0),
+    m_URL(new char[PL_strlen(i_url)+1]), 
+    m_Module(-1),
+    m_pStream(0),
+    m_pInfo(0)
+{
+    Init();
+    PR_ASSERT(i_url);
+    PL_strncpy(m_URL, i_url, PL_strlen(i_url));
+
+    *m_Charset = '\0';
+    *m_ContentEncoding = '\0';
+    *m_ContentType = '\0';
+    *m_Etag = '\0';
+    *m_Filename = '\0';
+    *m_PageServicesURL = '\0';
+    *m_PostData = '\0';
+}
+
+void nsCacheObject::Address(const char* i_url) 
+{
+    PR_ASSERT(i_url && *i_url);
+    if (!i_url)
+        return;
+    if (m_URL)
+        delete[] m_URL;
+    m_URL = new char[PL_strlen(i_url) + 1];
+    PL_strncpy(m_URL, i_url, PL_strlen(i_url));
+}
+
+void nsCacheObject::Charset(const char* i_Charset) 
+{
+//    PR_ASSERT(i_Charset && *i_Charset);
+    if (!i_Charset)
+        return;
+    if (m_Charset)
+        delete[] m_Charset;
+    m_URL = new char[PL_strlen(i_Charset) + 1];
+    PL_strncpy(m_Charset, i_Charset, PL_strlen(i_Charset));
+}
+
+void nsCacheObject::ContentEncoding(const char* i_Encoding) 
+{
+//    PR_ASSERT(i_Encoding && *i_Encoding);
+    if (!i_Encoding)
+        return;
+    if (m_ContentEncoding)
+        delete[] m_ContentEncoding;
+    m_ContentEncoding = new char[PL_strlen(i_Encoding) + 1];
+    PL_strncpy(m_ContentEncoding, i_Encoding, PL_strlen(i_Encoding));
+}
+
+void nsCacheObject::ContentType(const char* i_Type) 
+{
+//    PR_ASSERT(i_Type && *i_Type);
+    if (!i_Type)
+    {
+        /* Reset to empty */ // TODO ??
+        return;
+    }
+    if (m_ContentType)
+        delete[] m_ContentType;
+    m_ContentType = new char[PL_strlen(i_Type) + 1];
+    PL_strncpy(m_ContentType, i_Type, PL_strlen(i_Type));
+}
+
+void nsCacheObject::Etag(const char* i_etag) 
+{
+//    PR_ASSERT(i_etag && *i_etag);
+    if (!i_etag)
+        return;
+    if (m_Etag)
+        delete[] m_Etag;
+    m_Etag = new char[PL_strlen(i_etag) + 1];
+    PL_strncpy(m_Etag, i_etag, PL_strlen(i_etag));
+}
+
+void nsCacheObject::Filename(const char* i_Filename)
+{
+//    PR_ASSERT(i_Filename && *i_Filename);
+    if (!i_Filename)
+        return;
+    if (m_Filename)
+        delete[] m_Filename;
+    m_Filename = new char[PL_strlen(i_Filename) +1];
+    PL_strncpy(m_Filename, i_Filename, PL_strlen(i_Filename));
+}
+
+void* nsCacheObject::Info(void) const
+{
+    if (m_pInfo)
+        return m_pInfo;
+    
+    nsCacheObject* pThis = (nsCacheObject*) this;
+    if (m_URL){
+
+        pThis->m_info_size = sizeof(nsCacheObject);
+        
+        pThis->m_info_size -= sizeof(void*); // m_info itself is not being serialized
+        pThis->m_info_size -= sizeof(char*); // And neither is PostData
+
+        //Add the strings sizes
+        pThis->m_info_size += PL_strlen(m_Charset)+1;
+        pThis->m_info_size += PL_strlen(m_ContentEncoding)+1;
+        pThis->m_info_size += PL_strlen(m_ContentType)+1;
+        pThis->m_info_size += PL_strlen(m_Etag)+1;
+        pThis->m_info_size += PL_strlen(m_Filename)+1;
+        pThis->m_info_size += PL_strlen(m_PageServicesURL)+1;
+        pThis->m_info_size += PL_strlen(m_URL)+1;
+        
+        //Add the Postdata len
+        pThis->m_info_size += m_PostDataLen+1;
+
+        void* new_obj = PR_Calloc(1, m_info_size * sizeof(char));
+     
+        if (!new_obj)
+        {
+            PR_Free(new_obj);
+            return 0;
+        }
+
+        PRUint32 len;
+
+        char* cur_ptr = (char*) new_obj;
+        /* put the total size of the struct into
+         * the first field so that we have
+         * a cross check against corruption
+         */
+        COPY_INT32((void *)cur_ptr, &m_info_size);
+        cur_ptr += sizeof(PRUint32);
+
+        /* put the version number of the structure
+         * format that we are using. By using a version 
+         * string when writting we can support 
+         * backwards compatibility in our reading code
+         */
+        COPY_INT32((void *)cur_ptr, &kCACHE_VERSION);
+        cur_ptr += sizeof(PRUint32);
+
+        STUFF_STRING(m_Charset);
+        STUFF_STRING(m_ContentEncoding);
+        STUFF_NUMBER(m_ContentLength);
+        STUFF_STRING(m_ContentType);
+        STUFF_STRING(m_Etag);
+        STUFF_TIME(m_Expires);
+        STUFF_STRING(m_Filename);
+        STUFF_NUMBER(m_Flags);
+        STUFF_NUMBER(m_Hits);
+        STUFF_TIME(m_LastAccessed);
+        STUFF_TIME(m_LastModified);
+        STUFF_NUMBER(m_Module);
+        STUFF_STRING(m_PageServicesURL);
+        STUFF_NUMBER(m_PostDataLen);
+        /* There is a possibility of it not being a string! */
+        if (m_PostData)
+        {
+	        memcpy(cur_ptr, m_PostData, m_PostDataLen+1);
+	        cur_ptr += m_PostDataLen+1;
+        }
+        STUFF_NUMBER(m_Size);
+        STUFF_STRING(m_URL);
+
+        // Important Assertion. Dont remove!
+        // If this fails then you or somebody has added a variable to the 
+        // nsCacheObject class and a decision on its "cacheability" has
+        // not yet been made. 
+        PR_ASSERT(cur_ptr == (char*) new_obj + m_info_size);
+        pThis->m_pInfo = new_obj;
+    }
+    return m_pInfo;
+}
+
+PRBool nsCacheObject::Info(void* i_data) 
+{
+    if (!i_data)
+        return PR_FALSE;
+    
+    char* cur_ptr = (char*) i_data;
+
+    //Reset the m_pInfo;
+    PR_FREEIF(m_pInfo);
+
+    //Reset all strings
+    if (m_Charset)
+        delete[] m_Charset;
+    if (m_ContentEncoding)
+        delete[] m_ContentEncoding;
+    if (m_ContentType)
+        delete[] m_ContentType;
+    if (m_Etag)
+        delete[] m_Etag;
+    if (m_Filename)
+        delete[] m_Filename;
+    if (m_PageServicesURL)
+        delete[] m_PageServicesURL;
+    if (m_URL)
+        delete[] m_URL;
+    if (m_PostData)
+        delete[] m_PostData;
+
+    m_PostDataLen = 0;
+
+    COPY_INT32(&m_info_size, cur_ptr);
+    char* max_ptr = cur_ptr + m_info_size;
+    cur_ptr += sizeof(PRUint32);
+
+    PRUint32 version;
+    COPY_INT32(&version, cur_ptr);
+    cur_ptr += sizeof(PRUint32);
+
+    PR_ASSERT(version == kCACHE_VERSION);
+    if (version != kCACHE_VERSION)
+    {
+        //TODO Bad cache version
+        return PR_FALSE;
+    }
+
+    PRUint32 len;
+    
+    RETRIEVE_STRING(m_Charset);
+    RETRIEVE_STRING(m_ContentEncoding);
+    RETRIEVE_NUMBER(m_ContentLength);
+    RETRIEVE_STRING(m_ContentType);
+    RETRIEVE_STRING(m_Etag);
+    RETRIEVE_TIME(m_Expires);
+    RETRIEVE_STRING(m_Filename);
+    RETRIEVE_NUMBER(m_Flags);
+    RETRIEVE_NUMBER(m_Hits);
+    RETRIEVE_TIME(m_LastAccessed);
+    RETRIEVE_TIME(m_LastModified);
+    RETRIEVE_NUMBER(m_Module);
+    RETRIEVE_STRING(m_PageServicesURL);
+    RETRIEVE_NUMBER(m_PostDataLen);
+    // Special case-
+    m_PostData = new char[m_PostDataLen + 1];
+    if (m_PostData)
+    {
+        memcpy(m_PostData, cur_ptr, m_PostDataLen+1);
+    }
+    cur_ptr += m_PostDataLen +1;
+
+    RETRIEVE_NUMBER(m_Size);
+    RETRIEVE_STRING(m_URL);
+ 
+    // Most important assertion! Don't ever remove!
+    PR_ASSERT(cur_ptr == max_ptr);
+    return PR_TRUE;
+}
+
+PRUint32 nsCacheObject::InfoSize(void) const
+{
+    if (!m_pInfo)
+    {
+        ((nsCacheObject*) this)->Info();
+    }
+    return m_info_size;
+}
+
+void nsCacheObject::Init() 
+{
+    m_Expires = PR_IntervalNow() + DEFAULT_EXPIRES;
+    m_Hits = 0;
+}
+
+void nsCacheObject::PageServicesURL(const char* i_Url) 
+{
+//    PR_ASSERT(i_Url && *i_Url);
+    if (!i_Url)
+        return;
+    if (m_PageServicesURL)
+        delete[] m_PageServicesURL;
+    m_PageServicesURL = new char[PL_strlen(i_Url) + 1];
+    PL_strncpy(m_PageServicesURL, i_Url, PL_strlen(i_Url));
+}
+
+void nsCacheObject::PostData(const char* i_data, const PRUint32 i_Len)
+{
+    if (!i_data || (0 ==i_Len))
+        return;
+    if (m_PostData)
+        delete[] m_PostData;
+    m_PostData = new char[i_Len+1];
+    PL_strncpy(m_PostData, i_data, i_Len);
+    m_PostDataLen = i_Len;
+}
+
+PRUint32 nsCacheObject::Read(char* o_Buffer, PRUint32 len)
+{
+    if (!m_pStream)
+    {
+        PR_ASSERT(m_Module >=0);
+        if (0 <= m_Module)
+        {
+            nsCacheModule* pModule = nsCacheManager::GetInstance()->GetModule(m_Module);
+            if (pModule)
+            {
+                m_pStream = pModule->GetStreamFor(this);
+                if (m_pStream)
+                    return m_pStream->Read(o_Buffer, len);
+            }
+        }
+        return 0;
+    }
+    return m_pStream->Read(o_Buffer, len);
+}
+
+#if 0
+/* Caller must free returned string */
+// TODO  change to use PR_stuff...
+const char* nsCacheObject::Trace() const
+{
+    char linebuffer[256];
+    char* total;
+
+    PR_Sprintf(linebuffer, "nsCacheObject:URL=%s,SIZE=%d,ET=%s,\n\tLM=%d,LA=%d,EXP=%d,HITS=%d\n", 
+        m_URL, 
+        m_Size,
+        m_Etag,
+        m_LastModified,
+        m_LastAccessed,
+        m_Expires,
+        m_Hits);
+
+    total = new char[PL_strlen(linebuffer) +1];
+    PL_strcpy(total, linebuffer);
+
+    return total;
+}
+#endif
+
+PRUint32 nsCacheObject::Write(const char* i_Buffer, const PRUint32 len)
+{
+    if (!m_pStream)
+    {
+        PR_ASSERT(m_Module >=0);
+        if (0 <= m_Module)
+        {
+            nsCacheModule* pModule = nsCacheManager::GetInstance()->GetModule(m_Module);
+            if (pModule)
+            {   
+                m_pStream = pModule->GetStreamFor(this);
+                if (m_pStream)
+                    return m_pStream->Write(i_Buffer, len);
+            }
+        }
+        return 0;
+    }
+    return m_pStream->Write(i_Buffer, len);
+}