Check in my Mac fix that Chris Waterson didn't have, that makes the Macintosh build properly.

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

mozilla/base/Makefile.in

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

mozilla/base/macbuild/base.toc

@@ -0,0 +1,17 @@
+# target: baseDebug.shlb
+mozilla/base/src/mac/nsTimerMac.cpp
+mozilla/base/src/nsArena.cpp
+mozilla/base/src/nsAtomTable.cpp
+mozilla/base/src/nsBTree.cpp
+mozilla/base/src/nsByteBuffer.cpp
+mozilla/base/src/nsCRT.cpp
+mozilla/base/src/nsDeque.cpp
+mozilla/base/src/nsEscape.cpp
+mozilla/base/src/nsFileSpec.cpp
+mozilla/base/src/nsFileStream.cpp
+mozilla/base/src/nsRBTree.cpp
+mozilla/base/src/nsSizeOfHandler.cpp
+mozilla/base/src/nsString.cpp
+mozilla/base/src/nsUnicharBuffer.cpp
+mozilla/base/src/nsUnicharInputStream.cpp
+mozilla/base/src/nsVoidArray.cpp

mozilla/base/macbuild/files.prefix

@@ -0,0 +1,19 @@
+/* -*- 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 "MacPrefix_debug.h"

mozilla/base/macbuild/filesDebug.prefix

@@ -0,0 +1,19 @@
+/* -*- 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 "MacPrefix_debug.h"

mozilla/base/makefile.win

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

mozilla/base/public/MANIFEST

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

mozilla/base/public/Makefile.in

@@ -0,0 +1,40 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -D_IMPL_NS_BASE
+
+EXPORTS =		\
+    nsISizeOfHandler.h	\
+    nsEscape.h          \
+    nsFileSpec.h        \
+    nsFileStream.h      \
+    $(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+MODULE=base
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk

mozilla/base/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
+
+DEFINES = -D_IMPL_NS_BASE
+
+EXPORTS =		\
+    nsISizeOfHandler.h	\
+	nsFileSpec.h \
+	nsFileStream.h \
+    $(NULL)
+
+MODULE = raptor 
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/base/public/nsEscape.h

@@ -0,0 +1,60 @@
+/* -*- 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.
+ */
+
+/*	First checked in on 98/12/03 by John R. McMullen, derived from net.h/mkparse.c. */
+
+#ifndef _ESCAPE_H_
+#define _ESCAPE_H_
+
+#include "prtypes.h"
+
+/* valid mask values for NET_Escape() and NET_EscapedSize(). */
+typedef enum {
+	url_XAlphas		= (1<<0)
+,	url_XPAlphas	= (1<<1)
+,	url_Path		= (1<<2)
+} nsEscapeMask;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+char * nsEscape(const char * str, nsEscapeMask mask);
+	/* Caller must use delete [] on the result */
+char * nsUnescape(char * str);
+	/* decode % escaped hex codes into character values,
+	 * modifies the parameter, returns the same buffer
+	 */
+
+char * nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32* out_len);
+	/* Like nsEscape, but if out_len is non-null, return result string length
+	 * in *out_len, and uses len instead of NUL termination.
+	 * Caller must use delete [] on the result.
+	 */
+PRInt32 nsUnescapeCount (char * str);
+	/* decode % escaped hex codes into character values,
+	 * modifies the parameter buffer, returns the length of the result
+	 * (result may contain \0's).
+	 */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif //  _ESCAPE_H_

mozilla/base/public/nsFileSpec.h

@@ -0,0 +1,408 @@
+/* -*- 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.
+ */
+
+//    First checked in on 98/11/20 by John R. McMullen in the wrong directory.
+//    Checked in again 98/12/04.
+//    Polished version 98/12/08.
+
+//========================================================================================
+//
+//  Classes defined:
+//
+//      nsFilePath, nsFileURL, nsNativeFileSpec.
+//
+//  This suite provides the following services:
+//
+//      1.  Encapsulates all platform-specific file details, so that files can be
+//          described correctly without any platform #ifdefs
+//
+//      2.  Type safety.  This will fix the problems that used to occur because people
+//          confused file paths.  They used to use const char*, which could mean three
+//          or four different things.  Bugs were introduced as people coded, right up
+//          to the moment Communicator 4.5 shipped.
+//
+//      3.  Used in conjunction with nsFileStream.h (q.v.), this supports all the power
+//          and readability of the ansi stream syntax.
+//
+//          Basic example:
+//
+//              nsFilePath myPath("/Development/iotest.txt");
+//
+//              nsOutputFileStream testStream(myPath);
+//              testStream << "Hello World" << nsEndl;
+//
+//      4.  Handy methods for manipulating file specifiers safely, e.g. MakeUnique(),
+//          SetLeafName(), Exists().
+//
+//      5.  Easy cross-conversion.
+//
+//          Examples:
+//
+//              Initialize a URL from a string without suffix
+//
+//                  nsFileURL fileURL("file:///Development/MPW/MPW%20Shell");
+//
+//              Initialize a Unix path from a URL
+//
+//                  nsFilePath filePath(fileURL);
+//
+//              Initialize a native file spec from a URL
+//
+//                  nsNativeFileSpec fileSpec(fileURL);
+//
+//              Make the spec unique (this one has no suffix).
+//
+//                  fileSpec.MakeUnique();
+//
+//              Assign the spec to a URL
+//
+//                  fileURL = fileSpec;
+//
+//              Assign a unix path using a string with a suffix.
+//
+//                  filePath = "/Development/MPW/SysErrs.err";
+//
+//              Assign to a file spec using a unix path.
+//
+//                  fileSpec = filePath;
+//
+//              Make this unique (this one has a suffix).
+//
+//                  fileSpec.MakeUnique();
+//
+//      6.  Fixes a bug that have been there for a long time, and
+//          is inevitable if you use NSPR alone, where files are described as paths.
+//
+//          The problem affects platforms (Macintosh) in which a path does not fully
+//          specify a file, because two volumes can have the same name.  This
+//          is solved by holding a "private" native file spec inside the
+//          nsFilePath and nsFileURL classes, which is used when appropriate.
+//
+//      Not yet done:
+//
+//          Equality operators... much more.
+//
+//========================================================================================
+
+#ifndef _FILESPEC_H_
+#define _FILESPEC_H_
+
+#include "nscore.h"
+
+//========================================================================================
+//                          Compiler-specific macros, as needed
+//========================================================================================
+#if !defined(NS_USING_NAMESPACE) && (defined(__MWERKS__) || defined(XP_PC))
+#define NS_USING_NAMESPACE
+#endif
+
+#ifdef NS_USING_NAMESPACE
+
+#define NS_NAMESPACE_PROTOTYPE
+#define NS_NAMESPACE namespace
+#define NS_NAMESPACE_END
+#else
+
+#define NS_NAMESPACE_PROTOTYPE static
+#define NS_NAMESPACE struct
+#define NS_NAMESPACE_END ;
+
+#endif
+//=========================== End Compiler-specific macros ===============================
+
+#ifdef XP_MAC
+#include <Files.h>
+#elif defined(XP_UNIX) || defined (XP_OS2)
+#include <dirent.h>
+#elif XP_PC
+#include "prio.h"
+#endif
+
+//========================================================================================
+// Here are the allowable ways to describe a file.
+//========================================================================================
+
+class nsFilePath;                 // This can be passed to NSPR file I/O routines.
+class nsFileURL;
+class nsNativeFileSpec;
+
+#define kFileURLPrefix "file://"
+#define kFileURLPrefixLength (7)
+
+class nsBasicOutStream;
+
+//========================================================================================
+class NS_BASE nsNativeFileSpec
+//    This is whatever each platform really prefers to describe files as.  Declared first
+//  because the other two types have an embeded nsNativeFileSpec object.
+//========================================================================================
+{
+    public:
+                                nsNativeFileSpec();
+        explicit                nsNativeFileSpec(const char* inString, bool inCreateDirs = false);
+        explicit                nsNativeFileSpec(const nsFilePath& inPath);
+        explicit                nsNativeFileSpec(const nsFileURL& inURL);
+                                nsNativeFileSpec(const nsNativeFileSpec& inPath);
+        virtual                 ~nsNativeFileSpec();
+
+        void                    operator = (const char* inPath);
+        void                    operator = (const nsFilePath& inPath);
+        void                    operator = (const nsFileURL& inURL);
+        void                    operator = (const nsNativeFileSpec& inOther);
+
+#ifndef XP_MAC
+                                operator const char* () const { return mPath; }
+                                    // This is the only automatic conversion to const char*
+                                    // that is provided, and it allows the
+                                    // path to be "passed" to NSPR file routines.
+#endif
+
+#ifdef XP_MAC
+        // For Macintosh people, this is meant to be useful in its own right as a C++ version
+        // of the FSSpec struct.        
+                                nsNativeFileSpec(
+                                    short vRefNum,
+                                    long parID,
+                                    ConstStr255Param name);
+                                nsNativeFileSpec(const FSSpec& inSpec)
+                                    : mSpec(inSpec), mError(noErr) {}
+
+                                operator FSSpec* () { return &mSpec; }
+                                operator const FSSpec* const () { return &mSpec; }
+                                operator  FSSpec& () { return mSpec; }
+                                operator const FSSpec& () const { return mSpec; }
+        OSErr                   Error() const { return mError; }
+        void                    MakeAliasSafe();
+                                    // Called for the spec of an alias.  Copies the alias to
+                                    // a secret temp directory and modifies the spec to point
+                                    // to it.  Sets mError.
+        void                    ResolveAlias(bool& wasAliased);
+                                    // Called for the spec of an alias.  Modifies the spec to
+                                    // point to the original.  Sets mError.
+        void                    MakeUnique(ConstStr255Param inSuggestedLeafName);
+        StringPtr               GetLeafPName() { return mSpec.name; }
+        ConstStr255Param        GetLeafPName() const { return mSpec.name; }
+#endif // end of Macintosh utility methods.
+
+#ifdef XP_MAC
+        bool                    Valid() const { return mError == noErr; }
+#else
+        bool                    Valid() const { return true; } // Fixme.
+#endif // XP_MAC
+
+        friend                  NS_BASE nsBasicOutStream& operator << (
+                                    nsBasicOutStream& s,
+                                    const nsNativeFileSpec& spec);
+
+        //--------------------------------------------------
+        // Queries and path algebra.  These do not modify the disk.
+        //--------------------------------------------------
+
+        char*                   GetLeafName() const; // Allocated.  Use delete [].
+        void                    SetLeafName(const char* inLeafName);
+                                    // inLeafName can be a relative path, so this allows
+                                    // one kind of concatenation of "paths".
+
+        void                    GetParent(nsNativeFileSpec& outSpec) const;
+                                    // Return the filespec of the parent directory. Used
+                                    // in conjunction with GetLeafName(), this lets you
+                                    // parse a path into a list of node names.  Beware,
+                                    // however, that the top node is still not a name,
+                                    // but a spec.  Volumes on Macintosh can have identical
+                                    // names.  Perhaps could be used for an operator --() ?
+
+        nsNativeFileSpec        operator + (const char* inRelativePath) const;
+        void			        operator += (const char* inRelativePath);
+                                    // Concatenate the relative path to this directory.
+                                    // Used for constructing the filespec of a descendant.
+                                    // This must be a directory for this to work.  This differs
+                                    // from SetLeafName(), since the latter will work
+                                    // starting with a sibling of the directory and throws
+                                    // away its leaf information, whereas this one assumes
+                                    // this is a directory, and the relative path starts
+                                    // "below" this.
+
+        void                    MakeUnique();
+        void                    MakeUnique(const char* inSuggestedLeafName);
+    
+        bool                    IsDirectory() const;
+                                    // More stringent than Exists()
+        bool                    IsFile() const;
+                                    // More stringent than Exists()
+        bool                    Exists() const;
+
+        //--------------------------------------------------
+        // Creation and deletion of objects.  These can modify the disk.
+        //--------------------------------------------------
+
+        void                    CreateDirectory(int mode = 0700 /* for unix */);
+        void                    Delete(bool inRecursive);
+        
+        //--------------------------------------------------
+        // Data
+        //--------------------------------------------------
+
+    private:
+                                friend class nsFilePath;
+#ifdef XP_MAC
+        FSSpec                  mSpec;
+        OSErr                   mError;
+#else
+        char*                   mPath;
+#endif
+}; // class nsNativeFileSpec
+
+//========================================================================================
+class NS_BASE nsFileURL
+//    This is an escaped string that looks like "file:///foo/bar/mumble%20fish".  Since URLs
+//    are the standard way of doing things in mozilla, this allows a string constructor,
+//    which just stashes the string with no conversion.
+//========================================================================================
+{
+    public:
+                                nsFileURL(const nsFileURL& inURL);
+        explicit                nsFileURL(const char* inString, bool inCreateDirs = false);
+        explicit                nsFileURL(const nsFilePath& inPath);
+        explicit                nsFileURL(const nsNativeFileSpec& inPath);
+        virtual                 ~nsFileURL();
+
+//        nsString             GetString() const { return mPath; }
+                                    // may be needed for implementation reasons,
+                                    // but should not provide a conversion constructor.
+
+        void                    operator = (const nsFileURL& inURL);
+        void                    operator = (const char* inString);
+        void                    operator = (const nsFilePath& inOther);
+        void                    operator = (const nsNativeFileSpec& inOther);
+
+        friend                  NS_BASE nsBasicOutStream& operator << (
+                                     nsBasicOutStream& s, const nsFileURL& spec);
+
+#ifdef XP_MAC
+                                // Accessor to allow quick assignment to a mNativeFileSpec
+        const nsNativeFileSpec& GetNativeSpec() const { return mNativeFileSpec; }
+#endif
+    private:
+        // Should not be defined (only nsFilePath is to be treated as strings.
+                                operator char* ();
+                                operator const char* const ();
+    private:
+                                friend class nsFilePath; // to allow construction of nsFilePath
+        char*                   mURL;
+#ifdef XP_MAC
+        // Since the path on the macintosh does not uniquely specify a file (volumes
+        // can have the same name), stash the secret nsNativeFileSpec, too.
+        nsNativeFileSpec        mNativeFileSpec;
+#endif
+}; // class nsFileURL
+
+//========================================================================================
+class NS_BASE nsFilePath
+//    This is a string that looks like "/foo/bar/mumble%20fish".  Same as nsFileURL, but
+//    without the "file:// prefix".
+//========================================================================================
+{
+    public:
+                                nsFilePath(const nsFilePath& inPath);
+        explicit                nsFilePath(const char* inString, bool inCreateDirs = false);
+        explicit                nsFilePath(const nsFileURL& inURL);
+        explicit                nsFilePath(const nsNativeFileSpec& inPath);
+        virtual                 ~nsFilePath();
+
+                                
+                                operator const char* () const { return mPath; }
+                                    // This is the only automatic conversion to const char*
+                                    // that is provided, and it allows the
+                                    // path to be "passed" to NSPR file routines.
+                                operator char* () { return mPath; }
+                                    // This is the only automatic conversion to string
+                                    // that is provided, because a naked string should
+                                    // only mean a standard file path.
+
+        void                    operator = (const nsFilePath& inPath);
+        void                    operator = (const char* inString);
+        void                    operator = (const nsFileURL& inURL);
+        void                    operator = (const nsNativeFileSpec& inOther);
+
+#ifdef XP_MAC
+    public:
+                                // Accessor to allow quick assignment to a mNativeFileSpec
+        const nsNativeFileSpec& GetNativeSpec() const { return mNativeFileSpec; }
+#endif
+
+    private:
+
+        char*                    mPath;
+#ifdef XP_MAC
+        // Since the path on the macintosh does not uniquely specify a file (volumes
+        // can have the same name), stash the secret nsNativeFileSpec, too.
+        nsNativeFileSpec        mNativeFileSpec;
+#endif
+}; // class nsFilePath
+
+//========================================================================================
+class NS_BASE nsDirectoryIterator
+//  Example:
+//
+//       nsNativeFileSpec parentDir(...); // directory over whose children we shall iterate
+//       for (nsDirectoryIterator i(parentDir); i; i++)
+//       {
+//              // do something with (const nsNativeFileSpec&)i
+//       }
+//
+//  or:
+//
+//       for (nsDirectoryIterator i(parentDir, false); i; i--)
+//       {
+//              // do something with (const nsNativeFileSpec&)i
+//       }
+//
+//  Currently, the only platform on which backwards iteration actually goes backwards
+//  is Macintosh.  On other platforms, both styles will work, but will go forwards.
+//========================================================================================
+{
+	public:
+	                            nsDirectoryIterator(
+	                            	const nsNativeFileSpec& parent,
+	                            	int iterateDirection = +1);
+#ifndef XP_MAC
+	// Macintosh currently doesn't allocate, so needn't clean up.
+	    virtual                 ~nsDirectoryIterator();
+#endif
+	                            operator bool() const { return mExists; }
+	    nsDirectoryIterator&    operator ++(); // moves to the next item, if any.
+	    nsDirectoryIterator&    operator ++(int) { return ++(*this); } // post-increment.
+	    nsDirectoryIterator&    operator --(); // moves to the previous item, if any.
+	    nsDirectoryIterator&    operator --(int) { return --(*this); } // post-decrement.
+	                            operator nsNativeFileSpec&() { return mCurrent; }
+	private:
+	    nsNativeFileSpec        mCurrent;
+	    bool                    mExists;
+	      
+#if defined(XP_UNIX)
+        DIR*                    mDir;
+#elif defined(XP_PC)
+        PRDir*                  mDir; // XXX why not use PRDir for Unix & Mac, too?
+#elif defined(XP_MAC)
+        OSErr                   SetToIndex();
+	    short                   mIndex;
+	    short                   mMaxIndex;
+#endif
+}; // class nsDirectoryIterator
+
+#endif //  _FILESPEC_H_

mozilla/base/public/nsFileStream.h

@@ -0,0 +1,332 @@
+/* -*- 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.
+ */
+
+//    First checked in on 98/11/20 by John R. McMullen in the wrong directory.
+//    Checked in again 98/12/04.
+//    Polished version 98/12/08.
+
+//========================================================================================
+//
+//  Classes defined:
+//
+//      single-byte char:
+//
+//          nsInputFileStream, nsOutputFileStream
+//
+//  This suite provide the following services:
+//
+//      1.  Encapsulates all platform-specific file details, so that file i/o
+//          can be done correctly without any platform #ifdefs
+//
+//      2.  Uses NSPR file services (NOT ansi file I/O), in order to get best
+//          native performance.  This performance difference is especially large on
+//          macintosh.
+//
+//      3.  Allows all the power of the ansi stream syntax.
+//
+//          Basic example:
+//
+//              nsFilePath myPath("/Development/iotest.txt");
+//
+//	            nsOutputFileStream testStream(myPath);
+//				testStream << "Hello World" << nsEndl;
+//
+//      4.  Requires streams to be constructed using typesafe nsFilePath specifier
+//          (not the notorious and bug prone const char*), namely nsFilePath.  See
+//          nsFileSpec.h for more details.
+//
+//      5.  Fixes a bug that have been there for a long time, and
+//          is inevitable if you use NSPR alone:
+//
+//               The problem on platforms (Macintosh) in which a path does not fully
+//               specify a file, because two volumes can have the same name.
+//
+//  Not yet provided:
+//
+//      Endian-awareness for reading and writing crossplatform binary files.  At this
+//      time there seems to be no demand for this.
+//
+//========================================================================================
+
+#ifndef _FILESTREAM_H_
+#define _FILESTREAM_H_
+
+#include "nscore.h"
+
+#ifdef XP_MAC
+#include "pprio.h" // To get PR_ImportFile
+#else
+#include "prio.h"
+#endif
+#include "nsFileSpec.h"
+
+//========================================================================================
+//                          Compiler-specific macros, as needed
+//========================================================================================
+#if !defined(NS_USING_NAMESPACE) && (defined(__MWERKS__) || defined(XP_PC))
+#define NS_USING_NAMESPACE
+#endif
+
+#if !defined(NS_USING_STL) && (defined(__MWERKS__) || defined(XP_PC))
+#define NS_USING_STL
+#endif
+
+#ifdef NS_USING_NAMESPACE
+
+#define NS_NAMESPACE_PROTOTYPE
+#define NS_NAMESPACE namespace
+#define NS_NAMESPACE_END
+	
+#else
+
+#define NS_NAMESPACE_PROTOTYPE static
+#define NS_NAMESPACE struct
+#define NS_NAMESPACE_END ;
+
+#endif // NS_USING_NAMESPACE
+
+#ifndef XP_MAC
+// PR_STDOUT and PR_STDIN are fatal on Macintosh.  So for console i/o, we must use the std
+// stream stuff instead.  However, we have to require that cout and cin are passed in
+// to the constructor because in the current build, there is a copy in the base.shlb,
+// and another in the caller's file.  Passing it in as a parameter ensures that the
+// caller and this library are using the same global object.  Groan.
+//
+// Unix currently does not support iostreams at all.  Their compilers do not support
+// ANSI C++, or even ARM C++.
+//
+// Windows supports them, but only if you turn on the -GX compile flag, to support
+// exceptions.
+
+// Catch 22.
+#define NS_USE_PR_STDIO
+#endif
+
+#ifdef NS_USE_PR_STDIO
+class istream;
+class ostream;
+#define CONSOLE_IN 0
+#define CONSOLE_OUT 0
+#else
+#include <iostream>
+using std::istream;
+using std::ostream;
+#define CONSOLE_IN &std::cin
+#define CONSOLE_OUT &std::cout
+#endif
+
+//=========================== End Compiler-specific macros ===============================
+
+//========================================================================================
+class NS_BASE nsBasicFileStream
+//========================================================================================
+{
+public:
+                                      nsBasicFileStream();
+                                      nsBasicFileStream(PRFileDesc* desc, int nsprMode);
+                                      nsBasicFileStream(
+                                          const nsFilePath& inFile,
+                                          int nsprMode,
+                                          PRIntn accessMode);
+    virtual                           ~nsBasicFileStream();
+
+
+    inline PRBool                     is_open() const { return mFileDesc != 0; }
+    void                              open(
+                                           const nsFilePath& inFile,
+                                           int nsprMode,
+                                           PRIntn accessMode);
+    void                              close();
+    PRIntn                            tell() const;
+    void                              seek(PRInt32 offset) { seek(PR_SEEK_SET, offset); }
+    void                              seek(PRSeekWhence whence, PRInt32 offset);
+    PRBool                              eof() const { return mEOF; }
+    PRBool                            failed() const { return mFailed; }
+                                          // call PR_GetError() for details
+protected:
+
+	PRFileDesc*                       GetFileDescriptor() const { return mFileDesc; }
+    
+protected:
+    
+    friend class nsBasicInStream;
+    friend class nsBasicOutStream;
+    
+    PRFileDesc*                       mFileDesc;
+    int                               mNSPRMode;
+    PRBool                            mFailed;
+    PRBool                            mEOF;
+}; // class nsBasicFileStream
+
+//========================================================================================
+class NS_BASE nsBasicInStream
+//========================================================================================
+{
+protected:
+                                      nsBasicInStream(nsBasicFileStream& inStream, istream* stream);
+    
+public:
+
+    nsBasicInStream&                  operator >> (nsBasicInStream& (*pf)(nsBasicInStream&))
+                                      {
+                                           return pf(*this);
+                                       }
+    void                              get(char& c);
+    PRInt32                           read(void* s, PRInt32 n);
+    PRBool                            readline(char* s,  PRInt32 n);
+                                          // Result always null-terminated
+                                          // false result indicates line was truncated
+                                          // to fit buffer, or an error occurred.
+
+    // Input streamers.  Add more as needed
+    nsBasicInStream&                  operator >> (char& ch);
+    
+    istream*                          GetStandardStream() const { return mStdStream; }
+
+protected:
+
+    nsBasicFileStream&                mBase;    
+	istream*                          mStdStream;
+}; // class nsBasicInStream
+
+//========================================================================================
+class NS_BASE nsBasicOutStream
+//========================================================================================
+{
+protected:
+
+                                      nsBasicOutStream(nsBasicFileStream& inStream, ostream* stream);
+
+public:
+
+    nsBasicOutStream&                 operator << (nsBasicOutStream& (*pf)(nsBasicOutStream&))
+                                      {
+                                           return pf(*this);
+                                      }
+    void                              put(char c);
+    PRInt32                           write(const void* s, PRInt32 n);
+    void                              flush();
+    
+    // Output streamers.  Add more as needed
+    nsBasicOutStream&                 operator << (const char* buf);
+    nsBasicOutStream&                 operator << (char ch);
+    nsBasicOutStream&                 operator << (short val);
+    nsBasicOutStream&                 operator << (unsigned short val);
+    nsBasicOutStream&                 operator << (long val);
+    nsBasicOutStream&                 operator << (unsigned long val);
+
+    ostream*                          GetStandardStream() const { return mStdStream; }
+
+protected:
+
+    nsBasicFileStream&                mBase;    
+	ostream*                          mStdStream;
+}; // class nsBasicOutStream
+
+//========================================================================================
+class NS_BASE nsInputFileStream
+//========================================================================================
+:	public nsBasicFileStream
+,	public nsBasicInStream
+{
+public:
+	enum  { kDefaultMode = PR_RDONLY };
+                                      nsInputFileStream(istream* stream = CONSOLE_IN);
+                                      nsInputFileStream(
+                                          const nsFilePath& inFile,
+                                          int nsprMode = kDefaultMode,
+                                          PRIntn accessMode = 00700) // <- OCTAL
+                                      : nsBasicFileStream(inFile, nsprMode, accessMode)
+                                      , nsBasicInStream(*this, 0)
+                                      {}
+
+    void                              open(
+                                           const nsFilePath& inFile,
+                                           int nsprMode = kDefaultMode,
+                                           PRIntn accessMode = 00700) // <- OCTAL
+                                      {
+                                          nsBasicFileStream::open(inFile, nsprMode, accessMode);
+                                      }
+private:
+
+    nsInputFileStream&                operator >> (char* buf); // TOO DANGEROUS. DON'T DEFINE.
+
+}; // class nsInputFileStream
+
+//========================================================================================
+class NS_BASE nsOutputFileStream
+//========================================================================================
+:	public nsBasicFileStream
+,	public nsBasicOutStream
+{
+public:
+	enum  { kDefaultMode = (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE) };
+
+                                      nsOutputFileStream(ostream* stream = CONSOLE_OUT);
+                                      nsOutputFileStream(
+                                           const nsFilePath& inFile,
+                                           int nsprMode = kDefaultMode,
+                                           PRIntn accessMode = 00700) // <- OCTAL
+                                      : nsBasicFileStream(inFile, nsprMode, accessMode)
+                                      , nsBasicOutStream(*this, 0)
+                                      {}
+ 
+    inline void                       open(
+                                          const nsFilePath& inFile,
+                                          int nsprMode = kDefaultMode,
+                                          PRIntn accessMode = 00700) // <- OCTAL
+                                      {
+                                          nsBasicFileStream::open(inFile, nsprMode, accessMode);
+                                      }
+}; // class nsOutputFileStream
+
+//========================================================================================
+class NS_BASE nsIOFileStream
+//========================================================================================
+:	public nsBasicFileStream
+,	public nsBasicOutStream
+,	public nsBasicInStream
+{
+public:
+	enum  { kDefaultMode = (PR_RDWR | PR_CREATE_FILE) };
+
+                                      nsIOFileStream(
+                                           const nsFilePath& inFile,
+                                           int nsprMode = kDefaultMode,
+                                           PRIntn accessMode = 00700) // <- OCTAL
+                                      : nsBasicFileStream(inFile, nsprMode, accessMode)
+                                      , nsBasicInStream(*this, 0)
+                                      , nsBasicOutStream(*this, 0)
+                                      {}
+ 
+    inline void                       open(
+                                          const nsFilePath& inFile,
+                                          int nsprMode = kDefaultMode,
+                                          PRIntn accessMode = 00700) // <- OCTAL
+                                      {
+                                          nsBasicFileStream::open(inFile, nsprMode, accessMode);
+                                      }
+}; // class nsIOFileStream
+
+//========================================================================================
+//        Manipulators
+//========================================================================================
+NS_BASE nsBasicOutStream& nsEndl(nsBasicOutStream& os);
+ 
+
+#endif /* _FILESTREAM_H_ */

mozilla/base/public/nsISizeOfHandler.h

@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsISizeOfHandler_h___
+#define nsISizeOfHandler_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+/* c028d1f0-fc9e-11d1-89e4-006008911b81 */
+#define NS_ISIZEOF_HANDLER_IID \
+{ 0xc028d1f0, 0xfc9e, 0x11d1, {0x89, 0xe4, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81}}
+
+/**
+ * An API to managing a sizeof computation of an arbitrary graph.
+ * The handler is responsible for remembering which objects have been
+ * seen before. Note that the handler doesn't hold references to
+ * nsISupport's objects; the assumption is that the objects being
+ * sized are stationary and will not be modified during the sizing
+ * computation and therefore do not need an extra reference count.
+ */
+class nsISizeOfHandler : public nsISupports {
+public:
+  /**
+   * Add in a simple size value to the running total.
+   * Always returns NS_OK.
+   */
+  NS_IMETHOD Add(size_t aSize) = 0;
+
+  /**
+   * Update aResult with PR_TRUE if the object has been traversed
+   * by the sizeof computation before. Otherwise aResult is set to
+   * PR_FALSE and the object is added to the internal database
+   * of objects that have been traversed. It's ok to pass a null
+   * pointer in; aResult will be set to PR_TRUE so you won't accidently
+   * try to traverse through null pointer.
+   *
+   * Note: This violates the COM API standard on purpose; so there!
+   */
+  virtual PRBool HaveSeen(void* anObject) = 0;
+
+  /**
+   * Return the currently computed size.
+   * Always returns NS_OK.
+   */
+  NS_IMETHOD GetSize(PRUint32& aResult) = 0;
+};
+
+extern NS_BASE nsresult
+NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult);
+
+#endif /* nsISizeofHandler_h___ */

mozilla/base/public/nsRepeater.h

@@ -0,0 +1,58 @@
+/* -*- 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 nsRepeater_h___
+#define nsRepeater_h___
+
+class EventRecord;
+
+class Repeater {
+  public:
+  
+    Repeater();
+    virtual ~Repeater();
+    
+    virtual	void RepeatAction(const EventRecord &aMacEvent) = 0;
+    
+    void StartRepeating();
+    void StopRepeating();
+    void StartIdling();
+    void StopIdling();
+    
+    static void DoRepeaters(const EventRecord &aMacEvent);
+    static void DoIdlers(const EventRecord &aMacEvent);
+    
+  protected:
+    
+    void AddToRepeatList();
+    void RemoveFromRepeatList();
+    void AddToIdleList();
+    void RemoveFromIdleList();
+    
+    static Repeater* sRepeaters;
+    static Repeater* sIdlers;
+    
+    bool mRepeating;
+    bool mIdling;
+    Repeater* mPrevRptr;
+    Repeater* mNextRptr;
+    Repeater* mPrevIdlr;
+    Repeater* mNextIdlr;
+};
+
+#endif

mozilla/base/public/nsStdFileStream.h

@@ -0,0 +1,939 @@
+/* -*- 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.
+ */
+
+#error "Do not use this file.  The unix compilers do not support standard C++.  Use nsFileStream"
+
+//    First checked in on 98/11/20 by John R. McMullen in the wrong directory.
+//    Checked in again 98/12/04.
+//    Polished version 98/12/08.
+
+//========================================================================================
+//
+//  Classes defined:
+//
+//      single-byte char:
+//
+//          nsInputFileStream, nsOutputFileStream, nsIOFileStream
+//
+//      wide char:
+//
+//          nsWideInputFileStream, nsWideOutputFileStream, nsWideIOFileStream
+//
+//  This suite provide the following services:
+//
+//      1.  Encapsulates all platform-specific file details, so that file i/o
+//          can be done correctly without any platform #ifdefs
+//
+//      2.  Uses NSPR file services (NOT ansi file I/O), in order to get best
+//          native performance.  This performance difference is especially large on
+//          macintosh.
+//
+//      3.  Allows all the power of the ansi stream syntax: these streams
+//          ARE derived classes of ostream, istream, and iostream.  ALL METHODS OF
+//          istream, ostream, AND iostream ARE AVAILABLE!
+//
+//          Basic example:
+//
+//              nsFilePath myPath("/Development/iotest.txt");
+//
+//	            nsOutputFileStream testStream(myPath);
+//				testStream << "Hello World" << endl;
+//
+//      4.  Requires streams to be constructed using typesafe nsFilePath specifier
+//          (not the notorious and bug prone const char*), namely nsFilePath.  See
+//          nsFileSpec.h for more details.
+//
+//      5.  Fixes a bug that have been there for a long time, and
+//          is inevitable if you use NSPR alone:
+//
+//               The problem on platforms (Macintosh) in which a path does not fully
+//               specify a file, because two volumes can have the same name.
+//
+//  Not yet provided:
+//
+//      Endian-awareness for reading and writing crossplatform binary files.  At this
+//      time there seems to be no demand for this.
+//
+//========================================================================================
+
+#ifndef _FILESTREAM_H_
+#define _FILESTREAM_H_
+
+#include "nscore.h"
+
+#ifdef XP_MAC
+#include "pprio.h" // To get PR_ImportFile
+#else
+#include "prio.h"
+#endif
+#include "nsFileSpec.h"
+
+//========================================================================================
+//                          Compiler-specific macros, as needed
+//========================================================================================
+#if !defined(NS_USING_NAMESPACE) && (defined(__MWERKS__) || defined(XP_PC))
+#define NS_USING_NAMESPACE
+#endif
+
+#if !defined(NS_USING_STL) && (defined(__MWERKS__) || defined(XP_PC))
+#define NS_USING_STL
+#endif
+
+#ifdef NS_USING_NAMESPACE
+
+#define NS_NAMESPACE_PROTOTYPE
+#define NS_NAMESPACE namespace
+#define NS_NAMESPACE_END
+	
+#else
+
+#define NS_NAMESPACE_PROTOTYPE static
+#define NS_NAMESPACE struct
+#define NS_NAMESPACE_END ;
+
+#endif // NS_USING_NAMESPACE
+
+#ifdef NS_USING_STL
+
+// Macintosh and Windows use this section.
+//
+// Here's where the party is.  When Unix wants to join in (by supporting
+// a build system with STL headers), what fun we'll have!  Meanwhile, I've used
+// macros to make this build on all our platforms.  Unix doesn't have support for
+// STL, and therefore we could not use the template forms of these classes on Unix.
+// (it's a long story).  Therefore, Unix supports no stream char types except 1-byte
+// characters, and therefore nobody else does now either, until Unix catches up.
+
+
+#define DEFINING_FILE_STREAM // templateers define this when this file is included.
+#define IOS_BASE ios_base
+#include <istream>
+	using std::ios_base;
+	using std::basic_streambuf;
+	using std::codecvt_base;
+	using std::codecvt;
+	using std::streamsize;
+	using std::locale;
+	using std::basic_istream;
+	using std::basic_ostream;
+	using std::basic_iostream;
+	using std::char_traits;
+#define TEMPLATE_DEF template<class charT, class traits>
+#define FILE_BUFFER_TYPE nsFileBufferT<charT, traits>
+#define INPUT_FILE_STREAM nsInputFileStreamT<charT, traits>
+#define OUTPUT_FILE_STREAM nsOutputFileStreamT<charT, traits>
+#define IO_FILE_STREAM nsIOFileStreamT<charT, traits>
+#define BASIC_STREAMBUF basic_streambuf<charT, traits>
+#define BASIC_ISTREAM basic_istream<charT, traits>
+#define BASIC_OSTREAM basic_ostream<charT, traits>
+#define BASIC_IOSTREAM basic_iostream<charT, traits>
+#define INT_TYPE FILE_BUFFER_TYPE::int_type
+#define POS_TYPE FILE_BUFFER_TYPE::pos_type
+#define OFF_TYPE FILE_BUFFER_TYPE::off_type
+#define SEEK_DIR IOS_BASE::seekdir
+#define EOF_VALUE traits::eof()
+
+#else
+
+// Unix uses this section until it supports STL.  This means no locales, no traits,
+// no wide chars, etc.  Also, the stream classes are the original ARM-style ones,
+// and are not templatized.
+
+#define IOS_BASE ios
+#include <istream.h>
+#define TEMPLATE_DEF
+#define FILE_BUFFER_TYPE nsFileBufferT
+#define INPUT_FILE_STREAM nsInputFileStreamT
+#define OUTPUT_FILE_STREAM nsOutputFileStreamT
+#define IO_FILE_STREAM nsIOFileStreamT
+#define BASIC_STREAMBUF streambuf
+#define BASIC_ISTREAM istream
+#define BASIC_OSTREAM ostream
+#define BASIC_IOSTREAM iostream
+#define INT_TYPE int
+#define POS_TYPE long
+#define OFF_TYPE long
+#define SEEK_DIR ios::seek_dir
+#define int_type int
+#define pos_type long
+#define off_type long
+#define char_type char
+#define EOF_VALUE EOF
+
+#endif // NS_USING_STL
+
+#ifdef __MWERKS__
+
+#ifdef MSIPL_WCHART
+#define NS_USING_WIDE_CHAR
+#endif
+#ifdef MSIPL_EXPLICIT_FUNC_TEMPLATE_ARG
+#define NS_EXPLICIT_FUNC_TEMPLATE_ARG
+#endif
+#define NS_READ_LOCK(mut) READ_LOCK(mut)
+#define NS_WRITE_LOCK(mut) WRITE_LOCK(mut)
+
+#else
+
+// Fix me, if necessary, for thread-safety.
+#define NS_READ_LOCK(mut)
+#define NS_WRITE_LOCK(mut)
+
+#endif // __MWERKS__
+
+//=========================== End Compiler-specific macros ===============================
+
+//========================================================================================
+NS_NAMESPACE nsFileStreamHelpers
+// Prototypes for common (non-template) implementations in the .cpp file which do not
+// need the template args (charT, traits).
+//========================================================================================
+{
+	NS_NAMESPACE_PROTOTYPE NS_BASE PRFileDesc* open(
+		const nsFilePath& inFile,
+	    IOS_BASE::openmode mode,
+	    PRIntn accessMode);
+} NS_NAMESPACE_END // nsFileStreamHelpers
+
+//========================================================================================
+//	Template declarations
+//========================================================================================
+
+//========================================================================================
+TEMPLATE_DEF
+class nsFileBufferT
+//========================================================================================
+:    public BASIC_STREAMBUF
+{
+#ifdef NS_USING_STL
+    typedef codecvt_base::result result;
+
+public:
+    typedef charT              char_type;
+    typedef typename traits::pos_type pos_type;
+    typedef typename traits::off_type off_type;
+    typedef typename traits::int_type int_type;
+    typedef traits             traits_type;
+    typedef typename traits::state_type state_type;
+
+    typedef codecvt<charT, char, state_type> ofacet_type;
+    typedef codecvt<char, charT, state_type> ifacet_type;
+#endif
+
+public:
+                                       nsFileBufferT();
+                                       nsFileBufferT(PRFileDesc* pfile_arg);
+    virtual                            ~nsFileBufferT();
+    bool                               is_open() const;
+    FILE_BUFFER_TYPE*                  open(
+                                           const nsFilePath& inFile,
+                                           IOS_BASE::openmode mode,
+                                           PRIntn accessMode);
+    FILE_BUFFER_TYPE*                  close();
+ 
+protected:
+    virtual                            int_type overflow(int_type c=EOF_VALUE);
+    virtual                            int_type pbackfail(int_type c=EOF_VALUE);
+    virtual                            int_type underflow();
+    virtual                            pos_type seekoff(
+                                           off_type off, SEEK_DIR way, 
+                                           IOS_BASE::openmode which=IOS_BASE::in|IOS_BASE::out);
+    virtual                            pos_type seekpos(pos_type sp,
+                                           IOS_BASE::openmode which=IOS_BASE::in|IOS_BASE::out);
+    virtual                            BASIC_STREAMBUF* setbuf(char_type* s, streamsize n);
+    virtual                            int sync();
+    virtual                            int_type uflow();
+#ifdef NS_USING_STL
+    virtual                            void imbue(const locale& loc);
+#endif
+    virtual                            streamsize showmanyc();
+    virtual                            streamsize xsgetn(char_type* s, streamsize n);
+    virtual                            streamsize xsputn(const char_type* s, streamsize n);
+ 
+private:
+    PRFileDesc*                        mFileDesc;    
+    IOS_BASE::openmode                 mode_;
+}; // class nsFileBufferT
+
+//========================================================================================
+TEMPLATE_DEF
+class nsInputFileStreamT
+//========================================================================================
+:    public BASIC_ISTREAM
+{
+#ifdef NS_USING_STL
+public:
+    typedef charT              char_type;
+    typedef typename traits::pos_type pos_type;
+    typedef typename traits::off_type off_type;
+    typedef typename traits::int_type int_type;
+    typedef traits             traits_type;
+#endif
+ 
+public:
+                                      nsInputFileStreamT();
+                                      explicit nsInputFileStreamT(
+                                          const nsFilePath& inFile,
+                                          IOS_BASE::openmode mode=IOS_BASE::in,
+                                          PRIntn accessMode = 0x00400);
+
+    virtual                           ~nsInputFileStreamT();
+
+    FILE_BUFFER_TYPE*                 rdbuf() const;
+    inline bool                       is_open();
+    inline void                       open(
+                                           const nsFilePath& inFile,
+                                           IOS_BASE::openmode mode=IOS_BASE::in,
+                                           PRIntn accessMode = 0x00400);
+    inline void                       close();
+
+private:
+    FILE_BUFFER_TYPE                  mBuffer;
+}; // class nsInputFileStreamT
+
+//========================================================================================
+TEMPLATE_DEF
+class nsOutputFileStreamT
+//========================================================================================
+:    public BASIC_OSTREAM
+{
+#ifdef NS_USING_STL
+public:
+    typedef charT              char_type;
+    typedef typename traits::pos_type pos_type;
+    typedef typename traits::off_type off_type;
+    typedef typename traits::int_type int_type;
+    typedef traits             traits_type;
+#endif
+ 
+public:
+
+                                      nsOutputFileStreamT();
+                                      explicit nsOutputFileStreamT(
+                                           const nsFilePath& inFile,
+                                           IOS_BASE::openmode mode = IOS_BASE::out|IOS_BASE::trunc,
+                                           PRIntn accessMode = 0x00200);
+ 
+    virtual                           ~nsOutputFileStreamT();
+
+    FILE_BUFFER_TYPE*                 rdbuf() const;
+    inline bool                       is_open();
+    inline void                       open(
+                                          const nsFilePath& inFile,
+                                          IOS_BASE::openmode mode = IOS_BASE::out|IOS_BASE::trunc,
+                                          PRIntn accessMode = 0x00200);
+    inline void                       close();
+
+private:
+    FILE_BUFFER_TYPE                  mBuffer;
+}; // class nsOutputFileStreamT
+
+//========================================================================================
+//    Implementation of nsFileBufferT
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF
+inline FILE_BUFFER_TYPE::nsFileBufferT()
+    :    BASIC_STREAMBUF(), mFileDesc(NULL)
+//----------------------------------------------------------------------------------------
+{
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline FILE_BUFFER_TYPE::nsFileBufferT(PRFileDesc* pfarg)
+    :    BASIC_STREAMBUF(), mFileDesc(pfarg)
+//----------------------------------------------------------------------------------------
+{
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline FILE_BUFFER_TYPE* FILE_BUFFER_TYPE::close()
+// Must precede the destructor because both are inline.
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR) 
+       return this;
+    NS_WRITE_LOCK(_mutex);
+    return (mFileDesc && PR_Close(mFileDesc) == PR_SUCCESS) ? mFileDesc = 0, this : 0;
+}
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+FILE_BUFFER_TYPE::~nsFileBufferT()
+//----------------------------------------------------------------------------------------
+{
+    close();
+}
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline bool
+FILE_BUFFER_TYPE::is_open() const 
+//----------------------------------------------------------------------------------------
+{
+    NS_READ_LOCK(_mutex);
+    return bool(mFileDesc);  // in case it is typedefed to int
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline FILE_BUFFER_TYPE* FILE_BUFFER_TYPE::open(
+    const nsFilePath& inFile,
+    IOS_BASE::openmode mode,
+    PRIntn accessMode) 
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc) 
+       return 0;
+    NS_WRITE_LOCK(_mutex);
+    mFileDesc = nsFileStreamHelpers::open(inFile, mode, accessMode);
+    if (!mFileDesc)
+    	return 0;
+    mode_ = mode;
+    return this;
+}    //    FILE_BUFFER_TYPE::open
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline int FILE_BUFFER_TYPE:: sync()
+//----------------------------------------------------------------------------------------
+{
+    return (mFileDesc ? (int)PR_Sync(mFileDesc) : 0);
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline BASIC_STREAMBUF* FILE_BUFFER_TYPE::setbuf(char_type*, streamsize)
+//----------------------------------------------------------------------------------------
+{
+    return (!mFileDesc) ? 0 : this;
+}
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+INT_TYPE FILE_BUFFER_TYPE::overflow(int_type c)
+//----------------------------------------------------------------------------------------
+{
+#ifndef NS_USING_STL
+	char ch = c;
+    PRInt32 bytesWrit1 = PR_Write(mFileDesc, &ch, sizeof(ch));
+    return bytesWrit1 < sizeof(ch) ? EOF_VALUE : c;
+#else
+#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG    
+    const ofacet_type& ft=use_facet<ofacet_type>(getloc());
+#elif defined(XP_PC)
+	const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0, false);
+#else
+    const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0);
+#endif
+    char_type ch = traits_type::to_char_type(c);
+    if (!mFileDesc)
+        return EOF_VALUE;
+    if (traits_type::eq_int_type(c, EOF_VALUE))
+        return traits_type::not_eof(c);
+    if (ft.always_noconv())
+    {
+        PRInt32 bytesWrit1 = PR_Write(mFileDesc, &ch, sizeof(ch));
+        return bytesWrit1 < sizeof(ch) ? EOF_VALUE : c;
+    }
+    { // <- sic!
+        state_type fst;
+         const char_type* end;
+        char buf[4];
+        char* ebuf;
+        result conv;
+        if ((conv=ft.out(fst, &ch, &ch+1, end, buf, buf+3, ebuf))==
+                codecvt_base::noconv)
+        {
+             PRInt32 bytesWrit2 = PR_Write(mFileDesc, &ch, sizeof(ch));
+             return bytesWrit2 < sizeof(ch) ? EOF_VALUE : c;
+        }
+        if ((conv==codecvt_base::partial)||(conv==codecvt_base::error))
+            return EOF_VALUE;
+        *ebuf=0;
+        PRInt32 bytesWrit3 = strlen(buf);
+        return PR_Write(mFileDesc, buf, bytesWrit3) < bytesWrit3 ? EOF_VALUE : c;
+    }
+#endif
+}
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline INT_TYPE FILE_BUFFER_TYPE::underflow()
+//----------------------------------------------------------------------------------------
+{
+    if (!mFileDesc)
+       return EOF_VALUE;
+    char_type s;
+    PRInt32 request = 1; 
+    if (1 != PR_Read(mFileDesc, &s, request))
+       return EOF_VALUE;
+    PR_Seek(mFileDesc, -1, PR_SEEK_CUR);
+    return (int_type)s;
+}
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+streamsize FILE_BUFFER_TYPE::xsputn(const char_type* s, streamsize n)
+//----------------------------------------------------------------------------------------
+{
+#ifndef NS_USING_STL
+    PRInt32 bytesWrit1 = PR_Write(mFileDesc, s, sizeof(char) * size_t(n));
+    return bytesWrit1 < 0 ? 0 : (streamsize)bytesWrit1;
+#else
+#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG
+    const ofacet_type& ft=use_facet<ofacet_type>(loc);
+#elif defined(XP_PC)
+	const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0, false);
+#else
+    const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0);
+#endif
+    if (!mFileDesc || !n) 
+         return 0;
+    if (ft.always_noconv())
+    {
+         PRInt32 bytesWrit1 = PR_Write(mFileDesc, s, sizeof(char) * size_t(n));
+         return bytesWrit1 < 0 ? 0 : (streamsize)bytesWrit1;
+    }
+    { // <- sic!
+         state_type fst;
+         const char_type* end;
+         char buf[8];
+         char* ebuf;
+         result conv;
+#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG     
+         if ((conv=use_facet<ofacet_type>(getloc()).
+#elif defined(XP_PC)
+	     if ((conv=use_facet(getloc(), (ofacet_type*)0, false).
+#else
+         if ((conv=use_facet(getloc(), (ofacet_type*)0).
+#endif
+             out(fst, s, s+n, end, buf, buf+7, ebuf))==codecvt_base::noconv)
+             return (streamsize)PR_Write(mFileDesc, s, sizeof(char) * size_t(n));
+         if ((conv==codecvt_base::partial) ||(conv==codecvt_base::error)) 
+             return 0;
+         *ebuf=0;
+         PRInt32 bytesWrit2 = strlen(buf);
+         bytesWrit2 = PR_Write(mFileDesc, buf, bytesWrit2);
+         return bytesWrit2 < 0 ? 0 : streamsize(bytesWrit2 / sizeof(char_type));
+    }
+#endif
+}   //  FILE_BUFFER_TYPE::xsputn
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline INT_TYPE FILE_BUFFER_TYPE::pbackfail(int_type c)
+//----------------------------------------------------------------------------------------
+{
+    if (!mFileDesc)
+        return EOF_VALUE;
+    if (PR_Seek(mFileDesc, -1, PR_SEEK_CUR) < 0)
+        return EOF_VALUE;
+ #ifdef NS_USING_STL
+    return (traits::eq_int_type(c, EOF_VALUE)) ? traits::not_eof(c) : c;
+ #else
+ 	return c;
+ #endif
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline INT_TYPE FILE_BUFFER_TYPE::uflow()
+//----------------------------------------------------------------------------------------
+{
+    if (!mFileDesc)
+        return EOF_VALUE;
+    char_type s;
+    if (1 != PR_Read(mFileDesc, &s, 1)) // attempt to read 1 byte, confirm 1 byte
+        return EOF_VALUE;
+    return (int_type)s;
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline streamsize FILE_BUFFER_TYPE::xsgetn(char_type* s, streamsize n)
+//----------------------------------------------------------------------------------------
+{
+    return mFileDesc ? (streamsize)PR_Read(mFileDesc, s, sizeof(char) * size_t(n)) : 0;
+}
+
+#ifdef NS_USING_STL
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline void FILE_BUFFER_TYPE::imbue(const locale& loc_arg)
+//----------------------------------------------------------------------------------------
+{
+#ifdef XP_MAC
+   loc = loc_arg;
+#endif
+}
+#endif
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline streamsize FILE_BUFFER_TYPE::showmanyc()
+//----------------------------------------------------------------------------------------
+{
+    return (streamsize)PR_Available(mFileDesc);
+}
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+POS_TYPE FILE_BUFFER_TYPE::seekoff(
+    OFF_TYPE  off, 
+    SEEK_DIR way,
+    IOS_BASE::openmode /* which */)
+//----------------------------------------------------------------------------------------
+{
+    if (!mFileDesc ||
+#ifdef NS_USING_STL
+    ((way&IOS_BASE::beg) && off<0) || ((way&IOS_BASE::end) && off > 0)
+#else
+    ((way == IOS_BASE::beg) && off<0) || ((way == IOS_BASE::end) && off > 0)
+#endif
+    )
+        return pos_type(-1);
+    PRSeekWhence  poseek = PR_SEEK_CUR;
+    switch (way)
+    {
+        case IOS_BASE::beg : poseek= PR_SEEK_SET; 
+                        break;
+        case IOS_BASE::end : poseek= PR_SEEK_END; 
+                        break;
+    }
+    PRInt32 position = PR_Seek(mFileDesc, off, poseek);
+    if (position < 0) 
+        return pos_type(-1);
+    return pos_type(position);
+}
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+POS_TYPE FILE_BUFFER_TYPE::seekpos(pos_type sp, IOS_BASE::openmode)
+//----------------------------------------------------------------------------------------
+{
+    if (!mFileDesc || sp==pos_type(-1))
+        return -1;
+#if defined(XP_PC) || defined(XP_UNIX)
+    PRInt32 position = sp;
+#else
+    PRInt32 position = sp.offset();
+#endif
+    position = PR_Seek(mFileDesc, position, PR_SEEK_SET);
+    if (position < 0)
+        return pos_type(-1);
+    return position;
+}
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+//========================================================================================
+//    Implementation of nsInputFileStreamT
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline INPUT_FILE_STREAM::nsInputFileStreamT()
+    : BASIC_ISTREAM(&mBuffer)
+//----------------------------------------------------------------------------------------
+{
+    // already inited
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline INPUT_FILE_STREAM::nsInputFileStreamT(
+    const nsFilePath& inFile, 
+    IOS_BASE::openmode mode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+    : BASIC_ISTREAM(&mBuffer)
+{
+    // already inited
+    if (!mBuffer.open(inFile, openmode(mode|in), accessMode))
+      setstate(failbit);
+}
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+INPUT_FILE_STREAM::~nsInputFileStreamT()
+//----------------------------------------------------------------------------------------
+{
+}
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline FILE_BUFFER_TYPE* INPUT_FILE_STREAM::rdbuf() const 
+//----------------------------------------------------------------------------------------
+{
+    return (FILE_BUFFER_TYPE*)&mBuffer;
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline bool INPUT_FILE_STREAM:: is_open()
+//----------------------------------------------------------------------------------------
+{ 
+    return mBuffer.is_open();
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline void INPUT_FILE_STREAM::open(
+    const nsFilePath& inFile,
+    IOS_BASE::openmode mode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+{
+    if (!mBuffer.open(inFile, openmode(mode|in), accessMode)) 
+       setstate(failbit);
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline void INPUT_FILE_STREAM::close()
+//----------------------------------------------------------------------------------------
+{
+    if (!mBuffer.close()) 
+       setstate(failbit);
+}
+
+//========================================================================================
+//    Implementation of nsOutputFileStreamT
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF
+inline OUTPUT_FILE_STREAM::nsOutputFileStreamT()
+    : BASIC_OSTREAM(&mBuffer)
+//----------------------------------------------------------------------------------------
+{
+    // already inited
+}
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+OUTPUT_FILE_STREAM::nsOutputFileStreamT(
+    const nsFilePath& inFile, 
+    IOS_BASE::openmode mode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+:   BASIC_OSTREAM(&mBuffer)
+{
+    // already inited
+    if (!mBuffer.open(inFile, openmode(mode|out), accessMode))
+       setstate(failbit);
+}
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+#if defined(DEFINING_FILE_STREAM)
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline OUTPUT_FILE_STREAM::~nsOutputFileStreamT()
+//----------------------------------------------------------------------------------------
+{
+}
+#endif // #if defined(DEFINING_FILE_STREAM)
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline FILE_BUFFER_TYPE* 
+OUTPUT_FILE_STREAM::rdbuf() const
+//----------------------------------------------------------------------------------------
+{
+    return (FILE_BUFFER_TYPE*)&mBuffer;
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline bool OUTPUT_FILE_STREAM:: is_open()
+//----------------------------------------------------------------------------------------
+{
+    return mBuffer.is_open();
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline void OUTPUT_FILE_STREAM::open(
+    const nsFilePath& inFile,
+    IOS_BASE::openmode mode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+{
+    if (!mBuffer.open(inFile, openmode(mode | out), accessMode))
+       setstate(failbit);
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline void OUTPUT_FILE_STREAM:: close()
+//----------------------------------------------------------------------------------------
+{
+    if (!mBuffer.close())
+       setstate(failbit);
+}
+
+//========================================================================================
+TEMPLATE_DEF
+class nsIOFileStreamT : public BASIC_IOSTREAM
+//========================================================================================
+{
+#ifdef NS_USING_STL
+public:
+    typedef charT                 char_type;
+    typedef typename traits::pos_type pos_type;
+    typedef typename traits::off_type off_type;
+    typedef typename traits::int_type int_type;
+    typedef traits                traits_type;
+#endif
+
+public:
+                                        nsIOFileStreamT();
+                                        explicit nsIOFileStreamT(
+                                            const nsFilePath& inFile, 
+                                            IOS_BASE::openmode mode = IOS_BASE::in|IOS_BASE::out,
+                                            PRIntn accessMode = 0x00600);
+
+    virtual                             ~nsIOFileStreamT();
+
+    FILE_BUFFER_TYPE*                   rdbuf() const;
+    inline bool                         is_open();
+    inline void                         open(
+                                            const nsFilePath& inFile,
+                                            IOS_BASE::openmode mode = IOS_BASE::in|IOS_BASE::out,
+                                            PRIntn accessMode = 0x00600);
+    inline void                         close();
+
+private:
+    FILE_BUFFER_TYPE                    mBuffer;
+}; // class nsIOFileStreamT
+
+//========================================================================================
+//    Implementation of nsIOFileStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline IO_FILE_STREAM::nsIOFileStreamT()
+//----------------------------------------------------------------------------------------
+    : mBuffer(), BASIC_IOSTREAM(&mBuffer)
+{
+    // already inited
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline IO_FILE_STREAM::nsIOFileStreamT(
+    const nsFilePath& inFile, 
+    IOS_BASE::openmode mode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+    : mBuffer(), BASIC_IOSTREAM(&mBuffer)
+{
+    // already inited
+    if (!mBuffer.open(inFile, mode, accessMode))
+      setstate(failbit);
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline IO_FILE_STREAM::~nsIOFileStreamT()
+//----------------------------------------------------------------------------------------
+{
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline FILE_BUFFER_TYPE* 
+IO_FILE_STREAM::rdbuf() const
+//----------------------------------------------------------------------------------------
+{
+    return (FILE_BUFFER_TYPE*)&mBuffer;
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline bool IO_FILE_STREAM::is_open() 
+//----------------------------------------------------------------------------------------
+{
+    return mBuffer.is_open();
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline void IO_FILE_STREAM::open(
+    const nsFilePath& inFile,
+    IOS_BASE::openmode mode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+{
+    if (!mBuffer.open(inFile, mode, accessMode)) 
+      setstate(failbit);
+}
+
+//----------------------------------------------------------------------------------------
+TEMPLATE_DEF 
+inline void IO_FILE_STREAM::close() 
+//----------------------------------------------------------------------------------------
+{
+    if (!mBuffer.close()) 
+      setstate(failbit);
+}
+
+//========================================================================================
+//    Specializations of the stream templates
+//========================================================================================
+
+#ifdef NS_USING_STL
+typedef nsFileBufferT<char, char_traits<char> > nsFileBuffer;
+typedef nsInputFileStreamT<char, char_traits<char> > nsInputFileStream;
+typedef nsOutputFileStreamT<char, char_traits<char> > nsOutputFileStream;
+typedef nsIOFileStreamT<char, char_traits<char> > nsIOFileStream;
+
+#ifdef NS_USING_WIDE_CHAR
+typedef nsFileBufferT<wchar_t, char_traits<wchar_t> > nsWideFileBuffer;
+typedef nsInputFileStreamT<wchar_t, char_traits<wchar_t> > nsWideInputFileStream;
+typedef nsOutputFileStreamT<wchar_t, char_traits<wchar_t> > nsWideOutputFileStream;
+typedef nsIOFileStreamT<wchar_t, char_traits<wchar_t> > nsWideIOFileStream;
+#endif // NS_USING_WIDE_CHAR
+
+#else
+
+typedef nsFileBufferT nsFileBuffer;
+typedef nsInputFileStreamT nsInputFileStream;
+typedef nsOutputFileStreamT nsOutputFileStream;
+typedef nsIOFileStreamT nsIOFileStream;
+
+#endif
+
+#endif /* _FILESTREAM_H_ */
+

mozilla/base/src/MANIFEST

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

mozilla/base/src/Makefile.in

@@ -0,0 +1,85 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES +=-D_IMPL_NS_BASE
+
+DIRS = $(MOZ_TOOLKIT)
+
+LIBRARY_NAME = raptorbase
+
+CPPSRCS =                       \
+    nsArena.cpp                 \
+    nsAtomTable.cpp             \
+    nsBTree.cpp                 \
+    nsByteBuffer.cpp            \
+    nsCRT.cpp                   \
+    nsDeque.cpp                 \
+    nsEscape.cpp                \
+    nsFileSpec.cpp              \
+    nsFileStream.cpp            \
+    nsRBTree.cpp                \
+    nsSizeOfHandler.cpp		\
+    nsString.cpp                \
+    nsUnicharBuffer.cpp         \
+    nsUnicharInputStream.cpp    \
+    nsVoidArray.cpp             \
+    $(NULL)
+
+EXPORTS =                       \
+    nscore.h                    \
+    nsBTree.h                   \
+    nsCRT.h                     \
+    nsDeque.h                   \
+    nsIArena.h                  \
+    nsIAtom.h                   \
+    nsIByteBuffer.h             \
+    nsIBaseStream.h             \
+    nsIInputStream.h            \
+    nsIOutputStream.h           \
+    nsITimer.h                  \
+    nsITimerCallback.h          \
+    nsIUnicharBuffer.h          \
+    nsIUnicharInputStream.h     \
+    nsInt64.h                   \
+    nsRBTree.h                  \
+    nsString.h                  \
+    nsTime.h			\
+    nsVoidArray.h               \
+    nsUnitConversion.h          \
+    $(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+MODULE=base
+
+REQUIRES = xpcom netlib raptor
+
+include $(topsrcdir)/config/config.mk
+
+TARGET = $(LIBARY)
+
+include $(topsrcdir)/config/rules.mk
+
+test:
+	@echo OS_ARCH = $(OS_ARCH)

mozilla/base/src/gtk/Makefile.in

@@ -0,0 +1,37 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= gmbasegtk
+
+MODULE=base
+
+REQUIRES	= xpcom raptor
+
+DEFINES		+= -D_IMPL_NS_WIDGET
+
+CPPSRCS		= nsTimer.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+CFLAGS		+= $(TK_GTK_CFLAGS)

mozilla/base/src/gtk/nsTimer.cpp

@@ -0,0 +1,190 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "nsCRT.h"
+#include "prlog.h"
+#include <stdio.h>
+#include <limits.h>
+#include <gtk/gtk.h>
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+
+extern "C" gint nsTimerExpired(gpointer aCallData);
+
+/*
+ * Implementation of timers using Gtk timer facility 
+ */
+class TimerImpl : public nsITimer {
+public:
+
+public:
+  TimerImpl();
+  virtual ~TimerImpl();
+
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void Cancel();
+  virtual PRUint32 GetDelay() { return mDelay; }
+  virtual void SetDelay(PRUint32 aDelay) { mDelay=aDelay; };
+  virtual void* GetClosure() { return mClosure; }
+
+  void FireTimeout();
+
+private:
+  nsresult Init(PRUint32 aDelay);
+
+  PRUint32 mDelay;
+  nsTimerCallbackFunc mFunc;
+  void *mClosure;
+  nsITimerCallback *mCallback;
+  // PRBool mRepeat;
+  TimerImpl *mNext;
+  guint mTimerId;
+};
+
+void TimerImpl::FireTimeout()
+{
+  if (mFunc != NULL) {
+    (*mFunc)(this, mClosure);
+  }
+  else if (mCallback != NULL) {
+    mCallback->Notify(this); // Fire the timer
+  }
+
+// Always repeating here
+
+// if (mRepeat)
+//  mTimerId = gtk_timeout_add(aDelay, nsTimerExpired, this);
+}
+
+
+TimerImpl::TimerImpl()
+{
+  //  printf("TimerImple::TimerImpl called for %p\n", this);
+  NS_INIT_REFCNT();
+  mFunc = NULL;
+  mCallback = NULL;
+  mNext = NULL;
+  mTimerId = 0;
+  mDelay = 0;
+  mClosure = NULL;
+}
+
+TimerImpl::~TimerImpl()
+{
+  //printf("TimerImpl::~TimerImpl called for %p\n", this);
+  Cancel();
+  NS_IF_RELEASE(mCallback);
+}
+
+nsresult 
+TimerImpl::Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+  //printf("TimerImpl::Init called with func + closure for %p\n", this);
+    mFunc = aFunc;
+    mClosure = aClosure;
+    // mRepeat = aRepeat;
+
+  if ((aDelay > 10000) || (aDelay < 0)) {
+    printf("Timer::Init() called with bogus value \"%d\"!  Not enabling timer.\n",
+           aDelay);
+    return Init(aDelay);
+  }
+
+    mTimerId = gtk_timeout_add(aDelay, nsTimerExpired, this);
+
+    return Init(aDelay);
+}
+
+nsresult 
+TimerImpl::Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+  //printf("TimerImpl::Init called with callback only for %p\n", this);
+    mCallback = aCallback;
+    // mRepeat = aRepeat;
+  if ((aDelay > 10000) || (aDelay < 0)) {
+    printf("Timer::Init() called with bogus value \"%d\"!  Not enabling timer.\n",
+           aDelay);
+    return Init(aDelay);
+  }
+
+    mTimerId = gtk_timeout_add(aDelay, nsTimerExpired, this);
+
+    return Init(aDelay);
+}
+
+nsresult
+TimerImpl::Init(PRUint32 aDelay)
+{
+  //printf("TimerImpl::Init called with delay %d only for %p\n", aDelay, this);
+
+    mDelay = aDelay;
+    NS_ADDREF(this);
+
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+
+void
+TimerImpl::Cancel()
+{
+  //printf("TimerImpl::Cancel called for %p\n", this);
+  TimerImpl *me = this;
+  if (mTimerId)
+    gtk_timeout_remove(mTimerId);
+}
+
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}
+
+gint nsTimerExpired(gpointer aCallData)
+{
+  //printf("nsTimerExpired for %p\n", aCallData);
+  TimerImpl* timer = (TimerImpl *)aCallData;
+  timer->FireTimeout();
+  return 0;
+}

mozilla/base/src/mac/nsFileSpecMac.cpp

@@ -0,0 +1,851 @@
+/* -*- 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 file is included by nsFile.cp, and includes the Macintosh-specific
+//	implementations.
+
+#include "FullPath.h"
+#include "FileCopy.h"
+#include "MoreFilesExtras.h"
+#include "nsEscape.h"
+
+#include <Aliases.h>
+#include <Folders.h>
+#include <Errors.h>
+#include <TextUtils.h>
+
+const unsigned char* kAliasHavenFolderName = "\pnsAliasHaven";
+
+//========================================================================================
+namespace MacFileHelpers
+//========================================================================================
+{
+	inline void						PLstrcpy(Str255 dst, ConstStr255Param src)
+									{
+										memcpy(dst, src, 1 + src[0]);
+									}
+
+	void			                PLstrcpy(Str255 dst, const char* src, int inMaxLen=255);
+	void			                PLstrncpy(Str255 dst, const char* src, int inMaxLen);
+
+	void							SwapSlashColon(char * s);
+	OSErr							FSSpecFromFullUnixPath(
+										const char * unixPath,
+										FSSpec& outSpec,
+										Boolean resolveAlias,
+										Boolean allowPartial = false,
+										Boolean createDirs = false);
+	char*							MacPathFromUnixPath(const char* unixPath);
+	char*							EncodeMacPath(
+										char* inPath, // NOT const - gets clobbered
+										Boolean prependSlash,
+										Boolean doEscape );
+	OSErr							FSSpecFromPathname(
+										const char* inPathNamePtr,
+										FSSpec& outSpec,
+										Boolean inCreateDirs);
+	char*							PathNameFromFSSpec(
+										const FSSpec& inSpec,
+										Boolean wantLeafName );
+	OSErr							CreateFolderInFolder(
+										short				refNum, 	// Parent directory/volume
+										long				dirID,
+										ConstStr255Param	folderName,	// Name of the new folder
+										short&				outRefNum,	// Volume of the created folder
+										long&				outDirID);	// 
+
+	// Some routines to support an "alias haven" directory.  Aliases in this directory
+	// are never resolved.  There is a ResolveAlias here that respects that.  This is
+	// to support attaching of aliases in mail.
+	void							EnsureAliasHaven();
+	void							SetNoResolve(Boolean inResolve);
+	bool							IsAliasSafe(const FSSpec& inSpec);
+	OSErr							MakeAliasSafe(FSSpec& inOutSpec);
+	OSErr							ResolveAliasFile(FSSpec& inOutSpec, Boolean& wasAliased);
+
+	Boolean							sNoResolve = false;
+	long							sAliasHavenDirID = 0;
+	short							sAliasHavenVRefNum = 0;
+} // namespace MacFileHelpers
+
+//----------------------------------------------------------------------------------------
+void MacFileHelpers::PLstrcpy(Str255 dst, const char* src, int inMax)
+//----------------------------------------------------------------------------------------
+{
+	int srcLength = strlen(src);
+	NS_ASSERTION(srcLength <= inMax, "Oops, string is too long!");
+	if (srcLength > inMax)
+		srcLength = inMax;
+	dst[0] = srcLength;
+	memcpy(&dst[1], src, srcLength);
+}
+
+//----------------------------------------------------------------------------------------
+void MacFileHelpers::PLstrncpy(Str255 dst, const char* src, int inMax)
+//----------------------------------------------------------------------------------------
+{
+	int srcLength = strlen(src);
+	if (srcLength > inMax)
+		srcLength = inMax;
+	dst[0] = srcLength;
+	memcpy(&dst[1], src, srcLength);
+}
+
+//-----------------------------------
+void MacFileHelpers::SwapSlashColon(char * s)
+//-----------------------------------
+
+{
+	while ( *s != 0)
+	{
+		if (*s == '/')
+			*s++ = ':';
+		else if (*s == ':')
+			*s++ = '/';
+		else
+			*s++;
+	}
+} // MacFileHelpers::SwapSlashColon
+
+//-----------------------------------
+char* MacFileHelpers::EncodeMacPath(
+	char* inPath, // NOT const, gets clobbered
+	Boolean prependSlash,
+	Boolean doEscape )
+//	Transforms Macintosh style path into Unix one
+//	Method: Swap ':' and '/', hex escape the result
+//-----------------------------------
+{
+	if (inPath == NULL)
+		return NULL;
+	int pathSize = strlen(inPath);
+	
+	// XP code sometimes chokes if there's a final slash in the unix path.
+	// Since correct mac paths to folders and volumes will end in ':', strip this
+	// first.
+	char* c = inPath + pathSize - 1;
+	if (*c == ':')
+	{
+		*c = 0;
+		pathSize--;
+	}
+
+	char * newPath = NULL;
+	char * finalPath = NULL;
+	
+	if (prependSlash)
+	{
+		newPath = new char[pathSize + 2];
+		newPath[0] = ':';	// It will be converted to '/'
+		memcpy(&newPath[1], inPath, pathSize + 1);
+	}
+	else
+	{
+		newPath = new char[pathSize + 1];
+		strcpy(newPath, inPath);
+	}
+	if (newPath)
+	{
+		SwapSlashColon( newPath );
+		if (doEscape)
+		{
+			finalPath = nsEscape(newPath, url_Path);
+			delete [] newPath;
+		}
+		else
+			finalPath = newPath;
+	}
+	delete [] inPath;
+	return finalPath;
+} // MacFileHelpers::EncodeMacPath
+
+//----------------------------------------------------------------------------------------
+inline void MacFileHelpers::SetNoResolve(Boolean inResolve)
+//----------------------------------------------------------------------------------------
+{
+	sNoResolve = inResolve;
+} // MacFileHelpers::SetNoResolve
+
+//----------------------------------------------------------------------------------------
+OSErr MacFileHelpers::MakeAliasSafe(FSSpec& inOutSpec)
+// Pass in the spec of an alias.  This copies the file to the safe haven folder, and
+// returns the spec of the copy to the caller
+//----------------------------------------------------------------------------------------
+{
+	EnsureAliasHaven();
+	nsNativeFileSpec dstDirSpec(sAliasHavenVRefNum, sAliasHavenDirID, "\p");
+
+	// Make sure its name is unique
+	nsNativeFileSpec havenSpec(sAliasHavenVRefNum, sAliasHavenDirID, "\pG'day");
+	if (havenSpec.Valid())
+		havenSpec.MakeUnique(inOutSpec.name);
+	// Copy the file into the haven directory
+	if (havenSpec.Valid())
+	{
+		OSErr err = ::FSpFileCopy(
+						&inOutSpec,
+						dstDirSpec,
+						havenSpec.GetLeafPName(),
+						nil, 0, true);
+		// Return the spec of the copy to the caller.
+		if (err != noErr)
+			return err;
+		inOutSpec = havenSpec;
+	}
+	return noErr;
+} // MacFileHelpers::MakeAliasSafe
+
+//----------------------------------------------------------------------------------------
+char* MacFileHelpers::MacPathFromUnixPath(const char* unixPath)
+//----------------------------------------------------------------------------------------
+{
+	// Relying on the fact that the unix path is always longer than the mac path:
+	size_t len = strlen(unixPath);
+	char* result = new char[len + 2]; // ... but allow for the initial colon in a partial name
+	if (result)
+	{
+		char* dst = result;
+		const char* src = unixPath;
+		if (*src == '/')		 	// ¥ full path
+			src++;
+		else if (strchr(src, '/'))	// ¥ partial path, and not just a leaf name
+			*dst++ = ':';
+		strcpy(dst, src);
+		nsUnescape(dst);	// Hex Decode
+		MacFileHelpers::SwapSlashColon(dst);
+	}
+	return result;
+} // MacFileHelpers::MacPathFromUnixPath
+
+//----------------------------------------------------------------------------------------
+OSErr MacFileHelpers::FSSpecFromPathname(
+	const char* inPathNamePtr,
+	FSSpec& outSpec,
+	Boolean inCreateDirs)
+// FSSpecFromPathname reverses PathNameFromFSSpec.
+// It returns a FSSpec given a c string which is a mac pathname.
+//----------------------------------------------------------------------------------------
+{
+	OSErr err;
+	// Simplify this routine to use FSMakeFSSpec if length < 255. Otherwise use the MoreFiles
+	// routine FSpLocationFromFullPath, which allocates memory, to handle longer pathnames. 
+	
+	size_t inLength = strlen(inPathNamePtr);
+	if (inLength < 255)
+	{
+		Str255 ppath;
+		MacFileHelpers::PLstrcpy(ppath, inPathNamePtr);
+		err = ::FSMakeFSSpec(0, 0, ppath, &outSpec);
+	}
+	else
+		err = FSpLocationFromFullPath(inLength, inPathNamePtr, &outSpec);
+
+	if (err == dirNFErr && inCreateDirs)
+	{
+		const char* path = inPathNamePtr;
+		outSpec.vRefNum = 0;
+		outSpec.parID = 0;
+		do {
+			// Locate the colon that terminates the node.
+			// But if we've a partial path (starting with a colon), find the second one.
+			const char* nextColon = strchr(path + (*path == ':'), ':');
+			// Well, if there are no more colons, point to the end of the string.
+			if (!nextColon)
+				nextColon = path + strlen(path);
+
+			// Make a pascal string out of this node.  Include initial
+			// and final colon, if any!
+			Str255 ppath;
+			MacFileHelpers::PLstrncpy(ppath, path, nextColon - path + 1);
+			
+			// Use this string as a relative path using the directory created
+			// on the previous round (or directory 0,0 on the first round).
+			err = ::FSMakeFSSpec(outSpec.vRefNum, outSpec.parID, ppath, &outSpec);
+
+			// If this was the leaf node, then we are done.
+			if (!*nextColon)
+				break;
+
+			// If we got "file not found", then
+			// we need to create a directory.
+			if (err == fnfErr && *nextColon)
+				err = FSpDirCreate(&outSpec, smCurrentScript, &outSpec.parID);
+			// For some reason, this usually returns fnfErr, even though it works.
+			if (err != noErr && err != fnfErr)
+				return err;
+			path = nextColon; // next round
+		} while (1);
+	}
+	return err;
+} // MacFileHelpers::FSSpecFromPathname
+
+//----------------------------------------------------------------------------------------
+OSErr MacFileHelpers::CreateFolderInFolder(
+	short				refNum, 	// Parent directory/volume
+	long				dirID,
+	ConstStr255Param	folderName,	// Name of the new folder
+	short&				outRefNum,	// Volume of the created folder
+	long&				outDirID)	// 
+// Creates a folder named 'folderName' inside a folder.
+// The errors returned are same as PBDirCreate
+//----------------------------------------------------------------------------------------
+{
+	HFileParam hpb;
+	hpb.ioVRefNum = refNum;
+	hpb.ioDirID = dirID;
+	hpb.ioNamePtr = (StringPtr)&folderName;
+
+	OSErr err = PBDirCreateSync((HParmBlkPtr)&hpb);
+	if (err == noErr)
+	{
+		outRefNum = hpb.ioVRefNum;
+		outDirID = hpb.ioDirID;
+	}
+	else
+	{
+		outRefNum = 0;
+		outDirID = 0;
+	}
+	return err;
+} // MacFileHelpers::CreateFolderInFolder
+
+//----------------------------------------------------------------------------------------
+void MacFileHelpers::EnsureAliasHaven()
+//----------------------------------------------------------------------------------------
+{
+	// Alias Haven is a directory in which we never resolve aliases.
+	if (sAliasHavenVRefNum != 0)
+		return;
+
+	
+	FSSpec temp;
+	if (FindFolder(0, kTemporaryFolderType, true, & temp.vRefNum, &temp.parID) == noErr)
+	{
+		CreateFolderInFolder(
+			temp.vRefNum,	 			// Parent directory/volume
+			temp.parID,
+			kAliasHavenFolderName,		// Name of the new folder
+			sAliasHavenVRefNum,		// Volume of the created folder
+			sAliasHavenDirID);		
+	}
+} // MacFileHelpers::EnsureAliasHaven
+
+//----------------------------------------------------------------------------------------
+bool MacFileHelpers::IsAliasSafe(const FSSpec& inSpec)
+// Returns true if the alias is in the alias haven directory, or if alias resolution
+// has been turned off.
+//----------------------------------------------------------------------------------------
+{
+	return sNoResolve
+		|| (inSpec.parID == sAliasHavenDirID && inSpec.vRefNum == sAliasHavenVRefNum);
+} // MacFileHelpers::IsAliasSafe
+
+//----------------------------------------------------------------------------------------
+OSErr MacFileHelpers::ResolveAliasFile(FSSpec& inOutSpec, Boolean& wasAliased)
+//----------------------------------------------------------------------------------------
+{
+	wasAliased = false;
+	if (IsAliasSafe(inOutSpec))
+		return noErr;
+	Boolean dummy;	
+	return ::ResolveAliasFile(&inOutSpec, TRUE, &dummy, &wasAliased);
+} // MacFileHelpers::ResolveAliasFile
+
+//-----------------------------------
+OSErr MacFileHelpers::FSSpecFromFullUnixPath(
+	const char * unixPath,
+	FSSpec& outSpec,
+	Boolean resolveAlias,
+	Boolean allowPartial,
+	Boolean createDirs)
+// File spec from URL. Reverses GetURLFromFileSpec 
+// Its input is only the <path> part of the URL
+// JRM 97/01/08 changed this so that if it's a partial path (doesn't start with '/'),
+// then it is combined with inOutSpec's vRefNum and parID to form a new spec.
+//-----------------------------------
+{
+	if (unixPath == NULL)
+		return badFidErr;
+	char* macPath = MacPathFromUnixPath(unixPath);
+	if (!macPath)
+		return memFullErr;
+
+	OSErr err = noErr;
+	if (!allowPartial)
+	{
+		NS_ASSERTION(*unixPath == '/' /*full path*/, "Not a full Unix path!");
+	}
+	err = FSSpecFromPathname(macPath, outSpec, createDirs);
+	if (err == fnfErr)
+		err = noErr;
+	Boolean dummy;	
+	if (err == noErr && resolveAlias)	// Added 
+		err = MacFileHelpers::ResolveAliasFile(outSpec, dummy);
+	delete [] macPath;
+	NS_ASSERTION(err==noErr||err==fnfErr||err==dirNFErr||err==nsvErr, "Not a path!");
+	return err;
+} // MacFileHelpers::FSSpecFromLocalUnixPath
+
+//-----------------------------------
+char* MacFileHelpers::PathNameFromFSSpec( const FSSpec& inSpec, Boolean wantLeafName )
+// Returns a full pathname to the given file
+// Returned value is allocated with new [], and must be freed with delete []
+// This is taken from FSpGetFullPath in MoreFiles, except that we need to tolerate
+// fnfErr.
+//-----------------------------------
+{
+	char* result = nil;
+	OSErr err = noErr;
+	
+	short fullPathLength = 0;
+	Handle fullPath = NULL;
+	
+	FSSpec tempSpec = inSpec;
+	if ( tempSpec.parID == fsRtParID )
+	{
+		/* The object is a volume */
+		
+		/* Add a colon to make it a full pathname */
+		tempSpec.name[++tempSpec.name[0]] = ':';
+		
+		/* We're done */
+		err = PtrToHand(&tempSpec.name[1], &fullPath, tempSpec.name[0]);
+	}
+	else
+	{
+		/* The object isn't a volume */
+		
+		CInfoPBRec	pb = { 0 };
+		Str63 dummyFileName;
+		MacFileHelpers::PLstrcpy(dummyFileName, "\pG'day!");
+
+		/* Is the object a file or a directory? */
+		pb.dirInfo.ioNamePtr = (! tempSpec.name[0]) ? (StringPtr)dummyFileName : tempSpec.name;
+		pb.dirInfo.ioVRefNum = tempSpec.vRefNum;
+		pb.dirInfo.ioDrDirID = tempSpec.parID;
+		pb.dirInfo.ioFDirIndex = 0;
+		err = PBGetCatInfoSync(&pb);
+		if ( err == noErr || err == fnfErr)
+		{
+			// if the object is a directory, append a colon so full pathname ends with colon
+			// Beware of the "illegal spec" case that Netscape uses (empty name string). In
+			// this case, we don't want the colon.
+			if ( err == noErr && tempSpec.name[0] && (pb.hFileInfo.ioFlAttrib & ioDirMask) != 0 )
+			{
+				++tempSpec.name[0];
+				tempSpec.name[tempSpec.name[0]] = ':';
+			}
+			
+			/* Put the object name in first */
+			err = PtrToHand(&tempSpec.name[1], &fullPath, tempSpec.name[0]);
+			if ( err == noErr )
+			{
+				/* Get the ancestor directory names */
+				pb.dirInfo.ioNamePtr = tempSpec.name;
+				pb.dirInfo.ioVRefNum = tempSpec.vRefNum;
+				pb.dirInfo.ioDrParID = tempSpec.parID;
+				do	/* loop until we have an error or find the root directory */
+				{
+					pb.dirInfo.ioFDirIndex = -1;
+					pb.dirInfo.ioDrDirID = pb.dirInfo.ioDrParID;
+					err = PBGetCatInfoSync(&pb);
+					if ( err == noErr )
+					{
+						/* Append colon to directory name */
+						++tempSpec.name[0];
+						tempSpec.name[tempSpec.name[0]] = ':';
+						
+						/* Add directory name to beginning of fullPath */
+						(void) Munger(fullPath, 0, NULL, 0, &tempSpec.name[1], tempSpec.name[0]);
+						err = MemError();
+					}
+				} while ( err == noErr && pb.dirInfo.ioDrDirID != fsRtDirID );
+			}
+		}
+	}
+	if ( err != noErr && err != fnfErr)
+		goto Clean;
+
+	fullPathLength = GetHandleSize(fullPath);
+	err = noErr;	
+	int allocSize = 1 + fullPathLength;
+	// We only want the leaf name if it's the root directory or wantLeafName is true.
+	if (inSpec.parID != fsRtParID && !wantLeafName)
+		allocSize -= inSpec.name[0];
+	result = new char[allocSize];
+	if (!result)
+		goto Clean;
+	memcpy(result, *fullPath, allocSize - 1);
+	result[ allocSize - 1 ] = 0;
+Clean:
+	if (fullPath)
+		DisposeHandle(fullPath);
+	NS_ASSERTION(result, "Out of memory"); // OOPS! very bad.
+	return result;
+} // MacFileHelpers::PathNameFromFSSpec
+
+//========================================================================================
+//					Macintosh nsNativeFileSpec implementation
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec()
+//----------------------------------------------------------------------------------------
+:	mError(noErr)
+{
+	mSpec.name[0] = '\0';
+}
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+:	mSpec(inSpec.mSpec)
+,	mError(inSpec.Error())
+{
+}
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const char* inString, bool inCreateDirs)
+//----------------------------------------------------------------------------------------
+{
+	mError = MacFileHelpers::FSSpecFromFullUnixPath(
+								inString, mSpec, true, true, inCreateDirs);
+		// allow a partial path, create as necessary
+	if (mError == fnfErr)
+		mError = noErr;
+} // nsNativeFileSpec::nsNativeFileSpec
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(
+	short vRefNum,
+	long parID,
+	ConstStr255Param name)
+//----------------------------------------------------------------------------------------
+{
+	mError = ::FSMakeFSSpec(vRefNum, parID, name, &mSpec);
+	if (mError == fnfErr)
+		mError = noErr;
+}
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const nsFilePath& inPath)
+//----------------------------------------------------------------------------------------
+{
+	*this = inPath.GetNativeSpec();
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& operator << (nsBasicOutStream& s, const nsNativeFileSpec& spec)
+//----------------------------------------------------------------------------------------
+{
+	s << spec.mSpec.vRefNum << ", " << spec.mSpec.parID << ", \"";
+	s.write((const char*)&spec.mSpec.name[1], spec.mSpec.name[0]);
+	return s << "\"";	
+} // nsOutputFileStream& operator << (nsOutputFileStream&, const nsNativeFileSpec&)
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const char* inString)
+//----------------------------------------------------------------------------------------
+{
+	mError = MacFileHelpers::FSSpecFromFullUnixPath(inString, mSpec, true);
+} // nsNativeFileSpec::operator =
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+{
+	mSpec = inSpec.mSpec;
+	mError = inSpec.Error();
+} // nsNativeFileSpec::operator =
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const nsFilePath& inPath)
+//----------------------------------------------------------------------------------------
+{
+	*this = inPath.GetNativeSpec();
+} // nsNativeFileSpec::operator =
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::Exists() const
+//----------------------------------------------------------------------------------------
+{
+	FSSpec temp;
+	return ::FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, mSpec.name, &temp) == noErr;
+} // nsNativeFileSpec::operator =
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::SetLeafName(const char* inLeafName)
+// In leaf name can actually be a partial path...
+//----------------------------------------------------------------------------------------
+{
+	// what about long relative paths?  Hmm?
+	Str255 partialPath;
+	MacFileHelpers::PLstrcpy(partialPath, inLeafName);
+	mError = FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, partialPath, &mSpec);
+} // nsNativeFileSpec::SetLeafName
+
+//----------------------------------------------------------------------------------------
+char* nsNativeFileSpec::GetLeafName() const
+// Result needs to be delete[]ed.
+//----------------------------------------------------------------------------------------
+{
+	char leaf[64];
+	memcpy(leaf, &mSpec.name[1], mSpec.name[0]);
+	leaf[mSpec.name[0]] = '\0';
+	return nsFileSpecHelpers::StringDup(leaf);
+} // nsNativeFileSpec::GetLeafName
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::MakeAliasSafe()
+//----------------------------------------------------------------------------------------
+{
+	mError = MacFileHelpers::MakeAliasSafe(mSpec);
+} // nsNativeFileSpec::MakeAliasSafe
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::MakeUnique(ConstStr255Param inSuggestedLeafName)
+//----------------------------------------------------------------------------------------
+{
+	if (inSuggestedLeafName[0] > 0)
+		MacFileHelpers::PLstrcpy(mSpec.name, inSuggestedLeafName);
+
+	MakeUnique();
+} // nsNativeFileSpec::MakeUnique
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::ResolveAlias(bool& wasAliased)
+//----------------------------------------------------------------------------------------
+{
+	Boolean wasAliased2;
+	mError = MacFileHelpers::ResolveAliasFile(mSpec, wasAliased2);
+	wasAliased = (wasAliased2 != false);
+} // nsNativeFileSpec::ResolveAlias
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::IsFile() const
+//----------------------------------------------------------------------------------------
+{
+	long dirID;
+	Boolean isDirectory;
+	return (noErr == FSpGetDirectoryID(&mSpec, &dirID, &isDirectory) && !isDirectory);
+} // nsNativeFileSpec::IsFile
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::IsDirectory() const
+//----------------------------------------------------------------------------------------
+{
+	long dirID;
+	Boolean isDirectory;
+	return (noErr == FSpGetDirectoryID(&mSpec, &dirID, &isDirectory) && isDirectory);
+} // nsNativeFileSpec::IsDirectory
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::GetParent(nsNativeFileSpec& outSpec) const
+//----------------------------------------------------------------------------------------
+{
+	if (mError == noErr)
+		outSpec.mError = FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, NULL, outSpec);
+} // nsNativeFileSpec::GetParent
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator += (const char* inRelativePath)
+//----------------------------------------------------------------------------------------
+{
+	long dirID;
+	Boolean isDirectory;
+	mError = FSpGetDirectoryID(&mSpec, &dirID, &isDirectory);
+	if (mError == noErr && isDirectory)
+	{
+		mError = FSMakeFSSpec(mSpec.vRefNum, dirID, "\pG'day", *this);
+		if (mError == noErr)
+			SetLeafName(inRelativePath);
+	}
+} // nsNativeFileSpec::operator +=
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::CreateDirectory(int /* unix mode */)
+//----------------------------------------------------------------------------------------
+{
+	long ignoredDirID;
+	FSpDirCreate(&mSpec, smCurrentScript, &ignoredDirID);
+} // nsNativeFileSpec::CreateDirectory
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::Delete(bool inRecursive)
+//----------------------------------------------------------------------------------------
+{
+	if (inRecursive)
+	{
+		// MoreFilesExtras
+		mError = DeleteDirectory(
+					mSpec.vRefNum,
+					mSpec.parID,
+					const_cast<unsigned char*>(mSpec.name));
+	}
+	else
+		mError = FSpDelete(&mSpec);
+} // nsNativeFileSpec::Delete
+
+
+//========================================================================================
+//					Macintosh nsFilePath implementation
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const char* inString, bool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(nsnull)
+,    mNativeFileSpec(inString, inCreateDirs)
+{
+    // Make canonical and absolute.
+	char * path = MacFileHelpers::PathNameFromFSSpec( mNativeFileSpec, TRUE );
+	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
+}
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+:	mNativeFileSpec(inSpec)
+{
+	char * path = MacFileHelpers::PathNameFromFSSpec( inSpec.mSpec, TRUE );
+	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
+}
+
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+{
+	delete [] mPath;
+	char * path = MacFileHelpers::PathNameFromFSSpec( inSpec.mSpec, TRUE );
+	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
+	mNativeFileSpec = inSpec;
+} // nsFilePath::operator =
+
+//========================================================================================
+//                                nsFileURL implementation
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const char* inString, bool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mURL(nsnull)
+,    mNativeFileSpec(inString + kFileURLPrefixLength, inCreateDirs)
+{
+    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
+    // Make canonical and absolute.
+	char* path = MacFileHelpers::PathNameFromFSSpec( mNativeFileSpec, TRUE );
+	char* escapedPath = MacFileHelpers::EncodeMacPath(path, true, true);
+	mURL = nsFileSpecHelpers::StringDup(kFileURLPrefix, kFileURLPrefixLength + strlen(escapedPath));
+	strcat(mURL, escapedPath);
+	delete [] escapedPath;
+} // nsFileURL::nsFileURL
+
+//========================================================================================
+//								nsDirectoryIterator
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator::nsDirectoryIterator(
+	const nsNativeFileSpec& inDirectory
+,	int inIterateDirection)
+//----------------------------------------------------------------------------------------
+	: mCurrent(inDirectory)
+	, mExists(false)
+	, mIndex(-1)
+{
+	CInfoPBRec pb;
+	DirInfo* dipb = (DirInfo*)&pb;
+	// Sorry about this, there seems to be a bug in CWPro 4:
+	const FSSpec& inSpec = inDirectory.nsNativeFileSpec::operator const FSSpec&();
+    Str255 outName;
+    MacFileHelpers::PLstrcpy(outName, inSpec.name);
+	pb.hFileInfo.ioNamePtr = outName;
+	pb.hFileInfo.ioVRefNum = inSpec.vRefNum;
+	pb.hFileInfo.ioDirID = inSpec.parID;
+	pb.hFileInfo.ioFDirIndex = 0;	// use ioNamePtr and ioDirID
+
+	OSErr err = PBGetCatInfoSync( &pb );
+
+	// test that we have got a directory back, not a file
+	if ( (err != noErr ) || !( dipb->ioFlAttrib & 0x0010 ) )
+		return;
+	// Sorry about this, there seems to be a bug in CWPro 4:
+	FSSpec& currentSpec = mCurrent.nsNativeFileSpec::operator FSSpec&();
+	currentSpec.vRefNum = inSpec.vRefNum;
+	currentSpec.parID = dipb->ioDrDirID;
+	mMaxIndex = pb.dirInfo.ioDrNmFls;
+	if (inIterateDirection > 0)
+	{
+		mIndex = 0; // ready to increment
+		++(*this); // the pre-increment operator
+	}
+	else
+	{
+		mIndex = mMaxIndex + 1; // ready to decrement
+		--(*this); // the pre-decrement operator
+	}
+} // nsDirectoryIterator::nsDirectoryIterator
+
+//----------------------------------------------------------------------------------------
+OSErr nsDirectoryIterator::SetToIndex()
+//----------------------------------------------------------------------------------------
+{
+	CInfoPBRec cipb;
+	DirInfo	*dipb=(DirInfo *)&cipb;
+	Str255 objectName;
+	dipb->ioCompletion = NULL;
+	dipb->ioFDirIndex = mIndex;
+	// Sorry about this, there seems to be a bug in CWPro 4:
+	FSSpec& currentSpec = mCurrent.nsNativeFileSpec::operator FSSpec&();
+	dipb->ioVRefNum = currentSpec.vRefNum; /* Might need to use vRefNum, not sure*/
+	dipb->ioDrDirID = currentSpec.parID;
+	dipb->ioNamePtr = objectName;
+	OSErr err = PBGetCatInfoSync(&cipb);
+	if (err == noErr)
+		err = FSMakeFSSpec(currentSpec.vRefNum, currentSpec.parID, objectName, &currentSpec);
+	mExists = err == noErr;
+	return err;
+} // nsDirectoryIterator::SetToIndex()
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator& nsDirectoryIterator::operator -- ()
+//----------------------------------------------------------------------------------------
+{
+	mExists = false;
+	while (--mIndex > 0)
+	{
+		OSErr err = SetToIndex();
+		if (err == noErr)
+			break;
+	}
+	return *this;
+} // nsDirectoryIterator::operator --
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
+//----------------------------------------------------------------------------------------
+{
+	mExists = false;
+	if (mIndex >= 0) // probably trying to use a file as a directory!
+		while (++mIndex <= mMaxIndex)
+		{
+			OSErr err = SetToIndex();
+			if (err == noErr)
+				break;
+		}
+	return *this;
+} // nsDirectoryIterator::operator ++

mozilla/base/src/mac/nsRepeater.cpp

@@ -0,0 +1,147 @@
+/* -*- 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 "nsRepeater.h"
+
+Repeater* Repeater::sRepeaters = 0;
+Repeater* Repeater::sIdlers = 0;
+
+Repeater::Repeater()
+{
+  mRepeating = false;
+  mIdling = false;
+  mPrevRptr = 0;
+  mNextRptr = 0;
+  mPrevIdlr = 0;
+  mNextIdlr = 0;
+}
+
+Repeater::~Repeater()
+{
+  if (mRepeating) RemoveFromRepeatList();
+  if (mIdling) RemoveFromIdleList();
+}
+
+// protected helper functs
+
+//----------------------------------------------------------------------------
+void Repeater::AddToRepeatList()
+{
+  if (sRepeaters)
+  {
+    sRepeaters->mPrevRptr = this;
+    mNextRptr = sRepeaters;
+  }
+  sRepeaters = this;
+}
+
+//----------------------------------------------------------------------------
+void Repeater::RemoveFromRepeatList()
+{
+  if (sRepeaters == this) sRepeaters = mNextRptr;
+  if (mPrevRptr) mPrevRptr->mNextRptr = mNextRptr;
+  if (mNextRptr) mNextRptr->mPrevRptr = mPrevRptr;
+  mPrevRptr = 0;
+  mNextRptr = 0;
+}
+
+//----------------------------------------------------------------------------
+void Repeater::AddToIdleList()
+{
+  if (sIdlers)
+  {
+    sIdlers->mPrevIdlr = this;
+    mNextIdlr = sIdlers;
+  }
+  sIdlers = this;
+}
+
+//----------------------------------------------------------------------------
+void Repeater::RemoveFromIdleList()
+{
+  if (sIdlers == this) sIdlers = mNextIdlr;
+  if (mPrevIdlr) mPrevIdlr->mNextIdlr = mNextIdlr;
+  if (mNextIdlr) mNextIdlr->mPrevIdlr = mPrevIdlr;
+  mPrevIdlr = 0;
+  mNextIdlr = 0;
+}
+
+// repeater methods
+//----------------------------------------------------------------------------
+
+void Repeater::StartRepeating()
+{
+  if (!mRepeating) 
+  {
+    AddToRepeatList();
+    mRepeating = true;
+  }
+}
+
+void Repeater::StopRepeating()
+{
+  if (mRepeating)
+  {
+    RemoveFromRepeatList();
+    mRepeating = false;
+  }
+}
+
+void Repeater::DoRepeaters(const EventRecord &aMacEvent)
+{
+  Repeater* theRepeater = sRepeaters;
+  while (theRepeater)
+  {
+    theRepeater->RepeatAction(aMacEvent);
+    theRepeater = theRepeater->mNextRptr;
+  }
+}
+
+// idler methods
+
+void Repeater::StartIdling()
+{
+  if (!mIdling) 
+  {
+    AddToIdleList();
+    mIdling = true;
+  }
+}
+
+void Repeater::StopIdling()
+{
+  if (mIdling)
+  {
+    RemoveFromIdleList();
+    mIdling = false;
+  }
+}
+
+void Repeater::DoIdlers(const EventRecord &aMacEvent)
+{
+  Repeater* theIdler = sIdlers;
+  while (theIdler)
+  {
+    theIdler->RepeatAction(aMacEvent);
+    theIdler = theIdler->mNextIdlr;
+  }
+}
+
+
+
+    

mozilla/base/src/mac/nsTimerMac.cpp

@@ -0,0 +1,326 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+ 
+//
+// Mac implementation of the nsITimer interface
+//
+
+
+
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "prlog.h"
+#include "nsRepeater.h"
+
+#include <list.h>
+#include <Events.h>
+
+
+
+#pragma mark class TimerImpl
+
+//========================================================================================
+class TimerImpl : public nsITimer 
+// TimerImpl implements nsITimer API
+//========================================================================================
+{
+  private:
+    nsTimerCallbackFunc mCallbackFunc;
+    nsITimerCallback * mCallbackObject;
+    void * mClosure;
+    PRUint32 mDelay;
+    PRUint32 mFireTime;  // Timer should fire when TickCount >= this number
+  
+  public:
+
+  // constructors
+
+    TimerImpl();
+
+    virtual ~TimerImpl();
+      
+     NS_DECL_ISUPPORTS
+
+    PRUint32 GetFireTime() const { return mFireTime; }
+
+    void Fire();
+
+  // nsITimer overrides
+
+    virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                          void *aClosure,
+                          PRUint32 aDelay);
+
+    virtual nsresult Init(nsITimerCallback *aCallback,
+                          PRUint32 aDelay);
+
+    virtual void Cancel();
+
+    virtual PRUint32 GetDelay();
+
+    virtual void SetDelay(PRUint32 aDelay);
+
+    virtual void* GetClosure();
+  
+#if DEBUG
+	enum {
+		eGoodTimerSignature = 'Barf',
+		eDeletedTimerSignature = 'oops'
+	};
+	
+  	Boolean			IsGoodTimer() const { return (mSignature == eGoodTimerSignature); }
+#endif
+  	
+  private:
+  // Calculates mFireTime too
+    void SetDelaySelf( PRUint32 aDelay );
+    
+#if DEBUG
+    UInt32		mSignature;
+#endif
+
+};
+
+#pragma mark class TimerPeriodical
+
+//========================================================================================
+class TimerPeriodical  : public Repeater
+// TimerPeriodical is a singleton Repeater subclass that fires
+// off TimerImpl. The firing is done on idle.
+//========================================================================================
+{  
+    static TimerPeriodical * gPeriodical;
+    
+        list<TimerImpl*> mTimers;
+  
+  public:
+    // Returns the singleton instance
+    static TimerPeriodical * GetPeriodical();
+
+    TimerPeriodical();
+
+    virtual ~TimerPeriodical();
+    
+    virtual  void RepeatAction( const EventRecord &inMacEvent);
+    
+    nsresult AddTimer( TimerImpl * aTimer);
+    
+    nsresult RemoveTimer( TimerImpl * aTimer);
+
+};
+
+
+//========================================================================================
+// TimerImpl implementation
+//========================================================================================
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+//----------------------------------------------------------------------------------------
+TimerImpl::TimerImpl()
+//----------------------------------------------------------------------------------------
+:  mCallbackFunc(nsnull)
+,  mCallbackObject(nsnull)
+,  mClosure(nsnull)
+,  mDelay(0)
+,  mFireTime(0)
+#if DEBUG
+,  mSignature(eGoodTimerSignature)
+#endif
+{
+  NS_INIT_REFCNT();
+}
+
+//----------------------------------------------------------------------------------------
+TimerImpl::~TimerImpl()
+//----------------------------------------------------------------------------------------
+{
+  Cancel();
+  NS_IF_RELEASE(mCallbackObject);
+#if DEBUG
+  mSignature = eDeletedTimerSignature;
+#endif
+}
+
+//----------------------------------------------------------------------------------------
+nsresult TimerImpl::Init(nsTimerCallbackFunc aFunc,
+                          void *aClosure,
+                          PRUint32 aDelay)
+//----------------------------------------------------------------------------------------
+{
+  mCallbackFunc = aFunc;
+  mClosure = aClosure;
+  SetDelaySelf(aDelay);
+  return TimerPeriodical::GetPeriodical()->AddTimer(this);
+}
+
+//----------------------------------------------------------------------------------------
+nsresult TimerImpl::Init(nsITimerCallback *aCallback,
+                          PRUint32 aDelay)
+//----------------------------------------------------------------------------------------
+{
+  NS_ADDREF(aCallback);
+  mCallbackObject = aCallback;
+  SetDelaySelf(aDelay);
+  return TimerPeriodical::GetPeriodical()->AddTimer(this);
+}
+
+//----------------------------------------------------------------------------------------
+void TimerImpl::Cancel()
+//----------------------------------------------------------------------------------------
+{
+
+  TimerPeriodical::GetPeriodical()->RemoveTimer(this);
+}
+
+//----------------------------------------------------------------------------------------
+PRUint32 TimerImpl::GetDelay()
+//----------------------------------------------------------------------------------------
+{
+  return mDelay;
+}
+
+//----------------------------------------------------------------------------------------
+void TimerImpl::SetDelay(PRUint32 aDelay)
+//----------------------------------------------------------------------------------------
+{
+  SetDelaySelf(aDelay);
+}
+
+//----------------------------------------------------------------------------------------
+void* TimerImpl::GetClosure()
+//----------------------------------------------------------------------------------------
+{
+  return mClosure;
+}
+
+//----------------------------------------------------------------------------------------
+void TimerImpl::Fire()
+//----------------------------------------------------------------------------------------
+{
+  NS_PRECONDITION(mRefCnt > 0, "Firing a disposed Timer!");
+  if (mCallbackFunc != NULL)
+  {
+    (*mCallbackFunc)(this, mClosure);
+  }
+  else if (mCallbackObject != NULL)
+  {
+    nsITimerCallback* object = mCallbackObject;
+    mCallbackObject = nsnull;
+      // because the Notify call will release it.
+      // We will release again it in the destructor if
+      // it is not null when we go away!
+    object->Notify(this); // Fire the timer
+  }
+}
+
+//----------------------------------------------------------------------------------------
+void TimerImpl::SetDelaySelf( PRUint32 aDelay )
+//----------------------------------------------------------------------------------------
+{
+
+  mDelay = aDelay;
+  mFireTime = TickCount() + (mDelay * 3) / 50;  // We need mFireTime in ticks (1/60th)
+                          //  but aDelay is in 1000th (60/1000 = 3/50)
+}
+
+TimerPeriodical * TimerPeriodical::gPeriodical = nsnull;
+
+TimerPeriodical * TimerPeriodical::GetPeriodical()
+{
+  if (gPeriodical == NULL)
+    gPeriodical = new TimerPeriodical();
+  return gPeriodical;
+}
+
+TimerPeriodical::TimerPeriodical()
+{
+}
+
+TimerPeriodical::~TimerPeriodical()
+{
+  PR_ASSERT(mTimers.size() == 0);
+}
+
+nsresult TimerPeriodical::AddTimer( TimerImpl * aTimer)
+{
+  // make sure it's not already there
+  mTimers.remove(aTimer);
+  mTimers.push_back(aTimer);
+  StartRepeating();
+  return NS_OK;
+}
+
+nsresult TimerPeriodical::RemoveTimer( TimerImpl * aTimer)
+{
+  mTimers.remove(aTimer);
+  if ( mTimers.size() == 0 )
+    StopRepeating();
+  return NS_OK;
+}
+
+// Called through every event loop
+// Loops through the list of available timers, and 
+// fires off the appropriate ones
+void  TimerPeriodical::RepeatAction( const EventRecord &inMacEvent)
+{
+  list<TimerImpl*>::iterator iter = mTimers.begin();
+  list<TimerImpl*> fireList;
+  
+  while (iter != mTimers.end())
+  {
+    TimerImpl* timer = *iter;
+    
+    NS_ASSERTION(timer->IsGoodTimer(), "Bad timer!");
+    
+    if (timer->GetFireTime() <= inMacEvent.when)
+    {
+      mTimers.erase(iter++);
+      NS_ADDREF(timer);
+      fireList.push_back(timer);
+    }
+    else
+      {
+        iter++;
+      }
+  }
+  if ( mTimers.size() == 0 )
+     StopRepeating();
+     
+  for (iter=fireList.begin(); iter!=fireList.end(); iter++)
+  {
+    (*iter)->Fire();
+    NS_RELEASE(*iter);
+  }
+}
+
+                
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/makefile.win

@@ -0,0 +1,104 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..
+IGNORE_MANIFEST=1
+
+DIRS = windows
+
+DEFINES=-D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+LIBRARY_NAME=raptorbase 
+
+CPPSRCS =				\
+	nsArena.cpp			\
+	nsAtomTable.cpp			\
+	nsBTree.cpp			\
+	nsByteBuffer.cpp		\
+	nsCRT.cpp			\
+	nsDeque.cpp			\
+	nsRBTree.cpp			\
+	nsSizeOfHandler.cpp		\
+	nsString.cpp			\
+	nsUnicharBuffer.cpp		\
+	nsUnicharInputStream.cpp	\
+	nsVoidArray.cpp			\
+	nsFileSpec.cpp \
+	nsFileStream.cpp \
+	$(NULL)
+
+CPP_OBJS =					\
+	.\$(OBJDIR)\nsArena.obj			\
+	.\$(OBJDIR)\nsAtomTable.obj		\
+	.\$(OBJDIR)\nsBTree.obj			\
+	.\$(OBJDIR)\nsByteBuffer.obj		\
+	.\$(OBJDIR)\nsCRT.obj			\
+	.\$(OBJDIR)\nsDeque.obj			\
+	.\$(OBJDIR)\nsRBTree.obj		\
+	.\$(OBJDIR)\nsSizeOfHandler.obj		\
+	.\$(OBJDIR)\nsString.obj		\
+	.\$(OBJDIR)\nsUnicharBuffer.obj		\
+	.\$(OBJDIR)\nsUnicharInputStream.obj	\
+	.\$(OBJDIR)\nsVoidArray.obj		\
+	.\$(OBJDIR)\nsFileSpec.obj \
+	.\$(OBJDIR)\nsFileStream.obj \
+	$(NULL)
+
+EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
+    nsBTree.h nsCRT.h nsDeque.h nsITimer.h \
+    nsITimerCallback.h nsIUnicharBuffer.h nsRBTree.h \
+    nsIUnicharInputStream.h nsString.h nsVoidArray.h \
+    nsUnitConversion.h \
+    nsIBaseStream.h nsIInputStream.h nsIOutputStream.h \
+    nsInt64.h nsTime.h
+
+MODULE=raptor 
+
+REQUIRES=xpcom netlib raptor 
+
+LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib \
+    -I$(PUBLIC)\raptor
+
+MAKE_OBJ_TYPE = DLL
+DLLNAME = raptorbase
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
+
+OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+# These are the libraries we need to link with to create the dll
+LLIBS=				\
+ $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\libplc21.lib       \
+ $(LIBNSPR)  
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
+!endif
+
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\$(DLLNAME).dll
+	rm -f $(DIST)\lib\$(DLLNAME).lib

mozilla/base/src/motif/Makefile.in

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

mozilla/base/src/motif/nsTimer.cpp

@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "nsCRT.h"
+#include "prlog.h"
+#include <stdio.h>
+#include <limits.h>
+#include <X11/Intrinsic.h>
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+
+// Hack for now. This is Bad because it creates a dependency between the widget
+// library and this library. This needs to be replaced with having code 
+// to pass an interface which can be queried for the app context.
+extern XtAppContext gAppContext;
+
+extern void nsTimerExpired(XtPointer aCallData);
+
+
+/*
+ * Implementation of timers using Xt timer facility 
+ */
+class TimerImpl : public nsITimer {
+public:
+
+public:
+  TimerImpl();
+  virtual ~TimerImpl();
+
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void Cancel();
+  virtual PRUint32 GetDelay() { return mDelay; }
+  virtual void SetDelay(PRUint32 aDelay) { mDelay=aDelay; };
+  virtual void* GetClosure() { return mClosure; }
+
+  void FireTimeout();
+
+private:
+  nsresult Init(PRUint32 aDelay);
+
+  PRUint32 mDelay;
+  nsTimerCallbackFunc mFunc;
+  void *mClosure;
+  nsITimerCallback *mCallback;
+  // PRBool mRepeat;
+  TimerImpl *mNext;
+  XtIntervalId mTimerId; 
+};
+
+void TimerImpl::FireTimeout()
+{
+  if (mFunc != NULL) {
+    (*mFunc)(this, mClosure);
+  }
+  else if (mCallback != NULL) {
+    mCallback->Notify(this); // Fire the timer
+  }
+
+// Always repeating here
+
+// if (mRepeat)
+//  mTimerId = XtAppAddTimeOut(gAppContext, GetDelay(),(XtTimerCallbackProc)nsTimerExpired, this);
+}
+
+
+TimerImpl::TimerImpl()
+{
+  NS_INIT_REFCNT();
+  mFunc = NULL;
+  mCallback = NULL;
+  mNext = NULL;
+  mTimerId = 0;
+  mDelay = 0;
+  mClosure = NULL;
+}
+
+TimerImpl::~TimerImpl()
+{
+}
+
+nsresult 
+TimerImpl::Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mFunc = aFunc;
+    mClosure = aClosure;
+    // mRepeat = aRepeat;
+
+    mTimerId = XtAppAddTimeOut(gAppContext, aDelay,(XtTimerCallbackProc)nsTimerExpired, this);
+
+    return Init(aDelay);
+}
+
+nsresult 
+TimerImpl::Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mCallback = aCallback;
+    // mRepeat = aRepeat;
+
+    mTimerId = XtAppAddTimeOut(gAppContext, aDelay, (XtTimerCallbackProc)nsTimerExpired, this);
+
+    return Init(aDelay);
+}
+
+nsresult
+TimerImpl::Init(PRUint32 aDelay)
+{
+    mDelay = aDelay;
+    NS_ADDREF(this);
+
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+
+void
+TimerImpl::Cancel()
+{
+  XtRemoveTimeOut(mTimerId);
+}
+
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}
+
+
+void nsTimerExpired(XtPointer aCallData)
+{
+  TimerImpl* timer = (TimerImpl *)aCallData;
+  timer->FireTimeout();
+}

mozilla/base/src/nsArena.cpp

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIArena.h"
+#include "nsCRT.h"
+
+#define PL_ARENA_CONST_ALIGN_MASK 7
+#include "plarena.h"
+
+static NS_DEFINE_IID(kArenaIID, NS_IARENA_IID);
+
+// Simple arena implementation layered on plarena
+class ArenaImpl : public nsIArena {
+public:
+  ArenaImpl(PRInt32 aBlockSize);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void* Alloc(PRInt32 aSize);
+
+protected:
+  ~ArenaImpl();
+
+  PLArenaPool mPool;
+  PRInt32 mBlockSize;
+};
+
+ArenaImpl::ArenaImpl(PRInt32 aBlockSize)
+{
+  NS_INIT_REFCNT();
+  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
+    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
+  }
+  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
+  mBlockSize = aBlockSize;
+}
+
+NS_IMPL_ISUPPORTS(ArenaImpl,kArenaIID)
+
+ArenaImpl::~ArenaImpl()
+{
+  PL_FinishArenaPool(&mPool);
+}
+
+void* ArenaImpl::Alloc(PRInt32 size)
+{
+  // Adjust size so that it's a multiple of sizeof(double)
+  PRInt32 align = size & (sizeof(double) - 1);
+  if (0 != align) {
+    size += sizeof(double) - align;
+  }
+
+  void* p;
+  PL_ARENA_ALLOCATE(p, &mPool, size);
+  return p;
+}
+
+NS_BASE nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                 PRInt32 aArenaBlockSize)
+{
+  ArenaImpl* it = new ArenaImpl(aArenaBlockSize);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kArenaIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/nsAtomTable.cpp

@@ -0,0 +1,154 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIAtom.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "plhash.h"
+#include "nsISizeOfHandler.h"
+
+/**
+ * The shared hash table for atom lookups.
+ */
+static nsrefcnt gAtoms;
+static struct PLHashTable* gAtomHashTable;
+
+class AtomImpl : public nsIAtom {
+public:
+  AtomImpl();
+  ~AtomImpl();
+
+  NS_DECL_ISUPPORTS
+
+  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
+
+  virtual void ToString(nsString& aBuf) const;
+
+  virtual const PRUnichar* GetUnicode() const;
+
+  NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
+
+  // Actually more; 0 terminated. This slot is reserved for the
+  // terminating zero.
+  PRUnichar mString[1];
+};
+
+AtomImpl::AtomImpl()
+{
+  NS_INIT_REFCNT();
+  // Every live atom holds a reference on the atom hashtable
+  gAtoms++;
+}
+
+AtomImpl::~AtomImpl()
+{
+  NS_PRECONDITION(nsnull != gAtomHashTable, "null atom hashtable");
+  if (nsnull != gAtomHashTable) {
+    PL_HashTableRemove(gAtomHashTable, mString);
+    nsrefcnt cnt = --gAtoms;
+    if (0 == cnt) {
+      // When the last atom is destroyed, the atom arena is destroyed
+      NS_ASSERTION(0 == gAtomHashTable->nentries, "bad atom table");
+      PL_HashTableDestroy(gAtomHashTable);
+      gAtomHashTable = nsnull;
+    }
+  }
+}
+
+static NS_DEFINE_IID(kIAtomIID, NS_IATOM_IID);
+NS_IMPL_ISUPPORTS(AtomImpl, kIAtomIID);
+
+void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
+{
+  size = size + uslen * sizeof(PRUnichar);
+  AtomImpl* ii = (AtomImpl*) new char[size];
+  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
+  ii->mString[uslen] = 0;
+  return ii;
+}
+
+void AtomImpl::ToString(nsString& aBuf) const
+{
+  aBuf.SetLength(0);
+  aBuf.Append(mString, nsCRT::strlen(mString));
+}
+
+const PRUnichar* AtomImpl::GetUnicode() const
+{
+  return mString;
+}
+
+NS_IMETHODIMP
+AtomImpl::SizeOf(nsISizeOfHandler* aHandler) const
+{
+  aHandler->Add(sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar));
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+
+static PLHashNumber HashKey(const PRUnichar* k)
+{
+  return (PLHashNumber) nsCRT::HashValue(k);
+}
+
+static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
+{
+  return nsCRT::strcmp(k1, k2) == 0;
+}
+
+NS_BASE nsIAtom* NS_NewAtom(const char* isolatin1)
+{
+  nsAutoString tmp(isolatin1);
+  return NS_NewAtom(tmp.GetUnicode());
+}
+
+NS_BASE nsIAtom* NS_NewAtom(const nsString& aString)
+{
+  return NS_NewAtom(aString.GetUnicode());
+}
+
+NS_BASE nsIAtom* NS_NewAtom(const PRUnichar* us)
+{
+  if (nsnull == gAtomHashTable) {
+    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                                     (PLHashComparator) CompareKeys,
+                                     (PLHashComparator) nsnull,
+                                     nsnull, nsnull);
+  }
+  PRInt32 uslen;
+  PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
+  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
+  PLHashEntry* he = *hep;
+  if (nsnull != he) {
+    nsIAtom* id = (nsIAtom*) he->value;
+    NS_ADDREF(id);
+    return id;
+  }
+  AtomImpl* id = new(us, uslen) AtomImpl();
+  PL_HashTableRawAdd(gAtomHashTable, hep, hashCode, id->mString, id);
+  NS_ADDREF(id);
+  return id;
+}
+
+NS_BASE nsrefcnt NS_GetNumberOfAtoms(void)
+{
+  if (nsnull != gAtomHashTable) {
+    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
+  }
+  return gAtoms;
+}

mozilla/base/src/nsBTree.cpp

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

mozilla/base/src/nsBTree.h

@@ -0,0 +1,283 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/** 
+ * This file defines the binary tree class and it
+ * nsNode child class. Note that like all nsBTree
+ * containers, this one does not automatically balance.
+ * (Find for random data, bad for pre-ordered data).
+ *
+ * This simple version stores nodes, and the
+ * nodes store void* ptrs.
+ * 
+ * @update gess 4/11/98
+ */
+
+
+/**
+ * nsNode
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+
+#ifndef _BTREE_H
+#define _BTREE_H
+
+#include "nscore.h"
+
+struct NS_BASE nsNode {
+
+  /**
+   * 
+   * @update	gess4/20/98
+   * @param 
+   * @return
+   */
+  nsNode();
+
+  /**
+   * Copy constructor
+   * @update gess 4/11/98
+   */  
+  nsNode(const nsNode& aNode);
+
+  /**
+   * destructor
+   * @update gess 4/11/98
+   */  
+  virtual ~nsNode();
+
+  /**
+   * Retrieve parent node
+   *
+   * @update gess 4/11/98
+   * @return 
+   */  
+  nsNode*  GetParentNode(void) const;
+
+  /**
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */  
+  nsNode*  GetLeftNode() const;
+
+  /**
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */  
+  nsNode*  GetRightNode() const;
+
+  /**
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */  
+  virtual nsNode& operator=(const nsNode& aNode);
+
+
+  /**
+   * This method gets called to determine which of 
+   * two nodes is less. When you create your own
+   * subclass of nsNode, this is the most important
+   * method for you to overload.
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */ 
+  virtual PRBool operator<(const nsNode& aNode) const=0;
+
+  /** 
+   * This method gets called to determine which of 
+   * two nodes is less. When you create your own
+   * subclass of nsNode, this is the most important
+   * method for you to overload.
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */ 
+  virtual PRBool operator==(const nsNode& aNode) const=0;
+
+  enum eRBColor {eRed,eBlack};
+
+  nsNode*   mParent;
+  nsNode*   mLeft;
+  nsNode*   mRight;
+  eRBColor  mColor;
+};
+
+/**
+ * The Nodefunctor class is used when you want to create
+ * callbacks between the nsRBTree and your generic code.
+ *
+ * @update	gess4/20/98
+ */
+class NS_BASE nsNodeFunctor {
+public:
+  virtual nsNodeFunctor& operator()(nsNode& aNode)=0;
+};
+
+
+/****************************************************
+ * Here comes the nsBTree class...
+ ****************************************************/
+
+class NS_BASE nsBTree {
+public:
+friend class nsBTreeIterator;
+  
+  nsBTree();
+  virtual ~nsBTree();
+
+  /** 
+   * Add given node reference into our tree.
+   * 
+   * @update gess 4/11/98
+   * @param  aNode is a ref to a node to be added
+   * @return newly added node
+   */ 
+  nsNode*  Add(nsNode& aNode);
+
+  /** 
+   * Remove given node reference into our tree.
+   * 
+   * @update gess 4/11/98
+   * @param  aNode is a ref to a node to be removed
+   * @return Ptr to node if found (and removed) or NULL
+   */ 
+  nsNode*  Remove(nsNode& aNode);
+
+  /**
+   * Clears the tree of any data. 
+   * Be careful here if your objects are heap based!
+   * This method doesn't free the objects, so if you
+   * don't have your own pointers, they will become
+   * orphaned.
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return this
+   */
+   nsBTree& Empty(nsNode* aNode=0);
+
+  /**
+   * This method destroys all the objects in the tree.
+   * WARNING: Never call this method on stored objects
+   *          that are stack-based!
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return this
+   */
+   nsBTree& Erase(nsNode* aNode=0);
+
+  /** 
+   * Retrieve ptr to 1st node in tree (starting at root)
+   * 
+   * @update gess 4/11/98
+   * @return ptr to 1st node, possible to be NULL
+   */ 
+  nsNode*  First(void) const;
+
+  /** 
+   * Find first node in tree starting at given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode node to begin 1st search from
+   * @return ptr to 1st node below given node
+   */ 
+  nsNode*  First(const nsNode& aNode) const;
+
+  /** 
+   * Retrieve ptr to last node in tree relative to root.
+   * 
+   * @update gess 4/11/98
+   * @return ptr to last node or NULL
+   */ 
+  nsNode* Last(void) const;
+
+  /** 
+   * Retrieve ptr to last node in tree relative to given node.
+   * 
+   * @update gess 4/11/98
+   * @param  node to find last node from 
+   * @return ptr to last node or NULL
+   */ 
+  nsNode* Last(const nsNode& aNode) const;
+
+  /** 
+   * Retrieve a ptr to the node that preceeds given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode used as reference to find prev. 
+   * @return ptr to prev node or NULL
+   */ 
+  nsNode*  Before(const nsNode& aNode) const;
+
+  /** 
+   * Retrieve a ptr to the node after given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode used as reference to find next. 
+   * @return ptr to next node or NULL
+   */ 
+  nsNode*  After(const nsNode& aNode) const;
+
+  /** 
+   * Find given node in tree.
+   * (Why would you want to find a node you already have?)
+   * 
+   * @update gess 4/11/98
+   * @param  aNode is the node you're searching for
+   * @return ptr to node if found, or NULL
+   */ 
+  nsNode*  Find(const nsNode& aNode) const;
+
+  /** 
+   * Walks the tree, starting with root.
+   * 
+   * @update gess 4/11/98
+   */ 
+  virtual const nsBTree& ForEach(nsNodeFunctor& aFunctor,nsNode* aNode=0) const;
+            
+protected:
+
+  /**
+   * Rebalances tree around the given node. This only
+   * needs to be called after a node is deleted.
+   * 
+   * @update gess 4/11/98
+   * @param  aNode -- node to balance around
+   * @return this
+   */
+  virtual nsBTree& ReBalance(nsNode& aNode);
+
+
+  nsNode*  mRoot;
+};
+
+#endif
+

mozilla/base/src/nsByteBuffer.cpp

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

mozilla/base/src/nsCRT.cpp

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

mozilla/base/src/nsCRT.h

@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsCRT_h___
+#define nsCRT_h___
+
+#include <stdlib.h>
+#include <string.h>
+#include "plstr.h"
+#include "nscore.h"
+
+/// This is a wrapper class around all the C runtime functions. 
+
+class NS_BASE nsCRT {
+public:
+  /** Copy bytes from aSrc to aDest.
+    @param aDest the destination address
+    @param aSrc the source address
+    @param aCount the number of bytes to copy
+    */
+  static void memcpy(void* aDest, const void* aSrc, PRInt32 aCount) {
+    ::memcpy(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memmove(void* aDest, const void* aSrc, PRInt32 aCount) {
+    ::memmove(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memset(void* aDest, PRUint8 aByte, PRInt32 aCount) {
+    ::memset(aDest, aByte, aCount);
+  }
+
+  static void zero(void* aDest, PRInt32 aCount) {
+    ::memset(aDest, 0, (size_t)aCount);
+  }
+
+  /** Compute the string length of s
+   @param s the string in question
+   @return the length of s
+   */
+  static PRInt32 strlen(const char* s) {
+    return PRInt32(::strlen(s));
+  }
+
+  /// Compare s1 and s2.
+  static PRInt32 strcmp(const char* s1, const char* s2) {
+    return PRInt32(PL_strcmp(s1, s2));
+  }
+
+  /// Case-insensitive string comparison.
+  static PRInt32 strcasecmp(const char* s1, const char* s2) {
+    return PRInt32(PL_strcasecmp(s1, s2));
+  }
+
+  /// Case-insensitive string comparison with length
+  static PRInt32 strncasecmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
+  }
+
+  static char* strdup(const char* str) {
+    return PL_strdup(str);
+  }
+
+  /// Like strlen except for ucs2 strings
+  static PRInt32 strlen(const PRUnichar* s);
+
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strcmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strncmp(const PRUnichar* s1, const PRUnichar* s2,
+                         PRInt32 aMaxLen);
+
+  /// Like strcasecmp except for ucs2 strings
+  static PRInt32 strcasecmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strncasecmp except for ucs2 strings
+  static PRInt32 strncasecmp(const PRUnichar* s1, const PRUnichar* s2,
+                             PRInt32 aMaxLen);
+
+  /// Like strcmp with a char* and a ucs2 string
+  static PRInt32 strcmp(const PRUnichar* s1, const char* s2);
+  /// Like strncmp with a char* and a ucs2 string
+  static PRInt32 strncmp(const PRUnichar* s1, const char* s2,
+                         PRInt32 aMaxLen);
+
+  /// Like strcasecmp with a char* and a ucs2 string
+  static PRInt32 strcasecmp(const PRUnichar* s1, const char* s2);
+  /// Like strncasecmp with a char* and a ucs2 string
+  static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
+                             PRInt32 aMaxLen);
+
+  // Note: uses new[] to allocate memory, so you must use delete[] to
+  // free the memory
+  static PRUnichar* strdup(const PRUnichar* str);
+
+  /// Compute a hashcode for a ucs2 string
+  static PRUint32 HashValue(const PRUnichar* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRUint32 HashValue(const PRUnichar* s1, PRInt32* s1len);
+
+  /// String to integer.
+  static PRInt32 atoi( const PRUnichar *string );
+  
+  static PRUnichar ToUpper(PRUnichar aChar);
+
+  static PRUnichar ToLower(PRUnichar aChar);
+};
+
+#endif /* nsCRT_h___ */

mozilla/base/src/nsDeque.cpp

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

mozilla/base/src/nsDeque.h

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

mozilla/base/src/nsEscape.cpp

@@ -0,0 +1,152 @@
+/* -*- 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.
+ */
+ 
+//	First checked in on 98/12/03 by John R. McMullen, derived from net.h/mkparse.c.
+
+#include "nsEscape.h"
+
+#include "plstr.h"
+
+const int netCharType[256] =
+/*	Bit 0		xalpha		-- the alphas
+**	Bit 1		xpalpha		-- as xalpha but 
+**                             converts spaces to plus and plus to %20
+**	Bit 3 ...	path		-- as xalphas but doesn't escape '/'
+*/
+    /*   0 1 2 3 4 5 6 7 8 9 A B C D E F */
+    {    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,	/* 0x */
+		 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,	/* 1x */
+		 0,0,0,0,0,0,0,0,0,0,7,4,0,7,7,4,	/* 2x   !"#$%&'()*+,-./	 */
+         7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,	/* 3x  0123456789:;<=>?	 */
+	     0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,	/* 4x  @ABCDEFGHIJKLMNO  */
+	     /* bits for '@' changed from 7 to 0 so '@' can be escaped   */
+	     /* in usernames and passwords in publishing.                */
+	     7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,7,	/* 5X  PQRSTUVWXYZ[\]^_	 */
+	     0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,	/* 6x  `abcdefghijklmno	 */
+	     7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,	/* 7X  pqrstuvwxyz{\}~	DEL */
+		 0, };
+
+/* decode % escaped hex codes into character values
+ */
+#define UNHEX(C) \
+    ((C >= '0' && C <= '9') ? C - '0' : \
+     ((C >= 'A' && C <= 'F') ? C - 'A' + 10 : \
+     ((C >= 'a' && C <= 'f') ? C - 'a' + 10 : 0)))
+
+
+#define IS_OK(C) (netCharType[((unsigned int) (C))] & (mask))
+#define HEX_ESCAPE '%'
+
+//----------------------------------------------------------------------------------------
+char* nsEscape(const char * str, nsEscapeMask mask)
+//----------------------------------------------------------------------------------------
+{
+    if(!str)
+        return NULL;
+    return nsEscapeCount(str, (PRInt32)PL_strlen(str), mask, NULL);
+}
+
+//----------------------------------------------------------------------------------------
+char* nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32 * out_len)
+//----------------------------------------------------------------------------------------
+{
+    int32       i, extra = 0;
+    char        *hexChars = "0123456789ABCDEF";
+
+	if(!str)
+		return(0);
+
+	register const unsigned char* src = (unsigned char *) str;
+    for (i = 0; i < len; i++)
+	  {
+        if (!IS_OK(src[i]))
+            extra+=2; /* the escape, plus an extra byte for each nibble */
+	  }
+
+	char* result = new char[len + extra + 1];
+    if (!result)
+        return(0);
+
+    register unsigned char* dst = (unsigned char *) result;
+    for (i = 0; i < len; i++)
+	  {
+		unsigned char c = src[i];
+		if (IS_OK(c))
+		  {
+			*dst++ = c;
+		  }
+		else if (mask == url_XPAlphas && c == ' ')
+		  {
+			*dst++ = '+'; /* convert spaces to pluses */
+		  }
+		else 
+		  {
+			*dst++ = HEX_ESCAPE;
+			*dst++ = hexChars[c >> 4];		/* high nibble */
+			*dst++ = hexChars[c & 0x0f];	/* low nibble */
+		  }
+	  }
+
+    *dst = '\0';     /* tack on eos */
+	if(out_len)
+		*out_len = dst - (unsigned char *) result;
+    return result;
+}
+
+//----------------------------------------------------------------------------------------
+char* nsUnescape(char * str)
+//----------------------------------------------------------------------------------------
+{
+	nsUnescapeCount(str);
+	return str;
+}
+
+//----------------------------------------------------------------------------------------
+PRInt32 nsUnescapeCount(char * str)
+//----------------------------------------------------------------------------------------
+{
+    register char *src = str;
+    register char *dst = str;
+
+    while (*src)
+        if (*src != HEX_ESCAPE)
+		  {
+        	*dst++ = *src++;
+		  }
+        else 	
+		  {
+        	src++; /* walk over escape */
+        	if (*src)
+              {
+            	*dst = UNHEX(*src) << 4;
+            	src++;
+              }
+        	if (*src)
+              {
+            	*dst = (*dst + UNHEX(*src));
+            	src++;
+              }
+        	dst++;
+          }
+
+    *dst = 0;
+
+    return (int)(dst - str);
+
+} /* NET_UnEscapeCnt */
+

mozilla/base/src/nsFileSpec.cpp

@@ -0,0 +1,579 @@
+/* -*- 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 "nsFileSpec.h"
+
+#include "nsFileStream.h"
+#include "nsDebug.h"
+
+#include "prtypes.h"
+
+#include <string.h>
+#include <stdio.h>
+
+//========================================================================================
+NS_NAMESPACE nsFileSpecHelpers
+//========================================================================================
+{
+    enum
+    {    kMaxFilenameLength = 31                // should work on Macintosh, Unix, and Win32.
+    ,    kMaxAltDigitLength    = 5
+    ,    kMaxCoreLeafNameLength    = (kMaxFilenameLength - (kMaxAltDigitLength + 1))
+    };
+    NS_NAMESPACE_PROTOTYPE void LeafReplace(
+        char*& ioPath,
+        char inSeparator,
+        const char* inLeafName);
+#ifndef XP_MAC
+    NS_NAMESPACE_PROTOTYPE void Canonify(char*& ioPath, bool inMakeDirs);
+    NS_NAMESPACE_PROTOTYPE void MakeAllDirectories(const char* inPath, int mode);
+#endif
+    NS_NAMESPACE_PROTOTYPE char* GetLeaf(const char* inPath, char inSeparator); // allocated
+    NS_NAMESPACE_PROTOTYPE char* StringDup(const char* inString, int allocLength = 0);
+    NS_NAMESPACE_PROTOTYPE char* AllocCat(const char* inString1, const char* inString2);
+    NS_NAMESPACE_PROTOTYPE char* StringAssign(char*& ioString, const char* inOther);
+    NS_NAMESPACE_PROTOTYPE char* ReallocCat(char*& ioString, const char* inString1);
+#ifdef XP_PC
+    NS_NAMESPACE_PROTOTYPE void NativeToUnix(char*& ioPath);
+    NS_NAMESPACE_PROTOTYPE void UnixToNative(char*& ioPath);
+#endif
+} NS_NAMESPACE_END
+
+
+//----------------------------------------------------------------------------------------
+char* nsFileSpecHelpers::StringDup(
+    const char* inString,
+    int allocLength)
+//----------------------------------------------------------------------------------------
+{
+    if (!allocLength && inString)
+        allocLength = strlen(inString);
+    char* newPath = inString || allocLength ? new char[allocLength + 1] : nsnull;
+    if (!newPath)
+        return NULL;
+    strcpy(newPath, inString);
+    return newPath;
+} // nsFileSpecHelpers::StringDup
+
+//----------------------------------------------------------------------------------------
+char* nsFileSpecHelpers::AllocCat(
+    const char* inString1,
+    const char* inString2)
+//----------------------------------------------------------------------------------------
+{
+    if (!inString1)
+        return inString2 ? StringDup(inString2) : (char*)NULL;
+    if (!inString2)
+        return StringDup(inString1);
+    char* outString = StringDup(inString1, strlen(inString1) + strlen(inString2));
+    if (outString)
+        strcat(outString, inString2);
+    return outString;
+} // nsFileSpecHelpers::StringDup
+
+//----------------------------------------------------------------------------------------
+char* nsFileSpecHelpers::StringAssign(
+    char*& ioString,
+    const char* inString2)
+//----------------------------------------------------------------------------------------
+{
+    if (!inString2)
+    {
+        delete [] ioString;
+        ioString = (char*)NULL;
+        return ioString;
+    }
+    if (!ioString || (strlen(inString2) > strlen(ioString)))
+    {
+        delete [] ioString;
+        ioString = StringDup(inString2);
+        return ioString;
+    }
+    strcpy(ioString, inString2);
+    return ioString;
+} // nsFileSpecHelpers::StringAssign
+
+//----------------------------------------------------------------------------------------
+void nsFileSpecHelpers::LeafReplace(
+    char*& ioPath,
+    char inSeparator,
+    const char* inLeafName)
+//----------------------------------------------------------------------------------------
+{
+    // Find the existing leaf name
+    if (!ioPath)
+        return;
+    if (!inLeafName)
+    {
+        *ioPath = '\0';
+        return;
+    }
+    char* lastSeparator = strrchr(ioPath, inSeparator);
+    int oldLength = strlen(ioPath);
+    *(++lastSeparator) = '\0'; // strip the current leaf name
+    int newLength = lastSeparator - ioPath + strlen(inLeafName);
+    if (newLength > oldLength)
+    {
+        char* newPath = StringDup(ioPath, newLength + 1);
+        delete [] ioPath;
+        ioPath = newPath;
+    }
+    strcat(ioPath, inLeafName);
+} // nsNativeFileSpec::LeafReplace
+
+//----------------------------------------------------------------------------------------
+char* nsFileSpecHelpers::GetLeaf(const char* inPath, char inSeparator)
+// Returns a pointer to an allocated string representing the leaf.
+//----------------------------------------------------------------------------------------
+{
+    if (!inPath)
+        return NULL;
+    char* lastSeparator = strrchr(inPath, inSeparator);
+    if (lastSeparator)
+        return StringDup(++lastSeparator);
+    return StringDup(inPath);
+} // nsNativeFileSpec::GetLeaf
+
+#if defined(XP_UNIX) || defined(XP_PC)
+
+//----------------------------------------------------------------------------------------
+void nsFileSpecHelpers::MakeAllDirectories(const char* inPath, int mode)
+// Make the path a valid one by creating all the intermediate directories.  Does NOT
+// make the leaf into a directory.  This should be a unix path.
+//----------------------------------------------------------------------------------------
+{
+	if (!inPath)
+		return;
+		
+    char* pathCopy = nsFileSpecHelpers::StringDup( inPath );
+    if (!pathCopy)
+    	return;
+
+	const char kSeparator = '/'; // I repeat: this should be a unix-style path.
+    const int kSkipFirst = 1;
+
+#ifdef XP_PC
+    // Either this is a relative path, or we ensure that it has
+    // a drive letter specifier.
+    NS_ASSERTION( pathCopy[0] != '/' || pathCopy[2] == '|', "No drive letter!" );
+#endif
+    char* currentStart = pathCopy;
+    char* currentEnd = strchr(currentStart + kSkipFirst, kSeparator);
+    if (currentEnd)
+    {
+		*currentEnd = '\0';
+		nsNativeFileSpec spec(nsFilePath(pathCopy, false));
+		do
+		{
+			// If the node doesn't exist, and it is not the initial node in a full path,
+			// then make a directory (We cannot make the initial (volume) node).
+			if (!spec.Exists() && *currentStart != kSeparator)
+				spec.CreateDirectory(mode);
+			if (!spec.Exists())
+			{
+				NS_ASSERTION(spec.Exists(), "Could not create the directory?");
+				break;
+			}
+			currentStart = ++currentEnd;
+			currentEnd = strchr(currentStart, kSeparator);
+			if (!currentEnd)
+				break;
+			spec += currentStart; // "lengthen" the path, adding the next node.
+		} while (currentEnd);
+    }
+	delete [] pathCopy;
+} // nsFileSpecHelpers::MakeAllDirectories
+
+#endif // XP_PC || XP_UNIX
+
+//----------------------------------------------------------------------------------------
+char* nsFileSpecHelpers::ReallocCat(char*& ioString, const char* inString1)
+//----------------------------------------------------------------------------------------
+{
+    char* newString = AllocCat(ioString, inString1);
+    delete [] ioString;
+    ioString = newString;
+    return ioString;
+} // nsNativeFileSpec::ReallocCat
+
+#if defined(XP_PC)
+#include "windows/nsFileSpecWin.cpp" // Windows-specific implementations
+#elif defined(XP_MAC)
+#include "nsFileSpecMac.cpp" // Macintosh-specific implementations
+#elif defined(XP_UNIX)
+#include "unix/nsFileSpecUnix.cpp" // Unix-specific implementations
+#endif
+
+//========================================================================================
+//                                nsFileURL implementation
+//========================================================================================
+
+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const char* inString, bool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mURL(nsnull)
+{
+    if (!inString)
+    	return;
+    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
+    // Make canonical and absolute.
+	nsFilePath path(inString + kFileURLPrefixLength, inCreateDirs);
+	*this = path;
+} // nsFileURL::nsFileURL
+#endif
+
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsFileURL& inOther)
+//----------------------------------------------------------------------------------------
+:    mURL(nsFileSpecHelpers::StringDup(inOther.mURL))
+#ifdef XP_MAC
+,    mNativeFileSpec(inOther.GetNativeSpec())
+#endif
+{
+} // nsFileURL::nsFileURL
+
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsFilePath& inOther)
+//----------------------------------------------------------------------------------------
+:    mURL(nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)inOther))
+#ifdef XP_MAC
+,    mNativeFileSpec(inOther.GetNativeSpec())
+#endif
+{
+} // nsFileURL::nsFileURL
+
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsNativeFileSpec& inOther)
+:    mURL(nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)nsFilePath(inOther)))
+#ifdef XP_MAC
+,    mNativeFileSpec(inOther)
+#endif
+//----------------------------------------------------------------------------------------
+{
+} // nsFileURL::nsFileURL
+
+//----------------------------------------------------------------------------------------
+nsFileURL::~nsFileURL()
+//----------------------------------------------------------------------------------------
+{
+    delete [] mURL;
+}
+
+//----------------------------------------------------------------------------------------
+void nsFileURL::operator = (const char* inString)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(mURL, inString);
+    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
+#ifdef XP_MAC
+    mNativeFileSpec = inString + kFileURLPrefixLength;
+#endif
+} // nsFileURL::operator =
+
+//----------------------------------------------------------------------------------------
+void nsFileURL::operator = (const nsFileURL& inOther)
+//----------------------------------------------------------------------------------------
+{
+    mURL = nsFileSpecHelpers::StringAssign(mURL, inOther.mURL);
+#ifdef XP_MAC
+    mNativeFileSpec = inOther.GetNativeSpec();
+#endif
+} // nsFileURL::operator =
+
+//----------------------------------------------------------------------------------------
+void nsFileURL::operator = (const nsFilePath& inOther)
+//----------------------------------------------------------------------------------------
+{
+    delete [] mURL;
+    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)inOther);
+#ifdef XP_MAC
+    mNativeFileSpec  = inOther.GetNativeSpec();
+#endif
+} // nsFileURL::operator =
+
+//----------------------------------------------------------------------------------------
+void nsFileURL::operator = (const nsNativeFileSpec& inOther)
+//----------------------------------------------------------------------------------------
+{
+    delete [] mURL;
+    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)nsFilePath(inOther));
+#ifdef XP_MAC
+    mNativeFileSpec  = inOther;
+#endif
+} // nsFileURL::operator =
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& operator << (nsBasicOutStream& s, const nsFileURL& url)
+//----------------------------------------------------------------------------------------
+{
+    return (s << url.mURL);
+}
+
+//========================================================================================
+//                                nsFilePath implementation
+//========================================================================================
+
+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const char* inString, bool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(nsFileSpecHelpers::StringDup(inString))
+{
+    NS_ASSERTION(strstr(inString, kFileURLPrefix) != inString, "URL passed as path");
+
+#ifdef XP_PC
+    nsFileSpecHelpers::UnixToNative(mPath);
+#endif
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
+#ifdef XP_PC
+    NS_ASSERTION( mPath[1] == ':', "unexpected canonical path" );
+    nsFileSpecHelpers::NativeToUnix(mPath);
+#endif
+}
+#endif
+
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsFileURL& inOther)
+//----------------------------------------------------------------------------------------
+:    mPath(nsFileSpecHelpers::StringDup(inOther.mURL + kFileURLPrefixLength))
+#ifdef XP_MAC
+,    mNativeFileSpec(inOther.GetNativeSpec())
+#endif
+{
+}
+
+#ifdef XP_UNIX
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsNativeFileSpec& inOther)
+//----------------------------------------------------------------------------------------
+:    mPath(nsFileSpecHelpers::StringDup(inOther.mPath))
+{
+}
+#endif // XP_UNIX
+
+//----------------------------------------------------------------------------------------
+nsFilePath::~nsFilePath()
+//----------------------------------------------------------------------------------------
+{
+    delete [] mPath;
+}
+
+#ifdef XP_UNIX
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const nsNativeFileSpec& inOther)
+//----------------------------------------------------------------------------------------
+{
+    mPath = nsFileSpecHelpers::StringAssign(mPath, inOther.mPath);
+}
+#endif // XP_UNIX
+
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const char* inString)
+//----------------------------------------------------------------------------------------
+{
+    NS_ASSERTION(strstr(inString, kFileURLPrefix) != inString, "URL passed as path");
+#ifdef XP_MAC
+    mNativeFileSpec = inString;
+	nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(mNativeFileSpec));
+#else
+#ifdef XP_PC
+	nsFileSpecHelpers::UnixToNative(mPath);
+#endif
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, false /* XXX? */);
+#ifdef XP_PC
+	nsFileSpecHelpers::NativeToUnix(mPath);
+#endif
+#endif // XP_MAC
+}
+
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const nsFileURL& inOther)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(inOther));
+#ifdef XP_MAC
+    mNativeFileSpec = inOther.GetNativeSpec();
+#endif
+}
+
+//========================================================================================
+//                                nsNativeFileSpec implementation
+//========================================================================================
+
+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec()
+//----------------------------------------------------------------------------------------
+:    mPath(NULL)
+{
+}
+#endif
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const nsFileURL& inURL)
+//----------------------------------------------------------------------------------------
+#ifndef XP_MAC
+:    mPath(NULL)
+#endif
+{
+    *this = nsFilePath(inURL); // convert to unix path first
+}
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::MakeUnique(const char* inSuggestedLeafName)
+//----------------------------------------------------------------------------------------
+{
+    if (inSuggestedLeafName && *inSuggestedLeafName)
+        SetLeafName(inSuggestedLeafName);
+
+    MakeUnique();
+} // nsNativeFileSpec::MakeUnique
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::MakeUnique()
+//----------------------------------------------------------------------------------------
+{
+    if (!Exists())
+        return;
+
+    char* leafName = GetLeafName();
+    if (!leafName)
+        return;
+
+    char* lastDot = strrchr(leafName, '.');
+    char* suffix = "";
+    if (lastDot)
+    {
+        suffix = nsFileSpecHelpers::StringDup(lastDot); // include '.'
+        *lastDot = '\0'; // strip suffix and dot.
+    }
+    const int kMaxRootLength
+        = nsFileSpecHelpers::kMaxCoreLeafNameLength - strlen(suffix) - 1;
+    if (strlen(leafName) > kMaxRootLength)
+        leafName[kMaxRootLength] = '\0';
+    for (short index = 1; index < 1000 && Exists(); index++)
+    {
+        // start with "Picture-1.jpg" after "Picture.jpg" exists
+        char newName[nsFileSpecHelpers::kMaxFilenameLength + 1];
+        sprintf(newName, "%s-%d%s", leafName, index, suffix);
+        SetLeafName(newName);
+    }
+    if (*suffix)
+        delete [] suffix;
+    delete [] leafName;
+} // nsNativeFileSpec::MakeUnique
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const nsFileURL& inURL)
+//----------------------------------------------------------------------------------------
+{
+    *this = nsFilePath(inURL); // convert to unix path first
+}
+
+//========================================================================================
+//                                UNIX & WIN nsNativeFileSpec implementation
+//========================================================================================
+
+#ifdef XP_UNIX
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const nsFilePath& inPath)
+//----------------------------------------------------------------------------------------
+:    mPath(nsFileSpecHelpers::StringDup((const char*)inPath))
+{
+}
+#endif // XP_UNIX
+
+#ifdef XP_UNIX
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const nsFilePath& inPath)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(mPath, (const char*)inPath);
+}
+#endif //XP_UNIX
+
+#if defined(XP_UNIX) || defined(XP_PC)
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+:    mPath(nsFileSpecHelpers::StringDup(inSpec.mPath))
+{
+}
+#endif //XP_UNIX
+
+#if defined(XP_UNIX) || defined(XP_PC)
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const char* inString, bool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(nsFileSpecHelpers::StringDup(inString))
+{
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
+}
+#endif //XP_UNIX,PC
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::~nsNativeFileSpec()
+//----------------------------------------------------------------------------------------
+{
+#ifndef XP_MAC
+    delete [] mPath;
+#endif
+}
+
+#if defined(XP_UNIX) || defined(XP_PC)
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+{
+    mPath = nsFileSpecHelpers::StringAssign(mPath, inSpec.mPath);
+}
+#endif //XP_UNIX
+
+
+#if defined(XP_UNIX) || defined(XP_PC)
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const char* inString)
+//----------------------------------------------------------------------------------------
+{
+    mPath = nsFileSpecHelpers::StringAssign(mPath, inString);
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, true /* XXX? */);
+}
+#endif //XP_UNIX
+
+#if (defined(XP_UNIX) || defined(XP_PC))
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& operator << (nsBasicOutStream& s, const nsNativeFileSpec& spec)
+//----------------------------------------------------------------------------------------
+{
+    return (s << (const char*)spec.mPath);
+}
+#endif // DEBUG && XP_UNIX
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec nsNativeFileSpec::operator + (const char* inRelativePath) const
+//----------------------------------------------------------------------------------------
+{
+    nsNativeFileSpec result = *this;
+    result += inRelativePath;
+    return result;
+} // nsNativeFileSpec::operator +

mozilla/base/src/nsFileStream.cpp

@@ -0,0 +1,460 @@
+/* -*- 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.
+ */
+ 
+//	First checked in on 98/12/08 by John R. McMullen.
+//  Since nsFileStream.h is entirely templates, common code (such as open())
+//  which does not actually depend on the charT, can be placed here.
+
+#include "nsFileStream.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#ifdef XP_MAC
+#include <Errors.h>
+#endif
+
+//========================================================================================
+//          nsBasicFileStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsBasicFileStream::nsBasicFileStream()
+//----------------------------------------------------------------------------------------
+    :    mFileDesc(0)
+    ,    mNSPRMode(0)
+    ,    mFailed(false)
+    ,    mEOF(false)
+{
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicFileStream::nsBasicFileStream(
+    const nsFilePath& inFile, 
+    int nsprMode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+    :    mFileDesc(0)
+    ,    mNSPRMode(0)
+    ,    mFailed(false)
+    ,    mEOF(false)
+{
+    open(inFile, nsprMode, accessMode);
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicFileStream::nsBasicFileStream(PRFileDesc* desc, int nsprMode)
+//----------------------------------------------------------------------------------------
+    :    mFileDesc(desc)
+    ,    mNSPRMode(nsprMode)
+    ,    mFailed(false)
+    ,    mEOF(false)
+{
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicFileStream::~nsBasicFileStream()
+//----------------------------------------------------------------------------------------
+{
+	close();
+}
+
+//----------------------------------------------------------------------------------------
+void nsBasicFileStream::open(
+	const nsFilePath& inFile,
+    int nsprMode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc)
+        return;
+        
+    const int nspr_modes[]={
+        PR_WRONLY | PR_CREATE_FILE,
+        PR_WRONLY | PR_CREATE_FILE | PR_APPEND,
+        PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
+        PR_RDONLY,
+        PR_RDONLY | PR_APPEND,
+        PR_RDWR | PR_CREATE_FILE,
+        PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE,
+//      "wb",
+//      "ab", 
+//      "wb",
+//      "rb",
+//      "r+b",
+//      "w+b",
+        0 };
+    const int* currentLegalMode = nspr_modes;
+    while (*currentLegalMode && nsprMode != *currentLegalMode)
+        ++currentLegalMode;
+    if (!*currentLegalMode) 
+        return;
+
+#ifdef XP_MAC
+     // Use the file spec to open the file, because one path can be common to
+     // several files on the Macintosh (you can have several volumes with the
+     // same name, see).
+    mFileDesc = 0;
+    if (inFile.GetNativeSpec().Error() != noErr)
+        return;
+    OSErr err = noErr;
+#if DEBUG
+	const OSType kCreator = 'CWIE';
+#else
+    const OSType kCreator = 'MOSS';
+#endif
+	nsNativeFileSpec nativeSpec = inFile.GetNativeSpec();
+    FSSpec* spec = (FSSpec*)nativeSpec;
+    if (nsprMode & PR_CREATE_FILE)
+    	err = FSpCreate(spec, kCreator, 'TEXT', 0);
+    if (err == dupFNErr)
+    	err = noErr;
+    if (err != noErr)
+       return;
+    
+    SInt8 perm;
+    if (nsprMode & PR_RDWR)
+       perm = fsRdWrPerm;
+    else if (nsprMode & PR_WRONLY)
+       perm = fsWrPerm;
+    else
+       perm = fsRdPerm;
+
+    short refnum;
+    err = FSpOpenDF(spec, perm, &refnum);
+
+    if (err == noErr && (nsprMode & PR_TRUNCATE))
+    	err = SetEOF(refnum, 0);
+    if (err == noErr && (nsprMode & PR_APPEND))
+    	err = SetFPos(refnum, fsFromLEOF, 0);
+    if (err != noErr)
+       return;
+
+    if ((mFileDesc = PR_ImportFile(refnum)) == 0)
+    	return;
+#else
+	//	Platforms other than Macintosh...
+	//  Another bug in NSPR: Mac PR_Open assumes a unix style path, but Win PR_Open assumes
+	//  a windows path.
+    if ((mFileDesc = PR_Open((const char*)nsNativeFileSpec(inFile), nsprMode, accessMode)) == 0)
+    	return;
+#endif
+     mNSPRMode = nsprMode;
+} // nsFileStreamHelpers::open
+
+//----------------------------------------------------------------------------------------
+void nsBasicFileStream::close()
+// Must precede the destructor because both are inline.
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || mFileDesc == 0) 
+       return;
+    if (PR_Close(mFileDesc) == PR_SUCCESS)
+    	mFileDesc = 0;
+} // nsBasicFileStream::close
+
+//----------------------------------------------------------------------------------------
+void nsBasicFileStream::seek(PRSeekWhence whence, PRInt32 offset)
+// Must precede the destructor because both are inline.
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || mFileDesc == 0) 
+       return;
+    mFailed = false; // reset on a seek.
+    mEOF = false; // reset on a seek.
+    PRInt32 position = PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
+    PRInt32 available = PR_Available(mFileDesc);
+    PRInt32 fileSize = position + available;
+    PRInt32 newPosition;
+    switch (whence)
+    {
+    	case PR_SEEK_CUR: newPosition = position + offset; break;
+    	case PR_SEEK_SET: newPosition = offset; break;
+    	case PR_SEEK_END: newPosition = fileSize + offset; break;
+    }
+    if (newPosition < 0)
+    {
+    	newPosition = 0;
+    	mFailed = true;
+    }
+    else if (newPosition >= fileSize)
+    {
+    	newPosition = fileSize;
+    	mEOF = true;
+    }
+    if (PR_Seek(mFileDesc, newPosition, PR_SEEK_SET) < 0)
+    	mFailed = true;
+} // nsBasicFileStream::seek
+
+//----------------------------------------------------------------------------------------
+PRIntn nsBasicFileStream::tell() const
+// Must precede the destructor because both are inline.
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || mFileDesc == 0) 
+       return -1;
+    return PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
+} // nsBasicFileStream::tell
+
+//========================================================================================
+//          nsBasicInStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsBasicInStream::nsBasicInStream(nsBasicFileStream& inBasicStream, istream* inStream)
+//----------------------------------------------------------------------------------------
+	: mBase(inBasicStream)
+	, mStdStream(inStream)
+{
+}
+//----------------------------------------------------------------------------------------
+void nsBasicInStream::get(char& c)
+//----------------------------------------------------------------------------------------
+{
+    read(&c, sizeof(char));
+}
+
+//----------------------------------------------------------------------------------------
+PRBool nsBasicInStream::readline(char* s, PRInt32 n)
+// This will truncate if the buffer is too small.  Result will always be null-terminated.
+//----------------------------------------------------------------------------------------
+{
+    PRBool bufferLargeEnough = true; // result
+    if (!s || !n)
+        return true;
+    PRIntn position = mBase.tell();
+    if (position < 0)
+        return false;
+    PRInt32 bytesRead = read(s, n - 1);
+    if (mBase.failed())
+        return false;
+    s[bytesRead] = '\0'; // always terminate at the end of the buffer
+    char* tp = strpbrk(s, "\n\r");
+    if (tp)
+    {
+        char ch = *tp;
+        *tp++ = '\0'; // terminate at the newline, then skip past it
+        if ((ch == '\n' && *tp == '\r') || (ch == '\r' && *tp == '\n'))
+            tp++; // possibly a pair.
+        bytesRead = (tp - s);
+    }
+    else if (!mBase.eof())
+        bufferLargeEnough = false;
+    position += bytesRead;
+    mBase.seek(position);
+    return bufferLargeEnough;
+} // nsBasicInStream::getline
+
+//----------------------------------------------------------------------------------------
+PRInt32 nsBasicInStream::read(void* s, PRInt32 n)
+//----------------------------------------------------------------------------------------
+{
+#ifndef NS_USE_PR_STDIO
+    // Calling PR_Read on stdin is sure suicide on Macintosh.
+    if (GetStandardStream())
+    {
+    	GetStandardStream()->read((char*)s, n);
+    	return n;
+    }
+#endif
+    if (!mBase.is_open() || mBase.failed())
+        return -1;
+    PRInt32 bytesRead = PR_Read(mBase.GetFileDescriptor(), s, n);
+    if (bytesRead < 0)
+        mBase.mFailed = true;
+    else if (bytesRead < n)
+        mBase.mEOF = true;
+    return bytesRead;
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicInStream& nsBasicInStream::operator >> (char& c)
+//----------------------------------------------------------------------------------------
+{
+	get(c);
+	return *this;
+}
+
+//========================================================================================
+//          nsInputFileStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsInputFileStream::nsInputFileStream(istream* stream)
+//----------------------------------------------------------------------------------------
+#ifndef NS_USE_PR_STDIO
+    : nsBasicFileStream(0, kDefaultMode)
+    , nsBasicInStream(*this, stream)
+#else
+    : nsBasicFileStream(PR_STDIN, kDefaultMode)
+    , nsBasicInStream(*this, 0)
+#endif
+{
+}
+
+//========================================================================================
+//          nsBasicOutStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream::nsBasicOutStream(nsBasicFileStream& inBase, ostream* stream)
+//----------------------------------------------------------------------------------------
+    : mBase(inBase)
+    , mStdStream(stream)
+{
+}
+
+//----------------------------------------------------------------------------------------
+void nsBasicOutStream::put(char c)
+//----------------------------------------------------------------------------------------
+{
+    write(&c, sizeof(c));
+}
+
+//----------------------------------------------------------------------------------------
+PRInt32 nsBasicOutStream::write(const void* s, PRInt32 n)
+//----------------------------------------------------------------------------------------
+{
+#ifndef NS_USE_PR_STDIO
+    // Calling PR_Write on stdout is sure suicide.
+    if (mStdStream)
+    {
+    	mStdStream->write((const char*)s, n);
+        return n;
+    }
+#endif
+    if (!mBase.mFileDesc || mBase.failed())
+       return -1;
+    PRInt32 bytesWrit = PR_Write(mBase.mFileDesc, s, n);
+    if (bytesWrit != n)
+        mBase.mFailed = true;
+    return bytesWrit;
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& nsBasicOutStream::operator << (char c)
+//----------------------------------------------------------------------------------------
+{
+	put(c);
+	return *this;
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& nsBasicOutStream::operator << (const char* s)
+//----------------------------------------------------------------------------------------
+{
+	write(s, strlen(s));
+	return *this;
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& nsBasicOutStream::operator << (short val)
+//----------------------------------------------------------------------------------------
+{
+	char buf[30];
+	sprintf(buf, "%d", val);
+	return *this << buf;
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& nsBasicOutStream::operator << (unsigned short val)
+//----------------------------------------------------------------------------------------
+{
+	char buf[30];
+	sprintf(buf, "%ud", val);
+	return *this << buf;
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& nsBasicOutStream::operator << (long val)
+//----------------------------------------------------------------------------------------
+{
+	char buf[30];
+	sprintf(buf, "%ld", val);
+	return *this << buf;
+}
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& nsBasicOutStream::operator << (unsigned long val)
+//----------------------------------------------------------------------------------------
+{
+	char buf[30];
+	sprintf(buf, "%uld", val);
+	return *this << buf;
+}
+
+//----------------------------------------------------------------------------------------
+void nsBasicOutStream::flush()
+// Must precede the destructor because both are inline.
+//----------------------------------------------------------------------------------------
+{
+#ifndef NS_USE_PR_STDIO
+    if (mStdStream)
+    {
+        mStdStream->flush();
+        return;
+    }
+#endif
+    if (mBase.mFileDesc == 0) 
+        return;
+    PRBool itFailed = PR_Sync(mBase.mFileDesc) != PR_SUCCESS;
+#ifdef XP_MAC
+    // On unix, it seems to fail always.
+    if (itFailed)
+    	mBase.mFailed = true;
+#endif
+} // nsBasicOutStream::flush
+
+//========================================================================================
+//          nsOutputFileStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsOutputFileStream::nsOutputFileStream(ostream* stream)
+//----------------------------------------------------------------------------------------
+#ifndef NS_USE_PR_STDIO
+    : nsBasicFileStream(0, kDefaultMode)
+    , nsBasicOutStream(*this, stream)
+#else
+    : nsBasicFileStream(PR_STDOUT, kDefaultMode)
+    , nsBasicOutStream(*this, 0)
+#endif
+{
+}
+
+//========================================================================================
+//        Manipulators
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsBasicOutStream& nsEndl(nsBasicOutStream& os)
+//----------------------------------------------------------------------------------------
+{
+#ifndef NS_USE_PR_STDIO
+    // Calling PR_Write on stdout is sure suicide on Macintosh.
+    ostream* stream = os.GetStandardStream();
+    if (stream)
+    {
+        *stream << std::endl;
+        return os;
+    }
+#endif
+     os.put('\n');
+     os.flush();
+     return os;
+}

mozilla/base/src/nsIArena.h

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

mozilla/base/src/nsIAtom.h

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

mozilla/base/src/nsIBaseStream.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIBaseStream_h___
+#define nsIBaseStream_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+
+/* 6ccb17a0-e95e-11d1-beae-00805f8a66dc */
+#define NS_IBASESTREAM_IID   \
+{ 0x6ccb17a0, 0xe95e, 0x11d1, \
+  {0xbe, 0xae, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} }
+
+/** Abstract stream */
+class nsIBaseStream : public nsISupports {
+public:
+
+    /** Close the stream. */
+    NS_IMETHOD
+    Close(void) = 0;
+};
+
+/** Error codes */
+//@{ 
+/// End of file
+#define NS_BASE_STREAM_EOF            NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 1)
+/// Stream closed
+#define NS_BASE_STREAM_CLOSED         NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 2)
+/// Error from the operating system
+#define NS_BASE_STREAM_OSERROR        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 3)
+/// Illegal arguments
+#define NS_BASE_STREAM_ILLEGAL_ARGS   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 4)
+/// For unichar streams
+#define NS_BASE_STREAM_NO_CONVERTER   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 5)
+/// For unichar streams
+#define NS_BASE_STREAM_BAD_CONVERSION NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 6)
+//@}
+
+
+#endif /* nsInputStream_h___ */

mozilla/base/src/nsIByteBuffer.h

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

mozilla/base/src/nsIInputStream.h

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIInputStream_h___
+#define nsIInputStream_h___
+
+#include "nsIBaseStream.h"
+
+#define NS_IINPUTSTREAM_IID   \
+{ 0x022396f0, 0x93b5, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/** Abstract byte input stream */
+class nsIInputStream : public nsIBaseStream {
+public:
+
+    /** Return the number of bytes in the stream
+     *  @param aLength out parameter to hold the length
+     *         of the stream. if an error occurs, the length
+     *         will be undefined
+     *  @return error status
+     */
+    NS_IMETHOD
+    GetLength(PRUint32 *aLength) = 0;
+
+    /** Read data from the stream.
+     *  @param aErrorCode the error code if an error occurs
+     *  @param aBuf the buffer into which the data is read
+     *  @param aOffset the start offset of the data
+     *  @param aCount the maximum number of bytes to read
+     *  @param aReadCount out parameter to hold the number of
+     *         bytes read, eof if 0. if an error occurs, the
+     *         read count will be undefined
+     *  @return error status
+     */   
+    NS_IMETHOD
+    Read(char* aBuf, PRUint32 aOffset, PRUint32 aCount, PRUint32 *aReadCount) = 0; 
+};
+
+#endif /* nsInputStream_h___ */

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

mozilla/base/src/nsITimer.h

@@ -0,0 +1,94 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsITimer_h___
+#define nsITimer_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+class nsITimer;
+class nsITimerCallback;
+
+// Implementations of nsITimer should be written such that there are no limitations
+// on what can be called by the TimerCallbackFunc. On platforms like the Macintosh this
+// means that callback functions must be called from the main event loop NOT from
+// an interrupt.
+
+/// Signature of timer callback function
+typedef void
+(*nsTimerCallbackFunc) (nsITimer *aTimer, void *aClosure);
+
+/// Interface IID for nsITimer
+#define NS_ITIMER_IID         \
+{ 0x497eed20, 0xb740, 0x11d1,  \
+{ 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
+
+/**
+ * Timer class, used to invoke a function or method after a fixed
+ * millisecond interval. <B>Note that this interface is subject to
+ * change!</B>
+ */
+class nsITimer : public nsISupports {
+public:  
+  /**
+   * Initialize a timer to fire after the given millisecond interval.
+   * This version takes a function to call and a closure to pass to
+   * that function.
+   *
+   * @param aFunc - The function to invoke
+   * @param aClosure - an opaque pointer to pass to that function
+   * @param aRepeat - (Not yet implemented) One-shot or repeating
+   * @param aDelay - The millisecond interval
+   * @result - NS_OK if this operation was successful
+   */
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                        void *aClosure,
+//                      PRBool aRepeat, 
+                        PRUint32 aDelay)=0;
+
+  /**
+   * Initialize a timer to fire after the given millisecond interval.
+   * This version takes an interface of type <code>nsITimerCallback</code>. 
+   * The <code>Notify</code> method of this method is invoked.
+   *
+   * @param aCallback - The interface to notify
+   * @param aRepeat - (Not yet implemented) One-shot or repeating
+   * @param aDelay - The millisecond interval
+   * @result - NS_OK if this operation was successful
+   */
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//                      PRBool aRepeat, 
+                        PRUint32 aDelay)=0;
+
+  /// Cancels the timeout
+  virtual void Cancel()=0;
+
+  /// @return the millisecond delay of the timeout
+  virtual PRUint32 GetDelay()=0;
+
+  /// Change the millisecond interval for the timeout
+  virtual void SetDelay(PRUint32 aDelay)=0;
+
+  /// @return the opaque pointer
+  virtual void* GetClosure()=0;
+};
+
+/** Factory method for creating an nsITimer */
+extern NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult);
+
+#endif

mozilla/base/src/nsITimerCallback.h

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsITimerCallback_h___
+#define nsITimerCallback_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+class nsITimer;
+
+/// Interface IID for nsITimerCallback
+#define NS_ITIMERCALLBACK_IID         \
+{ 0x5079b3a0, 0xb743, 0x11d1,         \
+{ 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
+
+/**
+ * Interface implemented by users of the nsITimer class. An instance
+ * of this interface is passed in when creating a timer. The Notify()
+ * method of that instance is invoked after the specified delay.
+ */
+class nsITimerCallback : public nsISupports {
+public:  
+  virtual void Notify(nsITimer *timer)=0;
+};
+
+#endif

mozilla/base/src/nsIUnicharBuffer.h

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

mozilla/base/src/nsIUnicharInputStream.h

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIUnicharInputStream_h___
+#define nsIUnicharInputStream_h___
+
+#include "nsIInputStream.h"
+class nsString;
+
+#define NS_IUNICHAR_INPUT_STREAM_IID \
+{ 0x2d97fbf0, 0x93b5, 0x11d1,        \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+#define NS_IB2UCONVERTER_IID  \
+{ 0x35e40290, 0x93b5, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+
+/** Abstract unicode character input stream
+ *  @see nsIInputStream
+ */
+class nsIUnicharInputStream : public nsISupports {
+public:
+  NS_IMETHOD Read(PRUnichar* aBuf,
+                  PRUint32 aOffset,
+                  PRUint32 aCount,
+                  PRUint32 *aReadCount) = 0;
+  NS_IMETHOD Close() = 0;
+};
+
+/**
+ * Create a nsIUnicharInputStream that wraps up a string. Data is fed
+ * from the string out until the done. When this object is destroyed
+ * it destroyes the string (so make a copy if you don't want it doing
+ * that)
+ */
+extern NS_BASE nsresult
+  NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
+                                 nsString* aString);
+
+/// Abstract interface for converting from bytes to unicode characters
+class nsIB2UConverter : public nsISupports {
+public:
+  /** aDstLen is updated to indicate how much data was translated into
+   * aDst; aSrcLen is updated to indicate how much data was used in
+   * the source buffer.
+   */
+  NS_IMETHOD Convert(PRUnichar* aDst,
+                     PRUint32 aDstOffset,
+                     PRUint32& aDstLen,
+                     const char* aSrc,
+                     PRUint32 aSrcOffset,
+                     PRUint32& aSrcLen) = 0;
+};
+
+/** Create a new nsUnicharInputStream that provides a converter for the
+ * byte input stream aStreamToWrap. If no converter can be found then
+ * nsnull is returned and the error code is set to
+ * NS_INPUTSTREAM_NO_CONVERTER.
+ */
+extern NS_BASE nsresult
+  NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
+                        nsISupports* aOuter,
+                        nsIInputStream* aStreamToWrap,
+                        PRInt32 aBufferSize = 0,
+                        nsString* aCharSet = nsnull);
+
+/** Create a new nsB2UConverter for the given character set. When given
+ * nsnull, the converter for iso-latin1 to unicode is provided. If no
+ * converter can be found, nsnull is returned.
+ */
+extern NS_BASE nsresult
+  NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
+                     nsISupports* aOuter,
+                     nsString* aCharSet = nsnull);
+
+#endif /* nsUnicharInputStream_h___ */

mozilla/base/src/nsInt64.h

@@ -0,0 +1,340 @@
+/* -*- 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 nsInt64_h__
+#define nsInt64_h__
+
+#include "prlong.h"
+#include "nscore.h"
+
+/**
+ * This class encapsulates full 64-bit integer functionality and
+ * provides simple arithmetic and conversion operations.
+ */
+
+// If you ever decide that you need to add a non-inline method to this
+// class, be sure to change the class declaration to "class NS_BASE
+// nsInt64".
+
+class nsInt64
+{
+private:
+    PRInt64 mValue;
+
+public:
+    /**
+     * Construct a new 64-bit integer.
+     */
+    nsInt64(void) : mValue(LL_ZERO) {
+    }
+
+    /**
+     * Construct a new 64-bit integer from a 32-bit signed integer
+     */
+    nsInt64(const PRInt32 aInt32) {
+        LL_I2L(mValue, aInt32);
+    }
+
+    /**
+     * Construct a new 64-bit integer from a 32-bit unsigned integer
+     */
+    nsInt64(const PRUint32 aUint32) {
+        LL_UI2L(mValue, aUint32);
+    }
+
+    /**
+     * Construct a new 64-bit integer from a floating point value.
+     */
+    nsInt64(const PRFloat64 aFloat64) {
+        LL_D2L(mValue, aFloat64);
+    }
+
+    /**
+     * Construct a new 64-bit integer from a native 64-bit integer
+     */
+    nsInt64(const PRInt64 aInt64) : mValue(aInt64) {
+    }
+
+    /**
+     * Construct a new 64-bit integer from another 64-bit integer
+     */
+    nsInt64(const nsInt64& aObject) : mValue(aObject.mValue) {
+    }
+
+    // ~nsInt64(void) -- XXX destructor unnecessary
+
+    /**
+     * Assign a 64-bit integer to another 64-bit integer
+     */
+    const nsInt64& operator =(const nsInt64& aObject) {
+        mValue = aObject.mValue;
+        return *this;
+    }
+
+    /**
+     * Convert a 64-bit integer to a signed 32-bit value
+     */
+    operator PRInt32(void) const {
+        PRInt32 result;
+        LL_L2I(result, mValue);
+        return result;
+    }
+
+    /**
+     * Convert a 64-bit integer to an unsigned 32-bit value
+     */
+    operator PRUint32(void) const {
+        PRUint32 result;
+        LL_L2UI(result, mValue);
+        return result;
+    }
+
+    /**
+     * Convert a 64-bit integer to a floating point value
+     */
+    operator PRFloat64(void) const {
+        PRFloat64 result;
+        LL_L2D(result, mValue);
+        return result;
+    }
+
+    /**
+     * Convert a 64-bit integer to a native 64-bit integer.
+     */
+    operator PRInt64(void) const {
+        return mValue;
+    }
+
+    /**
+     * Perform unary negation on a 64-bit integer.
+     */
+    const nsInt64 operator -(void) {
+        nsInt64 result;
+        LL_NEG(result.mValue, mValue);
+        return result;
+    }
+
+    // Arithmetic operators
+    friend const nsInt64 operator +(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator -(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator *(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator /(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator %(const nsInt64& aObject1, const nsInt64& aObject2);
+
+    /**
+     * Increment a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator +=(const nsInt64& aObject) {
+        LL_ADD(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Decrement a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator -=(const nsInt64& aObject) {
+        LL_SUB(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Multiply a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator *=(const nsInt64& aObject) {
+        LL_MUL(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Divide a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator /=(const nsInt64& aObject) {
+        LL_DIV(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Compute the modulus of a 64-bit integer to a 64-bit value.
+     */
+    nsInt64& operator %=(const nsInt64& aObject) {
+        LL_MOD(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    // Comparison operators
+    friend PRBool operator ==(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator !=(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator >(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator >=(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator <(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator <=(const nsInt64& aObject1, const nsInt64& aObject2);
+
+    // Bitwise operators
+    friend const nsInt64 operator &(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator |(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator ^(const nsInt64& aObject1, const nsInt64& aObject2);
+
+    /**
+     * Compute the bitwise NOT of a 64-bit integer
+     */
+    const nsInt64 operator ~(void) {
+        nsInt64 result;
+        LL_NOT(result.mValue, mValue);
+        return result;
+    }
+
+    /**
+     * Compute the bitwise AND with another 64-bit integer
+     */
+    nsInt64& operator &=(const nsInt64& aObject) {
+        LL_AND(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Compute the bitwise OR with another 64-bit integer
+     */
+    nsInt64& operator |=(const nsInt64& aObject) {
+        LL_OR(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Compute the bitwise XOR with another 64-bit integer
+     */
+    nsInt64& operator ^=(const nsInt64& aObject) {
+        LL_XOR(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+};
+
+
+/**
+ * Add two 64-bit integers.
+ */
+inline const nsInt64
+operator +(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) += aObject2;
+}
+
+/**
+ * Subtract one 64-bit integer from another.
+ */
+inline const nsInt64
+operator -(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) -= aObject2;
+}
+
+/**
+ * Multiply two 64-bit integers
+ */
+inline const nsInt64
+operator *(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) *= aObject2;
+}
+
+/**
+ * Divide one 64-bit integer by another
+ */
+inline const nsInt64
+operator /(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) /= aObject2;
+}
+
+/**
+ * Compute the modulus of two 64-bit integers
+ */
+inline const nsInt64
+operator %(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) %= aObject2;
+}
+
+/**
+ * Determine if two 64-bit integers are equal
+ */
+inline PRBool
+operator ==(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_EQ(aObject1.mValue, aObject2.mValue);
+}
+
+/**
+ * Determine if two 64-bit integers are not equal
+ */
+inline PRBool
+operator !=(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_NE(aObject1.mValue, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integer is strictly greater than another, using signed values
+ */
+inline PRBool
+operator >(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, >, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integer is greater than or equal to another, using signed values
+ */
+inline PRBool
+operator >=(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, >=, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integer is strictly less than another, using signed values
+ */
+inline PRBool 
+operator <(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, <, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integers is less than or equal to another, using signed values
+ */
+inline PRBool
+operator <=(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, <=, aObject2.mValue);
+}
+
+/**
+ * Perform a bitwise AND of two 64-bit integers
+ */
+inline const nsInt64
+operator &(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) &= aObject2;
+}
+
+/**
+ * Perform a bitwise OR of two 64-bit integers
+ */
+inline const nsInt64
+operator |(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) |= aObject2;
+}
+
+/**
+ * Perform a bitwise XOR of two 64-bit integers
+ */
+inline const nsInt64
+operator ^(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) ^= aObject2;
+}
+
+
+#endif // nsInt64_h__

mozilla/base/src/nsRBTree.cpp

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

mozilla/base/src/nsRBTree.h

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

mozilla/base/src/nsSizeOfHandler.cpp

@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsISizeOfHandler.h"
+#include "plhash.h"
+
+static NS_DEFINE_IID(kISizeOfHandlerIID, NS_ISIZEOF_HANDLER_IID);
+
+class nsSizeOfHandler : public nsISizeOfHandler {
+public:
+  nsSizeOfHandler();
+  ~nsSizeOfHandler();
+
+  // nsISupports
+  NS_DECL_ISUPPORTS
+
+  // nsISizeOfHandler
+  NS_IMETHOD Add(size_t aSize);
+  virtual PRBool HaveSeen(void* anObject);
+  NS_IMETHOD GetSize(PRUint32& aResult);
+
+protected:
+  PRUint32 mTotalSize;
+  PLHashTable* mTable;
+};
+
+static PLHashNumber
+HashKey(void* key)
+{
+  return (PLHashNumber) key;
+}
+
+static PRIntn
+CompareKeys(void* key1, void* key2)
+{
+  return key1 == key2;
+}
+
+nsSizeOfHandler::nsSizeOfHandler()
+{
+  NS_INIT_REFCNT();
+  mTotalSize = 0;
+  mTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                           (PLHashComparator) CompareKeys,
+                           (PLHashComparator) nsnull,
+                           nsnull, nsnull);
+}
+
+nsSizeOfHandler::~nsSizeOfHandler()
+{
+  if (nsnull != mTable) {
+    PL_HashTableDestroy(mTable);
+  }
+}
+
+NS_IMPL_ISUPPORTS(nsSizeOfHandler, kISizeOfHandlerIID)
+
+NS_IMETHODIMP
+nsSizeOfHandler::Add(size_t aSize)
+{
+  mTotalSize += aSize;
+  return NS_OK;
+}
+
+PRBool
+nsSizeOfHandler::HaveSeen(void* anObject)
+{
+  if (nsnull == mTable) {
+    // When we run out of memory, HaveSeen returns PR_TRUE to stop
+    // wasting time.
+    return PR_TRUE;
+  }
+    
+  if (nsnull != anObject) {
+    PRInt32 hashCode = (PRInt32) anObject;
+    PLHashEntry** hep = PL_HashTableRawLookup(mTable, hashCode, anObject);
+    PLHashEntry* he = *hep;
+    if (nsnull != he) {
+      return PR_TRUE;
+    }
+    he = PL_HashTableRawAdd(mTable, hep, hashCode, anObject, anObject);
+    if (nsnull == he) {
+      // When we run out of memory, HaveSeen returns PR_TRUE to stop
+      // wasting time.
+      return PR_TRUE;
+    }
+    return PR_FALSE;
+  }
+  return PR_TRUE;
+}
+
+NS_IMETHODIMP
+nsSizeOfHandler::GetSize(PRUint32& aResult)
+{
+  aResult = mTotalSize;
+  return NS_OK;
+}
+
+NS_BASE nsresult
+NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult)
+{
+  nsISizeOfHandler *it = new nsSizeOfHandler();
+  if (it == nsnull) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kISizeOfHandlerIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/nsStdFileStream.cpp

@@ -0,0 +1,133 @@
+/* -*- 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.
+ */
+ 
+//	First checked in on 98/12/08 by John R. McMullen.
+//  Since nsFileStream.h is entirely templates, common code (such as open())
+//  which does not actually depend on the charT, can be placed here.
+
+#ifdef XP_UNIX
+// Compile the un-inlined functions in this file only.
+#define DEFINING_FILE_STREAM
+#endif
+
+#include "nsStdFileStream.h"
+
+#ifdef XP_MAC
+#include <Errors.h>
+#endif
+
+//----------------------------------------------------------------------------------------
+PRFileDesc* nsFileStreamHelpers::open(
+	const nsFilePath& inFile,
+    IOS_BASE::openmode mode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+{
+    PRFileDesc* descriptor = 0;
+    const IOS_BASE::openmode valid_modes[]=
+    {
+        IOS_BASE::out, 
+        IOS_BASE::out | IOS_BASE::app, 
+        IOS_BASE::out | IOS_BASE::trunc, 
+        IOS_BASE::in, 
+        IOS_BASE::in  | IOS_BASE::out, 
+        IOS_BASE::in  | IOS_BASE::out    | IOS_BASE::trunc, 
+//      IOS_BASE::out | IOS_BASE::binary, 
+//      IOS_BASE::out | IOS_BASE::app    | IOS_BASE::binary, 
+//      IOS_BASE::out | IOS_BASE::trunc  | IOS_BASE::binary, 
+//      IOS_BASE::in  | IOS_BASE::binary, 
+//      IOS_BASE::in  | IOS_BASE::out    | IOS_BASE::binary, 
+//      IOS_BASE::in  | IOS_BASE::out    | IOS_BASE::trunc | IOS_BASE::binary,
+        0 
+    };
+
+    const int nspr_modes[]={
+        PR_WRONLY | PR_CREATE_FILE,
+        PR_WRONLY | PR_CREATE_FILE | PR_APPEND,
+        PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
+        PR_RDONLY,
+        PR_RDONLY | PR_APPEND,
+        PR_RDWR | PR_CREATE_FILE,
+        PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE,
+//      "wb",
+//      "ab", 
+//      "wb",
+//      "rb",
+//      "r+b",
+//      "w+b",
+        0 };
+    int ind=0;
+    while (valid_modes[ind] && valid_modes[ind] != (mode&~IOS_BASE::ate))
+        ++ind;
+    if (!nspr_modes[ind]) 
+        return 0;
+
+#ifdef XP_MAC
+     // Use the file spec to open the file, because one path can be common to
+     // several files on the Macintosh (you can have several volumes with the
+     // same name, see).
+    descriptor = 0;
+    if (inFile.GetNativeSpec().Error() != noErr)
+        return 0;
+    OSErr err = noErr;
+#if DEBUG
+	const OSType kCreator = 'CWIE';
+#else
+    const OSType kCreator = 'MOSS';
+#endif
+	nsNativeFileSpec nativeSpec = inFile.GetNativeSpec();
+    FSSpec* spec = (FSSpec*)nativeSpec;
+    if (nspr_modes[ind] & PR_CREATE_FILE)
+    	err = FSpCreate(spec, kCreator, 'TEXT', 0);
+    if (err == dupFNErr)
+    	err = noErr;
+    if (err != noErr)
+       return 0;
+    
+    SInt8 perm;
+    if (nspr_modes[ind] & PR_RDWR)
+       perm = fsRdWrPerm;
+    else if (nspr_modes[ind] & PR_WRONLY)
+       perm = fsWrPerm;
+    else
+       perm = fsRdPerm;
+
+    short refnum;
+    err = FSpOpenDF(spec, perm, &refnum);
+
+    if (err == noErr && (nspr_modes[ind] & PR_TRUNCATE))
+    	err = SetEOF(refnum, 0);
+    if (err == noErr && (nspr_modes[ind] & PR_APPEND))
+    	err = SetFPos(refnum, fsFromLEOF, 0);
+    if (err != noErr)
+       return 0;
+
+    if ((descriptor = PR_ImportFile(refnum)) == 0)
+    	return 0;
+#else
+	//	Platforms other than Macintosh...
+    if ((descriptor = PR_Open(inFile, nspr_modes[ind], accessMode)) != 0)
+#endif
+       if (mode&IOS_BASE::ate && PR_Seek(descriptor, 0, PR_SEEK_END) >= 0)
+       {
+          PR_Close(descriptor);
+          descriptor = 0;
+          return 0;
+       }
+    return descriptor;
+} // nsFileStreamHelpers::open

mozilla/base/src/nsString.h

@@ -0,0 +1,797 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+    A. There are two philosophies to building string classes:
+        1. Hide the underlying buffer & offer API's allow indirect iteration
+        2. Reveal underlying buffer, risk corruption, but gain performance
+        
+       We chose the second option for performance reasons. 
+
+    B Our internal buffer always holds capacity+1 bytes.
+ ***********************************************************************/
+
+
+#ifndef _NSSTRING
+#define _NSSTRING
+
+
+#include "prtypes.h"
+#include "nscore.h"
+#include "nsIAtom.h"
+#include <iostream.h>
+#include <stdio.h>
+class nsISizeOfHandler;
+
+class NS_BASE nsString {
+  public: 
+
+/**
+ * Default constructor. Note that we actually allocate a small buffer
+ * to begin with. This is because the "philosophy" of the string class
+ * was to allow developers direct access to the underlying buffer for
+ * performance reasons. 
+ */
+nsString();
+
+/**
+ * This constructor accepts an isolatin string
+ * @param   an ascii is a ptr to a 1-byte cstr
+ */
+nsString(const char* aCString);
+
+/**
+ * This is our copy constructor 
+ * @param   reference to another nsString
+ */
+nsString(const nsString&);
+
+/**
+ * Constructor from a unicode string
+ * @param   anicodestr pts to a unicode string
+ */
+nsString(const PRUnichar* aUnicode);    
+
+/**
+ * Virtual Destructor
+ */
+virtual ~nsString();
+
+
+/**
+ * Retrieve the length of this string
+ * @return string length
+ */
+PRInt32 Length() const { return mLength; }
+
+
+/**
+ * Sets the new length of the string.
+ * @param   aLength is new string length.
+ * @return  nada
+ */
+void SetLength(PRInt32 aLength);
+
+/**
+ * This method truncates this string to given length.
+ *
+ * @param   anIndex -- new length of string
+ * @return  nada
+ */
+void Truncate(PRInt32 anIndex=0);
+
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size.
+ * @param   aNewLength -- new capacity of string  
+ * @return  void
+ */
+virtual void EnsureCapacityFor(PRInt32 aNewLength);
+
+/**
+ * 
+ * @param 
+ */
+virtual void SizeOf(nsISizeOfHandler* aHandler) const;
+
+/**
+ *  Determine whether or not the characters in this
+ *  string are in sorted order.
+ *  
+ *  @return  TRUE if ordered.
+ */
+PRBool IsOrdered(void) const;
+
+/**********************************************************************
+  Accessor methods...
+ *********************************************************************/
+
+/**
+ * Retrieve pointer to internal string value
+ * @return  PRUnichar* to internal string
+ */
+const PRUnichar* GetUnicode(void) const;
+
+/**
+ * 
+ * @param 
+ * @return
+ */
+operator PRUnichar*() const;
+
+/**
+ * Retrieve unicode char at given index
+ * @param   offset into string
+ * @return  PRUnichar* to internal string
+ */
+PRUnichar operator()(PRInt32 anIndex) const;
+
+/**
+ * Retrieve reference to unicode char at given index
+ * @param   offset into string
+ * @return  PRUnichar& from internal string
+ */
+PRUnichar& operator[](PRInt32 anIndex) const;
+
+/**
+ * Retrieve reference to unicode char at given index
+ * @param   offset into string
+ * @return  PRUnichar& from internal string
+ */
+PRUnichar& CharAt(PRInt32 anIndex) const;
+
+/**
+ * Retrieve reference to first unicode char in string
+ * @return  PRUnichar from internal string
+ */
+PRUnichar& First() const; 
+
+/**
+ * Retrieve reference to last unicode char in string
+ * @return  PRUnichar from internal string
+ */
+PRUnichar& Last() const;
+
+/**********************************************************************
+  String creation methods...
+ *********************************************************************/
+
+/**
+ * Create a new string by appending given string to this
+ * @param   aString -- 2nd string to be appended
+ * @return  new string
+ */
+nsString operator+(const nsString& aString);
+
+/**
+ * create a new string by adding this to the given buffer.
+ * @param   aCString is a ptr to cstring to be added to this
+ * @return  newly created string
+ */
+nsString operator+(const char* aCString);
+
+/**
+ * create a new string by adding this to the given char.
+ * @param   aChar is a char to be added to this
+ * @return  newly created string
+ */
+nsString operator+(char aChar);
+
+/**
+ * create a new string by adding this to the given buffer.
+ * @param   aStr unichar buffer to be added to this
+ * @return  newly created string
+ */
+nsString operator+(const PRUnichar* aBuffer);
+
+/**
+ * create a new string by adding this to the given char.
+ * @param   aChar is a unichar to be added to this
+ * @return  newly created string
+ */
+nsString operator+(PRUnichar aChar);
+
+/**
+ * Converts all chars in internal string to lower
+ */
+void ToLowerCase();
+
+/**
+ * Converts all chars in given string to lower
+ */
+void ToLowerCase(nsString& aString) const;
+
+/**
+ * Converts all chars in given string to upper
+ */
+void ToUpperCase();
+
+/**
+ * Converts all chars in given string to UCS2
+ * which ensure that the lower 256 chars are correct.
+ */
+void ToUCS2(PRInt32 aStartOffset);
+
+/**
+ * Converts all chars in internal string to upper
+ */
+void ToUpperCase(nsString& aString) const;
+
+/**
+ * Creates a duplicate clone (ptr) of this string.
+ * @return  ptr to clone of this string
+ */
+nsString* ToNewString() const;
+
+/**
+ * Creates an ascii clone of this string
+ * NOTE: This string is allocated with new; YOU MUST deallocate with delete[]!
+ * @return  ptr to new c-String string
+ */
+char* ToNewCString() const;
+
+/**
+ * Copies data from internal buffer onto given char* buffer
+ * @param aBuf is the buffer where data is stored
+ * @param aBuflength is the max # of chars to move to buffer
+ * @return ptr to given buffer
+ */
+char* ToCString(char* aBuf,PRInt32 aBufLength) const;
+
+/**
+ * Copies contents of this onto given string.
+ * @param   aString to hold copy of this
+ * @return  nada.
+ */
+void Copy(nsString& aString) const;
+
+/**
+ * Creates an unichar clone of this string
+ * @return  ptr to new unichar string
+ */
+PRUnichar* ToNewUnicode() const;
+
+/**
+ * Perform string to float conversion.
+ * @param   aErrorCode will contain error if one occurs
+ * @return  float rep of string value
+ */
+float ToFloat(PRInt32* aErrorCode) const;
+
+/**
+ * Perform string to int conversion.
+ * @param   aErrorCode will contain error if one occurs
+ * @return  int rep of string value
+ */
+PRInt32 ToInteger(PRInt32* aErrorCode,PRInt32 aRadix=10) const;
+
+/**********************************************************************
+  String manipulation methods...                
+ *********************************************************************/
+
+/**
+ * assign given PRUnichar* to this string
+ * @param   aStr: buffer to be assigned to this 
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& SetString(const PRUnichar* aStr,PRInt32 aLength=-1);
+
+/**
+ * assign given char* to this string
+ * @param   aCString: buffer to be assigned to this 
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& SetString(const char* aCString,PRInt32 aLength=-1);
+
+/**
+ * assign given string to this one
+ * @param   aString: string to be added to this
+ * @return  this
+ */
+nsString& operator=(const nsString& aString);
+
+/**
+ * assign given char* to this string
+ * @param   aCString: buffer to be assigned to this 
+ * @return  this
+ */
+nsString& operator=(const char* aCString);
+
+/**
+ * assign given char to this string
+ * @param   aChar: char to be assignd to this
+ * @return  this
+ */
+nsString& operator=(char aChar);
+
+/**
+ * assign given unichar* to this string
+ * @param   aBuffer: unichar buffer to be assigned to this 
+ * @return  this
+ */
+nsString& operator=(const PRUnichar* aBuffer);
+
+/**
+ * assign given char to this string
+ * @param   aChar: char to be assignd to this
+ * @return  this
+ */
+nsString& operator=(PRUnichar aChar);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @return  this
+ */
+nsString& operator+=(const nsString& aString);
+
+/**
+ * append given buffer to this string
+ * @param   aCString: buffer to be appended to this
+ * @return  this
+ */
+nsString& operator+=(const char* aCString);
+
+/**
+ * append given buffer to this string
+ * @param   aBuffer: buffer to be appended to this
+ * @return  this
+ */
+nsString& operator+=(const PRUnichar* aBuffer);
+
+/**
+ * append given char to this string
+ * @param   aChar: char to be appended to this
+ * @return  this
+ */
+nsString& operator+=(PRUnichar aChar);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& Append(const nsString& aString,PRInt32 aLength=-1);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& Append(const char* aCString,PRInt32 aLength=-1);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @return  this
+ */
+nsString& Append(char aChar);
+
+/**
+ * append given unichar buffer to this string
+ * @param   aString : string to be appended to this
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& Append(const PRUnichar* aBuffer,PRInt32 aLength=-1);
+
+/**
+ * append given unichar character to this string
+ * @param   aChar is the char to be appended to this
+ * @return  this
+ */
+nsString& Append(PRUnichar aChar);
+
+/**
+ * Append an integer onto this string
+ * @param aInteger is the int to be appended
+ * @param aRadix specifies 8,10,16
+ * @return this
+ */
+nsString& Append(PRInt32 aInteger,PRInt32 aRadix); //radix=8,10 or 16
+
+/**
+ * Append a float value onto this string
+ * @param aFloat is the float to be appended
+ * @return this
+ */
+nsString& Append(float aFloat);
+              
+/*
+ *  Copies n characters from this string to given string,
+ *  starting at the leftmost offset.
+ *  
+ *  
+ *  @param   aCopy -- Receiving string
+ *  @param   aCount -- number of chars to copy
+ *  @return  number of chars copied
+ */
+PRInt32 Left(nsString& aCopy,PRInt32 aCount) const;
+
+/*
+ *  Copies n characters from this string to given string,
+ *  starting at the given offset.
+ *  
+ *  
+ *  @param   aCopy -- Receiving string
+ *  @param   aCount -- number of chars to copy
+ *  @param   anOffset -- position where copying begins
+ *  @return  number of chars copied
+ */
+PRInt32 Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) const;
+
+/*
+ *  Copies n characters from this string to given string,
+ *  starting at rightmost char.
+ *  
+ *  
+ *  @param  aCopy -- Receiving string
+ *  @param  aCount -- number of chars to copy
+ *  @return number of chars copied
+ */
+PRInt32 Right(nsString& aCopy,PRInt32 aCount) const;
+
+/*
+ *  This method inserts n chars from given string into this
+ *  string at str[anOffset].
+ *  
+ *  @param  aCopy -- String to be inserted into this
+ *  @param  anOffset -- insertion position within this str
+ *  @param  aCount -- number of chars to be copied from aCopy
+ *  @return number of chars inserted into this.
+ */
+PRInt32 Insert(const nsString& aCopy,PRInt32 anOffset,PRInt32 aCount=-1);
+
+/**
+ * Insert a single unicode char into this string at
+ * a specified offset.
+ *
+ * @param   aChar char to be inserted into this string
+ * @param   anOffset is insert pos in str 
+ * @return  the number of chars inserted into this string
+ */
+PRInt32 Insert(PRUnichar aChar,PRInt32 anOffset);
+
+/*
+ *  This method is used to cut characters in this string
+ *  starting at anOffset, continuing for aCount chars.
+ *  
+ *  @param  anOffset -- start pos for cut operation
+ *  @param  aCount -- number of chars to be cut
+ *  @return *this
+ */
+nsString& Cut(PRInt32 anOffset,PRInt32 aCount);
+
+/**
+ *  This method is used to remove all occurances of the
+ *  characters found in aSet from this string.
+ *  
+ *  @param  aSet -- characters to be cut from this
+ *  @return *this 
+ */
+nsString& StripChars(const char* aSet);
+
+/**
+ *  This method strips whitespace throughout the string
+ *  
+ *  @return  this
+ */
+nsString& StripWhitespace();
+
+/**
+ *  This method trims characters found in aTrimSet from
+ *  either end of the underlying string.
+ *  
+ *  @param   aTrimSet -- contains chars to be trimmed from
+ *           both ends
+ *  @return  this
+ */
+nsString& Trim(const char* aSet,
+               PRBool aEliminateLeading=PR_TRUE,
+               PRBool aEliminateTrailing=PR_TRUE);
+
+/**
+ *  This method strips whitespace from string.
+ *  You can control whether whitespace is yanked from
+ *  start and end of string as well.
+ *  
+ *  @param   aEliminateLeading controls stripping of leading ws
+ *  @param   aEliminateTrailing controls stripping of trailing ws
+ *  @return  this
+ */
+nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,
+                              PRBool aEliminateTrailing=PR_TRUE);
+
+/**
+ *  Determine if given char is a valid space character
+ *  
+ *  @param   aChar is character to be tested
+ *  @return  TRUE if is valid space char
+ */
+static  PRBool IsSpace(PRUnichar ch);
+
+/**
+ *  Determine if given char in valid alpha range
+ *  
+ *  @param   aChar is character to be tested
+ *  @return  TRUE if in alpha range
+ */
+static  PRBool IsAlpha(PRUnichar ch);
+
+/**
+ *  Determine if given char is valid digit
+ *  
+ *  @param   aChar is character to be tested
+ *  @return  TRUE if char is a valid digit
+ */
+static  PRBool IsDigit(PRUnichar ch);
+
+/**********************************************************************
+  Searching methods...                
+ *********************************************************************/
+ 
+/**
+ *  Search for given character within this string.
+ *  This method does so by using a binary search,
+ *  so your string HAD BETTER BE ORDERED!
+ *  
+ *  @param   aChar is the unicode char to be found
+ *  @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 BinarySearch(PRUnichar aChar) const;
+
+/**
+ *  Search for given substring within this string
+ *  
+ *  @param   aString is substring to be sought in this
+ *  @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 Find(const char* aString) const;
+PRInt32 Find(const PRUnichar* aString) const;
+PRInt32 Find(const nsString& aString) const;
+
+/**
+ *  Search for given char within this string
+ *  
+ *  @param   aChar - char to be found
+ *  @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 Find(PRUnichar aChar,PRInt32 offset=0) const;
+
+/**
+ * This method searches this string for the first character
+ * found in the given string
+ * @param aString contains set of chars to be found
+ * @param anOffset tells us where to start searching in this
+ * @return -1 if not found, else the offset in this
+ */
+PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=0) const;
+PRInt32 FindCharInSet(nsString& aString,PRInt32 anOffset=0) const;
+
+/**
+ * This method searches this string for the last character
+ * found in the given string
+ * @param aString contains set of chars to be found
+ * @param anOffset tells us where to start searching in this
+ * @return -1 if not found, else the offset in this
+ */
+PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=0) const;
+PRInt32 RFindCharInSet(nsString& aString,PRInt32 anOffset=0) const;
+
+
+/**
+ * This methods scans the string backwards, looking for the given string
+ * @param   aString is substring to be sought in this
+ * @param   aIgnoreCase tells us whether or not to do caseless compare
+ * @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE) const;
+PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE) const;
+PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE) const;
+
+/**
+ * This methods scans the string backwards, looking for the given char
+ * @param   char is the char to be sought in this
+ * @param   aIgnoreCase tells us whether or not to do caseless compare
+ * @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 RFind(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE) const;
+
+/**********************************************************************
+  Comparison methods...                
+ *********************************************************************/
+
+/**
+ * Compares a given string type to this string. 
+ * @update	gess 7/27/98
+ * @param   S is the string to be compared
+ * @param   aIgnoreCase tells us how to treat case
+ * @return  -1,0,1
+ */
+virtual PRInt32 Compare(const nsString &aString,PRBool aIgnoreCase=PR_FALSE) const;
+virtual PRInt32 Compare(const char *aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
+virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
+
+/**
+ * These methods compare a given string type to this one
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator==(const nsString &aString) const;
+PRBool  operator==(const char *aString) const;
+PRBool  operator==(const PRUnichar* aString) const;
+
+/**
+ * These methods perform a !compare of a given string type to this 
+ * @param aString is the string to be compared to this
+ * @return  TRUE 
+ */
+PRBool  operator!=(const nsString &aString) const;
+PRBool  operator!=(const char *aString) const;
+PRBool  operator!=(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is < than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator<(const nsString &aString) const;
+PRBool  operator<(const char *aString) const;
+PRBool  operator<(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is > than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator>(const nsString &S) const;
+PRBool  operator>(const char *aCString) const;
+PRBool  operator>(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is <= than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator<=(const nsString &S) const;
+PRBool  operator<=(const char *aCString) const;
+PRBool  operator<=(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is >= than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator>=(const nsString &S) const;
+PRBool  operator>=(const char* aCString) const;
+PRBool  operator>=(const PRUnichar* aString) const;
+
+/**
+ * Compare this to given string; note that we compare full strings here.
+ * The optional length argument just lets us know how long the given string is.
+ * If you provide a length, it is compared to length of this string as an
+ * optimization.
+ * 
+ * @param  aString -- the string to compare to this
+ * @param  aLength -- optional length of given string.
+ * @return TRUE if equal
+ */
+PRBool  Equals(const nsString& aString) const;
+PRBool  Equals(const char* aString,PRInt32 aLength=-1) const;   
+PRBool  Equals(const nsIAtom *aAtom) const;
+
+
+/**
+ * Compares to unichar string ptrs to each other
+ * @param s1 is a ptr to a unichar buffer
+ * @param s2 is a ptr to a unichar buffer
+ * @return  TRUE if they match
+ */
+PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2) const;
+
+/**
+ * Compare this to given string; note that we compare full strings here.
+ * The optional length argument just lets us know how long the given string is.
+ * If you provide a length, it is compared to length of this string as an
+ * optimization.
+ * 
+ * @param  aString -- the string to compare to this
+ * @param  aLength -- optional length of given string.
+ * @return TRUE if equal
+ */
+PRBool  EqualsIgnoreCase(const nsString& aString) const;
+PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aLength=-1) const;
+PRBool  EqualsIgnoreCase(const nsIAtom *aAtom) const;
+
+/**
+ * Compares to unichar string ptrs to each other without respect to case
+ * @param s1 is a ptr to a unichar buffer
+ * @param s2 is a ptr to a unichar buffer
+ * @return  TRUE if they match
+ */
+PRBool  EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
+
+
+static void   SelfTest();
+virtual void          DebugDump(ostream& aStream) const;
+
+  protected:
+
+typedef PRUnichar chartype;
+
+            chartype*       mStr;
+            PRInt32         mLength;
+            PRInt32         mCapacity;
+		static	PRBool					mSelfTested;
+};
+
+ostream& operator<<(ostream& os,nsString& aString);
+extern NS_BASE int fputs(const nsString& aString, FILE* out);
+
+//----------------------------------------------------------------------
+
+/**
+ * A version of nsString which is designed to be used as an automatic
+ * variable.  It attempts to operate out of a fixed size internal
+ * buffer until too much data is added; then a dynamic buffer is
+ * allocated and grown as necessary.
+ */
+// XXX template this with a parameter for the size of the buffer?
+class NS_BASE nsAutoString : public nsString {
+public:
+                nsAutoString();
+                nsAutoString(const nsString& other);
+                nsAutoString(const nsAutoString& other);
+                nsAutoString(PRUnichar aChar);
+                nsAutoString(const char* aCString);
+                nsAutoString(const PRUnichar* us, PRInt32 uslen = -1);
+  virtual       ~nsAutoString();
+
+  nsAutoString& operator=(const nsString& aString) {nsString::operator=(aString); return *this;}
+  nsAutoString& operator=(const char* aCString) {nsString::operator=(aCString); return *this;}
+  nsAutoString& operator=(char aChar) {nsString::operator=(aChar); return *this;}
+  nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::operator=(aBuffer); return *this;}
+  nsAutoString& operator=(PRUnichar aChar) {nsString::operator=(aChar); return *this;}
+
+  virtual void  SizeOf(nsISizeOfHandler* aHandler) const;
+
+  static  void  SelfTest();
+
+protected:
+  virtual void EnsureCapacityFor(PRInt32 aNewLength);
+
+  chartype mBuf[32];
+};
+
+ostream& operator<<(ostream& os,nsAutoString& aString);
+
+#endif
+

mozilla/base/src/nsTime.h

@@ -0,0 +1,184 @@
+/* -*- 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 nsTime_h__
+#define nsTime_h__
+
+#include "prtime.h"
+#include "nsInt64.h"
+#include "nscore.h"
+
+/**
+ * This class encapsulates full 64-bit time functionality and
+ * provides simple arithmetic and conversion operations.
+ */
+
+// If you ever decide that you need to add a non-inline method to this
+// class, be sure to change the class declaration to "class NS_BASE
+// nsTime".
+
+class nsTime
+{
+private:
+    nsInt64 mValue;
+    
+public:
+    /**
+     * Construct the current time.
+     */
+    nsTime(void) : mValue(PR_Now()) {
+    }
+
+    /**
+     * Construct a time from a PRTime.
+     */
+    nsTime(const PRTime aTime) : mValue(aTime) {
+    }
+
+    /**
+     * Construct a time from a 64-bit value.
+     */
+    nsTime(const nsInt64& aTime) : mValue(aTime) {
+    }
+
+    /**
+     * Construct a time from another time.
+     */
+    nsTime(const nsTime& aTime) : mValue(aTime.mValue) {
+    }
+
+    // ~nsTime(void) -- XXX destructor unnecessary
+
+    /**
+     * Assign one time to another.
+     */
+    const nsTime& operator =(const nsTime& aTime) {
+        mValue = aTime.mValue;
+        return *this;
+    }
+
+    /**
+     * Convert a nsTime object to a PRTime
+     */
+    operator PRTime(void) const {
+        return mValue;
+    }
+
+    /**
+     * Subtract a 64-bit interval from a time.
+     */
+    nsTime& operator -=(const nsInt64& aInterval) {
+        mValue -= aInterval;
+        return *this;
+    }
+
+    /**
+     * Add a 64-bit interval to a time.
+     */
+    nsTime& operator +=(const nsInt64& aInterval) {
+        mValue += aInterval;
+        return *this;
+    }
+
+    // Arithmetic operators
+    friend const nsTime operator +(const nsTime& aTime, const nsInt64& aInterval);
+    friend const nsTime operator -(const nsTime& aTime, const nsInt64& aInterval);
+    friend const nsInt64 operator -(const nsTime& aTime1, const nsTime& aTime2);
+
+    // Comparison operators
+    friend const PRBool operator ==(const nsTime& aTime1, const nsTime& aTime2);
+    friend const PRBool operator !=(const nsTime& aTime1, const nsTime& aTime2);
+    friend const PRBool operator <(const nsTime& aTime1, const nsTime& aTime2);
+    friend const PRBool operator <=(const nsTime& aTime1, const nsTime& aTime2);
+    friend const PRBool operator >(const nsTime& aTime1, const nsTime& aTime2);
+    friend const PRBool operator >=(const nsTime& aTime1, const nsTime& aTime2);
+};
+
+/**
+ * Binary addition to add a 64-bit interval to a time.
+ */
+inline const nsTime
+operator +(const nsTime& aTime, const nsInt64& aInterval) {
+    return nsTime(aTime.mValue + aInterval);
+}
+
+/**
+ * Binary subtraction to subtract a 64-bit interval to a time.
+ */
+inline const nsTime
+operator -(const nsTime& aTime, const nsInt64& aInterval) {
+    return nsTime(aTime.mValue - aInterval);
+}
+
+/**
+ * Binary subtraction to compute an interval from the difference of two times.
+ */
+inline const nsInt64
+operator -(const nsTime& aTime1, const nsTime& aTime2) {
+    return aTime1.mValue - aTime2.mValue;
+}
+
+/**
+ * Determine if two times are equal
+ */
+inline const PRBool
+operator ==(const nsTime& aTime1, const nsTime& aTime2) {
+    return aTime1.mValue == aTime2.mValue;
+}
+
+/**
+ * Determine if two times are different
+ */
+inline const PRBool
+operator !=(const nsTime& aTime1, const nsTime& aTime2) {
+    return aTime1.mValue != aTime2.mValue;
+}
+
+/**
+ * Determine if one time is strictly less than another
+ */
+inline const PRBool
+operator <(const nsTime& aTime1, const nsTime& aTime2) {
+    return aTime1.mValue < aTime2.mValue;
+}
+
+/**
+ * Determine if one time is less than or equal to another
+ */
+inline const PRBool
+operator <=(const nsTime& aTime1, const nsTime& aTime2) {
+    return aTime1.mValue <= aTime2.mValue;
+}
+
+/**
+ * Determine if one time is strictly greater than another
+ */
+inline const PRBool
+operator >(const nsTime& aTime1, const nsTime& aTime2) {
+    return aTime1.mValue > aTime2.mValue;
+}
+
+/**
+ * Determine if one time is greater than or equal to another
+ */
+inline const PRBool
+operator >=(const nsTime& aTime1, const nsTime& aTime2) {
+    return aTime1.mValue >= aTime2.mValue;
+}
+
+#endif // nsTime_h__

mozilla/base/src/nsUnicharBuffer.cpp

@@ -0,0 +1,142 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIUnicharBuffer.h"
+#include "nsIUnicharInputStream.h"
+#include "nsCRT.h"
+
+#define MIN_BUFFER_SIZE 32
+
+class UnicharBufferImpl : public nsIUnicharBuffer {
+public:
+  UnicharBufferImpl(PRUint32 aBufferSize);
+  ~UnicharBufferImpl();
+
+  NS_DECL_ISUPPORTS
+  virtual PRInt32 GetLength() const;
+  virtual PRInt32 GetBufferSize() const;
+  virtual PRUnichar* GetBuffer() const;
+  virtual PRBool Grow(PRInt32 aNewSize);
+  virtual PRInt32 Fill(nsresult* aErrorCode, nsIUnicharInputStream* aStream,
+                       PRInt32 aKeep);
+
+  PRUnichar* mBuffer;
+  PRUint32 mSpace;
+  PRUint32 mLength;
+};
+
+UnicharBufferImpl::UnicharBufferImpl(PRUint32 aBufferSize)
+{
+  if (aBufferSize < MIN_BUFFER_SIZE) {
+    aBufferSize = MIN_BUFFER_SIZE;
+  }
+  mSpace = aBufferSize;
+  mBuffer = new PRUnichar[aBufferSize];
+  mLength = 0;
+  NS_INIT_REFCNT();
+}
+
+NS_DEFINE_IID(kUnicharBufferIID, NS_IUNICHAR_BUFFER_IID);
+NS_IMPL_ISUPPORTS(UnicharBufferImpl,kUnicharBufferIID)
+
+UnicharBufferImpl::~UnicharBufferImpl()
+{
+  if (nsnull != mBuffer) {
+    delete mBuffer;
+    mBuffer = nsnull;
+  }
+  mLength = 0;
+}
+
+PRInt32 UnicharBufferImpl::GetLength() const
+{
+  return mLength;
+}
+
+PRInt32 UnicharBufferImpl::GetBufferSize() const
+{
+  return mSpace;
+}
+
+PRUnichar* UnicharBufferImpl::GetBuffer() const
+{
+  return mBuffer;
+}
+
+PRBool UnicharBufferImpl::Grow(PRInt32 aNewSize)
+{
+  if (PRUint32(aNewSize) < MIN_BUFFER_SIZE) {
+    aNewSize = MIN_BUFFER_SIZE;
+  }
+  PRUnichar* newbuf = new PRUnichar[aNewSize];
+  if (nsnull != newbuf) {
+    if (0 != mLength) {
+      nsCRT::memcpy(newbuf, mBuffer, mLength * sizeof(PRUnichar));
+    }
+    delete mBuffer;
+    mBuffer = newbuf;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRInt32 UnicharBufferImpl::Fill(nsresult* aErrorCode,
+                                nsIUnicharInputStream* aStream,
+                                PRInt32 aKeep)
+{
+  NS_PRECONDITION(nsnull != aStream, "null stream");
+  NS_PRECONDITION(PRUint32(aKeep) < PRUint32(mLength), "illegal keep count");
+  if ((nsnull == aStream) || (PRUint32(aKeep) >= PRUint32(mLength))) {
+    // whoops
+    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
+    return -1;
+  }
+
+  if (0 != aKeep) {
+    // Slide over kept data
+    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep),
+                   aKeep * sizeof(PRUnichar));
+  }
+
+  // Read in some new data
+  mLength = aKeep;
+  PRInt32 amount = mSpace - aKeep;
+  PRUint32 nb;
+  NS_ASSERTION(aKeep >= 0, "unsigned madness");
+  NS_ASSERTION(amount >= 0, "unsigned madness");
+  *aErrorCode = aStream->Read(mBuffer, (PRUint32)aKeep, (PRUint32)amount, &nb);
+  if (NS_SUCCEEDED(*aErrorCode)) {
+    mLength += nb;
+  }
+  else
+    nb = 0;
+  return nb;
+}
+
+NS_BASE nsresult NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
+                                     nsISupports* aOuter,
+                                     PRUint32 aBufferSize)
+{
+  if (nsnull != aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+  UnicharBufferImpl* it = new UnicharBufferImpl(aBufferSize);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kUnicharBufferIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/nsUnicharInputStream.cpp

@@ -0,0 +1,341 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIUnicharInputStream.h"
+#include "nsIByteBuffer.h"
+#include "nsIUnicharBuffer.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include <fcntl.h>
+#ifdef NS_WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+static NS_DEFINE_IID(kIUnicharInputStreamIID, NS_IUNICHAR_INPUT_STREAM_IID);
+
+class StringUnicharInputStream : public nsIUnicharInputStream {
+public:
+  StringUnicharInputStream(nsString* aString);
+  ~StringUnicharInputStream();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Read(PRUnichar* aBuf,
+                  PRUint32 aOffset,
+                  PRUint32 aCount,
+                  PRUint32 *aReadCount);
+  NS_IMETHOD Close();
+
+  nsString* mString;
+  PRUint32 mPos;
+  PRUint32 mLen;
+};
+
+StringUnicharInputStream::StringUnicharInputStream(nsString* aString)
+{
+  NS_INIT_REFCNT();
+  mString = aString;
+  mPos = 0;
+  mLen = aString->Length();
+}
+
+StringUnicharInputStream::~StringUnicharInputStream()
+{
+  if (nsnull != mString) {
+    delete mString;
+  }
+}
+
+nsresult StringUnicharInputStream::Read(PRUnichar* aBuf,
+                                        PRUint32 aOffset,
+                                        PRUint32 aCount,
+                                        PRUint32 *aReadCount)
+{
+  if (mPos >= mLen) {
+    *aReadCount = 0;
+    return (nsresult)-1;
+  }
+  const PRUnichar* us = mString->GetUnicode();
+  NS_ASSERTION(mLen >= mPos, "unsigned madness");
+  PRUint32 amount = mLen - mPos;
+  if (amount > aCount) {
+    amount = aCount;
+  }
+  nsCRT::memcpy(aBuf + aOffset, us + mPos, sizeof(PRUnichar) * amount);
+  mPos += amount;
+  *aReadCount = amount;
+  return NS_OK;
+}
+
+nsresult StringUnicharInputStream::Close()
+{
+  mPos = mLen;
+  if (nsnull != mString) {
+    delete mString;
+  }
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(StringUnicharInputStream, kIUnicharInputStreamIID);
+
+NS_BASE nsresult
+NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
+                               nsString* aString)
+{
+  NS_PRECONDITION(nsnull != aString, "null ptr");
+  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+  if ((nsnull == aString) || (nsnull == aInstancePtrResult)) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  StringUnicharInputStream* it = new StringUnicharInputStream(aString);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return it->QueryInterface(kIUnicharInputStreamIID,
+                            (void**) aInstancePtrResult);
+}
+
+//----------------------------------------------------------------------
+
+class IsoLatin1Converter : public nsIB2UConverter {
+public:
+  IsoLatin1Converter();
+
+  NS_DECL_ISUPPORTS
+  NS_IMETHOD Convert(PRUnichar* aDst,
+                     PRUint32 aDstOffset,
+                     PRUint32& aDstLen,
+                     const char* aSrc,
+                     PRUint32 aSrcOffset,
+                     PRUint32& aSrcLen);
+};
+
+IsoLatin1Converter::IsoLatin1Converter()
+{
+  NS_INIT_REFCNT();
+}
+
+NS_DEFINE_IID(kIB2UConverterIID, NS_IB2UCONVERTER_IID);
+NS_IMPL_ISUPPORTS(IsoLatin1Converter,kIB2UConverterIID);
+
+nsresult IsoLatin1Converter::Convert(PRUnichar* aDst,
+                                    PRUint32 aDstOffset,
+                                    PRUint32& aDstLen,
+                                    const char* aSrc,
+                                    PRUint32 aSrcOffset,
+                                    PRUint32& aSrcLen)
+{
+  PRUint32 amount = aSrcLen;
+  if (aSrcLen > aDstLen) {
+    amount = aDstLen;
+  }
+  const char* end = aSrc + amount;
+  while (aSrc < end) {
+    PRUint8 isoLatin1 = PRUint8(*aSrc++);
+    /* XXX insert table based lookup converter here */
+    *aDst++ = isoLatin1;
+  }
+  aDstLen = amount;
+  aSrcLen = amount;
+  return NS_OK;
+}
+
+NS_BASE nsresult
+NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
+                   nsISupports* aOuter,
+                   nsString* aCharSet)
+{
+  if (nsnull != aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+  // We cannot use enum to pass charset id
+  if ((nsnull != aCharSet) && (! aCharSet->EqualsIgnoreCase( "iso-8859-1" ))){
+      return NS_BASE_STREAM_NO_CONVERTER;
+  }
+  IsoLatin1Converter* it = new IsoLatin1Converter();
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kIB2UConverterIID, (void**)aInstancePtrResult);
+}
+
+//----------------------------------------------------------------------
+
+class ConverterInputStream : public nsIUnicharInputStream {
+public:
+  ConverterInputStream(nsIInputStream* aStream,
+                       nsIB2UConverter* aConverter,
+                       PRUint32 aBufSize);
+  ~ConverterInputStream();
+
+  NS_DECL_ISUPPORTS
+  NS_IMETHOD Read(PRUnichar* aBuf,
+                  PRUint32 aOffset,
+                  PRUint32 aCount,
+                  PRUint32 *aReadCount);
+  NS_IMETHOD Close();
+
+protected:
+  PRInt32 Fill(nsresult * aErrorCode);
+
+  nsIInputStream* mInput;
+  nsIB2UConverter* mConverter;
+  nsIByteBuffer* mByteData;
+  PRUint32 mByteDataOffset;
+  nsIUnicharBuffer* mUnicharData;
+  PRUint32 mUnicharDataOffset;
+  PRUint32 mUnicharDataLength;
+};
+
+ConverterInputStream::ConverterInputStream(nsIInputStream* aStream,
+                                           nsIB2UConverter* aConverter,
+                                           PRUint32 aBufferSize)
+{
+  NS_INIT_REFCNT();
+  mInput = aStream; aStream->AddRef();
+  mConverter = aConverter; aConverter->AddRef();
+  if (aBufferSize == 0) {
+    aBufferSize = 8192;
+  }
+  nsresult rv1 = NS_NewByteBuffer(&mByteData, nsnull, aBufferSize);
+  nsresult rv2 = NS_NewUnicharBuffer(&mUnicharData, nsnull, aBufferSize);
+  mByteDataOffset = 0;
+  mUnicharDataOffset = 0;
+  mUnicharDataLength = 0;
+}
+
+NS_IMPL_ISUPPORTS(ConverterInputStream,kIUnicharInputStreamIID);
+
+ConverterInputStream::~ConverterInputStream()
+{
+  Close();
+}
+
+nsresult ConverterInputStream::Close()
+{
+  if (nsnull != mInput) {
+    mInput->Release();
+    mInput = nsnull;
+  }
+  if (nsnull != mConverter) {
+    mConverter->Release();
+    mConverter = nsnull;
+  }
+  if (nsnull != mByteData) {
+    mByteData->Release();
+    mByteData = nsnull;
+  }
+  if (nsnull != mUnicharData) {
+    mUnicharData->Release();
+    mUnicharData = nsnull;
+  }
+
+  return NS_OK;
+}
+
+nsresult ConverterInputStream::Read(PRUnichar* aBuf,
+                                    PRUint32 aOffset,
+                                    PRUint32 aCount,
+                                    PRUint32 *aReadCount)
+{
+  NS_ASSERTION(mUnicharDataLength >= mUnicharDataOffset, "unsigned madness");
+  PRUint32 rv = mUnicharDataLength - mUnicharDataOffset;
+  nsresult errorCode;
+  if (0 == rv) {
+    // Fill the unichar buffer
+    rv = Fill(&errorCode);
+    if (rv <= 0) {
+      *aReadCount = 0;
+      return errorCode;
+    }
+  }
+  if (rv > aCount) {
+    rv = aCount;
+  }
+  nsCRT::memcpy(aBuf + aOffset, mUnicharData->GetBuffer() + mUnicharDataOffset,
+                rv * sizeof(PRUnichar));
+  mUnicharDataOffset += rv;
+  *aReadCount = rv;
+  return NS_OK;
+}
+
+PRInt32 ConverterInputStream::Fill(nsresult * aErrorCode)
+{
+  if (nsnull == mInput) {
+    // We already closed the stream!
+    *aErrorCode = NS_BASE_STREAM_CLOSED;
+    return -1;
+  }
+
+  NS_ASSERTION(mByteData->GetLength() >= mByteDataOffset, "unsigned madness");
+  PRUint32 remainder = mByteData->GetLength() - mByteDataOffset;
+  mByteDataOffset = remainder;
+  PRInt32 nb = mByteData->Fill(aErrorCode, mInput, remainder);
+  if (nb <= 0) {
+    // Because we assume a many to one conversion, the lingering data
+    // in the byte buffer must be a partial conversion
+    // fragment. Because we know that we have recieved no more new
+    // data to add to it, we can't convert it. Therefore, we discard
+    // it.
+    return nb;
+  }
+  NS_ASSERTION(remainder + nb == mByteData->GetLength(), "bad nb");
+
+  // Now convert as much of the byte buffer to unicode as possible
+  PRUint32 dstLen = mUnicharData->GetBufferSize();
+  PRUint32 srcLen = remainder + nb;
+  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, dstLen,
+                                    mByteData->GetBuffer(), 0, srcLen);
+  mUnicharDataOffset = 0;
+  mUnicharDataLength = dstLen;
+  mByteDataOffset += srcLen;
+  return dstLen;
+}
+
+// XXX hook up auto-detect here (do we need more info, like the url?)
+NS_BASE nsresult
+NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
+                      nsISupports* aOuter,
+                      nsIInputStream* aStreamToWrap,
+                      PRInt32 aBufferSize,
+                      nsString* aCharSet)
+{
+  if (nsnull != aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+
+  // Create converter
+  nsIB2UConverter* converter;
+  nsresult rv = NS_NewB2UConverter(&converter, nsnull, aCharSet);
+  if (NS_OK != rv) {
+    return rv;
+  }
+
+  // Create converter input stream
+  ConverterInputStream* it =
+    new ConverterInputStream(aStreamToWrap, converter, aBufferSize);
+  converter->Release();
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kIUnicharInputStreamIID, 
+                            (void **) aInstancePtrResult);
+}

mozilla/base/src/nsUnitConversion.h

@@ -0,0 +1,182 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsUnitConversion_h__
+#define nsUnitConversion_h__
+
+#include "nscore.h"
+#include <math.h>
+
+/// handy constants
+#define TWIPS_PER_POINT_INT           20
+#define TWIPS_PER_POINT_FLOAT         20.0f
+#define ROUND_EXCLUSIVE_CONST_FLOAT   0.4999999999999999f   // XXX this should be derived from platform FLOAT_MIN
+#define ROUND_CONST_FLOAT             0.5f
+#define CEIL_CONST_FLOAT              0.9999999999999999f   // XXX this should be derived from platform FLOAT_MIN
+
+
+/*
+ * Coord Rounding Functions
+ */
+inline nscoord NSToCoordFloor(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue) : nscoord(aValue - CEIL_CONST_FLOAT));
+}
+
+inline nscoord NSToCoordCeil(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue + CEIL_CONST_FLOAT) : nscoord(aValue));
+}
+
+inline nscoord NSToCoordRound(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue + ROUND_CONST_FLOAT) : nscoord(aValue - ROUND_CONST_FLOAT));
+}
+
+inline nscoord NSToCoordRoundExclusive(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue + ROUND_EXCLUSIVE_CONST_FLOAT) :
+                             nscoord(aValue - ROUND_EXCLUSIVE_CONST_FLOAT));
+}
+
+
+/*
+ * Int Rounding Functions
+ */
+inline PRInt32 NSToIntFloor(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue) : PRInt32(aValue - CEIL_CONST_FLOAT));
+}
+
+inline PRInt32 NSToIntCeil(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue + CEIL_CONST_FLOAT) : PRInt32(aValue));
+}
+
+inline PRInt32 NSToIntRound(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue + ROUND_CONST_FLOAT) : PRInt32(aValue - ROUND_CONST_FLOAT));
+}
+
+inline PRInt32 NSToIntRoundExclusive(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue + ROUND_EXCLUSIVE_CONST_FLOAT) :
+                             PRInt32(aValue - ROUND_EXCLUSIVE_CONST_FLOAT));
+}
+
+
+/* 
+ * Twips/Points conversions
+ */
+inline nscoord NSFloatPointsToTwips(float aPoints)
+{
+  return NSToCoordRound(aPoints * TWIPS_PER_POINT_FLOAT);
+}
+
+inline nscoord NSIntPointsToTwips(PRInt32 aPoints)
+{
+  return nscoord(aPoints * TWIPS_PER_POINT_INT);
+}
+
+inline PRInt32 NSTwipsToIntPoints(nscoord aTwips)
+{
+  return NSToIntRound(aTwips / TWIPS_PER_POINT_FLOAT);
+}
+
+inline PRInt32 NSTwipsToFloorIntPoints(nscoord aTwips)
+{
+  return NSToIntFloor(aTwips / TWIPS_PER_POINT_FLOAT);
+}
+
+inline PRInt32 NSTwipsToCeilIntPoints(nscoord aTwips)
+{
+  return NSToIntCeil(aTwips / TWIPS_PER_POINT_FLOAT);
+}
+
+inline float NSTwipsToFloatPoints(nscoord aTwips)
+{
+  return (float(aTwips) / TWIPS_PER_POINT_FLOAT);
+}
+
+/* 
+ * Twips/Pixel conversions
+ */
+inline nscoord NSFloatPixelsToTwips(float aPixels, float aTwipsPerPixel)
+{
+  return NSToCoordRound(aPixels * aTwipsPerPixel);
+}
+
+inline nscoord NSIntPixelsToTwips(PRInt32 aPixels, float aTwipsPerPixel)
+{
+  return NSToCoordRound(float(aPixels) * aTwipsPerPixel);
+}
+
+inline float NSTwipsToFloatPixels(nscoord aTwips, float aPixelsPerTwip)
+{
+  return (float(aTwips) * aPixelsPerTwip);
+}
+
+inline PRInt32 NSTwipsToIntPixels(nscoord aTwips, float aPixelsPerTwip)
+{
+  return NSToIntRound(float(aTwips) * aPixelsPerTwip);
+}
+
+/* 
+ * Twips/unit conversions
+ */
+inline nscoord NSUnitsToTwips(float aValue, float aPointsPerUnit)
+{
+  return NSToCoordRound(aValue * aPointsPerUnit * TWIPS_PER_POINT_FLOAT);
+}
+
+inline float NSTwipsToUnits(nscoord aTwips, float aUnitsPerPoint)
+{
+  return (aTwips * (aUnitsPerPoint / TWIPS_PER_POINT_FLOAT));
+}
+
+
+/// Unit conversion macros
+//@{
+#define NS_INCHES_TO_TWIPS(x)         NSUnitsToTwips((x), 72.0f)                      // 72 points per inch
+#define NS_FEET_TO_TWIPS(x)           NSUnitsToTwips((x), (72.0f * 12.0f))            // 12 inches per foot
+#define NS_MILES_TO_TWIPS(x)          NSUnitsToTwips((x), (72.0f * 12.0f * 5280.0f))  // 5280 feet per mile
+
+#define NS_MILLIMETERS_TO_TWIPS(x)    NSUnitsToTwips((x), (72.0f * 0.03937f))
+#define NS_CENTIMETERS_TO_TWIPS(x)    NSUnitsToTwips((x), (72.0f * 0.3937f))
+#define NS_METERS_TO_TWIPS(x)         NSUnitsToTwips((x), (72.0f * 39.37f))
+#define NS_KILOMETERS_TO_TWIPS(x)     NSUnitsToTwips((x), (72.0f * 39370.0f))
+
+#define NS_PICAS_TO_TWIPS(x)          NSUnitsToTwips((x), 12.0f)                      // 12 points per pica
+#define NS_DIDOTS_TO_TWIPS(x)         NSUnitsToTwips((x), (16.0f / 15.0f))            // 15 didots per 16 points
+#define NS_CICEROS_TO_TWIPS(x)        NSUnitsToTwips((x), (12.0f * (16.0f / 15.0f)))  // 12 didots per cicero
+
+
+#define NS_TWIPS_TO_INCHES(x)         NSTwipsToUnits((x), 1.0f / 72.0f)
+#define NS_TWIPS_TO_FEET(x)           NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f))
+#define NS_TWIPS_TO_MILES(x)          NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f * 5280.0f))
+
+#define NS_TWIPS_TO_MILLIMETERS(x)    NSTwipsToUnits((x), 1.0f / (72.0f * 0.03937f))
+#define NS_TWIPS_TO_CENTIMETERS(x)    NSTwipsToUnits((x), 1.0f / (72.0f * 0.3937f))
+#define NS_TWIPS_TO_METERS(x)         NSTwipsToUnits((x), 1.0f / (72.0f * 39.37f))
+#define NS_TWIPS_TO_KILOMETERS(x)     NSTwipsToUnits((x), 1.0f / (72.0f * 39370.0f))
+
+#define NS_TWIPS_TO_PICAS(x)          NSTwipsToUnits((x), 1.0f / 12.0f)
+#define NS_TWIPS_TO_DIDOTS(x)         NSTwipsToUnits((x), 1.0f / (16.0f / 15.0f))
+#define NS_TWIPS_TO_CICEROS(x)        NSTwipsToUnits((x), 1.0f / (12.0f * (16.0f / 15.0f)))
+//@}
+
+#endif

mozilla/base/src/nsVoidArray.cpp

@@ -0,0 +1,411 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsVoidArray.h"
+#include "nsCRT.h"
+#include "nsISizeOfHandler.h"
+#include "nsString.h"
+
+static PRInt32 kGrowArrayBy = 8;
+
+nsVoidArray::nsVoidArray()
+{
+  mArray = nsnull;
+  mArraySize = 0;
+  mCount = 0;
+}
+
+nsVoidArray::nsVoidArray(PRInt32 aCount)
+{
+  NS_PRECONDITION(aCount > 0, "bad count");
+  mCount = mArraySize = aCount;
+  mArray = new void*[mCount];
+  nsCRT::memset(mArray, 0, mCount * sizeof(void*));
+}
+
+nsVoidArray& nsVoidArray::operator=(const nsVoidArray& other)
+{
+  if (nsnull != mArray) {
+    delete mArray;
+  }
+  PRInt32 otherCount = other.mCount;
+  mArraySize = otherCount;
+  mCount = otherCount;
+  if (otherCount != 0) {
+    mArray = new void*[otherCount];
+    nsCRT::memcpy(mArray, other.mArray, otherCount * sizeof(void*));
+  } else {
+    mArray = nsnull;
+  }
+  return *this;
+}
+
+nsVoidArray::~nsVoidArray()
+{
+  if (nsnull != mArray) {
+    delete [] mArray;
+  }
+}
+void
+nsVoidArray::SizeOf(nsISizeOfHandler* aHandler) const
+{
+  aHandler->Add(sizeof(*this));
+  aHandler->Add(sizeof(void*) * mArraySize);
+}
+
+void* nsVoidArray::ElementAt(PRInt32 aIndex) const
+{
+  if (PRUint32(aIndex) >= PRUint32(mCount)) {
+    return nsnull;
+  }
+  return mArray[aIndex];
+}
+
+PRInt32 nsVoidArray::IndexOf(void* aPossibleElement) const
+{
+  void** ap = mArray;
+  void** end = ap + mCount;
+  while (ap < end) {
+    if (*ap == aPossibleElement) {
+      return ap - mArray;
+    }
+    ap++;
+  }
+  return -1;
+}
+
+PRBool nsVoidArray::InsertElementAt(void* aElement, PRInt32 aIndex)
+{
+  PRInt32 oldCount = mCount;
+  if (PRUint32(aIndex) > PRUint32(oldCount)) {
+    // An invalid index causes the insertion to fail
+    return PR_FALSE;
+  }
+
+  if (oldCount + 1 > mArraySize) {
+    // We have to grow the array
+    PRInt32 newCount = oldCount + kGrowArrayBy;
+    void** newArray = new void*[newCount];
+    if (mArray != nsnull && aIndex != 0)
+      nsCRT::memcpy(newArray, mArray, aIndex * sizeof(void*));
+    PRInt32 slide = oldCount - aIndex;
+    if (0 != slide) {
+      // Slide data over to make room for the insertion
+      nsCRT::memcpy(newArray + aIndex + 1, mArray + aIndex,
+                    slide * sizeof(void*));
+    }
+    if (mArray != nsnull)
+      delete [] mArray;
+    mArray = newArray;
+    mArraySize = newCount;
+  } else {
+    // The array is already large enough
+    PRInt32 slide = oldCount - aIndex;
+    if (0 != slide) {
+      // Slide data over to make room for the insertion
+      nsCRT::memmove(mArray + aIndex + 1, mArray + aIndex,
+                     slide * sizeof(void*));
+    }
+  }
+  mArray[aIndex] = aElement;
+  mCount++;
+
+  return PR_TRUE;
+}
+
+PRBool nsVoidArray::ReplaceElementAt(void* aElement, PRInt32 aIndex)
+{
+  if (PRUint32(aIndex) >= PRUint32(mArraySize)) {
+
+    PRInt32 requestedCount = aIndex + 1;
+    PRInt32 growDelta = requestedCount - mCount;
+    PRInt32 newCount = mCount + (growDelta > kGrowArrayBy ? growDelta : kGrowArrayBy);
+    void** newArray = new void*[newCount];
+    nsCRT::memset(newArray, 0, newCount * sizeof(void*));
+    if (newArray==nsnull)
+       return PR_FALSE;
+    if (mArray != nsnull && aIndex != 0) {
+      nsCRT::memcpy(newArray, mArray, mCount * sizeof(void*));
+      if (mArray != nsnull)
+         delete [] mArray;
+    }
+    mArray = newArray;
+    mArraySize = newCount;
+  }
+  mArray[aIndex] = aElement;
+  if (aIndex >= mCount)
+     mCount = aIndex+1;
+  return PR_TRUE;
+}
+
+PRBool nsVoidArray::RemoveElementAt(PRInt32 aIndex)
+{
+  PRInt32 oldCount = mCount;
+  if (PRUint32(aIndex) >= PRUint32(oldCount)) {
+    // An invalid index causes the replace to fail
+    return PR_FALSE;
+  }
+
+  // We don't need to move any elements if we're removing the
+  // last element in the array
+  if (aIndex < (oldCount - 1)) {
+    nsCRT::memmove(mArray + aIndex, mArray + aIndex + 1,
+                   (oldCount - 1 - aIndex) * sizeof(void*));
+  }
+
+  mCount--;
+  return PR_TRUE;
+}
+
+PRBool nsVoidArray::RemoveElement(void* aElement)
+{
+  void** ep = mArray;
+  void** end = ep + mCount;
+  while (ep < end) {
+    void* e = *ep++;
+    if (e == aElement) {
+      ep--;
+      return RemoveElementAt(PRInt32(ep - mArray));
+    }
+  }
+  return PR_FALSE;
+}
+
+void nsVoidArray::Clear()
+{
+  mCount = 0;
+}
+
+void nsVoidArray::Compact()
+{
+  PRInt32 count = mCount;
+  if (mArraySize != count) {
+    void** newArray = new void*[count];
+    if (nsnull != newArray) {
+      nsCRT::memcpy(newArray, mArray, count * sizeof(void*));
+      delete [] mArray;
+      mArray = newArray;
+      mArraySize = count;
+    }
+  }
+}
+
+PRBool nsVoidArray::EnumerateForwards(nsVoidArrayEnumFunc aFunc, void* aData)
+{
+  PRInt32 index = -1;
+  PRBool  running = PR_TRUE;
+
+  while (running && (++index < mCount)) {
+    running = (*aFunc)(mArray[index], aData);
+  }
+  return running;
+}
+
+PRBool nsVoidArray::EnumerateBackwards(nsVoidArrayEnumFunc aFunc, void* aData)
+{
+  PRInt32 index = mCount;
+  PRBool  running = PR_TRUE;
+
+  while (running && (0 <= --index)) {
+    running = (*aFunc)(mArray[index], aData);
+  }
+  return running;
+}
+
+//----------------------------------------------------------------
+// nsStringArray
+
+nsStringArray::nsStringArray(void)
+  : nsVoidArray()
+{
+}
+
+nsStringArray::~nsStringArray(void)
+{
+  Clear();
+}
+
+nsStringArray& 
+nsStringArray::operator=(const nsStringArray& other)
+{
+  if (nsnull != mArray) {
+    delete mArray;
+  }
+  PRInt32 otherCount = other.mCount;
+  mArraySize = otherCount;
+  mCount = otherCount;
+  if (0 < otherCount) {
+    mArray = new void*[otherCount];
+    while (0 <= --otherCount) {
+      nsString* otherString = (nsString*)(other.mArray[otherCount]);
+      mArray[otherCount] = new nsString(*otherString);
+    }
+  } else {
+    mArray = nsnull;
+  }
+  return *this;
+}
+
+void  
+nsStringArray::SizeOf(nsISizeOfHandler* aHandler) const
+{
+  nsVoidArray::SizeOf(aHandler);
+  PRInt32 index = mCount;
+  while (0 <= --index) {
+    nsString* string = (nsString*)mArray[index];
+    string->SizeOf(aHandler);
+  }
+}
+
+void 
+nsStringArray::StringAt(PRInt32 aIndex, nsString& aString) const
+{
+  nsString* string = (nsString*)nsVoidArray::ElementAt(aIndex);
+  if (nsnull != string) {
+    aString = *string;
+  }
+  else {
+    aString.Truncate();
+  }
+}
+
+nsString*
+nsStringArray::StringAt(PRInt32 aIndex) const
+{
+  return (nsString*)nsVoidArray::ElementAt(aIndex);
+}
+
+PRInt32 
+nsStringArray::IndexOf(const nsString& aPossibleString) const
+{
+  void** ap = mArray;
+  void** end = ap + mCount;
+  while (ap < end) {
+    nsString* string = (nsString*)*ap;
+    if (string->Equals(aPossibleString)) {
+      return ap - mArray;
+    }
+    ap++;
+  }
+  return -1;
+}
+
+PRInt32 
+nsStringArray::IndexOfIgnoreCase(const nsString& aPossibleString) const
+{
+  void** ap = mArray;
+  void** end = ap + mCount;
+  while (ap < end) {
+    nsString* string = (nsString*)*ap;
+    if (string->EqualsIgnoreCase(aPossibleString)) {
+      return ap - mArray;
+    }
+    ap++;
+  }
+  return -1;
+}
+
+PRBool 
+nsStringArray::InsertStringAt(const nsString& aString, PRInt32 aIndex)
+{
+  nsString* string = new nsString(aString);
+  if (nsVoidArray::InsertElementAt(string, aIndex)) {
+    return PR_TRUE;
+  }
+  delete string;
+  return PR_FALSE;
+}
+
+PRBool
+nsStringArray::ReplaceStringAt(const nsString& aString, PRInt32 aIndex)
+{
+  nsString* string = (nsString*)nsVoidArray::ElementAt(aIndex);
+  if (nsnull != string) {
+    *string = aString;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRBool 
+nsStringArray::RemoveString(const nsString& aString)
+{
+  PRInt32 index = IndexOf(aString);
+  if (-1 < index) {
+    return RemoveStringAt(index);
+  }
+  return PR_FALSE;
+}
+
+PRBool 
+nsStringArray::RemoveStringIgnoreCase(const nsString& aString)
+{
+  PRInt32 index = IndexOfIgnoreCase(aString);
+  if (-1 < index) {
+    return RemoveStringAt(index);
+  }
+  return PR_FALSE;
+}
+
+PRBool nsStringArray::RemoveStringAt(PRInt32 aIndex)
+{
+  nsString* string = StringAt(aIndex);
+  if (nsnull != string) {
+    nsVoidArray::RemoveElementAt(aIndex);
+    delete string;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+void 
+nsStringArray::Clear(void)
+{
+  PRInt32 index = mCount;
+  while (0 <= --index) {
+    nsString* string = (nsString*)mArray[index];
+    delete string;
+  }
+  nsVoidArray::Clear();
+}
+
+
+
+PRBool 
+nsStringArray::EnumerateForwards(nsStringArrayEnumFunc aFunc, void* aData)
+{
+  PRInt32 index = -1;
+  PRBool  running = PR_TRUE;
+
+  while (running && (++index < mCount)) {
+    running = (*aFunc)(*((nsString*)mArray[index]), aData);
+  }
+  return running;
+}
+
+PRBool 
+nsStringArray::EnumerateBackwards(nsStringArrayEnumFunc aFunc, void* aData)
+{
+  PRInt32 index = mCount;
+  PRBool  running = PR_TRUE;
+
+  while (running && (0 <= --index)) {
+    running = (*aFunc)(*((nsString*)mArray[index]), aData);
+  }
+  return running;
+}
+

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

mozilla/base/src/nscore.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 nscore_h___
+#define nscore_h___
+
+#ifdef _WIN32
+#define NS_WIN32 1
+#endif
+
+#if defined(__unix)
+#define NS_UNIX 1
+#endif
+
+#include "prtypes.h"
+#include "nsDebug.h"
+
+/** ucs2 datatype for 2 byte unicode characters */
+typedef PRUint16 PRUcs2;
+
+/** ucs4 datatype for 4 byte unicode characters */
+typedef PRUint32 PRUcs4;
+
+#ifdef NS_UCS4
+typedef PRUcs4 PRUnichar;
+#else
+typedef PRUcs2 PRUnichar;
+#endif
+
+/// The preferred symbol for null.
+#define nsnull 0
+
+/* Define brackets for protecting C code from C++ */
+#ifdef __cplusplus
+#define NS_BEGIN_EXTERN_C extern "C" {
+#define NS_END_EXTERN_C }
+#else
+#define NS_BEGIN_EXTERN_C
+#define NS_END_EXTERN_C
+#endif
+
+/*----------------------------------------------------------------------*/
+/* Import/export defines */
+
+#ifdef NS_WIN32
+#define NS_IMPORT _declspec(dllimport)
+#define NS_IMPORT_(type) type _declspec(dllimport) __stdcall
+#define NS_EXPORT _declspec(dllexport)
+// XXX NS_EXPORT_ defined in nsCOm.h (xpcom) differs in where the __declspec
+// is placed. It needs to be done this way to make the 4.x compiler happy...
+#undef NS_EXPORT_
+#define NS_EXPORT_(type) type _declspec(dllexport) __stdcall
+#elif defined(XP_MAC)
+
+#define NS_IMPORT
+#define NS_IMPORT_(type) type
+
+// XXX NS_EXPORT_ defined in nsCom.h actually does an export. Here it's just sugar.
+#undef NS_EXPORT
+#undef NS_EXPORT_
+
+#define NS_EXPORT __declspec(export)
+#define NS_EXPORT_(type) type __declspec(export)
+
+#else
+/* XXX do something useful? */
+#define NS_IMPORT
+#define NS_IMPORT_(type) type
+#define NS_EXPORT
+#define NS_EXPORT_(type) type
+#endif
+
+#ifdef _IMPL_NS_BASE
+#define NS_BASE NS_EXPORT
+#else
+#define NS_BASE NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_NET
+#define NS_NET NS_EXPORT
+#else
+#define NS_NET NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_DOM
+#define NS_DOM NS_EXPORT
+#else
+#define NS_DOM NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_WIDGET
+#define NS_WIDGET NS_EXPORT
+#else
+#define NS_WIDGET NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_VIEW
+#define NS_VIEW NS_EXPORT
+#else
+#define NS_VIEW NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_GFXNONXP
+#define NS_GFXNONXP NS_EXPORT
+#define NS_GFXNONXP_(type) NS_EXPORT_(type)
+#else
+#define NS_GFXNONXP NS_IMPORT
+#define NS_GFXNONXP_(type) NS_IMPORT_(type)
+#endif
+
+#ifdef _IMPL_NS_GFX
+#define NS_GFX NS_EXPORT
+#define NS_GFX_(type) NS_EXPORT_(type)
+#else
+#define NS_GFX NS_IMPORT
+#define NS_GFX_(type) NS_IMPORT_(type)
+#endif
+
+#ifdef _IMPL_NS_PLUGIN
+#define NS_PLUGIN NS_EXPORT
+#else
+#define NS_PLUGIN NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_APPSHELL
+#define NS_APPSHELL NS_EXPORT
+#else
+#define NS_APPSHELL NS_IMPORT
+#endif
+
+
+/* ------------------------------------------------------------------------ */
+// Casting macros for hiding C++ features from older compilers
+
+#define HAS_C_PLUS_PLUS_CASTS // we'll be optimistic.
+#if defined(__sgi) && !defined(__GNUC__)
+#undef HAS_C_PLUS_PLUS_CASTS
+#endif
+
+#if defined(HAS_C_PLUS_PLUS_CASTS)
+#define NS_STATIC_CAST(__type, __ptr)      static_cast<__type>(__ptr)
+#define NS_CONST_CAST(__type, __ptr)       const_cast<__type>(__ptr)
+#define NS_REINTERPRET_CAST(__type, __ptr) reinterpret_cast<__type>(__ptr)
+#else
+#define NS_STATIC_CAST(__type, __ptr)      ((__type)(__ptr))
+#define NS_CONST_CAST(__type, __ptr)       ((__type)(__ptr))
+#define NS_REINTERPRET_CAST(__type, __ptr) ((__type)(__ptr))
+#endif
+
+// No sense in making an NS_DYNAMIC_CAST() macro: you can't duplicate
+// the semantics. So if you want to dynamic_cast, then just use it
+// "straight", no macro.
+
+#endif /* nscore_h___ */

mozilla/base/src/rhapsody/Makefile.in

@@ -0,0 +1,47 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+DEPTH = ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME = gmbaseunix
+
+MODULE=base
+
+REQUIRES=xpcom raptor 
+
+DEFINES += -D_IMPL_NS_WIDGET 
+
+CPPSRCS= \
+	nsTimer.cpp 
+
+CPP_OBJS=				\
+ ./$(OBJDIR)/nsTimer.o		\
+ $(NULL)
+
+include $(topsrcdir)/config/config.mk
+
+TARGETS = $(LIBRARY)
+
+include $(topsrcdir)/config/rules.mk
+
+

mozilla/base/src/rhapsody/nsTimer.cpp

@@ -0,0 +1,200 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "nsCRT.h"
+#include "prlog.h"
+#include <stdio.h>
+#include <limits.h>
+
+//
+// Copied from the unix version, Rhapsody needs to 
+// make this work.  Stubs to compile things for now.
+//
+
+#if 0
+Michael Hanni <mhanni@sprintmail.com> suggests:
+
+  I understand that nsTimer.cpp in base/rhapsody/ needs to be completed,
+  yes? Wouldn't this code just use some NSTimers in the NSRunLoop?
+
+  Timer = [NSTimer timerWithTimeInterval:0.02 //seconds
+                target:self
+                selector:@selector(doThis:)
+                userInfo:nil
+                repeats:YES];
+  [[NSRunLoop currentRunLoop] addTimer:Timer
+    forMode:NSDefaultRunLoopMode];
+
+  I only looked at nsTimer.cpp briefly, but could something like this work
+  if imbedded in all that c++? ;-)
+
+#endif
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+
+extern void nsTimerExpired(void *aCallData);
+
+class TimerImpl : public nsITimer {
+public:
+
+public:
+  TimerImpl();
+  virtual ~TimerImpl();
+
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void Cancel();
+  virtual PRUint32 GetDelay() { return mDelay; }
+  virtual void SetDelay(PRUint32 aDelay) { mDelay=aDelay; };
+  virtual void* GetClosure() { return mClosure; }
+
+  void FireTimeout();
+
+private:
+  nsresult Init(PRUint32 aDelay);
+
+  PRUint32 mDelay;
+  nsTimerCallbackFunc mFunc;
+  void *mClosure;
+  nsITimerCallback *mCallback;
+  // PRBool mRepeat;
+  TimerImpl *mNext;
+  int mTimerId; 
+};
+
+void TimerImpl::FireTimeout()
+{
+  if (mFunc != NULL) {
+    (*mFunc)(this, mClosure);
+  }
+  else if (mCallback != NULL) {
+    mCallback->Notify(this); // Fire the timer
+  }
+
+// Always repeating here
+
+// if (mRepeat)
+//  mTimerId = XtAppAddTimeOut(gAppContext, GetDelay(),(XtTimerCallbackProc)nsTimerExpired, this);
+}
+
+
+TimerImpl::TimerImpl()
+{
+  NS_INIT_REFCNT();
+  mFunc = NULL;
+  mCallback = NULL;
+  mNext = NULL;
+  mTimerId = 0;
+  mDelay = 0;
+  mClosure = NULL;
+}
+
+TimerImpl::~TimerImpl()
+{
+}
+
+nsresult 
+TimerImpl::Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mFunc = aFunc;
+    mClosure = aClosure;
+    // mRepeat = aRepeat;
+
+    printf("TimerImpl::Init() not implemented\n");
+
+#ifdef RHAPSODY_NEEDS_TO_IMPLEMENT_THIS
+    mTimerId = XtAppAddTimeOut(gAppContext, aDelay,(XtTimerCallbackProc)nsTimerExpired, this);
+#endif
+
+    return Init(aDelay);
+}
+
+nsresult 
+TimerImpl::Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mCallback = aCallback;
+    // mRepeat = aRepeat;
+
+printf("TimerImpl::Init() not implmented.\n");
+
+#ifdef RHAPSODY_NEEDS_TO_IMPLEMENT_THIS
+    mTimerId = XtAppAddTimeOut(gAppContext, aDelay, (XtTimerCallbackProc)nsTimerExpired, this);
+#endif
+
+    return Init(aDelay);
+}
+
+nsresult
+TimerImpl::Init(PRUint32 aDelay)
+{
+    mDelay = aDelay;
+    NS_ADDREF(this);
+
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+
+void
+TimerImpl::Cancel()
+{
+
+  printf("TimerImpl::Cancel() not implemented.\n");
+
+#ifdef RHAPSODY_NEEDS_TO_IMPLEMENT_THIS
+  XtRemoveTimeOut(mTimerId);
+#endif
+}
+
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}
+
+
+void nsTimerExpired(void *aCallData)
+{
+  TimerImpl* timer = (TimerImpl *)aCallData;
+  timer->FireTimeout();
+}

mozilla/base/src/unix/README

@@ -0,0 +1,6 @@
+This directory is obsolete.
+
+The nsTimer files that used to live here have been moved to ../motif
+in order to allow for multiple unix toolkits.
+
+ramiro@netscape.com 11-02-1998

mozilla/base/src/unix/nsFileSpecUnix.cpp

@@ -0,0 +1,220 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+ 
+//    This file is included by nsFileSpec.cpp, and includes the Unix-specific
+//    implementations.
+
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <errno.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+//----------------------------------------------------------------------------------------
+void nsFileSpecHelpers::Canonify(char*& ioPath, bool inMakeDirs)
+// Canonify, make absolute, and check whether directories exist
+//----------------------------------------------------------------------------------------
+{
+    if (!ioPath)
+        return;
+    if (inMakeDirs)
+    {
+        const mode_t mode = 0700;
+        nsFileSpecHelpers::MakeAllDirectories(ioPath, mode);
+    }
+    char buffer[MAXPATHLEN];
+    errno = 0;
+    *buffer = '\0';
+    char* canonicalPath = realpath(ioPath, buffer);
+    if (!canonicalPath)
+    {
+        // Linux's realpath() is pathetically buggy.  If the reason for the nil
+        // result is just that the leaf does not exist, strip the leaf off,
+        // process that, and then add the leaf back.
+        char* allButLeaf = nsFileSpecHelpers::StringDup(ioPath);
+        if (!allButLeaf)
+            return;
+        char* lastSeparator = strrchr(allButLeaf, '/');
+        if (lastSeparator)
+        {
+            *lastSeparator = '\0';
+            canonicalPath = realpath(allButLeaf, buffer);
+            strcat(buffer, "/");
+            // Add back the leaf
+            strcat(buffer, ++lastSeparator);
+        }
+        delete [] allButLeaf;
+    }
+    if (!canonicalPath && *ioPath != '/' && !inMakeDirs)
+    {
+        // Well, if it's a relative path, hack it ourselves.
+        canonicalPath = realpath(".", buffer);
+        if (canonicalPath)
+        {
+            strcat(canonicalPath, "/");
+            strcat(canonicalPath, ioPath);
+        }
+    }
+    if (canonicalPath)
+        nsFileSpecHelpers::StringAssign(ioPath, canonicalPath);
+} // nsFileSpecHelpers::Canonify
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::SetLeafName(const char* inLeafName)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::LeafReplace(mPath, '/', inLeafName);
+} // nsNativeFileSpec::SetLeafName
+
+//----------------------------------------------------------------------------------------
+char* nsNativeFileSpec::GetLeafName() const
+//----------------------------------------------------------------------------------------
+{
+    return nsFileSpecHelpers::GetLeaf(mPath, '/');
+} // nsNativeFileSpec::GetLeafName
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::Exists() const
+//----------------------------------------------------------------------------------------
+{
+    struct stat st;
+    return 0 == stat(mPath, &st); 
+} // nsNativeFileSpec::Exists
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::IsFile() const
+//----------------------------------------------------------------------------------------
+{
+    struct stat st;
+    return 0 == stat(mPath, &st) && S_ISREG(st.st_mode); 
+} // nsNativeFileSpec::IsFile
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::IsDirectory() const
+//----------------------------------------------------------------------------------------
+{
+    struct stat st;
+    return 0 == stat(mPath, &st) && S_ISDIR(st.st_mode); 
+} // nsNativeFileSpec::IsDirectory
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::GetParent(nsNativeFileSpec& outSpec) const
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(outSpec.mPath, mPath);
+    char* cp = strrchr(outSpec.mPath, '/');
+    if (cp)
+        *cp = '\0';
+} // nsNativeFileSpec::GetParent
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator += (const char* inRelativePath)
+//----------------------------------------------------------------------------------------
+{
+    if (!inRelativePath || !mPath)
+        return;
+    
+    if (mPath[strlen(mPath) - 1] != '/')
+        char* newPath = nsFileSpecHelpers::ReallocCat(mPath, "/");
+    SetLeafName(inRelativePath);
+} // nsNativeFileSpec::operator +=
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::CreateDirectory(int mode)
+//----------------------------------------------------------------------------------------
+{
+    // Note that mPath is canonical!
+    mkdir(mPath, mode);
+} // nsNativeFileSpec::CreateDirectory
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::Delete(bool inRecursive)
+// To check if this worked, call Exists() afterwards, see?
+//----------------------------------------------------------------------------------------
+{
+    if (IsDirectory())
+    {
+        if (inRecursive)
+        {
+            for (nsDirectoryIterator i(*this); i; i++)
+            {
+                nsNativeFileSpec& child = (nsNativeFileSpec&)i;
+                child.Delete(inRecursive);
+            }        
+        }
+        rmdir(mPath);
+    }
+    else
+        remove(mPath);
+} // nsNativeFileSpec::Delete
+
+//========================================================================================
+//                                nsDirectoryIterator
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator::nsDirectoryIterator(
+    const nsNativeFileSpec& inDirectory
+,    int inIterateDirection)
+//----------------------------------------------------------------------------------------
+    : mCurrent(inDirectory)
+    , mDir(nsnull)
+    , mExists(false)
+{
+    mCurrent += "sysygy"; // prepare the path for SetLeafName
+    mDir = opendir((const char*)nsFilePath(inDirectory));
+    ++(*this);
+} // nsDirectoryIterator::nsDirectoryIterator
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator::~nsDirectoryIterator()
+//----------------------------------------------------------------------------------------
+{
+    if (mDir)
+        closedir(mDir);
+} // nsDirectoryIterator::nsDirectoryIterator
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
+//----------------------------------------------------------------------------------------
+{
+    mExists = false;
+    if (!mDir)
+        return *this;
+    char* dot    = ".";
+    char* dotdot = "..";
+    struct dirent* entry = readdir(mDir);
+    if (entry && strcmp(entry->d_name, dot) == 0)
+        entry = readdir(mDir);
+    if (entry && strcmp(entry->d_name, dotdot) == 0)
+        entry = readdir(mDir);
+    if (entry)
+    {
+        mExists = true;
+        mCurrent.SetLeafName(entry->d_name);
+    }
+    return *this;
+} // nsDirectoryIterator::operator ++
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator& nsDirectoryIterator::operator -- ()
+//----------------------------------------------------------------------------------------
+{
+    return ++(*this); // can't do it backwards.
+} // nsDirectoryIterator::operator --

mozilla/base/src/windows/makefile.win

@@ -0,0 +1,40 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+DEFINES=-D_IMPL_NS_BASE 
+LIBRARY_NAME=gmbase 
+MODULE=raptor 
+REQUIRES=xpcom raptor 
+
+CPPSRCS=nsTimer.cpp 
+
+CPP_OBJS=.\$(OBJDIR)\nsTimer.obj 
+
+LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor 
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        -D_IMPL_NS_BASE \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(OBJS)
+	$(MAKE_INSTALL) $(OBJDIR)\nsTimer.obj ..\$(OBJDIR)

mozilla/base/src/windows/nsFileSpecWin.cpp

@@ -0,0 +1,297 @@
+/* -*- 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 file is included by nsFileSpec.cp, and includes the Windows-specific
+//	implementations.
+
+#include <sys/stat.h>
+#include <direct.h>
+#include <stdlib.h>
+#include "prio.h"
+
+//----------------------------------------------------------------------------------------
+void nsFileSpecHelpers::Canonify(char*& ioPath, bool inMakeDirs)
+// Canonify, make absolute, and check whether directories exist. This
+// takes a (possibly relative) native path and converts it into a
+// fully qualified native path.
+//----------------------------------------------------------------------------------------
+{
+  if (!ioPath)
+    return;
+  if (inMakeDirs) {
+    const int mode = 0700;
+    char* unixStylePath = nsFileSpecHelpers::StringDup(ioPath);
+    nsFileSpecHelpers::NativeToUnix(unixStylePath);
+    nsFileSpecHelpers::MakeAllDirectories(unixStylePath, mode);
+    delete[] unixStylePath;
+  }
+  char buffer[_MAX_PATH];
+  errno = 0;
+  *buffer = '\0';
+  char* canonicalPath = _fullpath(buffer, ioPath, _MAX_PATH);
+
+  NS_ASSERTION( canonicalPath[0] != '\0', "Uh oh...couldn't convert" );
+  if (canonicalPath[0] == '\0')
+    return;
+
+  nsFileSpecHelpers::StringAssign(ioPath, canonicalPath);
+}
+
+//----------------------------------------------------------------------------------------
+void nsFileSpecHelpers::UnixToNative(char*& ioPath)
+// This just does string manipulation.  It doesn't check reality, or canonify, or
+// anything
+//----------------------------------------------------------------------------------------
+{
+	// Allow for relative or absolute.  We can do this in place, because the
+	// native path is never longer.
+	
+	if (!ioPath || !*ioPath)
+		return;
+		
+	char* src = ioPath;
+	if (*ioPath == '/')
+    {
+      // Strip initial slash for an absolute path
+      src++;
+    }
+		
+	// Convert the vertical slash to a colon
+	char* cp = src + 1;
+	
+	// If it was an absolute path, check for the drive letter
+	if (*ioPath == '/' && strstr(cp, "|/") == cp)
+    *cp = ':';
+	
+	// Convert '/' to '\'.
+	while (*++cp)
+    {
+      if (*cp == '/')
+        *cp = '\\';
+    }
+
+	if (*ioPath == '/') {
+    for (cp = ioPath; *cp; ++cp)
+      *cp = *(cp + 1);
+  }
+}
+
+//----------------------------------------------------------------------------------------
+void nsFileSpecHelpers::NativeToUnix(char*& ioPath)
+// This just does string manipulation.  It doesn't check reality, or canonify, or
+// anything.  The unix path is longer, so we can't do it in place.
+//----------------------------------------------------------------------------------------
+{
+	if (!ioPath || !*ioPath)
+		return;
+		
+	// Convert the drive-letter separator, if present
+	char* temp = nsFileSpecHelpers::StringDup("/", 1 + strlen(ioPath));
+
+	char* cp = ioPath + 1;
+	if (strstr(cp, ":\\") == cp) {
+		*cp = '|';    // absolute path
+  }
+  else {
+    *temp = '\0'; // relative path
+  }
+	
+	// Convert '\' to '/'
+	for (; *cp; cp++)
+    {
+      if (*cp == '\\')
+        *cp = '/';
+    }
+
+	// Add the slash in front.
+	strcat(temp, ioPath);
+	StringAssign(ioPath, temp);
+	delete [] temp;
+}
+
+//----------------------------------------------------------------------------------------
+nsNativeFileSpec::nsNativeFileSpec(const nsFilePath& inPath)
+//----------------------------------------------------------------------------------------
+:	mPath(NULL)
+{
+	*this = inPath;
+}
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator = (const nsFilePath& inPath)
+//----------------------------------------------------------------------------------------
+{
+	nsFileSpecHelpers::StringAssign(mPath, (const char*)inPath);
+	nsFileSpecHelpers::UnixToNative(mPath);
+} // nsNativeFileSpec::operator =
+
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+:	mPath(NULL)
+{
+	*this = inSpec;
+} // nsFilePath::nsFilePath
+
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const nsNativeFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+{
+	nsFileSpecHelpers::StringAssign(mPath, inSpec.mPath);
+	nsFileSpecHelpers::NativeToUnix(mPath);
+} // nsFilePath::operator =
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::SetLeafName(const char* inLeafName)
+//----------------------------------------------------------------------------------------
+{
+	nsFileSpecHelpers::LeafReplace(mPath, '\\', inLeafName);
+} // nsNativeFileSpec::SetLeafName
+
+//----------------------------------------------------------------------------------------
+char* nsNativeFileSpec::GetLeafName() const
+//----------------------------------------------------------------------------------------
+{
+	return nsFileSpecHelpers::GetLeaf(mPath, '\\');
+} // nsNativeFileSpec::GetLeafName
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::Exists() const
+//----------------------------------------------------------------------------------------
+{
+	struct stat st;
+	return 0 == stat(mPath, &st); 
+} // nsNativeFileSpec::Exists
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::IsFile() const
+//----------------------------------------------------------------------------------------
+{
+  struct stat st;
+  return 0 == stat(mPath, &st) && (_S_IFREG & st.st_mode); 
+} // nsNativeFileSpec::IsFile
+
+//----------------------------------------------------------------------------------------
+bool nsNativeFileSpec::IsDirectory() const
+//----------------------------------------------------------------------------------------
+{
+	struct stat st;
+	return 0 == stat(mPath, &st) && (_S_IFDIR & st.st_mode); 
+} // nsNativeFileSpec::IsDirectory
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::GetParent(nsNativeFileSpec& outSpec) const
+//----------------------------------------------------------------------------------------
+{
+	nsFileSpecHelpers::StringAssign(outSpec.mPath, mPath);
+	char* cp = strrchr(outSpec.mPath, '\\');
+	if (cp)
+		*cp = '\0';
+} // nsNativeFileSpec::GetParent
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::operator += (const char* inRelativePath)
+//----------------------------------------------------------------------------------------
+{
+	if (!inRelativePath || !mPath)
+		return;
+	
+	if (mPath[strlen(mPath) - 1] != '\\')
+		char* newPath = nsFileSpecHelpers::ReallocCat(mPath, "\\");
+	SetLeafName(inRelativePath);
+} // nsNativeFileSpec::operator +=
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::CreateDirectory(int /*mode*/)
+//----------------------------------------------------------------------------------------
+{
+	// Note that mPath is canonical!
+	mkdir(mPath);
+} // nsNativeFileSpec::CreateDirectory
+
+//----------------------------------------------------------------------------------------
+void nsNativeFileSpec::Delete(bool inRecursive)
+//----------------------------------------------------------------------------------------
+{
+  if (IsDirectory())
+    {
+	    if (inRecursive)
+        {
+          for (nsDirectoryIterator i(*this); i; i++)
+            {
+              nsNativeFileSpec& child = (nsNativeFileSpec&)i;
+              child.Delete(inRecursive);
+            }		
+        }
+	    rmdir(mPath);
+    }
+	else
+    {
+      remove(mPath);
+    }
+} // nsNativeFileSpec::Delete
+
+//========================================================================================
+//								nsDirectoryIterator
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator::nsDirectoryIterator(
+	const nsNativeFileSpec& inDirectory
+,	int inIterateDirection)
+//----------------------------------------------------------------------------------------
+	: mCurrent(inDirectory)
+	, mDir(nsnull)
+	, mExists(false)
+{
+    mDir = PR_OpenDir(inDirectory);
+	mCurrent += "dummy";
+    ++(*this);
+} // nsDirectoryIterator::nsDirectoryIterator
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator::~nsDirectoryIterator()
+//----------------------------------------------------------------------------------------
+{
+    if (mDir)
+	    PR_CloseDir(mDir);
+} // nsDirectoryIterator::nsDirectoryIterator
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
+//----------------------------------------------------------------------------------------
+{
+	mExists = false;
+	if (!mDir)
+		return *this;
+  PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); // Ignore '.' && '..'
+	if (entry)
+    {
+      mExists = true;
+      mCurrent.SetLeafName(entry->name);
+    }
+	return *this;
+} // nsDirectoryIterator::operator ++
+
+//----------------------------------------------------------------------------------------
+nsDirectoryIterator& nsDirectoryIterator::operator -- ()
+//----------------------------------------------------------------------------------------
+{
+	return ++(*this); // can't do it backwards.
+} // nsDirectoryIterator::operator --
+

mozilla/base/src/windows/nsTimer.cpp

@@ -0,0 +1,362 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "nsCRT.h"
+#include "prlog.h"
+#include <stdio.h>
+#include <windows.h>
+#include <limits.h>
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+
+/*
+ * Implementation of timers lifted from Windows front-end file timer.cpp
+ */
+class TimerImpl : public nsITimer {
+public:
+  static TimerImpl *gTimerList;
+  static UINT gWindowsTimer;
+  static DWORD gNextFire;
+
+  static void ProcessTimeouts(DWORD aNow);
+  static void SyncTimeoutPeriod(DWORD aTickCount);
+
+public:
+  TimerImpl();
+  virtual ~TimerImpl();
+
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void Cancel();
+  void Fire(DWORD aNow);
+
+  virtual PRUint32 GetDelay() { return mDelay; }
+  virtual void SetDelay(PRUint32 aDelay) {};
+
+  virtual void* GetClosure() { return mClosure; }
+
+private:
+  nsresult Init(PRUint32 aDelay);
+
+  PRUint32 mDelay;
+  nsTimerCallbackFunc mFunc;
+  void *mClosure;
+  nsITimerCallback *mCallback;
+  DWORD mFireTime;
+  // PRBool mRepeat;
+  TimerImpl *mNext;
+};
+
+TimerImpl *TimerImpl::gTimerList = NULL;
+UINT TimerImpl::gWindowsTimer = 0;
+DWORD TimerImpl::gNextFire = (DWORD)-1;
+
+void CALLBACK FireTimeout(HWND aWindow, 
+                          UINT aMessage, 
+                          UINT aTimerID, 
+                          DWORD aTime)
+{
+  static BOOL bCanEnter = TRUE;
+
+  //  Don't allow old timer messages in here.
+  if(aMessage != WM_TIMER)    {
+    PR_ASSERT(0);
+    return;
+  }
+
+  if(aTimerID != TimerImpl::gWindowsTimer)   {
+    return;
+  }
+  
+  //  Block only one entry into this function, or else.
+  if(bCanEnter)   {
+    bCanEnter = FALSE;
+    // see if we need to fork off any timeout functions
+    if(TimerImpl::gTimerList)    {
+      TimerImpl::ProcessTimeouts(aTime);
+    }
+    bCanEnter = TRUE;
+  }
+}
+
+//  Function to correctly have the timer be set.
+void 
+TimerImpl::SyncTimeoutPeriod(DWORD aTickCount)
+{
+    //  May want us to set tick count ourselves.
+    if(aTickCount == 0)    {
+        aTickCount = ::GetTickCount();
+    }
+
+    //  If there's no list, we should clear the timer.
+    if(!gTimerList) {
+        if(gWindowsTimer) {
+            ::KillTimer(NULL, gWindowsTimer);
+            gWindowsTimer = 0;
+            gNextFire = (DWORD)-1;
+        }
+    }
+    else {
+        //  See if we need to clear the current timer.
+        //  Curcumstances are that if the timer will not
+        //      fire on time for the next timeout.
+        BOOL bSetTimer = FALSE;
+        TimerImpl *pTimeout = gTimerList;
+        if(gWindowsTimer)   {
+            if(pTimeout->mFireTime != gNextFire)   {
+                ::KillTimer(NULL, gWindowsTimer);
+                gWindowsTimer = 0;
+                gNextFire = (DWORD)-1;
+
+                //  Set the timer.
+                bSetTimer = TRUE;
+            }
+        }
+        else    {
+            //  No timer set, attempt.
+            bSetTimer = TRUE;
+        }
+
+        if(bSetTimer)   {
+            DWORD dwFireWhen = pTimeout->mFireTime > aTickCount ?
+                pTimeout->mFireTime - aTickCount : 0;
+            if(dwFireWhen > UINT_MAX)   {
+                dwFireWhen = UINT_MAX;
+            }
+            UINT uFireWhen = (UINT)dwFireWhen;
+
+            PR_ASSERT(gWindowsTimer == 0);
+            gWindowsTimer = ::SetTimer(NULL, 0, uFireWhen, (TIMERPROC)FireTimeout);
+
+            if(gWindowsTimer)   {
+                //  Set the fire time.
+                gNextFire = pTimeout->mFireTime;
+            }
+        }
+    }
+}
+
+// Walk down the timeout list and launch anyone appropriate
+void 
+TimerImpl::ProcessTimeouts(DWORD aNow)
+{
+    TimerImpl *p = gTimerList;
+    if(aNow == 0)   {
+        aNow = ::GetTickCount();
+    }
+
+    BOOL bCalledSync = FALSE;
+
+    // loop over all entries
+    while(p) {
+        // send it
+        if(p->mFireTime < aNow) {
+            //  Make sure that the timer cannot be deleted during the
+            //  Fire(...) call which may release *all* other references
+            //  to p...
+            NS_ADDREF(p);
+            p->Fire(aNow);
+
+            //  Clear the timer.
+            //  Period synced.
+            p->Cancel();
+            bCalledSync = TRUE;
+            NS_RELEASE(p);
+
+            //  Reset the loop (can't look at p->pNext now, and called
+            //      code may have added/cleared timers).
+            //  (could do this by going recursive and returning).
+            p = gTimerList;
+        } else {
+            //  Make sure we fire an timer.
+            //  Also, we need to check to see if things are backing up (they
+            //      may be asking to be fired long before we ever get to them,
+            //      and we don't want to pass in negative values to the real
+            //      timer code, or it takes days to fire....
+            if(bCalledSync == FALSE)    {
+                SyncTimeoutPeriod(aNow);
+                bCalledSync = TRUE;
+            }
+            //  Get next timer.
+            p = p->mNext;
+        }
+    }
+}
+
+
+TimerImpl::TimerImpl()
+{
+  NS_INIT_REFCNT();
+  mFunc = NULL;
+  mCallback = NULL;
+  mNext = NULL;
+  mClosure = nsnull;
+}
+
+TimerImpl::~TimerImpl()
+{
+    Cancel();
+    NS_IF_RELEASE(mCallback);
+}
+
+nsresult 
+TimerImpl::Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mFunc = aFunc;
+    mClosure = aClosure;
+    // mRepeat = aRepeat;
+
+    return Init(aDelay);
+}
+
+nsresult 
+TimerImpl::Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mCallback = aCallback;
+    NS_ADDREF(mCallback);
+    // mRepeat = aRepeat;
+
+    return Init(aDelay);
+}
+
+nsresult
+TimerImpl::Init(PRUint32 aDelay)
+{
+    DWORD dwNow = ::GetTickCount();
+  
+    mDelay = aDelay;
+    mFireTime = (DWORD) aDelay + dwNow;
+    mNext = NULL;
+
+    // add it to the list
+    if(!gTimerList) {        
+        // no list add it
+        gTimerList = this;
+    } 
+    else {
+
+        // is it before everything else on the list?
+        if(mFireTime < gTimerList->mFireTime) {
+
+            mNext = gTimerList;
+            gTimerList = this;
+
+        } else {
+
+            TimerImpl * pPrev = gTimerList;
+            TimerImpl * pCurrent = gTimerList;
+
+            while(pCurrent && (pCurrent->mFireTime <= mFireTime)) {
+                pPrev = pCurrent;
+                pCurrent = pCurrent->mNext;
+            }
+
+            PR_ASSERT(pPrev);
+
+            // insert it after pPrev (this could be at the end of the list)
+            mNext = pPrev->mNext;
+            pPrev->mNext = this;
+
+        }
+
+    }
+
+    NS_ADDREF(this);
+
+    //  Sync the timer fire period.
+    SyncTimeoutPeriod(dwNow);
+    
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+void
+TimerImpl::Fire(DWORD aNow)
+{
+    if (mFunc != NULL) {
+        (*mFunc)(this, mClosure);
+    }
+    else if (mCallback != NULL) {
+         mCallback->Notify(this);
+    }
+}
+
+void
+TimerImpl::Cancel()
+{
+    TimerImpl *me = this;
+
+    if(gTimerList == this) {
+
+        // first element in the list lossage
+        gTimerList = mNext;
+
+    } else {
+
+        // walk until no next pointer
+        for(TimerImpl * p = gTimerList; p && p->mNext && (p->mNext != this); p = p->mNext)
+            ;
+
+        // if we found something valid pull it out of the list
+        if(p && p->mNext && p->mNext == this) {
+            p->mNext = mNext;
+
+        } else {
+            // get out before we delete something that looks bogus
+            return;
+        }
+
+    }
+
+    // if we got here it must have been a valid element so trash it
+    NS_RELEASE(me);
+
+    //  If there's now no be sure to clear the timer.
+    SyncTimeoutPeriod(0);
+}
+
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}

mozilla/base/tests/CvtURL.cpp

@@ -0,0 +1,103 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include <stdio.h>
+#include "nsIUnicharInputStream.h"
+#include "nsIURL.h"
+#include "nsCRT.h"
+#include "nsString.h"
+#include "prprf.h"
+#include "prtime.h"
+
+static nsString* ConvertCharacterSetName(const char* aName)
+{
+  return new nsString(aName);
+}
+
+int main(int argc, char** argv)
+{
+  if (3 != argc) {
+    printf("usage: CvtURL url character-set-name\n");
+    return -1;
+  }
+
+  char* characterSetName = argv[2];
+  nsString* cset = ConvertCharacterSetName(characterSetName);
+  if (PRInt32(cset) < 0) {
+    printf("illegal character set name: '%s'\n", characterSetName);
+    return -1;
+  }
+
+  // Create url object
+  char* urlName = argv[1];
+  nsIURL* url;
+  nsresult rv = NS_NewURL(&url, urlName);
+  if (NS_OK != rv) {
+    printf("invalid URL: '%s'\n", urlName);
+    return -1;
+  }
+
+  // Get an input stream from the url
+  nsresult ec;
+  nsIInputStream* in;
+  ec = NS_OpenURL(url, &in);
+  if (nsnull == in) {
+    printf("open of url('%s') failed: error=%x\n", urlName, ec);
+    return -1;
+  }
+
+  // Translate the input using the argument character set id into unicode
+  nsIUnicharInputStream* uin;
+  rv = NS_NewConverterStream(&uin, nsnull, in, 0, cset);
+  if (NS_OK != rv) {
+    printf("can't create converter input stream: %d\n", rv);
+    return -1;
+  }
+
+  // Read the input and write some output
+  PRTime start = PR_Now();
+  PRInt32 count = 0;
+  for (;;) {
+    PRUnichar buf[1000];
+    PRUint32 nb;
+    ec = uin->Read(buf, 0, 1000, &nb);
+    if (ec < 0) {
+      if (ec != NS_BASE_STREAM_EOF) {
+        printf("i/o error: %d\n", ec);
+      }
+      break;
+    }
+    count += nb;
+  }
+  PRTime end = PR_Now();
+  PRTime conversion, ustoms;
+  LL_I2L(ustoms, 1000);
+  LL_SUB(conversion, end, start);
+  LL_DIV(conversion, conversion, ustoms);
+  char buf[500];
+  PR_snprintf(buf, sizeof(buf),
+              "converting and discarding %d bytes took %lldms",
+              count, conversion);
+  puts(buf);
+
+  // Release the objects
+  in->Release();
+  uin->Release();
+  url->Release();
+
+  return 0;
+}

mozilla/base/tests/FilesTest.cpp

@@ -0,0 +1,401 @@
+#include "string.h"
+#include "nsFileSpec.h"
+#include "nsFileStream.h"
+
+struct FilesTest
+{
+	FilesTest() : mConsole() {}
+
+	int RunAllTests();
+	
+	void WriteStuff(nsOutputFileStream& s);
+	int InputStream(const char* relativePath);
+	int OutputStream(const char* relativePath);
+	int IOStream(const char* relativePath);
+	int Parent(const char* relativePath, nsNativeFileSpec& outParent);
+	int Delete(nsNativeFileSpec& victim);
+	int CreateDirectory(nsNativeFileSpec& victim);
+	int IterateDirectoryChildren(nsNativeFileSpec& startChild);
+	int CanonicalPath(const char* relativePath);
+
+	void Banner(const char* bannerString);
+	void Passed();
+	void Failed();
+	void Inspect();
+		
+	nsOutputFileStream mConsole;
+};
+
+//----------------------------------------------------------------------------------------
+void FilesTest::Banner(const char* bannerString)
+//----------------------------------------------------------------------------------------
+{
+	mConsole
+		<< nsEndl
+		<< "---------------------------" << nsEndl
+		<< bannerString << " Test"       << nsEndl
+		<< "---------------------------" << nsEndl;
+}
+
+//----------------------------------------------------------------------------------------
+void FilesTest::Passed()
+//----------------------------------------------------------------------------------------
+{
+	mConsole << "Test passed." << nsEndl;
+}
+
+//----------------------------------------------------------------------------------------
+void FilesTest::Failed()
+//----------------------------------------------------------------------------------------
+{
+	mConsole << "ERROR: Test failed." << nsEndl;
+}
+
+//----------------------------------------------------------------------------------------
+void FilesTest::Inspect()
+//----------------------------------------------------------------------------------------
+{
+	mConsole << nsEndl << "^^^^^^^^^^ PLEASE INSPECT OUTPUT FOR ERRORS" << nsEndl;
+}
+
+//----------------------------------------------------------------------------------------
+void FilesTest::WriteStuff(nsOutputFileStream& s)
+//----------------------------------------------------------------------------------------
+{
+	// Initialize a URL from a string without suffix.  Change the path to suit your machine.
+	nsFileURL fileURL("file:///Development/MPW/MPW%20Shell", false);
+	s << "File URL initialized to:     \"" << fileURL << "\""<< nsEndl;
+	
+	// Initialize a Unix path from a URL
+	nsFilePath filePath(fileURL);
+	s << "As a unix path:              \"" << (const char*)filePath << "\""<< nsEndl;
+	
+	// Initialize a native file spec from a URL
+	nsNativeFileSpec fileSpec(fileURL);
+	s << "As a file spec:               " << fileSpec << nsEndl;
+	
+	// Make the spec unique (this one has no suffix).
+	fileSpec.MakeUnique();
+	s << "Unique file spec:             " << fileSpec << nsEndl;
+	
+	// Assign the spec to a URL
+	fileURL = fileSpec;
+	s << "File URL assigned from spec: \"" << fileURL << "\""<< nsEndl;
+	
+	// Assign a unix path using a string with a suffix.
+	filePath = "/Development/MPW/SysErrs.err";
+	s << "File path reassigned to:     \"" << (const char*)filePath << "\""<< nsEndl;	
+	
+	// Assign to a file spec using a unix path.
+	fileSpec = filePath;
+	s << "File spec reassigned to:      " << fileSpec << nsEndl;
+	
+	// Make this unique (this one has a suffix).
+	fileSpec.MakeUnique();
+	s << "File spec made unique:        " << fileSpec << nsEndl;
+} // WriteStuff
+
+//----------------------------------------------------------------------------------------
+int FilesTest::OutputStream(const char* relativePath)
+//----------------------------------------------------------------------------------------
+{
+	nsFilePath myTextFilePath(relativePath, true); // relative path.
+	const char* pathAsString = (const char*)myTextFilePath;
+	nsNativeFileSpec mySpec(myTextFilePath);
+	{
+		mConsole << "WRITING IDENTICAL OUTPUT TO " << pathAsString << nsEndl << nsEndl;
+		nsOutputFileStream testStream(myTextFilePath);
+		if (!testStream.is_open())
+		{
+			mConsole
+			    << "ERROR: File "
+			    << pathAsString
+			    << " could not be opened for output"
+			    << nsEndl;
+			return -1;
+		}
+		FilesTest::WriteStuff(testStream);
+	}	// <-- Scope closes the stream (and the file).
+
+	if (!mySpec.Exists() || mySpec.IsDirectory() || !mySpec.IsFile())
+	{
+			mConsole
+			    << "ERROR: File "
+			    << pathAsString
+			    << " is not a file (cela n'est pas un pipe)"
+			    << nsEndl;
+			return -1;
+	}
+	Passed();
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::IOStream(const char* relativePath)
+//----------------------------------------------------------------------------------------
+{
+	nsFilePath myTextFilePath(relativePath, true); // relative path.
+	const char* pathAsString = (const char*)myTextFilePath;
+	mConsole
+		<< "Replacing \"path\" by \"ZUUL\" in " << pathAsString << nsEndl << nsEndl;
+	nsIOFileStream testStream(myTextFilePath);
+	if (!testStream.is_open())
+	{
+		mConsole
+		    << "ERROR: File "
+		    << pathAsString
+		    << " could not be opened for input+output"
+		    << nsEndl;
+		return -1;
+	}
+	char line[1000];
+	testStream.seek(0); // check that the seek compiles
+	while (!testStream.eof())
+	{
+		PRInt32 pos = testStream.tell();
+		testStream.readline(line, sizeof(line));
+		char* replacementSubstring = strstr(line, "path");
+		if (replacementSubstring)
+		{
+			testStream.seek(pos + (replacementSubstring - line));
+			testStream << "ZUUL";
+			testStream.seek(pos); // back to the start of the line
+		}
+	}
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::InputStream(const char* relativePath)
+//----------------------------------------------------------------------------------------
+{
+	nsFilePath myTextFilePath(relativePath, true);
+	const char* pathAsString = (const char*)myTextFilePath;
+	mConsole << "READING BACK DATA FROM " << pathAsString << nsEndl << nsEndl;
+	nsInputFileStream testStream2(myTextFilePath);
+	if (!testStream2.is_open())
+	{
+		mConsole
+		    << "ERROR: File "
+		    << pathAsString
+		    << " could not be opened for input"
+		    << nsEndl;
+		return -1;
+	}
+	char line[1000];
+	
+	testStream2.seek(0); // check that the seek compiles
+	while (!testStream2.eof())
+	{
+		testStream2.readline(line, sizeof(line));
+		mConsole << line << nsEndl;
+	}
+	Inspect();
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::Parent(
+	const char* relativePath,
+	nsNativeFileSpec& outParent)
+//----------------------------------------------------------------------------------------
+{
+	nsFilePath myTextFilePath(relativePath, true);
+	const char* pathAsString = (const char*)myTextFilePath;
+	nsNativeFileSpec mySpec(myTextFilePath);
+
+    mySpec.GetParent(outParent);
+    nsFilePath parentPath(outParent);
+	mConsole
+		<< "GetParent() on "
+		<< "\n\t" << pathAsString
+		<< "\n yields "
+		<< "\n\t" << (const char*)parentPath
+		<< nsEndl;
+	Inspect();
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::Delete(nsNativeFileSpec& victim)
+//----------------------------------------------------------------------------------------
+{
+	// - Test of non-recursive delete
+
+    nsFilePath victimPath(victim);
+	mConsole
+		<< "Attempting to delete "
+		<< "\n\t" << (const char*)victimPath
+		<< "\n without recursive option (should fail)"	
+		<< nsEndl;
+	victim.Delete(false);	
+	if (victim.Exists())
+		Passed();
+	else
+	{
+		mConsole
+		    << "ERROR: File "
+		    << "\n\t" << (const char*)victimPath
+		    << "\n has been deleted without the recursion option,"
+		    << "\n and is a nonempty directory!"
+		    << nsEndl;
+		return -1;
+	}
+
+	// - Test of recursive delete
+
+	mConsole
+		<< nsEndl
+		<< "Deleting "
+		<< "\n\t" << (const char*)victimPath
+		<< "\n with recursive option"
+		<< nsEndl;
+	victim.Delete(true);
+	if (victim.Exists())
+	{
+		mConsole
+		    << "ERROR: Directory "
+		    << "\n\t" << (const char*)victimPath
+		    << "\n has NOT been deleted despite the recursion option!"
+		    << nsEndl;
+		return -1;
+	}
+	
+	Passed();
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::CreateDirectory(nsNativeFileSpec& dirSpec)
+//----------------------------------------------------------------------------------------
+{
+    nsFilePath dirPath(dirSpec);
+	mConsole
+		<< "Testing CreateDirectory() using"
+		<< "\n\t" << (const char*)dirPath
+		<< nsEndl;
+		
+	dirSpec.CreateDirectory();
+	if (dirSpec.Exists())
+		Passed();
+	else
+	{
+		Failed();
+		return -1;
+	}
+	dirSpec.Delete(true);
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::IterateDirectoryChildren(nsNativeFileSpec& startChild)
+//----------------------------------------------------------------------------------------
+{
+	// - Test of directory iterator
+
+    nsNativeFileSpec grandparent;
+    startChild.GetParent(grandparent); // should be the original default directory.
+    nsFilePath grandparentPath(grandparent);
+    
+    mConsole << "Forwards listing of " << (const char*)grandparentPath << ":" << nsEndl;
+    for (nsDirectoryIterator i(grandparent, +1); i; i++)
+    {
+    	char* itemName = ((nsNativeFileSpec&)i).GetLeafName();
+    	mConsole << '\t' << itemName << nsEndl;
+    	delete [] itemName;
+    }
+
+    mConsole << "Backwards listing of " << (const char*)grandparentPath << ":" << nsEndl;
+    for (nsDirectoryIterator j(grandparent, -1); j; j--)
+    {
+    	char* itemName = ((nsNativeFileSpec&)j).GetLeafName();
+    	mConsole << '\t' << itemName << nsEndl;
+    	delete [] itemName;
+    }
+    Inspect();
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::CanonicalPath(
+	const char* relativePath)
+//----------------------------------------------------------------------------------------
+{
+	nsFilePath myTextFilePath(relativePath, true);
+	const char* pathAsString = (const char*)myTextFilePath;
+	if (*pathAsString != '/')
+	{
+		mConsole
+		    << "ERROR: after initializing the path object with a relative path,"
+		    << "\n the path consisted of the string "
+		    << "\n\t" << pathAsString
+		    << "\n which is not a canonical full path!"
+		    << nsEndl;
+		return -1;
+	}
+	Passed();
+	return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::RunAllTests()
+// For use with DEBUG defined.
+//----------------------------------------------------------------------------------------
+{
+	// Test of mConsole output
+	
+	mConsole << "WRITING TEST OUTPUT TO CONSOLE" << nsEndl << nsEndl;
+
+	// Test of nsFileSpec
+	
+	Banner("Interconversion");
+	WriteStuff(mConsole);
+	Inspect();
+		
+	Banner("Canonical Path");
+	if (CanonicalPath("mumble/iotest.txt") != 0)
+		return -1;
+	
+	Banner("OutputStream");
+	if (OutputStream("mumble/iotest.txt") != 0)
+		return -1;
+	
+	Banner("InputStream");
+	if (InputStream("mumble/iotest.txt") != 0)
+		return -1;
+	
+	Banner("IOStream");
+	if (IOStream("mumble/iotest.txt") != 0)
+		return -1;
+	if (InputStream("mumble/iotest.txt") != 0)
+		return -1;
+	
+	Banner("Parent");
+	nsNativeFileSpec parent;
+	if (Parent("mumble/iotest.txt", parent) != 0)
+		return -1;
+		
+	Banner("Delete");
+	if (Delete(parent) != 0)
+		return -1;
+		
+	Banner("CreateDirectory");
+	if (CreateDirectory(parent) != 0)
+		return -1;
+
+	Banner("IterateDirectoryChildren");
+	if (IterateDirectoryChildren(parent) != 0)
+		return -1;
+
+    return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int main()
+// For use with DEBUG defined.
+//----------------------------------------------------------------------------------------
+{
+
+	FilesTest tester;
+	return tester.RunAllTests();
+} // main

mozilla/base/tests/Makefile.in

@@ -0,0 +1,46 @@
+#
+# 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
+
+REQUIRES	= xpcom netlib
+
+CPPSRCS		= TestAtoms.cpp TestCRT.cpp FilesTest.cpp
+
+LIBS		= \
+	-lraptorbase \
+	-lxpcom \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I$(srcdir)/../src
+
+# needed for mac linux
+ifeq ($(OS_ARCH),Linux)
+ifneq ($(OS_RELEASE),1.2)
+OS_LIBS		+= /usr/lib/libdl.so
+endif
+endif
+

mozilla/base/tests/TestAtoms.cpp

@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIAtom.h"
+#include "nsString.h"
+#include "prprf.h"
+#include "prtime.h"
+#include <stdio.h>
+
+extern "C" int _CrtSetDbgFlag(int);
+
+int main(int argc, char** argv)
+{
+  FILE* fp = fopen("words.txt", "r");
+  if (nsnull == fp) {
+    printf("can't open words.txt\n");
+    return -1;
+  }
+
+  PRInt32 count = 0;
+  PRUnichar** strings = new PRUnichar*[60000];
+  nsIAtom** ids = new nsIAtom*[60000];
+  nsAutoString s1, s2;
+  PRTime start = PR_Now();
+  PRInt32 i;
+  for (i = 0; i < 60000; i++) {
+    char buf[1000];
+    char* s = fgets(buf, sizeof(buf), fp);
+    if (nsnull == s) {
+      break;
+    }
+    nsAutoString sb(buf);
+    strings[count++] = sb.ToNewUnicode();
+    sb.ToUpperCase();
+    strings[count++] = sb.ToNewUnicode();
+  }
+  PRTime end0 = PR_Now();
+
+  // Find and create idents
+  for (i = 0; i < count; i++) {
+    ids[i] = NS_NewAtom(strings[i]);
+  }
+  PRUnichar qqs[1]; qqs[0] = 0;
+  nsIAtom* qq = NS_NewAtom(qqs);
+  PRTime end1 = PR_Now();
+
+  // Now make sure we can find all the idents we just made
+  for (i = 0; i < count; i++) {
+    nsIAtom* id = NS_NewAtom(ids[i]->GetUnicode());
+    if (id != ids[i]) {
+      id->ToString(s1);
+      ids[i]->ToString(s2);
+      printf("find failed: id='%s' ids[%d]='%s'\n",
+             s1.ToNewCString(), i, s2.ToNewCString());
+      return -1;
+    }
+    NS_RELEASE(id);
+  }
+  PRTime end2 = PR_Now();
+
+  // Destroy all the atoms we just made
+  NS_RELEASE(qq);
+  for (i = 0; i < count; i++) {
+    NS_RELEASE(ids[i]);
+  }
+
+  // Print out timings
+  PRTime end3 = PR_Now();
+  PRTime creates, finds, lookups, dtor, ustoms;
+  LL_I2L(ustoms, 1000);
+  LL_SUB(creates, end0, start);
+  LL_DIV(creates, creates, ustoms);
+  LL_SUB(finds, end1, end0);
+  LL_DIV(finds, finds, ustoms);
+  LL_SUB(lookups, end2, end1);
+  LL_DIV(lookups, lookups, ustoms);
+  LL_SUB(dtor, end3, end2);
+  char buf[500];
+  PR_snprintf(buf, sizeof(buf), "making %d ident strings took %lldms",
+              count, creates);
+  puts(buf);
+  PR_snprintf(buf, sizeof(buf), "%d new idents took %lldms",
+              count, finds);
+  puts(buf);
+  PR_snprintf(buf, sizeof(buf), "%d ident lookups took %lldms",
+              count, lookups);
+  puts(buf);
+  PR_snprintf(buf, sizeof(buf), "dtor took %lldusec", dtor);
+  puts(buf);
+
+  printf("%d live atoms\n", NS_GetNumberOfAtoms());
+  NS_POSTCONDITION(0 == NS_GetNumberOfAtoms(), "dangling atoms");
+
+  return 0;
+}

mozilla/base/tests/TestCRT.cpp

@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsCRT.h"
+#include "nsString.h"
+#include "plstr.h"
+#include <stdlib.h>
+
+// Verify that nsCRT versions of string comparison routines get the
+// same answers as the native non-unicode versions. We only pass in
+// iso-latin-1 strings, so the comparision must be valid.
+static void Check(const char* s1, const char* s2, PRIntn n)
+{
+  PRIntn clib = PL_strcmp(s1, s2);
+  PRIntn clib_n = PL_strncmp(s1, s2, n);
+  PRIntn clib_case = PL_strcasecmp(s1, s2);
+  PRIntn clib_case_n = PL_strncasecmp(s1, s2, n);
+
+  nsAutoString t1(s1), t2(s2);
+  const PRUnichar* us1 = t1.GetUnicode();
+  const PRUnichar* us2 = t2.GetUnicode();
+
+  PRIntn u = nsCRT::strcmp(us1, s2);
+  PRIntn u_n = nsCRT::strncmp(us1, s2, n);
+  PRIntn u_case = nsCRT::strcasecmp(us1, s2);
+  PRIntn u_case_n = nsCRT::strncasecmp(us1, s2, n);
+
+  PRIntn u2 = nsCRT::strcmp(us1, us2);
+  PRIntn u2_n = nsCRT::strncmp(us1, us2, n);
+  PRIntn u2_case = nsCRT::strcasecmp(us1, us2);
+  PRIntn u2_case_n = nsCRT::strncasecmp(us1, us2, n);
+
+  NS_ASSERTION(clib == u, "strcmp");
+  NS_ASSERTION(clib_n == u_n, "strncmp");
+  NS_ASSERTION(clib_case == u_case, "strcasecmp");
+  NS_ASSERTION(clib_case_n == u_case_n, "strncasecmp");
+
+  NS_ASSERTION(clib == u2, "strcmp");
+  NS_ASSERTION(clib_n == u2_n, "strncmp");
+  NS_ASSERTION(clib_case == u2_case, "strcasecmp");
+  NS_ASSERTION(clib_case_n == u2_case_n, "strncasecmp");
+}
+
+struct Test {
+  const char* s1;
+  const char* s2;
+  PRIntn n;
+};
+
+static Test tests[] = {
+  { "foo", "foo", 3 },
+  { "foo", "fo", 3 },
+
+  { "foo", "bar", 3 },
+  { "foo", "ba", 3 },
+
+  { "foo", "zap", 3 },
+  { "foo", "za", 3 },
+
+  { "bar", "foo", 3 },
+  { "bar", "fo", 3 },
+
+  { "bar", "foo", 3 },
+  { "bar", "fo", 3 },
+};
+#define NUM_TESTS (sizeof(tests) / sizeof(tests[0]))
+
+void main()
+{
+  Test* tp = tests;
+  for (PRIntn i = 0; i < NUM_TESTS; i++, tp++) {
+    Check(tp->s1, tp->s2, tp->n);
+  }
+}

mozilla/base/tests/TimerTest.cpp

@@ -0,0 +1,202 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prtypes.h"
+#include "nsVoidArray.h"
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include "resources.h"
+
+#include <windows.h>
+
+static char* class1Name = "TimerTest";
+
+static HINSTANCE gInstance, gPrevInstance;
+static nsVoidArray *gTimeouts = NULL;
+
+static void CreateRepeat(PRUint32 aDelay);
+
+void
+MyCallback (nsITimer *aTimer, void *aClosure)
+{
+    printf("Timer executed with delay %d\n", (int)aClosure);
+    
+    if (gTimeouts->RemoveElement(aTimer) == PR_TRUE) {
+      NS_RELEASE(aTimer);
+    }
+}
+
+void
+MyRepeatCallback (nsITimer *aTimer, void *aClosure)
+{
+    printf("Timer executed with delay %d\n", (int)aClosure);
+    
+    if (gTimeouts->RemoveElement(aTimer) == PR_TRUE) {
+      NS_RELEASE(aTimer);
+    }
+
+    CreateRepeat((PRUint32)aClosure);
+}
+
+static void
+CreateOneShot(PRUint32 aDelay)
+{
+    nsITimer *timer;
+
+    NS_NewTimer(&timer);
+    timer->Init(MyCallback, (void *)aDelay, aDelay);
+    
+    gTimeouts->AppendElement(timer);
+}
+
+static void
+CreateRepeat(PRUint32 aDelay)
+{
+    nsITimer *timer;
+
+    NS_NewTimer(&timer);
+    timer->Init(MyRepeatCallback, (void *)aDelay, aDelay);
+    
+    gTimeouts->AppendElement(timer);
+}
+
+static void
+CancelAll()
+{
+    int i, count = gTimeouts->Count();
+
+    for (i=0; i < count; i++) {
+        nsITimer *timer = (nsITimer *)gTimeouts->ElementAt(i);
+	
+	if (timer != NULL) {
+	    timer->Cancel();
+	    NS_RELEASE(timer);
+	}
+    }
+
+    gTimeouts->Clear();
+}
+
+long PASCAL
+WndProc(HWND hWnd, UINT msg, WPARAM param, LPARAM lparam)
+{
+  HMENU hMenu;
+
+  switch (msg) {
+    case WM_COMMAND:
+      hMenu = GetMenu(hWnd);
+
+      switch (LOWORD(param)) {
+        case TIMER_EXIT:
+	  ::DestroyWindow(hWnd);
+	  exit(0);
+
+        case TIMER_1SECOND:
+	  CreateOneShot(1000);
+	  break;
+        case TIMER_5SECOND:
+	  CreateOneShot(5000);
+	  break;
+        case TIMER_10SECOND:
+	  CreateOneShot(10000);
+	  break;
+
+        case TIMER_1REPEAT:
+	  CreateRepeat(1000);
+	  break;
+        case TIMER_5REPEAT:
+	  CreateRepeat(5000);
+	  break;
+        case TIMER_10REPEAT:
+	  CreateRepeat(10000);
+	  break;
+
+        case TIMER_CANCEL:
+	  CancelAll();
+	  break;
+
+        default:
+	  break;
+    }
+
+    default:
+      break;
+  }
+
+  return DefWindowProc(hWnd, msg, param, lparam);
+}
+
+static HWND CreateTopLevel(const char* clazz, const char* title,
+                                  int aWidth, int aHeight)
+{
+  // Create a simple top level window
+  HWND window = ::CreateWindowEx(WS_EX_CLIENTEDGE,
+                                 clazz, title,
+                                 WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN,
+                                 CW_USEDEFAULT, CW_USEDEFAULT,
+                                 aWidth, aHeight,
+                                 HWND_DESKTOP,
+                                 NULL,
+                                 gInstance,
+                                 NULL);
+
+  ::ShowWindow(window, SW_SHOW);
+  ::UpdateWindow(window);
+  return window;
+}
+
+int PASCAL
+WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam, int nCmdShow)
+{
+  gInstance = instance;
+
+  if (!prevInstance) {
+    WNDCLASS wndClass;
+    wndClass.style = 0;
+    wndClass.lpfnWndProc = WndProc;
+    wndClass.cbClsExtra = 0;
+    wndClass.cbWndExtra = 0;
+    wndClass.hInstance = gInstance;
+    wndClass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndClass.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wndClass.hbrBackground = (HBRUSH) GetStockObject(LTGRAY_BRUSH);
+    wndClass.lpszMenuName = class1Name;
+    wndClass.lpszClassName = class1Name;
+    RegisterClass(&wndClass);
+  }
+
+  // Create our first top level window
+  HWND window = CreateTopLevel(class1Name, "Raptor HTML Viewer", 620, 400);
+
+  gTimeouts = new nsVoidArray();
+
+  // Process messages
+  MSG msg;
+  while (GetMessage(&msg, NULL, 0, 0)) {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+  }
+  return msg.wParam;
+}
+
+void main(int argc, char **argv)
+{
+  WinMain(GetModuleHandle(NULL), NULL, 0, SW_SHOW);
+}

mozilla/base/tests/makefile.win

@@ -0,0 +1,96 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..
+
+MAKE_OBJ_TYPE	= EXE
+PROG0 = .\$(OBJDIR)\TimerTest.exe
+PROG1 = .\$(OBJDIR)\TestAtoms.exe
+PROG2 = .\$(OBJDIR)\CvtURL.exe
+PROG3 = .\$(OBJDIR)\TestCRT.exe
+PROG4 = .\$(OBJDIR)\FilesTest.exe
+RESFILE = timer.res
+PROGRAMS = $(PROG0) $(PROG1) \
+!ifdef MODULAR_NETLIB
+        $(PROG2) \
+	$(PROG3) \
+!endif
+	$(PROG4) \
+	$(NULL)
+
+LINCS=-I..\src -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib -I$(PUBLIC)\raptor
+
+LLIBS=				\
+ $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\raptorbase.lib	\
+!ifdef MODULAR_NETLIB
+ $(DIST)\lib\netlib.lib         \
+!endif
+ $(LIBNSPR)			\
+ $(DIST)\lib\libplc21.lib	\
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+ $(GLOWDIR)\glowcode.lib	\
+!endif
+ $(RESFILE)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(PROGRAMS)
+	$(MAKE_INSTALL) $(PROG0) $(DIST)\bin
+	$(MAKE_INSTALL) $(PROG1) $(DIST)\bin
+!ifdef MODULAR_NETLIB
+	$(MAKE_INSTALL) $(PROG2) $(DIST)\bin
+	$(MAKE_INSTALL) $(PROG3) $(DIST)\bin
+!endif
+	$(MAKE_INSTALL) $(PROG4) $(DIST)\bin
+
+clobber::
+	rm -f $(DIST)\bin\TimerTest.exe
+	rm -f $(DIST)\bin\TestAtoms.exe
+!ifdef MODULAR_NETLIB
+	rm -f $(DIST)\bin\CvtURL.exe
+	rm -f $(DIST)\bin\TestCRT.exe
+!endif
+	rm -f $(DIST)\bin\FilesTest.exe
+
+# Move this into config/obj.inc when it's allowed
+.cpp{.\$(OBJDIR)\}.exe:
+    $(CC) @<<$(CFGFILE)
+        $(CFLAGS)
+        $(LCFLAGS)
+        $(LINCS)
+        $(LINCS_1)
+        $(INCS)
+        $(LLIBS)
+        $(OS_LIBS)
+        -Fd$(PBDFILE)
+        -Fe.\$(OBJDIR)\
+        -Fo.\$(OBJDIR)\
+        $(CURDIR)$(*B).cpp
+<<KEEP
+
+$(PROG0): $(OBJDIR) TimerTest.cpp $(RESFILE)
+
+$(PROG1): $(OBJDIR) TestAtoms.cpp
+
+$(PROG4): $(OBJDIR) FilesTest.cpp
+
+!ifdef MODULAR_NETLIB
+$(PROG2): $(OBJDIR) CvtURL.cpp
+
+$(PROG3): $(OBJDIR) TestCRT.cpp
+!endif

mozilla/base/tests/resources.h

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef resources_h___
+#define resources_h___
+
+#define TIMER_1SECOND             40000
+#define TIMER_5SECOND             40001
+#define TIMER_10SECOND            40002
+
+#define TIMER_1REPEAT             40003
+#define TIMER_5REPEAT             40004
+#define TIMER_10REPEAT            40005
+
+#define TIMER_CANCEL              40006
+#define TIMER_EXIT                40010
+
+#endif /* resources_h___ */

mozilla/base/tests/timer.rc

@@ -0,0 +1,38 @@
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "resources.h"
+
+TIMERTEST MENU DISCARDABLE
+{
+  POPUP "Debug"
+  {
+    POPUP "One Shot"
+    {
+      MENUITEM "1 second", TIMER_1SECOND
+      MENUITEM "5 second", TIMER_5SECOND
+      MENUITEM "10 second", TIMER_10SECOND
+    }
+    POPUP "Repeated"
+    {
+      MENUITEM "1 second", TIMER_1REPEAT
+      MENUITEM "5 second", TIMER_5REPEAT
+      MENUITEM "10 second", TIMER_10REPEAT
+    }
+    MENUITEM "Cancel All", TIMER_CANCEL
+    MENUITEM "Exit", TIMER_EXIT
+  }
+}

mozilla/string/obsolete/nsString.h

@@ -0,0 +1,797 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+    A. There are two philosophies to building string classes:
+        1. Hide the underlying buffer & offer API's allow indirect iteration
+        2. Reveal underlying buffer, risk corruption, but gain performance
+        
+       We chose the second option for performance reasons. 
+
+    B Our internal buffer always holds capacity+1 bytes.
+ ***********************************************************************/
+
+
+#ifndef _NSSTRING
+#define _NSSTRING
+
+
+#include "prtypes.h"
+#include "nscore.h"
+#include "nsIAtom.h"
+#include <iostream.h>
+#include <stdio.h>
+class nsISizeOfHandler;
+
+class NS_BASE nsString {
+  public: 
+
+/**
+ * Default constructor. Note that we actually allocate a small buffer
+ * to begin with. This is because the "philosophy" of the string class
+ * was to allow developers direct access to the underlying buffer for
+ * performance reasons. 
+ */
+nsString();
+
+/**
+ * This constructor accepts an isolatin string
+ * @param   an ascii is a ptr to a 1-byte cstr
+ */
+nsString(const char* aCString);
+
+/**
+ * This is our copy constructor 
+ * @param   reference to another nsString
+ */
+nsString(const nsString&);
+
+/**
+ * Constructor from a unicode string
+ * @param   anicodestr pts to a unicode string
+ */
+nsString(const PRUnichar* aUnicode);    
+
+/**
+ * Virtual Destructor
+ */
+virtual ~nsString();
+
+
+/**
+ * Retrieve the length of this string
+ * @return string length
+ */
+PRInt32 Length() const { return mLength; }
+
+
+/**
+ * Sets the new length of the string.
+ * @param   aLength is new string length.
+ * @return  nada
+ */
+void SetLength(PRInt32 aLength);
+
+/**
+ * This method truncates this string to given length.
+ *
+ * @param   anIndex -- new length of string
+ * @return  nada
+ */
+void Truncate(PRInt32 anIndex=0);
+
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size.
+ * @param   aNewLength -- new capacity of string  
+ * @return  void
+ */
+virtual void EnsureCapacityFor(PRInt32 aNewLength);
+
+/**
+ * 
+ * @param 
+ */
+virtual void SizeOf(nsISizeOfHandler* aHandler) const;
+
+/**
+ *  Determine whether or not the characters in this
+ *  string are in sorted order.
+ *  
+ *  @return  TRUE if ordered.
+ */
+PRBool IsOrdered(void) const;
+
+/**********************************************************************
+  Accessor methods...
+ *********************************************************************/
+
+/**
+ * Retrieve pointer to internal string value
+ * @return  PRUnichar* to internal string
+ */
+const PRUnichar* GetUnicode(void) const;
+
+/**
+ * 
+ * @param 
+ * @return
+ */
+operator PRUnichar*() const;
+
+/**
+ * Retrieve unicode char at given index
+ * @param   offset into string
+ * @return  PRUnichar* to internal string
+ */
+PRUnichar operator()(PRInt32 anIndex) const;
+
+/**
+ * Retrieve reference to unicode char at given index
+ * @param   offset into string
+ * @return  PRUnichar& from internal string
+ */
+PRUnichar& operator[](PRInt32 anIndex) const;
+
+/**
+ * Retrieve reference to unicode char at given index
+ * @param   offset into string
+ * @return  PRUnichar& from internal string
+ */
+PRUnichar& CharAt(PRInt32 anIndex) const;
+
+/**
+ * Retrieve reference to first unicode char in string
+ * @return  PRUnichar from internal string
+ */
+PRUnichar& First() const; 
+
+/**
+ * Retrieve reference to last unicode char in string
+ * @return  PRUnichar from internal string
+ */
+PRUnichar& Last() const;
+
+/**********************************************************************
+  String creation methods...
+ *********************************************************************/
+
+/**
+ * Create a new string by appending given string to this
+ * @param   aString -- 2nd string to be appended
+ * @return  new string
+ */
+nsString operator+(const nsString& aString);
+
+/**
+ * create a new string by adding this to the given buffer.
+ * @param   aCString is a ptr to cstring to be added to this
+ * @return  newly created string
+ */
+nsString operator+(const char* aCString);
+
+/**
+ * create a new string by adding this to the given char.
+ * @param   aChar is a char to be added to this
+ * @return  newly created string
+ */
+nsString operator+(char aChar);
+
+/**
+ * create a new string by adding this to the given buffer.
+ * @param   aStr unichar buffer to be added to this
+ * @return  newly created string
+ */
+nsString operator+(const PRUnichar* aBuffer);
+
+/**
+ * create a new string by adding this to the given char.
+ * @param   aChar is a unichar to be added to this
+ * @return  newly created string
+ */
+nsString operator+(PRUnichar aChar);
+
+/**
+ * Converts all chars in internal string to lower
+ */
+void ToLowerCase();
+
+/**
+ * Converts all chars in given string to lower
+ */
+void ToLowerCase(nsString& aString) const;
+
+/**
+ * Converts all chars in given string to upper
+ */
+void ToUpperCase();
+
+/**
+ * Converts all chars in given string to UCS2
+ * which ensure that the lower 256 chars are correct.
+ */
+void ToUCS2(PRInt32 aStartOffset);
+
+/**
+ * Converts all chars in internal string to upper
+ */
+void ToUpperCase(nsString& aString) const;
+
+/**
+ * Creates a duplicate clone (ptr) of this string.
+ * @return  ptr to clone of this string
+ */
+nsString* ToNewString() const;
+
+/**
+ * Creates an ascii clone of this string
+ * NOTE: This string is allocated with new; YOU MUST deallocate with delete[]!
+ * @return  ptr to new c-String string
+ */
+char* ToNewCString() const;
+
+/**
+ * Copies data from internal buffer onto given char* buffer
+ * @param aBuf is the buffer where data is stored
+ * @param aBuflength is the max # of chars to move to buffer
+ * @return ptr to given buffer
+ */
+char* ToCString(char* aBuf,PRInt32 aBufLength) const;
+
+/**
+ * Copies contents of this onto given string.
+ * @param   aString to hold copy of this
+ * @return  nada.
+ */
+void Copy(nsString& aString) const;
+
+/**
+ * Creates an unichar clone of this string
+ * @return  ptr to new unichar string
+ */
+PRUnichar* ToNewUnicode() const;
+
+/**
+ * Perform string to float conversion.
+ * @param   aErrorCode will contain error if one occurs
+ * @return  float rep of string value
+ */
+float ToFloat(PRInt32* aErrorCode) const;
+
+/**
+ * Perform string to int conversion.
+ * @param   aErrorCode will contain error if one occurs
+ * @return  int rep of string value
+ */
+PRInt32 ToInteger(PRInt32* aErrorCode,PRInt32 aRadix=10) const;
+
+/**********************************************************************
+  String manipulation methods...                
+ *********************************************************************/
+
+/**
+ * assign given PRUnichar* to this string
+ * @param   aStr: buffer to be assigned to this 
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& SetString(const PRUnichar* aStr,PRInt32 aLength=-1);
+
+/**
+ * assign given char* to this string
+ * @param   aCString: buffer to be assigned to this 
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& SetString(const char* aCString,PRInt32 aLength=-1);
+
+/**
+ * assign given string to this one
+ * @param   aString: string to be added to this
+ * @return  this
+ */
+nsString& operator=(const nsString& aString);
+
+/**
+ * assign given char* to this string
+ * @param   aCString: buffer to be assigned to this 
+ * @return  this
+ */
+nsString& operator=(const char* aCString);
+
+/**
+ * assign given char to this string
+ * @param   aChar: char to be assignd to this
+ * @return  this
+ */
+nsString& operator=(char aChar);
+
+/**
+ * assign given unichar* to this string
+ * @param   aBuffer: unichar buffer to be assigned to this 
+ * @return  this
+ */
+nsString& operator=(const PRUnichar* aBuffer);
+
+/**
+ * assign given char to this string
+ * @param   aChar: char to be assignd to this
+ * @return  this
+ */
+nsString& operator=(PRUnichar aChar);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @return  this
+ */
+nsString& operator+=(const nsString& aString);
+
+/**
+ * append given buffer to this string
+ * @param   aCString: buffer to be appended to this
+ * @return  this
+ */
+nsString& operator+=(const char* aCString);
+
+/**
+ * append given buffer to this string
+ * @param   aBuffer: buffer to be appended to this
+ * @return  this
+ */
+nsString& operator+=(const PRUnichar* aBuffer);
+
+/**
+ * append given char to this string
+ * @param   aChar: char to be appended to this
+ * @return  this
+ */
+nsString& operator+=(PRUnichar aChar);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& Append(const nsString& aString,PRInt32 aLength=-1);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& Append(const char* aCString,PRInt32 aLength=-1);
+
+/**
+ * append given string to this string
+ * @param   aString : string to be appended to this
+ * @return  this
+ */
+nsString& Append(char aChar);
+
+/**
+ * append given unichar buffer to this string
+ * @param   aString : string to be appended to this
+ * @param   alength is the length of the given str (or -1)
+            if you want me to determine its length
+ * @return  this
+ */
+nsString& Append(const PRUnichar* aBuffer,PRInt32 aLength=-1);
+
+/**
+ * append given unichar character to this string
+ * @param   aChar is the char to be appended to this
+ * @return  this
+ */
+nsString& Append(PRUnichar aChar);
+
+/**
+ * Append an integer onto this string
+ * @param aInteger is the int to be appended
+ * @param aRadix specifies 8,10,16
+ * @return this
+ */
+nsString& Append(PRInt32 aInteger,PRInt32 aRadix); //radix=8,10 or 16
+
+/**
+ * Append a float value onto this string
+ * @param aFloat is the float to be appended
+ * @return this
+ */
+nsString& Append(float aFloat);
+              
+/*
+ *  Copies n characters from this string to given string,
+ *  starting at the leftmost offset.
+ *  
+ *  
+ *  @param   aCopy -- Receiving string
+ *  @param   aCount -- number of chars to copy
+ *  @return  number of chars copied
+ */
+PRInt32 Left(nsString& aCopy,PRInt32 aCount) const;
+
+/*
+ *  Copies n characters from this string to given string,
+ *  starting at the given offset.
+ *  
+ *  
+ *  @param   aCopy -- Receiving string
+ *  @param   aCount -- number of chars to copy
+ *  @param   anOffset -- position where copying begins
+ *  @return  number of chars copied
+ */
+PRInt32 Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) const;
+
+/*
+ *  Copies n characters from this string to given string,
+ *  starting at rightmost char.
+ *  
+ *  
+ *  @param  aCopy -- Receiving string
+ *  @param  aCount -- number of chars to copy
+ *  @return number of chars copied
+ */
+PRInt32 Right(nsString& aCopy,PRInt32 aCount) const;
+
+/*
+ *  This method inserts n chars from given string into this
+ *  string at str[anOffset].
+ *  
+ *  @param  aCopy -- String to be inserted into this
+ *  @param  anOffset -- insertion position within this str
+ *  @param  aCount -- number of chars to be copied from aCopy
+ *  @return number of chars inserted into this.
+ */
+PRInt32 Insert(const nsString& aCopy,PRInt32 anOffset,PRInt32 aCount=-1);
+
+/**
+ * Insert a single unicode char into this string at
+ * a specified offset.
+ *
+ * @param   aChar char to be inserted into this string
+ * @param   anOffset is insert pos in str 
+ * @return  the number of chars inserted into this string
+ */
+PRInt32 Insert(PRUnichar aChar,PRInt32 anOffset);
+
+/*
+ *  This method is used to cut characters in this string
+ *  starting at anOffset, continuing for aCount chars.
+ *  
+ *  @param  anOffset -- start pos for cut operation
+ *  @param  aCount -- number of chars to be cut
+ *  @return *this
+ */
+nsString& Cut(PRInt32 anOffset,PRInt32 aCount);
+
+/**
+ *  This method is used to remove all occurances of the
+ *  characters found in aSet from this string.
+ *  
+ *  @param  aSet -- characters to be cut from this
+ *  @return *this 
+ */
+nsString& StripChars(const char* aSet);
+
+/**
+ *  This method strips whitespace throughout the string
+ *  
+ *  @return  this
+ */
+nsString& StripWhitespace();
+
+/**
+ *  This method trims characters found in aTrimSet from
+ *  either end of the underlying string.
+ *  
+ *  @param   aTrimSet -- contains chars to be trimmed from
+ *           both ends
+ *  @return  this
+ */
+nsString& Trim(const char* aSet,
+               PRBool aEliminateLeading=PR_TRUE,
+               PRBool aEliminateTrailing=PR_TRUE);
+
+/**
+ *  This method strips whitespace from string.
+ *  You can control whether whitespace is yanked from
+ *  start and end of string as well.
+ *  
+ *  @param   aEliminateLeading controls stripping of leading ws
+ *  @param   aEliminateTrailing controls stripping of trailing ws
+ *  @return  this
+ */
+nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,
+                              PRBool aEliminateTrailing=PR_TRUE);
+
+/**
+ *  Determine if given char is a valid space character
+ *  
+ *  @param   aChar is character to be tested
+ *  @return  TRUE if is valid space char
+ */
+static  PRBool IsSpace(PRUnichar ch);
+
+/**
+ *  Determine if given char in valid alpha range
+ *  
+ *  @param   aChar is character to be tested
+ *  @return  TRUE if in alpha range
+ */
+static  PRBool IsAlpha(PRUnichar ch);
+
+/**
+ *  Determine if given char is valid digit
+ *  
+ *  @param   aChar is character to be tested
+ *  @return  TRUE if char is a valid digit
+ */
+static  PRBool IsDigit(PRUnichar ch);
+
+/**********************************************************************
+  Searching methods...                
+ *********************************************************************/
+ 
+/**
+ *  Search for given character within this string.
+ *  This method does so by using a binary search,
+ *  so your string HAD BETTER BE ORDERED!
+ *  
+ *  @param   aChar is the unicode char to be found
+ *  @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 BinarySearch(PRUnichar aChar) const;
+
+/**
+ *  Search for given substring within this string
+ *  
+ *  @param   aString is substring to be sought in this
+ *  @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 Find(const char* aString) const;
+PRInt32 Find(const PRUnichar* aString) const;
+PRInt32 Find(const nsString& aString) const;
+
+/**
+ *  Search for given char within this string
+ *  
+ *  @param   aChar - char to be found
+ *  @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 Find(PRUnichar aChar,PRInt32 offset=0) const;
+
+/**
+ * This method searches this string for the first character
+ * found in the given string
+ * @param aString contains set of chars to be found
+ * @param anOffset tells us where to start searching in this
+ * @return -1 if not found, else the offset in this
+ */
+PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=0) const;
+PRInt32 FindCharInSet(nsString& aString,PRInt32 anOffset=0) const;
+
+/**
+ * This method searches this string for the last character
+ * found in the given string
+ * @param aString contains set of chars to be found
+ * @param anOffset tells us where to start searching in this
+ * @return -1 if not found, else the offset in this
+ */
+PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=0) const;
+PRInt32 RFindCharInSet(nsString& aString,PRInt32 anOffset=0) const;
+
+
+/**
+ * This methods scans the string backwards, looking for the given string
+ * @param   aString is substring to be sought in this
+ * @param   aIgnoreCase tells us whether or not to do caseless compare
+ * @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE) const;
+PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE) const;
+PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE) const;
+
+/**
+ * This methods scans the string backwards, looking for the given char
+ * @param   char is the char to be sought in this
+ * @param   aIgnoreCase tells us whether or not to do caseless compare
+ * @return  offset in string, or -1 (kNotFound)
+ */
+PRInt32 RFind(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE) const;
+
+/**********************************************************************
+  Comparison methods...                
+ *********************************************************************/
+
+/**
+ * Compares a given string type to this string. 
+ * @update	gess 7/27/98
+ * @param   S is the string to be compared
+ * @param   aIgnoreCase tells us how to treat case
+ * @return  -1,0,1
+ */
+virtual PRInt32 Compare(const nsString &aString,PRBool aIgnoreCase=PR_FALSE) const;
+virtual PRInt32 Compare(const char *aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
+virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
+
+/**
+ * These methods compare a given string type to this one
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator==(const nsString &aString) const;
+PRBool  operator==(const char *aString) const;
+PRBool  operator==(const PRUnichar* aString) const;
+
+/**
+ * These methods perform a !compare of a given string type to this 
+ * @param aString is the string to be compared to this
+ * @return  TRUE 
+ */
+PRBool  operator!=(const nsString &aString) const;
+PRBool  operator!=(const char *aString) const;
+PRBool  operator!=(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is < than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator<(const nsString &aString) const;
+PRBool  operator<(const char *aString) const;
+PRBool  operator<(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is > than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator>(const nsString &S) const;
+PRBool  operator>(const char *aCString) const;
+PRBool  operator>(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is <= than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator<=(const nsString &S) const;
+PRBool  operator<=(const char *aCString) const;
+PRBool  operator<=(const PRUnichar* aString) const;
+
+/**
+ * These methods test if a given string is >= than this
+ * @param aString is the string to be compared to this
+ * @return  TRUE or FALSE
+ */
+PRBool  operator>=(const nsString &S) const;
+PRBool  operator>=(const char* aCString) const;
+PRBool  operator>=(const PRUnichar* aString) const;
+
+/**
+ * Compare this to given string; note that we compare full strings here.
+ * The optional length argument just lets us know how long the given string is.
+ * If you provide a length, it is compared to length of this string as an
+ * optimization.
+ * 
+ * @param  aString -- the string to compare to this
+ * @param  aLength -- optional length of given string.
+ * @return TRUE if equal
+ */
+PRBool  Equals(const nsString& aString) const;
+PRBool  Equals(const char* aString,PRInt32 aLength=-1) const;   
+PRBool  Equals(const nsIAtom *aAtom) const;
+
+
+/**
+ * Compares to unichar string ptrs to each other
+ * @param s1 is a ptr to a unichar buffer
+ * @param s2 is a ptr to a unichar buffer
+ * @return  TRUE if they match
+ */
+PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2) const;
+
+/**
+ * Compare this to given string; note that we compare full strings here.
+ * The optional length argument just lets us know how long the given string is.
+ * If you provide a length, it is compared to length of this string as an
+ * optimization.
+ * 
+ * @param  aString -- the string to compare to this
+ * @param  aLength -- optional length of given string.
+ * @return TRUE if equal
+ */
+PRBool  EqualsIgnoreCase(const nsString& aString) const;
+PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aLength=-1) const;
+PRBool  EqualsIgnoreCase(const nsIAtom *aAtom) const;
+
+/**
+ * Compares to unichar string ptrs to each other without respect to case
+ * @param s1 is a ptr to a unichar buffer
+ * @param s2 is a ptr to a unichar buffer
+ * @return  TRUE if they match
+ */
+PRBool  EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
+
+
+static void   SelfTest();
+virtual void          DebugDump(ostream& aStream) const;
+
+  protected:
+
+typedef PRUnichar chartype;
+
+            chartype*       mStr;
+            PRInt32         mLength;
+            PRInt32         mCapacity;
+		static	PRBool					mSelfTested;
+};
+
+ostream& operator<<(ostream& os,nsString& aString);
+extern NS_BASE int fputs(const nsString& aString, FILE* out);
+
+//----------------------------------------------------------------------
+
+/**
+ * A version of nsString which is designed to be used as an automatic
+ * variable.  It attempts to operate out of a fixed size internal
+ * buffer until too much data is added; then a dynamic buffer is
+ * allocated and grown as necessary.
+ */
+// XXX template this with a parameter for the size of the buffer?
+class NS_BASE nsAutoString : public nsString {
+public:
+                nsAutoString();
+                nsAutoString(const nsString& other);
+                nsAutoString(const nsAutoString& other);
+                nsAutoString(PRUnichar aChar);
+                nsAutoString(const char* aCString);
+                nsAutoString(const PRUnichar* us, PRInt32 uslen = -1);
+  virtual       ~nsAutoString();
+
+  nsAutoString& operator=(const nsString& aString) {nsString::operator=(aString); return *this;}
+  nsAutoString& operator=(const char* aCString) {nsString::operator=(aCString); return *this;}
+  nsAutoString& operator=(char aChar) {nsString::operator=(aChar); return *this;}
+  nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::operator=(aBuffer); return *this;}
+  nsAutoString& operator=(PRUnichar aChar) {nsString::operator=(aChar); return *this;}
+
+  virtual void  SizeOf(nsISizeOfHandler* aHandler) const;
+
+  static  void  SelfTest();
+
+protected:
+  virtual void EnsureCapacityFor(PRInt32 aNewLength);
+
+  chartype mBuf[32];
+};
+
+ostream& operator<<(ostream& os,nsAutoString& aString);
+
+#endif
+

mozilla/webtools/bugzilla/Attachment.pm

@@ -1,97 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Myk Melez <myk@mozilla.org>
-
-############################################################################
-# Module Initialization
-############################################################################
-
-use diagnostics;
-use strict;
-
-package Attachment;
-
-# This module requires that its caller have said "require CGI.pl" to import
-# relevant functions from that script and its companion globals.pl.
-
-############################################################################
-# Functions
-############################################################################
-
-sub query
-{
-  # Retrieves and returns an array of attachment records for a given bug. 
-  # This data should be given to attachment/list.atml in an
-  # "attachments" variable.
-  my ($bugid) = @_;
-
-  my $in_editbugs = &::UserInGroup($::userid, "editbugs");
-
-  # Retrieve a list of attachments for this bug and write them into an array
-  # of hashes in which each hash represents a single attachment.
-  &::SendSQL("
-              SELECT attach_id, creation_ts, mimetype, description, ispatch, 
-               isobsolete, submitter_id 
-              FROM attachments WHERE bug_id = $bugid ORDER BY attach_id
-            ");
-  my @attachments = ();
-  while (&::MoreSQLData()) {
-    my %a;
-    my $submitter_id;
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, $a{'description'},
-     $a{'ispatch'}, $a{'isobsolete'}, $submitter_id) = &::FetchSQLData();
-
-    # Format the attachment's creation/modification date into a standard
-    # format (YYYY-MM-DD HH:MM)
-    if ($a{'date'} =~ /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-        $a{'date'} = "$1-$2-$3 $4:$5";
-    }
-
-    # Retrieve a list of status flags that have been set on the attachment.
-    &::PushGlobalSQLState();
-    &::SendSQL(" 
-                SELECT   name 
-                FROM     attachstatuses, attachstatusdefs 
-                WHERE    attach_id = $a{'attachid'} 
-                AND      attachstatuses.statusid = attachstatusdefs.id
-                ORDER BY sortkey
-              ");
-    my @statuses = ();
-    while (&::MoreSQLData()) { 
-      my ($status) = &::FetchSQLData(); 
-      push @statuses , $status;
-    }
-    $a{'statuses'} = \@statuses;
-    &::PopGlobalSQLState();
-
-    # We will display the edit link if the user can edit the attachment;
-    # ie the are the submitter, or they have canedit.
-    # Also show the link if the user is not logged in - in that cae,
-    # They'll be prompted later
-    $a{'canedit'} = ($::userid == 0 || $submitter_id == $::userid ||
-                     $in_editbugs);
-    push @attachments, \%a;
-  }
-  
-  return \@attachments;  
-}
-
-1;

mozilla/webtools/bugzilla/Bug.pm

@@ -1,525 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Dawn Endico    <endico@mozilla.org>
-#                 Terry Weissman <terry@mozilla.org>
-#                 Chris Yeh      <cyeh@bluemartini.com>
-
-use diagnostics;
-use strict;
-
-use DBI;
-use RelationSet;
-use vars qw($unconfirmedstate $legal_keywords);
-require "globals.pl";
-require "CGI.pl";
-package Bug;
-use CGI::Carp qw(fatalsToBrowser);
-my %ok_field;
-
-for my $key (qw (bug_id product version rep_platform op_sys bug_status 
-                resolution priority bug_severity component assigned_to
-                reporter bug_file_loc short_desc target_milestone 
-                qa_contact status_whiteboard creation_ts 
-                delta_ts votes whoid comment query error) ){
-    $ok_field{$key}++;
-    }
-
-# create a new empty bug
-#
-sub new {
-  my $type = shift();
-  my %bug;
-
-  # create a ref to an empty hash and bless it
-  #
-  my $self = {%bug};
-  bless $self, $type;
-
-  # construct from a hash containing a bug's info
-  #
-  if ($#_ == 1) {
-    $self->initBug(@_);
-  } else {
-    confess("invalid number of arguments \($#_\)($_)");
-  }
-
-  # bless as a Bug
-  #
-  return $self;
-}
-
-
-
-# dump info about bug into hash unless user doesn't have permission
-# user_id 0 is used when person is not logged in.
-#
-sub initBug  {
-  my $self = shift();
-  my ($bug_id, $user_id) = (@_);
-
-  my $old_bug_id = $bug_id;
-  if ((! defined $bug_id) || (!$bug_id) || (!&::detaint_natural($bug_id))) {
-      # no bug number given
-      $self->{'bug_id'} = $old_bug_id;
-      $self->{'error'} = "InvalidBugId";
-      return $self;
-  }
-
-# default userid 0, or get DBID if you used an email address
-  unless (defined $user_id) {
-    $user_id = 0;
-  }
-  else {
-     if ($user_id =~ /^\@/) {
-        $user_id = &::DBname_to_id($user_id); 
-     }
-  }
-     
-
-  &::ConnectToDatabase();
-  &::GetVersionTable();
-
-  # this verification should already have been done by caller
-  # my $loginok = quietly_check_login();
-
-
-  $self->{'whoid'} = $user_id;
-
-  # First check that we can see it
-  if (!&::CanSeeBug($bug_id, $user_id)) {
-      # is it not there, or are we just forbidden to see it?
-      &::SendSQL("SELECT bug_id FROM bugs WHERE bug_id = $bug_id");
-      if (&::FetchSQLData()) {
-          $self->{'error'} = "NotPermitted";
-      } else {
-          $self->{'error'} = "NotFound";
-      }
-      $self->{'bug_id'} = $bug_id;
-      return $self;
-  }
-
-    my $query = "";
-    if ($::driver eq 'mysql') {
-        $query = "
-    select
-      bugs.bug_id, product, version, rep_platform, op_sys, bug_status,
-      resolution, priority, bug_severity, component, assigned_to, reporter,
-      bug_file_loc, short_desc, target_milestone, qa_contact,
-      status_whiteboard, date_format(creation_ts,'%Y-%m-%d %H:%i'),
-      delta_ts, sum(votes.count)
-    from bugs left join votes using(bug_id)
-    where bugs.bug_id = $bug_id
-    group by bugs.bug_id";
-    } elsif ($::driver eq 'Pg') {
-        $query = "
-    select
-      bugs.bug_id, product, version, rep_platform, op_sys, bug_status,
-      resolution, priority, bug_severity, component, assigned_to, reporter,
-      bug_file_loc, short_desc, target_milestone, qa_contact,
-      status_whiteboard, creation_ts,
-      delta_ts, sum(votes.count)
-    from bugs left join votes using(bug_id)
-    where bugs.bug_id = $bug_id
-    group by bugs.bug_id, product, version, rep_platform, op_sys, bug_status,
-         resolution, priority, bug_severity, component, assigned_to, reporter,
-         bug_file_loc, short_desc, target_milestone, qa_contact, status_whiteboard,
-         creation_ts, delta_ts";
-    }
-
-  &::SendSQL($query);
-  my @row;
-
-  @row = &::FetchSQLData();
-  my $count = 0;
-  my %fields;
-  foreach my $field ("bug_id", "product", "version", "rep_platform",
-                     "op_sys", "bug_status", "resolution", "priority",
-                     "bug_severity", "component", "assigned_to", "reporter",
-                     "bug_file_loc", "short_desc", "target_milestone",
-                     "qa_contact", "status_whiteboard", "creation_ts",
-                     "delta_ts", "votes") {
-      $fields{$field} = shift @row;
-      if ($fields{$field}) {
-          $self->{$field} = $fields{$field};
-      }
-      $count++;
-  }
-
-  $self->{'assigned_to'} = &::DBID_to_name($self->{'assigned_to'});
-  $self->{'reporter'} = &::DBID_to_name($self->{'reporter'});
-
-  my $ccSet = new RelationSet;
-  $ccSet->mergeFromDB("select who from cc where bug_id=$bug_id");
-  my @cc = $ccSet->toArrayOfStrings();
-  if (@cc) {
-    $self->{'cc'} = \@cc;
-  }
-
-  if (&::Param("useqacontact") && (defined $self->{'qa_contact'}) ) {
-    my $name = $self->{'qa_contact'} > 0 ? &::DBID_to_name($self->{'qa_contact'}) :"";
-    if ($name) {
-      $self->{'qa_contact'} = $name;
-    }
-  }
-
-  if (@::legal_keywords) {
-    &::SendSQL("SELECT keyworddefs.name 
-              FROM keyworddefs, keywords
-             WHERE keywords.bug_id = $bug_id 
-               AND keyworddefs.id = keywords.keywordid
-          ORDER BY keyworddefs.name");
-    my @list;
-    while (&::MoreSQLData()) {
-        push(@list, &::FetchOneColumn());
-    }
-    if (@list) {
-      $self->{'keywords'} = join(', ', @list);
-    }
-  }
-
-  &::SendSQL("select attach_id, creation_ts, description 
-           from attachments 
-           where bug_id = $bug_id");
-  my @attachments;
-  while (&::MoreSQLData()) {
-    my ($attachid, $date, $desc) = (&::FetchSQLData());
-    if ($date =~ /^(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-        $date = "$3/$4/$2 $5:$6";
-      my %attach;
-      $attach{'attachid'} = $attachid;
-      $attach{'date'} = $date;
-      $attach{'desc'} = $desc;
-      push @attachments, \%attach;
-    }
-  }
-  if (@attachments) {
-    $self->{'attachments'} = \@attachments;
-  }
-
-  &::SendSQL("select bug_id, who, bug_when, thetext 
-           from longdescs 
-           where bug_id = $bug_id");
-  my @longdescs;
-  while (&::MoreSQLData()) {
-    my ($bug_id, $who, $bug_when, $thetext) = (&::FetchSQLData());
-    my %longdesc;
-    $longdesc{'who'} = $who;
-    $longdesc{'bug_when'} = $bug_when;
-    $longdesc{'thetext'} = $thetext;
-    push @longdescs, \%longdesc;
-  }
-  if (@longdescs) {
-    $self->{'longdescs'} = \@longdescs;
-  }
-
-  if (&::Param("usedependencies")) {
-    my @depends = EmitDependList("blocked", "dependson", $bug_id);
-    if ( @depends ) {
-      $self->{'dependson'} = \@depends;
-    }
-    my @blocks = EmitDependList("dependson", "blocked", $bug_id);
-    if ( @blocks ) {
-      $self->{'blocks'} = \@blocks;
-    }
-  }
-
-  return $self;
-}
-
-
-
-# given a bug hash, emit xml for it. with file header provided by caller
-#
-sub emitXML {
-  ( $#_ == 0 ) || confess("invalid number of arguments");
-  my $self = shift();
-  my $xml;
-
-
-  if (exists $self->{'error'}) {
-    $xml .= "<bug error=\"$self->{'error'}\">\n";
-    $xml .= "  <bug_id>$self->{'bug_id'}</bug_id>\n";
-    $xml .= "</bug>\n";
-    return $xml;
-  }
-
-  $xml .= "<bug>\n";
-
-  foreach my $field ("bug_id", "bug_status", "product",
-      "priority", "version", "rep_platform", "assigned_to", "delta_ts", 
-      "component", "reporter", "target_milestone", "bug_severity", 
-      "creation_ts", "qa_contact", "op_sys", "resolution", "bug_file_loc",
-      "short_desc", "keywords", "status_whiteboard") {
-    if ($self->{$field}) {
-      $xml .= "  <$field>" . QuoteXMLChars($self->{$field}) . "</$field>\n";
-    }
-  }
-
-  foreach my $field ("dependson", "blocks", "cc") {
-    if (defined $self->{$field}) {
-      for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
-        $xml .= "  <$field>" . $self->{$field}[$i] . "</$field>\n";
-      }
-    }
-  }
-
-  if (defined $self->{'longdescs'}) {
-    for (my $i=0 ; $i < @{$self->{'longdescs'}} ; $i++) {
-      $xml .= "  <long_desc>\n"; 
-      $xml .= "   <who>" . &::DBID_to_name($self->{'longdescs'}[$i]->{'who'}) 
-                         . "</who>\n"; 
-      $xml .= "   <bug_when>" . $self->{'longdescs'}[$i]->{'bug_when'} 
-                              . "</bug_when>\n"; 
-      $xml .= "   <thetext>" . QuoteXMLChars($self->{'longdescs'}[$i]->{'thetext'})
-                             . "</thetext>\n"; 
-      $xml .= "  </long_desc>\n"; 
-    }
-  }
-
-  if (defined $self->{'attachments'}) {
-    for (my $i=0 ; $i < @{$self->{'attachments'}} ; $i++) {
-      $xml .= "  <attachment>\n"; 
-      $xml .= "    <attachid>" . $self->{'attachments'}[$i]->{'attachid'}
-                              . "</attachid>\n"; 
-      $xml .= "    <date>" . $self->{'attachments'}[$i]->{'date'} . "</date>\n"; 
-      $xml .= "    <desc>" . QuoteXMLChars($self->{'attachments'}[$i]->{'desc'}) . "</desc>\n"; 
-    # $xml .= "    <type>" . $self->{'attachments'}[$i]->{'type'} . "</type>\n"; 
-    # $xml .= "    <data>" . $self->{'attachments'}[$i]->{'data'} . "</data>\n"; 
-      $xml .= "  </attachment>\n"; 
-    }
-  }
-
-  $xml .= "</bug>\n";
-  return $xml;
-}
-
-sub EmitDependList {
-  my ($myfield, $targetfield, $bug_id) = (@_);
-  my @list;
-  &::SendSQL("select dependencies.$targetfield, bugs.bug_status
-           from dependencies, bugs
-           where dependencies.$myfield = $bug_id
-             and bugs.bug_id = dependencies.$targetfield
-           order by dependencies.$targetfield");
-  while (&::MoreSQLData()) {
-    my ($i, $stat) = (&::FetchSQLData());
-    push @list, $i;
-  }
-  return @list;
-}
-
-sub QuoteXMLChars {
-  $_[0] =~ s/&/&amp;/g;
-  $_[0] =~ s/</&lt;/g;
-  $_[0] =~ s/>/&gt;/g;
-  $_[0] =~ s/'/&apos;/g;
-  $_[0] =~ s/"/&quot;/g;
-# $_[0] =~ s/([\x80-\xFF])/&XmlUtf8Encode(ord($1))/ge;
-  return($_[0]);
-}
-
-sub XML_Header {
-  my ($urlbase, $version, $maintainer, $exporter) = (@_);
-
-  my $xml;
-  $xml = "<?xml version=\"1.0\" standalone=\"yes\"?>\n";
-  $xml .= "<!DOCTYPE bugzilla SYSTEM \"$urlbase";
-  if (! ($urlbase =~ /.+\/$/)) {
-    $xml .= "/";
-  }
-  $xml .= "bugzilla.dtd\">\n";
-  $xml .= "<bugzilla";
-  if (defined $exporter) {
-    $xml .= " exporter=\"$exporter\"";
-  }
-  $xml .= " version=\"$version\"";
-  $xml .= " urlbase=\"$urlbase\"";
-  $xml .= " maintainer=\"$maintainer\">\n";
-  return ($xml);
-}
-
-
-sub XML_Footer {
-  return ("</bugzilla>\n");
-}
-
-sub UserInGroup {
-    my $self = shift();
-    my ($groupname) = (@_);
-    return &::UserInGroup($self->{'whoid'}, $groupname);
-}
-
-sub CanChangeField {
-   my $self = shift();
-   my ($f, $oldvalue, $newvalue) = (@_);
-   my $UserInEditGroup = -1;
-   my $UserInCanConfirmGroup = -1;
-   my $ownerid;
-   my $reporterid;
-   my $qacontactid;
-
-    if ($f eq "assigned_to" || $f eq "reporter" || $f eq "qa_contact") {
-        if ($oldvalue =~ /^\d+$/) {
-            if ($oldvalue == 0) {
-                $oldvalue = "";
-            } else {
-                $oldvalue = &::DBID_to_name($oldvalue);
-            }
-        }
-    }
-    if ($oldvalue eq $newvalue) {
-        return 1;
-    }
-    if (&::trim($oldvalue) eq &::trim($newvalue)) {
-        return 1;
-    }
-    if ($f =~ /^longdesc/) {
-        return 1;
-    }
-    if ($UserInEditGroup < 0) {
-        $UserInEditGroup = UserInGroup($self, "editbugs");
-    }
-    if ($UserInEditGroup) {
-        return 1;
-    }
-    &::SendSQL("SELECT reporter, assigned_to, qa_contact FROM bugs " .
-                "WHERE bug_id = $self->{'bug_id'}");
-    ($reporterid, $ownerid, $qacontactid) = (&::FetchSQLData());
-
-    # Let reporter change bug status, even if they can't edit bugs.
-    # If reporter can't re-open their bug they will just file a duplicate.
-    # While we're at it, let them close their own bugs as well.
-    if ( ($f eq "bug_status") && ($self->{'whoid'} eq $reporterid) ) {
-        return 1;
-    }
-    if ($f eq "bug_status" && $newvalue ne $::unconfirmedstate &&
-        &::IsOpenedState($newvalue)) {
-
-        # Hmm.  They are trying to set this bug to some opened state
-        # that isn't the UNCONFIRMED state.  Are they in the right
-        # group?  Or, has it ever been confirmed?  If not, then this
-        # isn't legal.
-
-        if ($UserInCanConfirmGroup < 0) {
-            $UserInCanConfirmGroup = &::UserInGroup($self->{'whoid'},"canconfirm");
-        }
-        if ($UserInCanConfirmGroup) {
-            return 1;
-        }
-        &::SendSQL("SELECT everconfirmed FROM bugs WHERE bug_id = $self->{'bug_id'}");
-        my $everconfirmed = FetchOneColumn();
-        if ($everconfirmed) {
-            return 1;
-        }
-    } elsif ($reporterid eq $self->{'whoid'} || $ownerid eq $self->{'whoid'} ||
-             $qacontactid eq $self->{'whoid'}) {
-        return 1;
-    }
-    $self->{'error'} = "
-Only the owner or submitter of the bug, or a sufficiently
-empowered user, may make that change to the $f field."
-}
-
-sub Collision {
-    my $self = shift();
-    my $write = "WRITE";        # Might want to make a param to control
-                                # whether we do LOW_PRIORITY ...
-    if ($::driver eq 'mysql') {
-        &::SendSQL("LOCK TABLES bugs $write, bugs_activity $write, cc $write, " .
-                "cc AS selectVisible_cc $write, " .
-                "profiles $write, dependencies $write, votes $write, " .
-                "keywords $write, longdescs $write, fielddefs $write, " .
-                "keyworddefs READ, groups READ, attachments READ, products READ");
-    } 
-    &::SendSQL("SELECT delta_ts FROM bugs where bug_id=$self->{'bug_id'}");
-    my $delta_ts = &::FetchOneColumn();
-    if ($::driver eq 'mysql') {
-        &::SendSQL("unlock tables");
-    }
-    if ($self->{'delta_ts'} ne $delta_ts) {
-       return 1;
-    }
-    else {
-       return 0;
-    }
-}
-
-sub AppendComment  {
-    my $self = shift();
-    my ($comment) = (@_);
-    $comment =~ s/\r\n/\n/g;     # Get rid of windows-style line endings.
-    $comment =~ s/\r/\n/g;       # Get rid of mac-style line endings.
-    if ($comment =~ /^\s*$/) {  # Nothin' but whitespace.
-        return;
-    }
-
-    &::SendSQL("INSERT INTO longdescs (bug_id, who, bug_when, thetext) " .
-            "VALUES($self->{'bug_id'}, $self->{'whoid'}, now(), " . &::SqlQuote($comment) . ")");
-
-    &::SendSQL("UPDATE bugs SET delta_ts = now() WHERE bug_id = $self->{'bug_id'}");
-}
-
-
-#from o'reilley's Programming Perl
-sub display {
-    my $self = shift;
-    my @keys;
-    if (@_ == 0) {                  # no further arguments
-        @keys = sort keys(%$self);
-    }  else {
-        @keys = @_;                 # use the ones given
-    }
-    foreach my $key (@keys) {
-        print "\t$key => $self->{$key}\n";
-    }
-}
-
-sub CommitChanges {
-
-#snapshot bug
-#snapshot dependencies
-#check can change fields
-#check collision
-#lock and change fields
-#notify through mail
-
-}
-
-sub AUTOLOAD {
-  use vars qw($AUTOLOAD);
-  my $self = shift;
-  my $type = ref($self) || $self;
-  my $attr = $AUTOLOAD;
-
-  $attr =~ s/.*:://;
-  return unless $attr=~ /[^A-Z]/;
-  if (@_) {
-    $self->{$attr} = shift;
-    return;
-  }
-  confess ("invalid bug attribute $attr") unless $ok_field{$attr};
-  if (defined $self->{$attr}) {
-    return $self->{$attr};
-  } else {
-    return '';
-  }
-}
-
-1;

mozilla/webtools/bugzilla/README

@@ -1,16 +0,0 @@
-* This README is no longer used to house installation instructions.  Instead,
-it contains pointers to where you may find the information you need.
-
-* Installation instructions are now found in docs/, with a variety of document
-types available.  Please refer to these documents when installing, configuring,
-and maintaining your Bugzilla installation.  A helpful starting point is
-docs/txt/Bugzilla-Guide.txt, or with a web browser at docs/html/index.html.
-
-* Release notes for people upgrading to a new version of Bugzilla are
-available at docs/rel_notes.txt.
-
-* If you wish to contribute to the documentation, please read docs/README.docs.
-
-* The Bugzilla web site is at "http://www.mozilla.org/projects/bugzilla/".
-This site will contain the latest Bugzilla information, including how to
-report bugs and how to get help with Bugzilla.

mozilla/webtools/bugzilla/RelationSet.pm

@@ -1,268 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): Dan Mosedale <dmose@mozilla.org>
-#                 Terry Weissman <terry@mozilla.org>
-#                 Dave Miller <justdave@syndicomm.com>
-
-# This object models a set of relations between one item and a group
-# of other items.  An example is the set of relations between one bug
-# and the users CCed on that bug.  Currently, the relation objects are
-# expected to be bugzilla userids.  However, this could and perhaps
-# should be generalized to work with non userid objects, such as
-# keywords associated with a bug.  That shouldn't be hard to do; it
-# might involve turning this into a virtual base class, and having
-# UserSet and KeywordSet types that inherit from it.
-
-use diagnostics;
-use strict;
-
-# Everything that uses RelationSet should already have globals.pl loaded
-# so we don't want to load it here.  Doing so causes a loop in Perl because
-# globals.pl turns around and does a 'use RelationSet'
-# See http://bugzilla.mozilla.org/show_bug.cgi?id=72862
-#require "globals.pl";
-
-package RelationSet;
-use CGI::Carp qw(fatalsToBrowser);
-
-# create a new empty RelationSet
-#
-sub new {
-  my $type = shift();
-
-  # create a ref to an empty hash and bless it
-  #
-  my $self = {};
-  bless $self, $type;
-
-  # construct from a comma-delimited string
-  # 
-  if ($#_ == 0) {
-    $self->mergeFromString($_[0]);
-  }
-  # unless this was a constructor for an empty list, somebody screwed up.
-  #
-  elsif ( $#_ != -1 ) {
-    confess("invalid number of arguments");
-  }
-
-  # bless as a RelationSet
-  #
-  return $self;
-}
-
-# Assumes that the set of relations "FROM $table WHERE $constantSql and 
-# $column = $value" is currently represented by $self, and this set should
-# be updated to look like $other.  
-#
-# Returns an array of two strings, one INSERT and one DELETE, which will
-# make this change.  Either or both strings may be the empty string,
-# meaning that no INSERT or DELETE or both (respectively) need to be done.
-#
-# THE CALLER IS RESPONSIBLE FOR ANY DESIRED LOCKING AND/OR CONSISTENCY 
-# CHECKS (not to mention doing the SendSQL() calls).
-#
-sub generateSqlDeltas {
-  ($#_ == 5) || confess("invalid number of arguments");
-  my ( $self, # instance ptr to set representing the existing state
-       $endState, # instance ptr to set representing the desired state
-       $table, # table where these relations are kept
-       $invariantName, # column held const for a RelationSet (often "bug_id")
-       $invariantValue, # what to hold the above column constant at
-       $columnName # the column which varies (often a userid)
-     ) = @_;
-
-  # construct the insert list by finding relations which exist in the
-  # end state but not the current state.
-  #
-  my @endStateRelations = keys(%$endState);
-  my @insertList = ();
-  foreach ( @endStateRelations ) {
-    push ( @insertList, $_ ) if ( ! exists $$self{"$_"} );
-  }
-
-  # we've built the list.  If it's non-null, add required sql chrome.
-  #
-  my $sqlInsert="";
-  if ( $#insertList > -1 ) {
-    $sqlInsert = "INSERT INTO $table ($invariantName, $columnName) VALUES " .
-      join (",", 
-            map ( "($invariantValue, $_)" , @insertList ) 
-           );
-  }
-     
-  # construct the delete list by seeing which relations exist in the
-  # current state but not the end state
-  #
-  my @selfRelations = keys(%$self);
-  my @deleteList = ();
-  foreach ( @selfRelations ) {
-    push (@deleteList, $_) if ( ! exists $$endState{"$_"} );
-  }
-
-  # we've built the list.  if it's non-empty, add required sql chrome.
-  #
-  my $sqlDelete = "";
-  if ( $#deleteList > -1 ) {
-    $sqlDelete = "DELETE FROM $table WHERE $invariantName = $invariantValue " .
-      "AND $columnName IN ( " . join (",", @deleteList) . " )";
-  } 
-
-  return ($sqlInsert, $sqlDelete);
-}
-
-# compare the current object with another.  
-#
-sub isEqual {
-  ($#_ == 1) || confess("invalid number of arguments");
-  my $self = shift();
-  my $other = shift();
-
-  # get arrays of the keys for faster processing
-  #
-  my @selfRelations = keys(%$self);
-  my @otherRelations = keys(%$other);
- 
-  # make sure the arrays are the same size
-  #
-  return 0 if ( $#selfRelations != $#otherRelations );
-
-  # bail out if any of the elements are different
-  #
-  foreach my $relation ( @selfRelations ) {
-    return 0 if ( !exists $$other{$relation})
-  }
-
-  # we made it!
-  #
-  return 1;
-
-}
-
-# merge the results of a SQL command into this set
-#
-sub mergeFromDB {
-  ( $#_ == 1 ) || confess("invalid number of arguments");
-  my $self = shift();
-
-  &::SendSQL(shift());
-  while (my @row = &::FetchSQLData()) {
-    $$self{$row[0]} = 1;
-  }
-
-  return;
-}
-
-# merge a set in string form into this set
-#
-sub mergeFromString {
-  ($#_ == 1) || confess("invalid number of arguments");
-  my $self = shift();
-
-  # do the merge
-  #
-  foreach my $person (split(/[ ,]/, shift())) {
-    if ($person ne "") {
-      $$self{&::DBNameToIdAndCheck($person)} = 1;
-    }
-  }
-}
-
-# remove a set in string form from this set
-#
-sub removeItemsInString {
-  ($#_ == 1) || confess("invalid number of arguments");
-  my $self = shift();
-
-  # do the merge
-  #
-  foreach my $person (split(/[ ,]/, shift())) {
-    if ($person ne "") {
-      my $dbid = &::DBNameToIdAndCheck($person);
-      if (exists $$self{$dbid}) {
-        delete $$self{$dbid};
-      }
-    }
-  }
-}
-
-# remove a set in array form from this set
-#
-sub removeItemsInArray {
-  ($#_ > 0) || confess("invalid number of arguments");
-  my $self = shift();
-
-  # do the merge
-  #
-  while (my $person = shift()) {
-    if ($person ne "") {
-      my $dbid = &::DBNameToIdAndCheck($person);
-      if (exists $$self{$dbid}) {
-        delete $$self{$dbid};
-      }
-    }
-  }
-}
-
-# return the number of elements in this set
-#
-sub size {
-  my $self = shift();
-
-  my @k = keys(%$self);
-  return $#k++;
-}
-
-# return this set in array form
-#
-sub toArray {
-  my $self= shift();
-
-  return keys(%$self);
-}
-
-# return this set as an array of strings
-#
-sub toArrayOfStrings {
-  ($#_ == 0) || confess("invalid number of arguments");
-  my $self = shift();
-
-  my @result = ();
-  foreach my $i ( keys %$self ) {
-    push @result, &::DBID_to_name($i);
-  }
-
-  return sort { lc($a) cmp lc($b) } @result;
-}  
-
-# return this set in string form (comma-separated and sorted)
-#
-sub toString {
-  ($#_ == 0) || confess("invalid number of arguments");
-  my $self = shift();
-
-  my @result = ();
-  foreach my $i ( keys %$self ) {
-    push @result, &::DBID_to_name($i);
-  }
-
-  return join(',', sort(@result));
-}  
-
-1;

mozilla/webtools/bugzilla/Token.pm

@@ -1,273 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s):    Myk Melez <myk@mozilla.org>
-
-################################################################################
-# Module Initialization
-################################################################################
-
-# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
-use strict;
-
-# Bundle the functions in this file together into the "Token" package.
-package Token;
-
-use Date::Format;
-
-# This module requires that its caller have said "require CGI.pl" to import
-# relevant functions from that script and its companion globals.pl.
-
-################################################################################
-# Constants
-################################################################################
-
-# The maximum number of days a token will remain valid.
-my $maxtokenage = 3;
-
-################################################################################
-# Functions
-################################################################################
-
-sub IssueEmailChangeToken {
-    my ($userid, $old_email, $new_email) = @_;
-
-    my $token_ts = time();
-    my $issuedate = time2str("%Y-%m-%d %H:%M", $token_ts);
-
-    # Generate a unique token and insert it into the tokens table.
-    # We have to lock the tokens table before generating the token, 
-    # since the database must be queried for token uniqueness.
-    &::SendSQL("LOCK TABLES tokens WRITE");
-    my $token = GenerateUniqueToken();
-    my $quotedtoken = &::SqlQuote($token);
-    my $quoted_emails = &::SqlQuote($old_email . ":" . $new_email);
-    &::SendSQL("INSERT INTO tokens ( userid , issuedate , token , 
-                                     tokentype , eventdata )
-                VALUES             ( $userid , '$issuedate' , $quotedtoken , 
-                                     'emailold' , $quoted_emails )");
-    my $newtoken = GenerateUniqueToken();
-    $quotedtoken = &::SqlQuote($newtoken);
-    &::SendSQL("INSERT INTO tokens ( userid , issuedate , token , 
-                                     tokentype , eventdata )
-                VALUES             ( $userid , '$issuedate' , $quotedtoken , 
-                                     'emailnew' , $quoted_emails )");
-    &::SendSQL("UNLOCK TABLES");
-
-    # Mail the user the token along with instructions for using it.
-
-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'oldemailaddress'} = $old_email . &::Param('emailsuffix');
-    $vars->{'newemailaddress'} = $new_email . &::Param('emailsuffix');
-    
-    $vars->{'max_token_age'} = $maxtokenage;
-    $vars->{'token_ts'} = $token_ts;
-
-    $vars->{'token'} = $token;
-    $vars->{'emailaddress'} = $old_email . &::Param('emailsuffix');
-
-    my $message;
-    $template->process("account/email/change-old.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-    $vars->{'token'} = $newtoken;
-    $vars->{'emailaddress'} = $new_email . &::Param('emailsuffix');
-
-    $message = "";
-    $template->process("account/email/change-new.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-}
-
-sub IssuePasswordToken {
-    # Generates a random token, adds it to the tokens table, and sends it
-    # to the user with instructions for using it to change their password.
-
-    my ($loginname) = @_;
-
-    # Retrieve the user's ID from the database.
-    my $quotedloginname = &::SqlQuote($loginname);
-    &::SendSQL("SELECT userid FROM profiles WHERE login_name = $quotedloginname");
-    my ($userid) = &::FetchSQLData();
-
-    my $token_ts = time();
-    my $issuedate = time2str("%Y-%m-%d %H:%M", $token_ts);
-
-    # Generate a unique token and insert it into the tokens table.
-    # We have to lock the tokens table before generating the token, 
-    # since the database must be queried for token uniqueness.
-    &::SendSQL("LOCK TABLE tokens WRITE") if $::driver eq 'mysql';
-    my $token = GenerateUniqueToken();
-    my $quotedtoken = &::SqlQuote($token);
-    my $quotedipaddr = &::SqlQuote($::ENV{'REMOTE_ADDR'});
-    &::SendSQL("INSERT INTO tokens ( userid , issuedate , token , tokentype , eventdata )
-                VALUES      ( $userid , '$issuedate' , $quotedtoken , 'password' , $quotedipaddr )");
-    &::SendSQL("UNLOCK TABLES") if $::driver eq 'mysql';
-
-    # Mail the user the token along with instructions for using it.
-    
-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'token'} = $token;
-    $vars->{'emailaddress'} = $loginname . &::Param('emailsuffix');
-
-    $vars->{'max_token_age'} = $maxtokenage;
-    $vars->{'token_ts'} = $token_ts;
-
-    my $message = "";
-    $template->process("account/password/forgotten-password.txt.tmpl", 
-                                                               $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-}
-
-
-sub CleanTokenTable {
-    &::SendSQL("LOCK TABLES tokens WRITE") if $::driver eq 'mysql';
-    if ($::driver eq 'mysql') {
-        &::SendSQL("DELETE FROM tokens WHERE TO_DAYS(NOW()) - TO_DAYS(issuedate) >= " . $maxtokenage);
-    } elsif ($::driver eq 'Pg') {
-        &::SendSQL("DELETE FROM tokens WHERE now() - issuedate >= '$maxtokenage days'");
-    }
-    &::SendSQL("UNLOCK TABLES") if $::driver eq 'mysql';
-}
-
-
-sub GenerateUniqueToken {
-    # Generates a unique random token.  Uses &GenerateRandomPassword 
-    # for the tokens themselves and checks uniqueness by searching for
-    # the token in the "tokens" table.  Gives up if it can't come up
-    # with a token after about one hundred tries.
-
-    my $token;
-    my $duplicate = 1;
-    my $tries = 0;
-    while ($duplicate) {
-
-        ++$tries;
-        if ($tries > 100) {
-            &::DisplayError("Something is seriously wrong with the token generation system.");
-            exit;
-        }
-
-        $token = &::GenerateRandomPassword();
-        &::SendSQL("SELECT userid FROM tokens WHERE token = " . &::SqlQuote($token));
-        $duplicate = &::FetchSQLData();
-    }
-
-    return $token;
-
-}
-
-
-sub Cancel {
-    # Cancels a previously issued token and notifies the system administrator.
-    # This should only happen when the user accidentally makes a token request
-    # or when a malicious hacker makes a token request on behalf of a user.
-    
-    my ($token, $cancelaction) = @_;
-
-    # Quote the token for inclusion in SQL statements.
-    my $quotedtoken = &::SqlQuote($token);
-    
-    # Get information about the token being cancelled.
-    &::SendSQL("SELECT  issuedate , tokentype , eventdata , login_name , realname
-                FROM    tokens, profiles 
-                WHERE   tokens.userid = profiles.userid
-                AND     token = $quotedtoken");
-    my ($issuedate, $tokentype, $eventdata, $loginname, $realname) = &::FetchSQLData();
-
-    # Get the email address of the Bugzilla maintainer.
-    my $maintainer = &::Param('maintainer');
-
-    # Format the user's real name and email address into a single string.
-    my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
-
-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'emailaddress'} = $username;
-    $vars->{'maintainer'} = $maintainer;
-    $vars->{'remoteaddress'} = $::ENV{'REMOTE_ADDR'};
-    $vars->{'token'} = $token;
-    $vars->{'tokentype'} = $tokentype;
-    $vars->{'issuedate'} = $issuedate;
-    $vars->{'eventdata'} = $eventdata;
-    $vars->{'cancelaction'} = $cancelaction;
-
-    # Notify the user via email about the cancellation.
-
-    my $message;
-    $template->process("account/cancel-token.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-    # Delete the token from the database.
-    &::SendSQL("LOCK TABLE tokens WRITE") if $::driver eq 'mysql';
-    &::SendSQL("DELETE FROM tokens WHERE token = $quotedtoken");
-    &::SendSQL("UNLOCK TABLES") if $::driver eq 'mysql';
-}
-
-sub HasPasswordToken {
-    # Returns a password token if the user has one.
-    
-    my ($userid) = @_;
-    
-    &::SendSQL("SELECT token FROM tokens 
-                WHERE userid = $userid AND tokentype = 'password' LIMIT 1");
-    my ($token) = &::FetchSQLData();
-    
-    return $token;
-}
-
-sub HasEmailChangeToken {
-    # Returns an email change token if the user has one. 
-    
-    my ($userid) = @_;
-    
-    &::SendSQL("SELECT token FROM tokens 
-                 WHERE userid = $userid 
-                   AND tokentype = 'emailnew' 
-                    OR tokentype = 'emailold' LIMIT 1");
-    my ($token) = &::FetchSQLData();
-    
-    return $token;
-}
-
-
-1;

mozilla/webtools/bugzilla/UPGRADING

@@ -1,3 +0,0 @@
-Please consult The Bugzilla Guide for instructions on how to upgrade
-Bugzilla from an older version.  The Guide can be found with this
-distribution, in docs/html, docs/txt, and docs/sgml.

mozilla/webtools/bugzilla/UPGRADING-pre-2.8

@@ -1,407 +0,0 @@
-This file contains only important changes made to Bugzilla before release
-2.8.  If you are upgrading from version older than 2.8, please read this file.
-If you are upgrading from 2.8 or newer, please read the Installation and
-Upgrade instructions in The Bugzilla Guide, found with this distribution in
-docs/html, docs/txt, and docs/sgml.
-
-For a complete list of what changes, use Bonsai
-(http://cvs-mirror.mozilla.org/webtools/bonsai/cvsqueryform.cgi) to
-query the CVS tree.  For example,
-
-    http://cvs-mirror.mozilla.org/webtools/bonsai/cvsquery.cgi?module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fwebtools%2Fbugzilla&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot 
-
-will tell you what has been changed in the last week.
-
-
-10/12/99 The CHANGES file is now obsolete!  There is a new file called
-checksetup.pl.  You should get in the habit of running that file every time
-you update your installation of Bugzilla.  That file will be constantly 
-updated to automatically update your installation to match any code changes.
-If you're curious as to what is going on, changes are commented in that file, 
-at the end.
-
-Many thanks to Holger Schurig <holgerschurig@nikocity.de> for writing this
-script!
-
-
-
-10/11/99 Restructured voting database to add a cached value in each
-bug recording how many total votes that bug has.  While I'm at it, I
-removed the unused "area" field from the bugs database.  It is
-distressing to realize that the bugs table has reached the maximum
-number of indices allowed by MySQL (16), which may make future
-enhancements awkward.
-
-You must feed the following to MySQL:
-
-	alter table bugs drop column area;
-	alter table bugs add column votes mediumint not null, add index (votes);
-
-You then *must* delete the data/versioncache file when you make this
-change, as it contains references to the "area" field.  Deleting it is safe,
-bugzilla will correctly regenerate it.
-
-If you have been using the voting feature at all, then you will then
-need to update the voting cache.  You can do this by visiting the
-sanitycheck.cgi page, and taking it up on its offer to rebuild the
-votes stuff.
-
-
-10/7/99 Added voting ability.  You must run the new script
-"makevotestable.sh".  You must also feed the following to mysql:
-
-	alter table products add column votesperuser smallint not null;
-
-
-
-9/15/99 Apparently, newer alphas of MySQL won't allow you to have
-"when" as a column name.  So, I have had to rename a column in the
-bugs_activity table.  You must feed the below to mysql or you won't
-work at all.
-
-	alter table bugs_activity change column when bug_when datetime not null;
-
-
-8/16/99 Added "OpenVMS" to the list of OS's. Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "BeOS", "OpenVMS", "other") not null;
-
-6/22/99 Added an entry to the attachments table to record who the submitter
-was.  Nothing uses this yet, but it still should be recorded.
-
-	alter table attachments add column submitter_id mediumint not null;
-
-You should also run this script to populate the new field:
-
-#!/usr/bonsaitools/bin/perl -w
-use diagnostics;
-use strict;
-require "globals.pl";
-$|=1;
-ConnectToDatabase();
-SendSQL("select bug_id, attach_id from attachments order by bug_id");
-my @list;
-while (MoreSQLData()) {
-    my @row = FetchSQLData();
-    push(@list, \@row);
-}
-foreach my $ref (@list) {
-    my ($bug, $attach) = (@$ref);
-    SendSQL("select long_desc from bugs where bug_id = $bug");
-    my $comment = FetchOneColumn() . "Created an attachment (id=$attach)";
-
-    if ($comment =~ m@-* Additional Comments From ([^ ]*)[- 0-9/:]*\nCreated an attachment \(id=$attach\)@) {
-	print "Found $1\n";
-	SendSQL("select userid from profiles where login_name=" .
-		SqlQuote($1));
-	my $userid = FetchOneColumn();
-	if (defined $userid && $userid > 0) {
-	    SendSQL("update attachments set submitter_id=$userid where attach_id = $attach");
-	}
-    } else {
-	print "Bug $bug can't find comment for attachment $attach\n";
-    }
-}
-
-
-
-
-
-
-6/14/99 Added "BeOS" to the list of OS's. Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "BeOS", "other") not null;
-
-
-5/27/99 Added support for dependency information.  You must run the new
-"makedependenciestable.sh" script.  You can turn off dependencies with the new
-"usedependencies" param, but it defaults to being on.  Also, read very
-carefully the description for the new "webdotbase" param; you will almost
-certainly need to tweak it.
-
-
-5/24/99 Added "Mac System 8.6" and "Neutrino" to the list of OS's.
-Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "other") not null;
-
-
-5/12/99 Added a pref to control how much email you get.  This needs a new
-column in the profiles table, so feed the following to mysql:
-
-	alter table profiles add column emailnotification enum("ExcludeSelfChanges", "CConly", "All") not null default "ExcludeSelfChanges";
-
-5/5/99 Added the ability to search by creation date.  To make this perform
-well, you ought to do the following:
-
-	alter table bugs change column creation_ts creation_ts datetime not null, add index (creation_ts);
-
-
-4/30/99 Added a new severity, "blocker".  To get this into your running
-Bugzilla, do the following:
-
-	alter table bugs change column bug_severity bug_severity enum("blocker", "critical", "major", "normal", "minor", "trivial", "enhancement") not null;
-
-
-4/22/99 There was a bug where the long descriptions of bugs had a variety of
-newline characters at the end, depending on the operating system of the browser
-that submitted the text.  This bug has been fixed, so that no further changes
-like that will happen.  But to fix problems that have already crept into your
-database, you can run the following perl script (which is slow and ugly, but
-does work:)
-#!/usr/bonsaitools/bin/perl -w
-use diagnostics;
-use strict;
-require "globals.pl";
-$|=1;
-ConnectToDatabase();
-SendSQL("select bug_id from bugs order by bug_id");
-my @list;
-while (MoreSQLData()) {
-    push(@list, FetchOneColumn());
-}
-foreach my $id (@list) {
-    if ($id % 50 == 0) {
-	print "\n$id ";
-    }
-    SendSQL("select long_desc from bugs where bug_id = $id");
-    my $comment = FetchOneColumn();
-    my $orig = $comment;
-    $comment =~ s/\r\n/\n/g;     # Get rid of windows-style line endings.
-    $comment =~ s/\r/\n/g;       # Get rid of mac-style line endings.
-    if ($comment ne $orig) {
-	SendSQL("update bugs set long_desc = " . SqlQuote($comment) .
-		" where bug_id = $id");
-	print ".";
-    } else {
-	print "-";
-    }
-}
-
-
-
-4/8/99 Added ability to store patches with bugs.  This requires a new table
-to store the data, so you will need to run the "makeattachmenttable.sh" script.
-
-3/25/99 Unfortunately, the HTML::FromText CPAN module had too many bugs, and
-so I had to roll my own.  We no longer use the HTML::FromText CPAN module.
-
-3/24/99 (This entry has been removed.  It used to say that we required the
-HTML::FromText CPAN module, but that's no longer true.)
-
-3/22/99 Added the ability to query by fields which have changed within a date
-range.  To make this perform a bit better, we need a new index:
-
-	alter table bugs_activity add index (field);
-
-3/10/99 Added 'groups' stuff, where we have different group bits that we can
-put on a person or on a bug.  Some of the group bits control access to bugzilla
-features.  And a person can't access a bug unless he has every group bit set
-that is also set on the bug.  See the comments in makegroupstable.sh for a bit
-more info.
-
-The 'maintainer' param is now used only as an email address for people to send
-complaints to.  The groups table is what is now used to determine permissions.
-
-You will need to run the new script "makegroupstable.sh".  And then you need to
-feed the following lines to MySQL (replace XXX with the login name of the
-maintainer, the person you wish to be all-powerful).
-
-	alter table bugs add column groupset bigint not null;
-	alter table profiles add column groupset bigint not null;
-	update profiles set groupset=0x7fffffffffffffff where login_name = XXX;
-
-
-
-3/8/99 Added params to control how priorities are set in a new bug.  You can
-now choose whether to let submitters of new bugs choose a priority, or whether
-they should just accept the default priority (which is now no longer hardcoded
-to "P2", but is instead a param.)  The default value of the params will cause
-the same behavior as before.
-
-3/3/99 Added a "disallownew" field to the products table.  If non-zero, then
-don't let people file new bugs against this product.  (This is for when a 
-product is retired, but you want to keep the bug reports around for posterity.)
-Feed this to MySQL:
-
-	alter table products add column disallownew tinyint not null;
-
-
-2/8/99 Added FreeBSD to the list of OS's.  Feed this to MySQL:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "OS/2", "other") not null;
-
-
-2/4/99 Added a new column "description" to the components table, and added 
-links to a new page which will use this to describe the components of a 
-given product.  Feed this to MySQL:
-
-	alter table components add column description mediumtext not null;
-
-
-2/3/99 Added a new column "initialqacontact" to the components table that gives
-an initial QA contact field.  It may be empty if you wish the initial qa
-contact to be empty.  If you're not using the QA contact field, you don't need
-to add this column, but you might as well be safe and add it anyway:
-
-	alter table components add column initialqacontact tinytext not null;
-
-
-2/2/99 Added a new column "milestoneurl" to the products table that gives a URL
-which is to describe the currently defined milestones for a product.  If you
-don't use target milestone, you might be able to get away without adding this
-column, but you might as well be safe and add it anyway:
-
-	alter table products add column milestoneurl tinytext not null;
-
-
-1/29/99 Whoops; had a misspelled op_sys.  It was "Mac System 7.1.6"; it should
-be "Mac System 7.6.1".  It turns out I had no bugs with this value set, so I
-could just do the below simple command.  If you have bugs with this value, you
-may need to do something more complicated.
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "OSF/1", "Solaris", "SunOS", "OS/2", "other") not null;
-
-
-
-1/20/99 Added new fields: Target Milestone, QA Contact, and Status Whiteboard.
-These fields are all optional in the UI; there are parameters to turn them on.
-However, whether or not you use them, the fields need to be in the DB.  There
-is some code that needs them, even if you don't.
-
-To update your DB to have these fields, send the following to MySQL:
-
-        alter table bugs add column target_milestone varchar(20) not null,
-                add column qa_contact mediumint not null,
-                add column status_whiteboard mediumtext not null,
-                add index (target_milestone), add index (qa_contact);
-
-
-
-1/18/99 You can now query by CC.  To make this perform reasonably, the CC table
-needs some indices.  The following MySQL does the necessary stuff:
-
-	alter table cc add index (bug_id), add index (who);
-
-
-1/15/99 The op_sys field can now be queried by (and more easily tweaked).
-To make this perform reasonably, it needs an index.  The following MySQL 
-command will create the necessary index:
-
-	alter table bugs add index (op_sys);
-
-
-12/2/98 The op_sys and rep_platform fields have been tweaked.  op_sys
-is now an enum, rather than having the legal values all hard-coded in
-perl.  rep_platform now no longer allows a value of "X-Windows".
-
-Here's how I ported to the new world.  This ought to work for you too.
-Actually, it's probably overkill.  I had a lot of illegal values for op_sys
-in my tables, from importing bugs from strange places.  If you haven't done 
-anything funky, then much of the below will be a no-op.
-
-First, send the following commands to MySQL to make sure all your values for
-rep_platform and op_sys are legal in the new world..
-
-	update bugs set rep_platform="Sun" where rep_platform="X-Windows" and op_sys like "Solaris%";
-	update bugs set rep_platform="SGI" where rep_platform="X-Windows" and op_sys = "IRIX";
-	update bugs set rep_platform="SGI" where rep_platform="X-Windows" and op_sys = "HP-UX";
-	update bugs set rep_platform="DEC" where rep_platform="X-Windows" and op_sys = "OSF/1";
-	update bugs set rep_platform="PC" where rep_platform="X-Windows" and op_sys = "Linux";
-	update bugs set rep_platform="other" where rep_platform="X-Windows";
-	update bugs set rep_platform="other" where rep_platform="";
-	update bugs set op_sys="Mac System 7" where op_sys="System 7";
-	update bugs set op_sys="Mac System 7.5" where op_sys="System 7.5";
-	update bugs set op_sys="Mac System 8.0" where op_sys="8.0";
-	update bugs set op_sys="OSF/1" where op_sys="Digital Unix 4.0";
-	update bugs set op_sys="IRIX" where op_sys like "IRIX %";
-	update bugs set op_sys="HP-UX" where op_sys like "HP-UX %";
-	update bugs set op_sys="Windows NT" where op_sys like "NT %";
-	update bugs set op_sys="OSF/1" where op_sys like "OSF/1 %";
-	update bugs set op_sys="Solaris" where op_sys like "Solaris %";
-	update bugs set op_sys="SunOS" where op_sys like "SunOS%";
-	update bugs set op_sys="other" where op_sys = "Motif";
-	update bugs set op_sys="other" where op_sys = "Other";
-
-Next, send the following commands to make sure you now have only legal
-entries in your table.  If either of the queries do not come up empty, then
-you have to do more stuff like the above.
-
-	select bug_id,op_sys,rep_platform from bugs where rep_platform not regexp "^(All|DEC|HP|Macintosh|PC|SGI|Sun|X-Windows|Other)$";
-	select bug_id,op_sys,rep_platform from bugs where op_sys not regexp "^(All|Windows 3.1|Windows 95|Windows 98|Windows NT|Mac System 7|Mac System 7.5|Mac System 7.1.6|Mac System 8.0|AIX|BSDI|HP-UX|IRIX|Linux|OSF/1|Solaris|SunOS|other)$";
-
-Finally, once that's all clear, alter the table to make enforce the new legal
-entries:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.1.6", "Mac System 8.0", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "OSF/1", "Solaris", "SunOS", "other") not null, change column rep_platform rep_platform enum("All", "DEC", "HP", "Macintosh", "PC", "SGI", "Sun", "Other");
-
-
-
-
-
-11/20/98 Added searching of CC field.  To better support this, added
-some indexes to the CC table.  You probably want to execute the following
-mysql commands:
-
-	alter table cc add index (bug_id);
-	alter table cc add index (who);
-
-
-10/27/98 security check for legal products in place. bug charts are not
-available as an option if collectstats.pl has never been run. all products 
-get daily stats collected now. README updated: Chart::Base is listed as
-a requirement, instructions for using collectstats.pl included as 
-an optional step. also got silly and added optional quips to bug
-reports. 
-
-10/17/98 modified README installation instructions slightly. 
-
-10/7/98 Added a new table called "products".  Right now, this is used
-only to have a description for each product, and that description is
-only used when initially adding a new bug.  Anyway, you *must* create
-the new table (which you can do by running the new makeproducttable.sh
-script).  If you just leave it empty, things will work much as they
-did before, or you can add descriptions for some or all of your
-products.
-
-
-9/15/98 Everything has been ported to Perl.  NO MORE TCL.  This
-transition should be relatively painless, except for the "params"
-file.  This is the file that contains parameters you've set up on the
-editparams.cgi page.  Before changing to Perl, this was a tcl-syntax
-file, stored in the same directory as the code; after the change to
-Perl, it becomes a perl-syntax file, stored in a subdirectory named
-"data".  See the README file for more details on what version of Perl
-you need.
-
-So, if updating from an older version of Bugzilla, you will need to
-edit data/param, change the email address listed for
-$::param{'maintainer'}, and then go revisit the editparams.cgi page
-and reset all the parameters to your taste.  Fortunately, your old
-params file will still be around, and so you ought to be able to
-cut&paste important bits from there.
-
-Also, note that the "whineatnews" script has changed name (it now has
-an extension of .pl instead of .tcl), so you'll need to change your
-cron job.
-
-And the "comments" file has been moved to the data directory.  Just do
-"cat comments >> data/comments" to restore any old comments that may
-have been lost.
-
-
-
-9/2/98 Changed the way password validation works.  We now keep a
-crypt'd version of the password in the database, and check against
-that.  (This is silly, because we're also keeping the plaintext
-version there, but I have plans...)  Stop passing the plaintext
-password around as a cookie; instead, we have a cookie that references
-a record in a new database table, logincookies.
-
-IMPORTANT: if updating from an older version of Bugzilla, you must run
-the following commands to keep things working:
-
- ./makelogincookiestable.sh
- echo "alter table profiles add column cryptpassword varchar(64);" | mysql bugs
- echo "update profiles set cryptpassword = encrypt(password,substring(rand(),3, 4));" | mysql bugs
-

mozilla/webtools/bugzilla/attachment.cgi

@@ -1,792 +0,0 @@
-#!/usr/bonsaitools/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Myk Melez <myk@mozilla.org>
-
-################################################################################
-# Script Initialization
-################################################################################
-
-# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
-use strict;
-
-use lib qw(.);
-
-use vars qw(
-  $template
-  $vars
-);
-
-# Include the Bugzilla CGI and general utility library.
-require "CGI.pl";
-
-# Establish a connection to the database backend.
-ConnectToDatabase();
-
-# Check whether or not the user is logged in and, if so, set the $userid 
-my $userid = quietly_check_login();
-
-################################################################################
-# Main Body Execution
-################################################################################
-
-# All calls to this script should contain an "action" variable whose value
-# determines what the user wants to do.  The code below checks the value of
-# that variable and runs the appropriate code.
-
-# Determine whether to use the action specified by the user or the default.
-my $action = $::FORM{'action'} || 'view';
-
-if ($action eq "view")  
-{ 
-  validateID();
-  view(); 
-}
-elsif ($action eq "viewall") 
-{ 
-  ValidateBugID($::FORM{'bugid'}, $userid);
-  viewall(); 
-}
-elsif ($action eq "enter") 
-{ 
-  my $userid = confirm_login();
-  ValidateBugID($::FORM{'bugid'}, $userid);
-  enter(); 
-}
-elsif ($action eq "insert")
-{
-  my $userid = confirm_login();
-  ValidateBugID($::FORM{'bugid'}, $userid);
-  ValidateComment($::FORM{'comment'});
-  validateFilename();
-  validateData();
-  validateDescription();
-  validateIsPatch();
-  validateContentType() unless $::FORM{'ispatch'};
-  validateObsolete() if $::FORM{'obsolete'};
-  insert();
-}
-elsif ($action eq "edit") 
-{ 
-  quietly_check_login();
-  validateID();
-  validateCanEdit($::FORM{'id'});
-  edit(); 
-}
-elsif ($action eq "update") 
-{ 
-  my $userid = confirm_login();
-  UserInGroup($userid, "editbugs")
-    || DisplayError("You are not authorized to edit attachments.")
-    && exit;
-  ValidateComment($::FORM{'comment'});
-  validateID();
-  validateCanEdit($::FORM{'id'});
-  validateDescription();
-  validateIsPatch();
-  validateContentType() unless $::FORM{'ispatch'};
-  validateIsObsolete();
-  validateStatuses();
-  update();
-}
-else 
-{ 
-  DisplayError("I could not figure out what you wanted to do.")
-}
-
-exit;
-
-################################################################################
-# Data Validation / Security Authorization
-################################################################################
-
-sub validateID
-{
-  # Validate the value of the "id" form field, which must contain an
-  # integer that is the ID of an existing attachment.
-
-  detaint_natural($::FORM{'id'})
-    || DisplayError("You did not enter a valid attachment number.") 
-      && exit;
-  
-  # Make sure the attachment exists in the database.
-  SendSQL("SELECT bug_id FROM attachments WHERE attach_id = $::FORM{'id'}");
-  MoreSQLData()
-    || DisplayError("Attachment #$::FORM{'id'} does not exist.") 
-    && exit;
-
-  # Make sure the user is authorized to access this attachment's bug.
-  my ($bugid) = FetchSQLData();
-  ValidateBugID($bugid, $userid);
-}
-
-sub validateCanEdit
-{
-    my ($attach_id) = (@_);
-
-    # If the user is not logged in, claim that they can edit. This allows
-    # the edit scrren to be displayed to people who aren't logged in.
-    # People not logged in can't actually commit changes, because that code
-    # calls confirm_login, not quietly_check_login, before calling this sub
-    return if $userid == 0;
-
-    # People in editbugs can edit all attachments
-    return if UserInGroup($userid, "editbugs");
-
-    # Bug 97729 - the submitter can edit their attachments
-    SendSQL("SELECT attach_id FROM attachments WHERE " .
-            "attach_id = $attach_id AND submitter_id = $userid");
-
-    FetchSQLData()
-      || DisplayError("You are not authorised to edit attachment #$attach_id")
-      && exit;
-}
-
-sub validateDescription
-{
-  $::FORM{'description'}
-    || DisplayError("You must enter a description for the attachment.")
-      && exit;
-}
-
-sub validateIsPatch
-{
-  # Set the ispatch flag to zero if it is undefined, since the UI uses
-  # an HTML checkbox to represent this flag, and unchecked HTML checkboxes
-  # do not get sent in HTML requests.
-  $::FORM{'ispatch'} = $::FORM{'ispatch'} ? 1 : 0;
-
-  # Set the content type to text/plain if the attachment is a patch.
-  $::FORM{'contenttype'} = "text/plain" if $::FORM{'ispatch'};
-}
-
-sub validateContentType
-{
-  if (!$::FORM{'contenttypemethod'})
-  {
-    DisplayError("You must choose a method for determining the content type,
-      either <em>auto-detect</em>, <em>select from list</em>, or <em>enter 
-      manually</em>.");
-    exit;
-  }
-  elsif ($::FORM{'contenttypemethod'} eq 'autodetect')
-  {
-    # The user asked us to auto-detect the content type, so use the type
-    # specified in the HTTP request headers.
-    if ( !$::FILE{'data'}->{'contenttype'} )
-    {
-      DisplayError("You asked Bugzilla to auto-detect the content type, but
-        your browser did not specify a content type when uploading the file, 
-        so you must enter a content type manually.");
-      exit;
-    }
-    $::FORM{'contenttype'} = $::FILE{'data'}->{'contenttype'};
-  }
-  elsif ($::FORM{'contenttypemethod'} eq 'list')
-  {
-    # The user selected a content type from the list, so use their selection.
-    $::FORM{'contenttype'} = $::FORM{'contenttypeselection'};
-  }
-  elsif ($::FORM{'contenttypemethod'} eq 'manual')
-  {
-    # The user entered a content type manually, so use their entry.
-    $::FORM{'contenttype'} = $::FORM{'contenttypeentry'};
-  }
-  else
-  {
-    my $htmlcontenttypemethod = html_quote($::FORM{'contenttypemethod'});
-    DisplayError("Your form submission got corrupted somehow.  The <em>content
-      method</em> field, which specifies how the content type gets determined,
-      should have been either <em>autodetect</em>, <em>list</em>, 
-      or <em>manual</em>, but was instead <em>$htmlcontenttypemethod</em>.");
-    exit;
-  }
-
-  if ( $::FORM{'contenttype'} !~ /^(application|audio|image|message|model|multipart|text|video)\/.+$/ )
-  {
-    my $htmlcontenttype = html_quote($::FORM{'contenttype'});
-    DisplayError("The content type <em>$htmlcontenttype</em> is invalid.
-      Valid types must be of the form <em>foo/bar</em> where <em>foo</em> 
-      is either <em>application, audio, image, message, model, multipart, 
-      text,</em> or <em>video</em>.");
-    exit;
-  }
-}
-
-sub validateIsObsolete
-{
-  # Set the isobsolete flag to zero if it is undefined, since the UI uses
-  # an HTML checkbox to represent this flag, and unchecked HTML checkboxes
-  # do not get sent in HTML requests.
-  $::FORM{'isobsolete'} = $::FORM{'isobsolete'} ? 1 : 0;
-}
-
-sub validateStatuses
-{
-  # Get a list of attachment statuses that are valid for this attachment.
-  PushGlobalSQLState();
-  SendSQL("SELECT  attachstatusdefs.id
-           FROM    attachments, bugs, attachstatusdefs
-           WHERE   attachments.attach_id = $::FORM{'id'}
-           AND     attachments.bug_id = bugs.bug_id
-           AND     attachstatusdefs.product = bugs.product");
-  my @statusdefs;
-  push(@statusdefs, FetchSQLData()) while MoreSQLData();
-  PopGlobalSQLState();
-  
-  foreach my $status (@{$::MFORM{'status'}})
-  {
-    grep($_ == $status, @statusdefs)
-      || DisplayError("One of the statuses you entered is not a valid status
-                       for this attachment.")
-        && exit;
-    # We have tested that the status is valid, so it can be detainted
-    detaint_natural($status);
-  }
-}
-
-sub validateData
-{
-  $::FORM{'data'}
-    || DisplayError("The file you are trying to attach is empty!")
-      && exit;
-
-  my $len = length($::FORM{'data'});
-
-  my $maxpatchsize = Param('maxpatchsize');
-  my $maxattachmentsize = Param('maxattachmentsize');
-  
-  # Makes sure the attachment does not exceed either the "maxpatchsize" or 
-  # the "maxattachmentsize" parameter.
-  if ( $::FORM{'ispatch'} && $maxpatchsize && $len > $maxpatchsize*1024 )
-  {
-    my $lenkb = sprintf("%.0f", $len/1024);
-    DisplayError("The file you are trying to attach is ${lenkb} kilobytes (KB) in size.  
-                  Patches cannot be more than ${maxpatchsize}KB in size.
-                  Try breaking your patch into several pieces.");
-    exit;
-  } elsif ( !$::FORM{'ispatch'} && $maxattachmentsize && $len > $maxattachmentsize*1024 ) {
-    my $lenkb = sprintf("%.0f", $len/1024);
-    DisplayError("The file you are trying to attach is ${lenkb} kilobytes (KB) in size.  
-                  Non-patch attachments cannot be more than ${maxattachmentsize}KB.
-                  If your attachment is an image, try converting it to a compressable
-                  format like JPG or PNG, or put it elsewhere on the web and
-                  link to it from the bug's URL field or in a comment on the bug.");
-    exit;
-  }
-}
-
-sub validateFilename
-{
-  defined $::FILE{'data'}
-    || DisplayError("You did not specify a file to attach.")
-      && exit;
-}
-
-sub validateObsolete
-{
-  # Make sure the attachment id is valid and the user has permissions to view
-  # the bug to which it is attached.
-  foreach my $attachid (@{$::MFORM{'obsolete'}}) {
-    detaint_natural($attachid)
-      || DisplayError("The attachment number of one of the attachments 
-           you wanted to obsolete is invalid.") 
-        && exit;
-  
-    SendSQL("SELECT bug_id, isobsolete, description 
-             FROM attachments WHERE attach_id = $attachid");
-
-    # Make sure the attachment exists in the database.
-    MoreSQLData()
-      || DisplayError("Attachment #$attachid does not exist.") 
-        && exit;
-
-    my ($bugid, $isobsolete, $description) = FetchSQLData();
-
-    if ($bugid != $::FORM{'bugid'})
-    {
-      $description = html_quote($description);
-      DisplayError("Attachment #$attachid ($description) is attached 
-        to bug #$bugid, but you tried to flag it as obsolete while
-        creating a new attachment to bug #$::FORM{'bugid'}.");
-      exit;
-    }
-
-    if ( $isobsolete )
-    {
-      $description = html_quote($description);
-      DisplayError("Attachment #$attachid ($description) is already obsolete.");
-      exit;
-    }
-
-    # Check that the user can modify this attachment
-    validateCanEdit($attachid);
-  }
-
-}
-
-################################################################################
-# Functions
-################################################################################
-
-sub view
-{
-  # Display an attachment.
-
-  # Retrieve the attachment content and its content type from the database.
-  SendSQL("SELECT mimetype, thedata FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($contenttype, $thedata) = FetchSQLData();
-    
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: $contenttype\n\n";
-
-  print $thedata;
-}
-
-
-sub viewall
-{
-  # Display all attachments for a given bug in a series of IFRAMEs within one HTML page.
-
-  # Retrieve the attachments from the database and write them into an array
-  # of hashes where each hash represents one attachment.
-  SendSQL("SELECT attach_id, creation_ts, mimetype, description, ispatch, isobsolete 
-           FROM attachments WHERE bug_id = $::FORM{'bugid'} ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while (MoreSQLData())
-  {
-    my %a; # the attachment hash
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, 
-     $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}) = FetchSQLData();
-
-    # Format the attachment's creation/modification date into something readable.
-    if ($a{'date'} =~ /^(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-        $a{'date'} = "$3/$4/$2&nbsp;$5:$6";
-    }
-
-    # Flag attachments as to whether or not they can be viewed (as opposed to
-    # being downloaded).  Currently I decide they are viewable if their MIME type 
-    # is either text/*, image/*, or application/vnd.mozilla.*.
-    # !!! Yuck, what an ugly hack.  Fix it!
-    $a{'isviewable'} = ( $a{'contenttype'} =~ /^(text|image|application\/vnd\.mozilla\.)/ );
-
-    # Retrieve a list of status flags that have been set on the attachment.
-    PushGlobalSQLState();
-    SendSQL("SELECT    name 
-             FROM      attachstatuses, attachstatusdefs 
-             WHERE     attach_id = $a{'attachid'} 
-             AND       attachstatuses.statusid = attachstatusdefs.id
-             ORDER BY  sortkey");
-    my @statuses;
-    push(@statuses, FetchSQLData()) while MoreSQLData();
-    $a{'statuses'} = \@statuses;
-    PopGlobalSQLState();
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
-
-  # Retrieve the bug summary for displaying on screen.
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $::FORM{'bugid'}");
-  my ($bugsummary) = FetchSQLData();
-
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'bugid'} = $::FORM{'bugid'};
-  $vars->{'bugsummary'} = $bugsummary;
-  $vars->{'attachments'} = \@attachments;
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/show-multiple.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}
-
-
-sub enter
-{
-  # Display a form for entering a new attachment.
-
-  # Retrieve the attachments the user can edit from the database and write
-  # them into an array of hashes where each hash represents one attachment.
-  my $canEdit = "";
-  if (!UserInGroup($userid, "editbugs")) {
-      $canEdit = "AND submitter_id = $userid";
-  }
-  SendSQL("SELECT attach_id, description 
-           FROM attachments
-           WHERE bug_id = $::FORM{'bugid'}
-           AND isobsolete = 0 $canEdit
-           ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while ( MoreSQLData() ) {
-    my %a; # the attachment hash
-    ($a{'id'}, $a{'description'}) = FetchSQLData();
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
-
-  # Retrieve the bug summary for displaying on screen.
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $::FORM{'bugid'}");
-  my ($bugsummary) = FetchSQLData();
-
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'bugid'} = $::FORM{'bugid'};
-  $vars->{'bugsummary'} = $bugsummary;
-  $vars->{'attachments'} = \@attachments;
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/create.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}
-
-
-sub insert
-{
-  # Insert a new attachment into the database.
-
-  # Escape characters in strings that will be used in SQL statements.
-  my $filename = SqlQuote($::FILE{'data'}->{'filename'});
-  my $description = SqlQuote($::FORM{'description'});
-  my $contenttype = SqlQuote($::FORM{'contenttype'});
-  my $thedata = SqlQuote($::FORM{'data'});
-
-  # Insert the attachment into the database.
-  SendSQL("INSERT INTO attachments (bug_id, filename, description, mimetype, ispatch, submitter_id, thedata) 
-           VALUES ($::FORM{'bugid'}, $filename, $description, $contenttype, $::FORM{'ispatch'}, $userid, $thedata)");
-
-  # Retrieve the ID of the newly created attachment record.
-  my $attachid = CurrId('attachments_attach_id_seq');
-
-  # Insert a comment about the new attachment into the database.
-  my $comment = "Created an attachment (id=$attachid)\n$::FORM{'description'}\n";
-  $comment .= ("\n" . $::FORM{'comment'}) if $::FORM{'comment'};
-
-  use Text::Wrap;
-  $Text::Wrap::columns = 80;
-  $Text::Wrap::huge = 'overflow';
-  $comment = Text::Wrap::wrap('', '', $comment);
-
-  AppendComment($::FORM{'bugid'}, 
-                $::COOKIE{"Bugzilla_login"},
-                $comment);
-
-  # Make existing attachments obsolete.
-  my $fieldid = GetFieldID('attachments.isobsolete');
-  foreach my $attachid (@{$::MFORM{'obsolete'}}) {
-    SendSQL("UPDATE attachments SET isobsolete = 1 WHERE attach_id = $attachid");
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($::FORM{'bugid'}, $attachid, $userid, NOW(), $fieldid, '0', '1')");
-  }
-
-  # Send mail to let people know the attachment has been created.  Uses a 
-  # special syntax of the "open" and "exec" commands to capture the output of 
-  # "processmail", which "system" doesn't allow, without running the command 
-  # through a shell, which backticks (``) do.
-  #system ("./processmail", $bugid , $userid);
-  #my $mailresults = `./processmail $bugid $::userid`;
-  my $mailresults = '';
-  open(PMAIL, "-|") or exec('./processmail', $::FORM{'bugid'}, $::COOKIE{'Bugzilla_login'});
-  $mailresults .= $_ while <PMAIL>;
-  close(PMAIL);
- 
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'bugid'} = $::FORM{'bugid'};
-  $vars->{'attachid'} = $attachid;
-  $vars->{'description'} = $description;
-  $vars->{'mailresults'} = $mailresults;
-  $vars->{'contenttypemethod'} = $::FORM{'contenttypemethod'};
-  $vars->{'contenttype'} = $::FORM{'contenttype'};
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/created.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $::FORM{'bugid'}");
-}
-
-
-sub edit
-{
-  # Edit an attachment record.  Users with "editbugs" privileges, (or the 
-  # original attachment's submitter) can edit the attachment's description,
-  # content type, ispatch and isobsolete flags, and statuses, and they can
-  # also submit a comment that appears in the bug.
-  # Users cannot edit the content of the attachment itself.
-
-  # Retrieve the attachment from the database.
-  SendSQL("SELECT description, mimetype, bug_id, ispatch, isobsolete 
-           FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($description, $contenttype, $bugid, $ispatch, $isobsolete) = FetchSQLData();
-
-  # Flag attachment as to whether or not it can be viewed (as opposed to
-  # being downloaded).  Currently I decide it is viewable if its content
-  # type is either text/.* or application/vnd.mozilla.*.
-  # !!! Yuck, what an ugly hack.  Fix it!
-  my $isviewable = ( $contenttype =~ /^(text|image|application\/vnd\.mozilla\.)/ );
-
-  # Retrieve a list of status flags that have been set on the attachment.
-  my %statuses;
-  SendSQL("SELECT  id, name 
-           FROM    attachstatuses, attachstatusdefs 
-           WHERE   attachstatuses.statusid = attachstatusdefs.id 
-           AND     attach_id = $::FORM{'id'}");
-  while ( my ($id, $name) = FetchSQLData() )
-  {
-    $statuses{$id} = $name;
-  }
-
-  # Retrieve a list of statuses for this bug's product, and build an array 
-  # of hashes in which each hash is a status flag record.
-  # ???: Move this into versioncache or its own routine?
-  my @statusdefs;
-  SendSQL("SELECT   id, name 
-           FROM     attachstatusdefs, bugs 
-           WHERE    bug_id = $bugid 
-           AND      attachstatusdefs.product = bugs.product 
-           ORDER BY sortkey");
-  while ( MoreSQLData() )
-  {
-    my ($id, $name) = FetchSQLData();
-    push @statusdefs, { 'id' => $id , 'name' => $name };
-  }
-
-  # Retrieve a list of attachments for this bug as well as a summary of the bug
-  # to use in a navigation bar across the top of the screen.
-  SendSQL("SELECT attach_id FROM attachments WHERE bug_id = $bugid ORDER BY attach_id");
-  my @bugattachments;
-  push(@bugattachments, FetchSQLData()) while (MoreSQLData());
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $bugid");
-  my ($bugsummary) = FetchSQLData();
-
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'attachid'} = $::FORM{'id'}; 
-  $vars->{'description'} = $description; 
-  $vars->{'contenttype'} = $contenttype; 
-  $vars->{'bugid'} = $bugid; 
-  $vars->{'bugsummary'} = $bugsummary; 
-  $vars->{'ispatch'} = $ispatch; 
-  $vars->{'isobsolete'} = $isobsolete; 
-  $vars->{'isviewable'} = $isviewable; 
-  $vars->{'statuses'} = \%statuses; 
-  $vars->{'statusdefs'} = \@statusdefs; 
-  $vars->{'attachments'} = \@bugattachments; 
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/edit.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}
-
-
-sub update 
-{
-  # Update an attachment record.
-
-  # Get the bug ID for the bug to which this attachment is attached.
-  SendSQL("SELECT bug_id FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my $bugid = FetchSQLData() 
-    || DisplayError("Cannot figure out bug number.")
-    && exit;
-
-  # Lock database tables in preparation for updating the attachment.
-  if ($::driver eq 'mysql') {
-    SendSQL("LOCK TABLES attachments WRITE , attachstatuses WRITE , 
-             attachstatusdefs READ , fielddefs READ , bugs_activity WRITE");
-  }
-
-  # Get a copy of the attachment record before we make changes
-  # so we can record those changes in the activity table.
-  SendSQL("SELECT description, mimetype, ispatch, isobsolete 
-           FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($olddescription, $oldcontenttype, $oldispatch, $oldisobsolete) = FetchSQLData();
-
-  # Get the list of old status flags.
-  SendSQL("SELECT    attachstatusdefs.name 
-           FROM      attachments, attachstatuses, attachstatusdefs
-           WHERE     attachments.attach_id = $::FORM{'id'}
-           AND       attachments.attach_id = attachstatuses.attach_id
-           AND       attachstatuses.statusid = attachstatusdefs.id
-           ORDER BY  attachstatusdefs.sortkey
-          ");
-  my @oldstatuses;
-  while (MoreSQLData()) {
-    push(@oldstatuses, FetchSQLData());
-  }
-  my $oldstatuslist = join(', ', @oldstatuses);
-
-  # Update the database with the new status flags.
-  SendSQL("DELETE FROM attachstatuses WHERE attach_id = $::FORM{'id'}");
-  foreach my $statusid (@{$::MFORM{'status'}}) 
-  {
-    SendSQL("INSERT INTO attachstatuses (attach_id, statusid) VALUES ($::FORM{'id'}, $statusid)");
-  }
-
-  # Get the list of new status flags.
-  SendSQL("SELECT    attachstatusdefs.name 
-           FROM      attachments, attachstatuses, attachstatusdefs
-           WHERE     attachments.attach_id = $::FORM{'id'}
-           AND       attachments.attach_id = attachstatuses.attach_id
-           AND       attachstatuses.statusid = attachstatusdefs.id
-           ORDER BY  attachstatusdefs.sortkey
-          ");
-  my @newstatuses;
-  while (MoreSQLData()) {
-    push(@newstatuses, FetchSQLData());
-  }
-  my $newstatuslist = join(', ', @newstatuses);
-
-  # Quote the description and content type for use in the SQL UPDATE statement.
-  my $quoteddescription = SqlQuote($::FORM{'description'});
-  my $quotedcontenttype = SqlQuote($::FORM{'contenttype'});
-
-  # Update the attachment record in the database.
-  # Sets the creation timestamp to itself to avoid it being updated automatically.
-  SendSQL("UPDATE  attachments 
-           SET     description = $quoteddescription , 
-                   mimetype = $quotedcontenttype , 
-                   ispatch = $::FORM{'ispatch'} , 
-                   isobsolete = $::FORM{'isobsolete'} , 
-                   creation_ts = creation_ts
-           WHERE   attach_id = $::FORM{'id'}
-         ");
-
-  # Record changes in the activity table.
-  if ($olddescription ne $::FORM{'description'}) {
-    my $quotedolddescription = SqlQuote($olddescription);
-    my $fieldid = GetFieldID('attachments.description');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $quotedolddescription, $quoteddescription)");
-  }
-  if ($oldcontenttype ne $::FORM{'contenttype'}) {
-    my $quotedoldcontenttype = SqlQuote($oldcontenttype);
-    my $fieldid = GetFieldID('attachments.mimetype');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $quotedoldcontenttype, $quotedcontenttype)");
-  }
-  if ($oldispatch ne $::FORM{'ispatch'}) {
-    my $fieldid = GetFieldID('attachments.ispatch');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $oldispatch, $::FORM{'ispatch'})");
-  }
-  if ($oldisobsolete ne $::FORM{'isobsolete'}) {
-    my $fieldid = GetFieldID('attachments.isobsolete');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $oldisobsolete, $::FORM{'isobsolete'})");
-  }
-  if ($oldstatuslist ne $newstatuslist) {
-    my ($removed, $added) = DiffStrings($oldstatuslist, $newstatuslist);
-    my $quotedremoved = SqlQuote($removed);
-    my $quotedadded = SqlQuote($added);
-    my $fieldid = GetFieldID('attachstatusdefs.name');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $quotedremoved, $quotedadded)");
-  }
-
-  # Unlock all database tables now that we are finished updating the database.
-  if ($::driver eq 'mysql') {
-    SendSQL("UNLOCK TABLES");
-  }
-
-  # If this installation has enabled the request manager, let the manager know
-  # an attachment was updated so it can check for requests on that attachment
-  # and fulfill them.  The request manager allows users to request database
-  # changes of other users and tracks the fulfillment of those requests.  When
-  # an attachment record is updated and the request manager is called, it will
-  # fulfill those requests that were requested of the user performing the update
-  # which are requests for the attachment being updated.
-  #my $requests;
-  #if (Param('userequestmanager'))
-  #{
-  #  use Request;
-  #  # Specify the fieldnames that have been updated.
-  #  my @fieldnames = ('description', 'mimetype', 'status', 'ispatch', 'isobsolete');
-  #  # Fulfill pending requests.
-  #  $requests = Request::fulfillRequest('attachment', $::FORM{'id'}, @fieldnames);
-  #  $vars->{'requests'} = $requests; 
-  #}
-
-  # If the user submitted a comment while editing the attachment, 
-  # add the comment to the bug.
-  if ( $::FORM{'comment'} )
-  {
-    use Text::Wrap;
-    $Text::Wrap::columns = 80;
-    $Text::Wrap::huge = 'wrap';
-
-    # Append a string to the comment to let users know that the comment came from
-    # the "edit attachment" screen.
-    my $comment = qq|(From update of attachment $::FORM{'id'})\n| . $::FORM{'comment'};
-
-    my $wrappedcomment = "";
-    foreach my $line (split(/\r\n|\r|\n/, $comment))
-    {
-      if ( $line =~ /^>/ )
-      {
-        $wrappedcomment .= $line . "\n";
-      }
-      else
-      {
-        $wrappedcomment .= wrap('', '', $line) . "\n";
-      }
-    }
-
-    # Get the user's login name since the AppendComment function needs it.
-    my $who = DBID_to_name($userid);
-
-    # Append the comment to the list of comments in the database.
-    AppendComment($bugid, $who, $wrappedcomment);
-
-  }
-
-  # Send mail to let people know the bug has changed.  Uses a special syntax
-  # of the "open" and "exec" commands to capture the output of "processmail",
-  # which "system" doesn't allow, without running the command through a shell,
-  # which backticks (``) do.
-  #system ("./processmail", $bugid , $userid);
-  #my $mailresults = `./processmail $bugid $userid`;
-  my $mailresults = '';
-  open(PMAIL, "-|") or exec('./processmail', $bugid, DBID_to_name($userid));
-  $mailresults .= $_ while <PMAIL>;
-  close(PMAIL);
- 
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'attachid'} = $::FORM{'id'}; 
-  $vars->{'bugid'} = $bugid; 
-  $vars->{'mailresults'} = $mailresults; 
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/updated.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}

mozilla/webtools/bugzilla/bug_form.pl

@@ -1,366 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Dave Miller <justdave@syndicomm.com>
-
-use diagnostics;
-use strict;
-
-use RelationSet;
-
-# Use the Attachment module to display attachments for the bug.
-use Attachment;
-
-sub show_bug {    
-    # Shut up misguided -w warnings about "used only once".  For some reason,
-    # "use vars" chokes on me when I try it here.
-    sub bug_form_pl_sillyness {
-        my $zz;
-        $zz = %::FORM;
-        $zz = %::proddesc;
-        $zz = %::prodmaxvotes;
-        $zz = @::enterable_products;                                            
-        $zz = @::settable_resolution;
-        $zz = $::unconfirmedstate;
-        $zz = $::milestoneurl;
-        $zz = $::template;
-        $zz = $::vars;
-        $zz = @::legal_priority;
-        $zz = @::legal_platform;
-        $zz = @::legal_severity;
-        $zz = @::legal_bug_status;
-        $zz = @::target_milestone;
-        $zz = @::components;
-        $zz = @::legal_keywords;
-        $zz = @::versions;
-        $zz = @::legal_opsys;
-    }
-
-    # Use templates
-    my $template = $::template;
-    my $vars = $::vars;
-    
-    $vars->{'GetBugLink'} = \&GetBugLink;
-    $vars->{'quoteUrls'} = \&quoteUrls,
-    $vars->{'lsearch'} = \&lsearch,
-    $vars->{'header_done'} = (@_),
-
-    my $userid = quietly_check_login();
-
-    my $id = $::FORM{'id'};
-    
-    if (!defined($id)) {
-      $template->process("bug/choose.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-      exit;
-    }
-    
-    my %user = %{$vars->{'user'}};
-    my %bug;
-
-    # Populate the bug hash with the info we get directly from the DB.
-    my $query = "
-SELECT
-    bugs.bug_id,
-    product,
-    version,
-    rep_platform,
-    op_sys,
-    bug_status,
-    resolution,
-    priority,
-    bug_severity,
-    component,
-    assigned_to,
-    reporter,
-    bug_file_loc,
-    short_desc,
-    target_milestone,
-    qa_contact,
-    status_whiteboard, ";
-
-    if ($::driver eq 'mysql') {
-        $query .= "
-    date_format(creation_ts, '%Y-%m-%d %H:%i'),
-    delta_ts, ";
-    } elsif ($::driver eq 'Pg') {
-        $query .= "
-    TO_CHAR(creation_ts, 'YYYY-MM-DD HH24:MI:SS'),
-    TO_CHAR(delta_ts, 'YYYYMMDDHH24MISS'), ";
-    }
-
-    $query .= "
-    SUM(votes.count)
-FROM 
-    bugs LEFT JOIN votes USING(bug_id)
-WHERE 
-    bugs.bug_id = $id
-GROUP BY 
-    bugs.bug_id,
-    product,
-    version,
-    rep_platform,
-    op_sys,
-    bug_status,
-    resolution,
-    priority,
-    bug_severity,
-    component,
-    assigned_to,
-    reporter,
-    bug_file_loc,
-    short_desc,
-    target_milestone,
-    qa_contact,
-    status_whiteboard,
-    creation_ts,
-    delta_ts ";
-
-    SendSQL($query);
-
-    my $value;
-    my @row = FetchSQLData();
-    foreach my $field ("bug_id", "product", "version", "rep_platform",
-                       "op_sys", "bug_status", "resolution", "priority",
-                       "bug_severity", "component", "assigned_to", "reporter",
-                       "bug_file_loc", "short_desc", "target_milestone",
-                       "qa_contact", "status_whiteboard", "creation_ts",
-                       "delta_ts", "votes") 
-    {
-        $value = shift(@row);
-        $bug{$field} = defined($value) ? $value : "";
-    }
-
-    # General arrays of info about the database state
-    GetVersionTable();
-
-    # Fiddle the product list.
-    my $seen_curr_prod;
-    my @prodlist;
-    
-    foreach my $product (@::enterable_products) {
-        if ($product eq $bug{'product'}) {
-            # if it's the product the bug is already in, it's ALWAYS in
-            # the popup, period, whether the user can see it or not, and
-            # regardless of the disallownew setting.
-            $seen_curr_prod = 1;
-            push(@prodlist, $product);
-            next;
-        }
-
-        next if !CanSeeProduct($userid, $product);
-
-        push(@prodlist, $product);
-    }
-
-    # The current product is part of the popup, even if new bugs are no longer
-    # allowed for that product
-    if (!$seen_curr_prod) {
-        push (@prodlist, $bug{'product'});
-        @prodlist = sort @prodlist;
-    }
-
-    $vars->{'product'} = \@prodlist;
-    $vars->{'rep_platform'} = \@::legal_platform;
-    $vars->{'priority'} = \@::legal_priority;
-    $vars->{'bug_severity'} = \@::legal_severity;
-    $vars->{'op_sys'} = \@::legal_opsys;
-    $vars->{'bug_status'} = \@::legal_bug_status;
-
-    # Hack - this array contains "" for some reason. See bug 106589.
-    shift @::settable_resolution; 
-    $vars->{'resolution'} = \@::settable_resolution;
-
-    $vars->{'component_'} = $::components{$bug{'product'}};
-    $vars->{'version'} = $::versions{$bug{'product'}};
-    $vars->{'target_milestone'} = $::target_milestone{$bug{'product'}};
-    $bug{'milestoneurl'} = $::milestoneurl{$bug{'product'}} || 
-                           "notargetmilestone.html";
-
-    $vars->{'use_votes'} = $::prodmaxvotes{$bug{'product'}};
-
-    # Add additional, calculated fields to the bug hash
-    if (@::legal_keywords) {
-        $vars->{'use_keywords'} = 1;
-
-        SendSQL("SELECT keyworddefs.name 
-                 FROM keyworddefs, keywords
-                 WHERE keywords.bug_id = $id 
-                 AND keyworddefs.id = keywords.keywordid
-                 ORDER BY keyworddefs.name");
-        my @keywords;
-        while (MoreSQLData()) {
-            push(@keywords, FetchOneColumn());
-        }
-
-        $bug{'keywords'} = \@keywords;
-    }    
-
-    # Attachments
-    $bug{'attachments'} = Attachment::query($id);
-
-    # Dependencies
-    my @list;
-    SendSQL("SELECT dependson FROM dependencies WHERE  
-             blocked = $id ORDER BY dependson");
-    while (MoreSQLData()) {
-        my ($i) = FetchSQLData();
-        push(@list, $i);
-    }
-
-    $bug{'dependson'} = \@list;
-
-    my @list2;
-    SendSQL("SELECT blocked FROM dependencies WHERE  
-             dependson = $id ORDER BY blocked");
-    while (MoreSQLData()) {
-        my ($i) = FetchSQLData();
-        push(@list2, $i);
-    }
-
-    $bug{'blocked'} = \@list2;
-
-    # Groups
-    my @groups;
-    my (%buggroups, %usergroups);
-
-    # Find out if this bug is private to any group
-    SendSQL("SELECT group_id FROM bug_group_map WHERE bug_id = $id");
-    while (my $group_id = FetchOneColumn()) {
-        $buggroups{$group_id} = 1;
-    }
-
-    # Get a list of active groups the user is in, subject to the above conditions
-    if ($userid) {
-        # NB - the number of groups is likely to be small - should we just select
-        # everything, and weed manually? OTOH, the number of products is likely
-        # to be small, too. This buggroup stuff needs to be rethought
-        SendSQL("SELECT groups.group_id, groups.isactive " .
-                "FROM user_group_map, " .
-                "groups LEFT JOIN products ON groups.name = products.product " .
-                "WHERE groups.group_id = user_group_map.group_id AND " .
-                "user_group_map.user_id = $userid AND groups.isbuggroup != 0 AND " .
-                "(groups.name = " . SqlQuote($bug{'product'}) . " OR " .
-                "products.product IS NULL)");
-        while (my $group_id = FetchOneColumn()) {
-            $usergroups{$group_id} = 1;
-        }
-
-        # Now get information about each group
-        SendSQL("SELECT group_id, name, description " .
-                "FROM groups " .
-                # "WHERE group_id IN (" . join(',', @groups) . ") " .
-                "ORDER BY description");
-        while (MoreSQLData()) {
-            my ($group_id, $name, $description) = FetchSQLData();
-            my ($ison, $ingroup);
-    
-            if ($buggroups{$group_id} || 
-                ($usergroups{$group_id} && (($name eq $bug{'product'}) || 
-                                (!defined $::proddesc{$name})))) 
-            {
-                $user{'inallgroups'} &= $ingroup;
-
-                push (@groups, { "bit" => $group_id,
-                                 "ison" => $buggroups{$group_id},
-                                 "ingroup" => $usergroups{$group_id},
-                                 "description" => $description });
-            }
-        }
-
-        # If the bug is restricted to a group, display checkboxes that allow
-        # the user to set whether or not the reporter 
-        # and cc list can see the bug even if they are not members of all 
-        # groups to which the bug is restricted.
-        if (%buggroups) {
-            $bug{'inagroup'} = 1;
-
-            # Determine whether or not the bug is always accessible by the
-            # reporter, QA contact, and/or users on the cc: list.
-            SendSQL("SELECT reporter_accessible, cclist_accessible
-                     FROM   bugs
-                     WHERE  bug_id = $id
-                    ");
-            ($bug{'reporter_accessible'}, 
-             $bug{'cclist_accessible'}) = FetchSQLData();        
-        }
-    }
-    $vars->{'groups'} = \@groups;
-
-    my $movers = Param("movers");
-    $user{'canmove'} = Param("move-enabled") 
-                       && (defined $::COOKIE{"Bugzilla_login"}) 
-                       && ($::COOKIE{"Bugzilla_login"} =~ /\Q$movers\E/);
-
-    # User permissions
-
-    # In the below, if the person hasn't logged in ($::userid == 0), then
-    # we treat them as if they can do anything.  That's because we don't
-    # know why they haven't logged in; it may just be because they don't
-    # use cookies.  Display everything as if they have all the permissions
-    # in the world; their permissions will get checked when they log in
-    # and actually try to make the change.
-    $user{'canedit'} = $::userid == 0
-                       || $::userid == $bug{'reporter'}
-                       || $::userid == $bug{'qa_contact'}
-                       || $::userid == $bug{'assigned_to'}
-                       || UserInGroup($userid, "editbugs");                   
-    $user{'canconfirm'} = ($::userid == 0) || UserInGroup($userid, "canconfirm");
-
-    # Bug states
-    $bug{'isunconfirmed'} = ($bug{'bug_status'} eq $::unconfirmedstate);
-    $bug{'isopened'} = IsOpenedState($bug{'bug_status'});
-
-    # People involved with the bug
-    $bug{'assigned_to_email'} = DBID_to_name($bug{'assigned_to'});
-    $bug{'assigned_to'} = DBID_to_real_or_loginname($bug{'assigned_to'});
-    $bug{'reporter'} = DBID_to_real_or_loginname($bug{'reporter'});
-    $bug{'qa_contact'} = $bug{'qa_contact'} > 0 ? 
-                                          DBID_to_name($bug{'qa_contact'}) : "";
-
-    my $ccset = new RelationSet;
-    $ccset->mergeFromDB("SELECT who FROM cc WHERE bug_id=$id");
-    
-    my @cc = $ccset->toArrayOfStrings();
-    $bug{'cc'} = \@cc if $cc[0];
-
-    # Next bug in list (if there is one)
-    my @bug_list;
-    if ($::COOKIE{"BUGLIST"} && $id) 
-    {
-        @bug_list = split(/:/, $::COOKIE{"BUGLIST"});
-    }
-    $vars->{'bug_list'} = \@bug_list;
-
-    $bug{'comments'} = GetComments($bug{'bug_id'});
-
-    # This is length in number of comments
-    $bug{'longdesclength'} = scalar(@{$bug{'comments'}});
-
-    # Add the bug and user hashes to the variables
-    $vars->{'bug'} = \%bug;
-    $vars->{'user'} = \%user;
-
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("bug/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-}
- 
-1;

mozilla/webtools/bugzilla/bug_status.html

@@ -1,206 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-
-<!--
-     The contents of this file are subject to the Mozilla Public
-     License Version 1.1 (the "License"); you may not use this file
-     except in compliance with the License. You may obtain a copy of
-     the License at http://www.mozilla.org/MPL/
-    
-     Software distributed under the License is distributed on an "AS
-     IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-     implied. See the License for the specific language governing
-     rights and limitations under the License.
-    
-     The Original Code is the Bugzilla Bug Tracking System.
-    
-     The Initial Developer of the Original Code is Netscape Communications
-     Corporation. Portions created by Netscape are
-     Copyright (C) 1998 Netscape Communications Corporation. All
-     Rights Reserved.
-    
-     Contributor(s): 
-
-     Contributor(s): Terry Weissman <terry@mozilla.org>
--->
-
-<head>
-<TITLE>A Bug's Life Cycle</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body>
-
-<h1 ALIGN=CENTER>A Bug's Life Cycle</h1>
-
-The <B>status</B> and <B>resolution</B> field define and track the
-life cycle of a bug.
-
-<a name="status"></a>
-<p>
-<TABLE BORDER=1 CELLPADDING=4>
-
-<TR ALIGN=CENTER VALIGN=TOP>
-<TD WIDTH="50%"><H1>STATUS</H1> <TD><H1>RESOLUTION</H1>
-
-<TR VALIGN=TOP>
-<TD>The <B>status</B> field indicates the general health of a bug. Only
-certain status transitions are allowed.
-<TD>The <b>resolution</b> field indicates what happened to this bug.
-
-<TR VALIGN=TOP><TD>
-<DL><DT><B>
-<A HREF="confirmhelp.html">UNCONFIRMED</A></B> 
-<DD> This bug has recently been added to the database.  Nobody has
-     validated that this bug is true.  Users who have the "canconfirm"
-     permission set may confirm this bug, changing its state to NEW.
-     Or, it may be directly resolved and marked RESOLVED.
-<DT><B>NEW</B> 
-<DD> This bug has recently been added to the assignee's list of bugs
-     and must be processed. Bugs in this state may be accepted, and
-     become <B>ASSIGNED</B>, passed on to someone else, and remain
-     <B>NEW</B>, or resolved and marked <B>RESOLVED</B>.
-<DT><B>ASSIGNED</B> 
-<DD> This bug is not yet resolved, but is assigned to the proper
-     person. From here bugs can be given to another person and become
-     <B>NEW</B>, or resolved and become <B>RESOLVED</B>.
-<DT><B>REOPENED</B>
-<DD>This bug was once resolved, but the resolution was deemed
-     incorrect.  For example, a <B>WORKSFORME</B> bug is
-     <B>REOPENED</B> when more information shows up and the bug is now
-     reproducible.  From here bugs are either marked <B>ASSIGNED</B>
-     or <B>RESOLVED</B>.
-</DL>
-<TD>
-<DL>
-<DD> No resolution yet. All bugs which are in one of these "open" states
-     have the resolution set to blank. All other bugs
-     will be marked with one of the following resolutions.
-</DL>
-
-<TR VALIGN=TOP><TD>
-<DL>
-<DT><B>RESOLVED</B> 
-<DD> A resolution has been taken, and it is awaiting verification by
-     QA. From here bugs are either re-opened and become
-     <B>REOPENED</B>, are marked <B>VERIFIED</B>, or are closed for good
-     and marked <B>CLOSED</B>.
-<DT><B>VERIFIED</B>
-<DD> QA has looked at the bug and the resolution and agrees that the
-     appropriate resolution has been taken.  Bugs remain in this state
-     until the product they were reported against actually ships, at
-     which point they become <B>CLOSED</B>.
-<DT><B>CLOSED</B> 
-<DD> The bug is considered dead, the resolution is correct. Any zombie
-     bugs who choose to walk the earth again must do so by becoming
-     <B>REOPENED</B>.
-</DL>
-
-<TD>
-<DL>
-<DT><B>FIXED</B>
-<DD> A fix for this bug is checked into the tree and tested.
-<DT><B>INVALID</B>
-<DD> The problem described is not a bug 
-<DT><B>WONTFIX</B>
-<DD> The problem described is a bug which will never be fixed.
-<DT><B>LATER</B>
-<DD> The problem described is a bug which will not be fixed in this
-     version of the product.
-<DT><B>REMIND</B>
-<DD> The problem described is a bug which will probably not be fixed in this
-     version of the product, but might still be.
-<DT><B>DUPLICATE</B>
-<DD> The problem is a duplicate of an existing bug. Marking a bug
-     duplicate requires the bug# of the duplicating bug and will at
-     least put that bug number in the description field.
-<DT><B>WORKSFORME</B>
-<DD> All attempts at reproducing this bug were futile, reading the
-     code produces no clues as to why this behavior would occur. If
-     more information appears later, please re-assign the bug, for
-     now, file it.
-</DL>
-</TABLE>
-
-<H1>Other Fields</H1>
-
-<table border=1 cellpadding=4><tr><td>
-<h2><a name="severity">Severity</a></h2>
-
-This field describes the impact of a bug.
-
-<p>
-<p>
- 
-<table>
-<tr><th>Blocker</th><td>Blocks development and/or testing work
-<tr><th>Critical</th><td>crashes, loss of data, severe memory leak 
-<tr><th>Major</th><td>major loss of function 
-<tr><th>Minor</th><td>minor loss of function, or other problem where easy workaround is present 
-<tr><th>Trivial</th><td>cosmetic problem like misspelled words or misaligned text 
-<tr><th>Enhancement</th><td>Request for enhancement
-</table> 
-
-</td><td>
-
-<h2><a name="priority">Priority</a></h2>
-
-This field describes the importance and order in which a bug should be
-fixed.  This field is utilized by the programmers/engineers to
-prioritize their work to be done.  The available priorities are:
-
-<p>
-<p>
-
-<table>
-<tr><th>P1</th><td>Most important
-<tr><th>P2</th><td>
-<tr><th>P3</th><td>
-<tr><th>P4</th><td>
-<tr><th>P5</th><td>Least important
-</table>
-</tr></table>
-
-<h2><a name="rep_platform">Platform</a></h2>
-This is the hardware platform against which the bug was reported.  Legal
-platforms include:
-
-<UL>
-<LI> All (happens on all platform; cross-platform bug)
-<LI> Macintosh
-<LI> PC
-<LI> Sun
-<LI> HP
-</UL>
-
-<b>Note:</b> Selecting the option "All" does not select bugs assigned against all platforms.  It
-merely selects bugs that <b>occur</b> on all platforms.
-
-<h2><a name="op_sys">Operating System</a></h2>
-This is the operating system against which the bug was reported.  Legal
-operating systems include:
-
-<UL>
-<LI> All (happens on all operating systems; cross-platform bug)
-<LI> Windows 95
-<LI> Mac System 8.0
-<LI> Linux
-</UL>
-
-Note that the operating system implies the platform, but not always.
-For example, Linux can run on PC and Macintosh and others.
-
-<h2><a name="assigned_to">Assigned To</a></h2>
-
-This is the person in charge of resolving the bug.  Every time this
-field changes, the status changes to <B>NEW</B> to make it easy to see
-which new bugs have appeared on a person's list.
-
-The default status for queries is set to NEW, ASSIGNED and REOPENED. When
-searching for bugs that have been resolved or verified, remember to set the
-status field appropriately. 
-
-<hr>
-<!-- hhmts start -->
-Last modified: Sun Apr 14 12:51:23 EST 2002
-<!-- hhmts end -->
-</body> </html>

mozilla/webtools/bugzilla/bugwritinghelp.html

@@ -1,392 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<title>Bug Writing Guidelines</title>
-</head>
-<body>
-<center>
-<h1>Bug Writing Guidelines</h1>
-</center>
-
-<h3>Why You Should Read This</h3>
-
-<blockquote>
-<p>Simply put, the more effectively you report a bug, the more
-likely an engineer will actually fix it.</p>
-
-<p>These guidelines are a general
-tutorial to teach novice and intermediate bug reporters how to compose effective bug reports. Not every sentence may precisely apply to
-your software project.</p>
-</blockquote>
-
-<h3>How to Write a Useful Bug Report</h3>
-
-<blockquote>
-<p>Useful bug reports are ones that get bugs fixed. A useful bug
-report normally has two qualities:</p>
-
-<ol>
-<li><b>Reproducible.</b> If an engineer can't see the bug herself to prove that it exists, she'll probably stamp your bug report "WORKSFORME" or "INVALID" and move on to the next bug. Every detail you can provide helps.<br>
-<br>
-</li>
-
-<li><b>Specific.</b> The quicker the engineer can isolate the bug
-to a specific area, the more likely she'll expediently fix it. 
-(If a programmer or tester has to decypher a bug, they may spend
-more time cursing the submitter than solving the problem.)
-<br>
-<br>
-[ <a href="#tips" name="Anchor">Tell Me More</a> ]
-</li>
-</ol>
-
-<p>Let's say the application you're testing is a web browser. You
-crash at foo.com, and want to write up a bug report:</p>
-
-<blockquote>
-<p><b>BAD:</b> "My browser crashed. I think I was on www.foo.com. I play golf with Bill Gates, so you better fix this problem, or I'll report you to him. By the way, your Back icon looks like a squashed rodent. UGGGLY. And my grandmother's home page is all messed up in your browser. Thx 4 UR help."
-</p>
-
-<p>
- <b>GOOD:</b> "I crashed each time I went to www.foo.com, using
-the 2002-02-25 build on a Windows 2000 system. I also
-rebooted into Linux, and reproduced this problem using the 2002-02-24
-Linux build.
-</p>
-
-<p>
- It again crashed each time upon drawing the Foo banner at the top
-of the page. I broke apart the page, and discovered that the
-following image link will crash the application reproducibly,
-unless you remove the "border=0" attribute:
-</p>
-
-<p>
- <tt>&lt;IMG SRC="http://www.foo.com/images/topics/topicfoos.gif"
-width="34" height="44" border="0" alt="News"&gt;</tt>
-</p>
-</blockquote>
-</blockquote>
-
-<h3>How to Enter your Useful Bug Report into Bugzilla:</h3>
-
-<blockquote>
-<p>Before you enter your bug, use Bugzilla's 
-<a href="query.cgi">search page</a> to determine whether the defect you've discovered is a known, already-reported bug. If your bug is the 37th duplicate of a known issue, you're more likely to annoy the engineer. (Annoyed
-engineers fix fewer bugs.)
-</p>
-
-<p>
-Next, be sure to reproduce your bug using a recent
-build. Engineers tend to be most interested in problems affecting
-the code base that they're actively working on. After all, the bug you're reporting
-may already be fixed.
-
-</p>
-
-<p>
- If you've discovered a new bug using a current build, report it in
-Bugzilla:
-</p>
-
-<ol>
-<li>From your Bugzilla main page, choose 
-"<a href="enter_bug.cgi">Enter a new bug</a>".</li>
-
-<li>Select the product that you've found a bug in.</li>
-
-<li>Enter your e-mail address, password, and press the "Login"
-button. (If you don't yet have a password, leave the password field empty, 
-and press the "E-mail me a password" button instead.
-You'll quickly receive an e-mail message with your password.)</li>
-</ol>
-
-<p>Now, fill out the form. Here's what it all means:</p>
-
-<p><b>Where did you find the bug?</b></p>
-
-<blockquote>
-<p><b>Product: In which product did you find the bug?</b><br>
- You just specified this on the last page, so you can't edit it here.</p>
-
-<p><b>Version: In which product version did you find the
-bug?</b><br>
- (If applicable)</p>
-
-<p><b>Component: In which component does the bug exist?</b><br>
-Bugzilla requires that you select a component to enter a bug. (Not sure which to choose? 
-Click on the Component link. You'll see a description of each component, to help you make the best choice.)</p>
-
-<p><b>OS: On which Operating System (OS) did you find this bug?</b>
-(e.g. Linux, Windows 2000, Mac OS 9.)<br>
- If you know the bug happens on all OSs, choose 'All'. Otherwise,
-select the OS that you found the bug on, or "Other" if your OS
-isn't listed.</p>
-</blockquote>
-
-<p><b>How important is the bug?</b></p>
-
-<blockquote>
-<p><b>Severity: How damaging is the bug?</b><br>
- This item defaults to 'normal'. If you're not sure what severity your bug deserves, click on the Severity link.
- You'll see a description of each severity rating. <br>
-</p>
-</blockquote>
-
-<p><b>Who will be following up on the bug?</b></p>
-
-<blockquote>
-<p><b>Assigned To: Which engineer should be responsible for fixing
-this bug?</b><br>
- Bugzilla will automatically assign the bug to a default engineer
-upon submitting a bug report. If you'd prefer to directly assign the bug to
-someone else, enter their e-mail address into this field. (To see the list of
-default engineers for each component, click on the Component
-link.)</p>
-
-<p><b>Cc: Who else should receive e-mail updates on changes to this
-bug?</b><br>
- List the full e-mail addresses of other individuals who should
-receive an e-mail update upon every change to the bug report. You
-can enter as many e-mail addresses as you'd like, separated by spaces or commas, as long as those
-people have Bugzilla accounts.</p>
-</blockquote>
-
-<p><b>What else can you tell the engineer about the bug?</b></p>
-
-<blockquote>
-
-<p><b>Summary:</b> <b>How would you describe the bug, in
-approximately 60 or fewer characters?</b><br>
- A good summary should <b>quickly and uniquely identify a bug
-report</b>. Otherwise, an engineer cannot meaningfully identify
-your bug by its summary, and will often fail to pay attention to
-your bug report when skimming through a 10 page bug list.<br>
-<br>
- A useful summary might be 
- "<tt>PCMCIA install fails on Tosh Tecra 780DVD w/ 3c589C</tt>". 
- "<tt>Software fails</tt>" or "<tt>install problem</tt>" would be
-examples of a bad summary.<br>
-<br>
- [ <a href="#summary">Tell Me More</a> ]<br>
-<br>
- <b>Description: </b><br>
- Please provide a detailed problem report in this field.
-Your bug's recipients will most likely expect the following information:</p>
-
-<blockquote>
-<p><b>Overview Description:</b> More detailed expansion of
-summary.</p>
-
-<blockquote>
-<pre>
-Drag-selecting any page crashes Mac builds in NSGetFactory
-</pre>
-</blockquote>
-
-<p><b>Steps to Reproduce:</b> Minimized, easy-to-follow steps that will
-trigger the bug. Include any special setup steps.</p>
-
-<blockquote>
-<pre>
-1) View any web page. (I used the default sample page,
-resource:/res/samples/test0.html)
-                          
-2) Drag-select the page. (Specifically, while holding down 
-the mouse button, drag the mouse pointer downwards from any 
-point in the browser's content region to the bottom of the 
-browser's content region.)                   
-</pre>
-</blockquote>
-
-<p>
- <b>Actual Results:</b> What the application did after performing
-the above steps. 
-</p>
-
-<blockquote>
-<pre>
-The application crashed. Stack crawl appended below from MacsBug.
-</pre>
-</blockquote>
-
-<p><b>Expected Results:</b> What the application should have done,
-were the bug not present.</p>
-
-<blockquote>
-<pre>
-The window should scroll downwards. Scrolled content should be selected. 
-(Or, at least, the application should not crash.)
-</pre>
-</blockquote>
-
-<p><b>Build Date &amp; Platform:</b> Date and platform of the build
-that you first encountered the bug in.</p>
-
-<blockquote>
-<pre>
-Build 2002-03-15 on Mac OS 9.0
-</pre>
-</blockquote>
-
-<p><b>Additional Builds and Platforms:</b> Whether or not the bug
-takes place on other platforms (or browsers, if applicable).</p>
-
-<blockquote>
-<pre>
-- Also Occurs On        
-    Mozilla (2002-03-15 build on Windows NT 4.0) 
-                                    
-- Doesn't Occur On        
-    Mozilla (2002-03-15 build on Red Hat Linux; feature not supported)        
-    Internet Explorer 5.0 (shipping build on Windows NT 4.0)        
-    Netscape Communicator 4.5 (shipping build on Mac OS 9.0)
-</pre>
-</blockquote>
-
-<p><b>Additional Information:</b> Any other debugging information.
-For crashing bugs:</p>
-
-<ul>
-<li><b>Win32:</b> if you receive a Dr. Watson error, please note
-the type of the crash, and the module that the application crashed
-in. (e.g. access violation in apprunner.exe)</li>
-
-<li><b>Mac OS:</b> if you're running MacsBug, please provide the
-results of a <b>how</b> and an <b>sc</b>:</li>
-</ul>
-
-<blockquote>
-<pre>
-*** MACSBUG STACK CRAWL OF CRASH (Mac OS)
-Calling chain using A6/R1 links 
-    Back chain  ISA  Caller 
-    00000000    PPC  0BA85E74   
-    03AEFD80    PPC  0B742248   
-    03AEFD30    PPC  0B50FDDC  NSGetFactory+027FC
-PowerPC unmapped memory exception at 0B512BD0 NSGetFactory+055F0
-</pre>
-</blockquote>
-</blockquote>
-</blockquote>
-
-<p>You're done!<br>
-<br>
- After double-checking your entries for any possible errors, press
-the "Commit" button, and your bug report will now be in the
-Bugzilla database.<br>
-</p>
-</blockquote>
-
-<hr>
-<h3>More Information on Writing Good Bugs</h3>
-
-<blockquote>
-<p><b><a name="tips"></a> 1. General Tips for a Useful Bug
-Report</b>
-</p>
-
-<blockquote>
-<p>
- <b>Use an explicit structure, so your bug reports are easy to
-skim.</b> Bug report users often need immediate access to specific
-sections of your bug. If your Bugzilla installation supports the
-Bugzilla Helper, use it.
-</p>
-
-<p>
- <b>Avoid cuteness if it costs clarity.</b> Nobody will be laughing
-at your funny bug title at 3:00 AM when they can't remember how to
-find your bug.
-</p>
-
-<p>
- <b>One bug per report.</b> Completely different people typically
-fix, verify, and prioritize different bugs. If you mix a handful of
-bugs into a single report, the right people probably won't discover
-your bugs in a timely fashion, or at all. Certain bugs are also
-more important than others. It's impossible to prioritize a bug
-report when it contains four different issues, all of differing
-importance.
-</p>
-
-<p>
- <b>No bug is too trivial to report.</b> Unless you're reading the
-source code, you can't see actual software bugs, like a dangling
-pointer -- you'll see their visible manifestations, such as the
-segfault when the application finally crashes. Severe software
-problems can manifest themselves in superficially trivial ways.
-File them anyway.<br>
-</p>
-</blockquote>
-
-<p><b><a name="summary"></a>2. How and Why to Write Good Bug Summaries</b>
-</p>
-
-<blockquote>
-<p><b>You want to make a good first impression on the bug
-recipient.</b> Just like a New York Times headline guides readers
-towards a relevant article from dozens of choices, will your bug summary
-suggest that your bug report is worth reading from dozens or hundreds of
-choices?
-</p>
-
-<p>
- Conversely, a vague bug summary like <tt>install problem</tt> forces anyone
-reviewing installation bugs to waste time opening up your bug to
-determine whether it matters.
-</p>
-
-<p>
- <b>Your bug will often be searched by its summary.</b> Just as
-you'd find web pages with Google by searching by keywords through
-intuition, so will other people locate your bugs. Descriptive bug
-summaries are naturally keyword-rich, and easier to find.
-</p>
-
-<p>
- For example, you'll find a bug titled "<tt>Dragging icons from List View to
-gnome-terminal doesn't paste path</tt>" if you search on "List",
-"terminal", or "path". Those search keywords wouldn't have found a
-bug titled "<tt>Dragging icons
-doesn't paste</tt>".
-</p>
-
-<p>
- Ask yourself, "Would someone understand my bug from just this
-summary?" If so, you've written a fine summary.
-</p>
-
-<p><b>Don't write titles like these:</b></p>
-
-<ol>
- <li>"Can't install" - Why can't you install? What happens when you
-try to install?</li>
-<li>"Severe Performance Problems" - ...and they occur when you do
-what?</li>
-<li>"back button does not work" - Ever? At all?</li>
-</ol>
-
-<p><b>Good bug titles:</b></p>
-<ol>
-<li>"1.0 upgrade installation fails if Mozilla M18 package present"
-- Explains problem and the context.</li>
-<li>"RPM 4 installer crashes if launched on Red Hat 6.2 (RPM 3)
-system" - Explains what happens, and the context.</li>
-</ol>
-
-
-
-</blockquote>
-</blockquote>
-
-<p>(Written and maintained by 
-<a href="http://www.prometheus-music.com/eli">Eli Goldberg</a>. Claudius
-Gayle, Gervase Markham, Peter Mock, Chris Pratt, Tom Schutter and Chris Yeh also
-contributed significant changes. Constructive 
-<a href="mailto:eli@prometheus-music.com">suggestions</a> welcome.)</p>
-
-</body>
-</html>
-

mozilla/webtools/bugzilla/bugzilla.dtd

@@ -1,46 +0,0 @@
-<!ELEMENT bugzilla (bug+)>
-<!ATTLIST bugzilla
-	version CDATA #REQUIRED
-	urlbase CDATA #REQUIRED
-	maintainer CDATA #REQUIRED
-	exporter CDATA #IMPLIED
->
-<!ELEMENT bug (bug_id, (bug_status, product, priority, version, rep_platform, assigned_to, delta_ts, component, reporter, target_milestone?, bug_severity, creation_ts, qa_contact?, op_sys, resolution?, bug_file_loc?, short_desc?, keywords*, status_whiteboard?, dependson*, blocks*, cc*, long_desc*, attachment*)?)>
-<!ATTLIST bug
-	error (NotFound | NotPermitted | InvalidBugId) #IMPLIED
->
-<!ELEMENT bug_id (#PCDATA)>
-<!ELEMENT exporter (#PCDATA)>
-<!ELEMENT urlbase (#PCDATA)>
-<!ELEMENT bug_status (#PCDATA)>
-<!ELEMENT product (#PCDATA)>
-<!ELEMENT priority (#PCDATA)>
-<!ELEMENT version (#PCDATA)>
-<!ELEMENT rep_platform (#PCDATA)>
-<!ELEMENT assigned_to (#PCDATA)>
-<!ELEMENT delta_ts (#PCDATA)>
-<!ELEMENT component (#PCDATA)>
-<!ELEMENT reporter (#PCDATA)>
-<!ELEMENT target_milestone (#PCDATA)>
-<!ELEMENT bug_severity (#PCDATA)>
-<!ELEMENT creation_ts (#PCDATA)>
-<!ELEMENT qa_contact (#PCDATA)>
-<!ELEMENT status_whiteboard (#PCDATA)>
-<!ELEMENT op_sys (#PCDATA)>
-<!ELEMENT resolution (#PCDATA)>
-<!ELEMENT bug_file_loc (#PCDATA)>
-<!ELEMENT short_desc (#PCDATA)>
-<!ELEMENT keywords (#PCDATA)>
-<!ELEMENT dependson (#PCDATA)>
-<!ELEMENT blocks (#PCDATA)>
-<!ELEMENT cc (#PCDATA)>
-<!ELEMENT long_desc (who, bug_when, thetext)>
-<!ELEMENT who (#PCDATA)>
-<!ELEMENT bug_when (#PCDATA)>
-<!ELEMENT thetext (#PCDATA)>
-<!ELEMENT attachment (attachid, date, desc, type?, data?)>
-<!ELEMENT attachid (#PCDATA)>
-<!ELEMENT date (#PCDATA)>
-<!ELEMENT desc (#PCDATA)>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT data (#PCDATA)>

mozilla/webtools/bugzilla/changepassword.cgi

@@ -1,39 +0,0 @@
-#!/usr/bonsaitools/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use strict;
-
-print q{Content-type: text/html
-
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Refresh"
-  CONTENT="0; URL=userprefs.cgi">
-</HEAD>
-<BODY>
-This URL is obsolete.  Forwarding you to the correct one.
-<P>
-Going to <A HREF="userprefs.cgi">userprefs.cgi</A>
-<BR>
-</BODY>
-</HTML>
-}

mozilla/webtools/bugzilla/colchange.cgi

@@ -1,156 +0,0 @@
-#!/usr/bonsaitools/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use diagnostics;
-use strict;
-
-use lib qw(.);
-
-use vars qw(
-  @legal_keywords
-  $buffer
-  $template
-  $vars
-);
-
-require "CGI.pl";
-
-# Use the template toolkit (http://www.template-toolkit.org/) to generate
-# the user interface (HTML pages and mail messages) using templates in the
-# "template/" subdirectory.
-use Template;
-
-# Create the global template object that processes templates and specify
-# configuration parameters that apply to all templates processed in this script.
-my $template = Template->new(
-{
-    # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => "template/custom:template/default",
-    # Allow templates to be specified with relative paths.
-    RELATIVE => 1,
-    PRE_CHOMP => 1,
-});
-
-# Define the global variables and functions that will be passed to the UI 
-# template.  Individual functions add their own values to this hash before
-# sending them to the templates they process.
-my $vars = 
-{
-    # Function for retrieving global parameters.
-    'Param' => \&Param, 
-
-    # Function for processing global parameters that contain references
-    # to other global parameters.
-    'PerformSubsts' => \&PerformSubsts,
-
-    # Function to search an array for a value   
-    'lsearch' => \&lsearch,
-};
-
-print "Content-type: text/html\n";
-
-# The master list not only says what fields are possible, but what order
-# they get displayed in.
-
-ConnectToDatabase();
-GetVersionTable();
-
-my @masterlist = ("opendate", "changeddate", "severity", "priority",
-                  "platform", "owner", "reporter", "status", "resolution",
-                  "product", "component", "version", "os", "votes");
-
-if (Param("usetargetmilestone")) {
-    push(@masterlist, "target_milestone");
-}
-if (Param("useqacontact")) {
-    push(@masterlist, "qa_contact");
-}
-if (Param("usestatuswhiteboard")) {
-    push(@masterlist, "status_whiteboard");
-}
-if (@::legal_keywords) {
-    push(@masterlist, "keywords");
-}
-
-
-push(@masterlist, ("summary", "summaryfull"));
-
-$vars->{masterlist} = \@masterlist;
-
-my @collist;
-if (defined $::FORM{'rememberedquery'}) {
-    my $splitheader = 0;
-    if (defined $::FORM{'resetit'}) {
-        @collist = @::default_column_list;
-    } else {
-        foreach my $i (@masterlist) {
-            if (defined $::FORM{"column_$i"}) {
-                push @collist, $i;
-            }
-        }
-        if (exists $::FORM{'splitheader'}) {
-            $splitheader = $::FORM{'splitheader'};
-        }
-    }
-    my $list = join(" ", @collist);
-    my $urlbase = Param("urlbase");
-    my $cookiepath = Param("cookiepath");
-    print "Set-Cookie: COLUMNLIST=$list ; path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
-    print "Set-Cookie: SPLITHEADER=$::FORM{'splitheader'} ; path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
-    print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n";
-    print "\n";
-    print "<META HTTP-EQUIV=Refresh CONTENT=\"1; URL=$urlbase"."buglist.cgi?$::FORM{'rememberedquery'}\">\n";
-    print "<TITLE>What a hack.</TITLE>\n";
-    PutHeader ("Change columns");
-    print "Resubmitting your query with new columns...\n";
-    exit;
-}
-
-if (defined $::COOKIE{'COLUMNLIST'}) {
-    @collist = split(/ /, $::COOKIE{'COLUMNLIST'});
-} else {
-    @collist = @::default_column_list;
-}
-
-$vars->{collist} = \@collist;
-
-$vars->{splitheader} = 0;
-if ($::COOKIE{'SPLITHEADER'}) {
-    $vars->{splitheader} = 1;
-}
-
-my %desc = ();
-foreach my $i (@masterlist) {
-    $desc{$i} = $i;
-}
-
-$desc{'summary'} = "Summary (first 60 characters)";
-$desc{'summaryfull'} = "Full Summary";
-
-$vars->{desc} = \%desc;
-$vars->{buffer} = $::buffer;
-
-# Generate and return the UI (HTML page) from the appropriate template.
-print "Content-type: text/html\n\n";
-$template->process("list/change-columns.html.tmpl", $vars)
-  || ThrowTemplateError($template->error());
-

mozilla/webtools/bugzilla/collectstats.pl

@@ -1,202 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>,
-#                 Harrison Page <harrison@netscape.com>
-#         Gervase Markham <gerv@gerv.net>
-
-# Run me out of cron at midnight to collect Bugzilla statistics.
-
-
-use AnyDBM_File;
-use diagnostics;
-use strict;
-use vars @::legal_product;
-
-require "globals.pl";
-
-# tidy up after graphing module
-if (chdir("graphs")) {
-    unlink <./*.gif>;
-    unlink <./*.png>;
-    chdir("..");
-}
-
-ConnectToDatabase(1);
-GetVersionTable();
-
-my @myproducts;
-push( @myproducts, "-All-", @::legal_product );
-
-foreach (@myproducts) {
-    my $dir = "data/mining";
-
-    &check_data_dir ($dir);
-    &collect_stats ($dir, $_);
-}
-
-&calculate_dupes();
-
-sub check_data_dir {
-    my $dir = shift;
-
-    if (! -d) {
-        mkdir $dir, 0777;
-        chmod 0777, $dir;
-    }
-}
-
-sub collect_stats {
-    my $dir = shift;
-    my $product = shift;
-    my $when = localtime (time);
-
-    # NB: Need to mangle the product for the filename, but use the real
-    # product name in the query
-    my $file_product = $product;
-    $file_product =~ s/\//-/gs;
-    my $file = join '/', $dir, $file_product;
-    my $exists = -f $file;
-
-    if (open DATA, ">>$file") {
-        push my @row, &today;
-
-        foreach my $status ('NEW', 'ASSIGNED', 'REOPENED', 'UNCONFIRMED', 'RESOLVED', 'VERIFIED', 'CLOSED') {
-            if( $product eq "-All-" ) {
-                SendSQL("select count(bug_status) from bugs where bug_status='$status'");
-            } else {
-                SendSQL("select count(bug_status) from bugs where bug_status='$status' and product='$product'");
-            }
-
-            push @row, FetchOneColumn();
-        }
-
-        foreach my $resolution ('FIXED', 'INVALID', 'WONTFIX', 'LATER', 'REMIND', 'DUPLICATE', 'WORKSFORME', 'MOVED') {
-            if( $product eq "-All-" ) {
-                SendSQL("select count(resolution) from bugs where resolution='$resolution'");
-            } else {
-                SendSQL("select count(resolution) from bugs where resolution='$resolution' and product='$product'");
-            }
-
-            push @row, FetchOneColumn();
-        }
-
-        if (! $exists) {
-            print DATA <<FIN;
-# Bugzilla Daily Bug Stats
-#
-# Do not edit me! This file is generated.
-#
-# fields: DATE|NEW|ASSIGNED|REOPENED|UNCONFIRMED|RESOLVED|VERIFIED|CLOSED|FIXED|INVALID|WONTFIX|LATER|REMIND|DUPLICATE|WORKSFORME|MOVED
-# Product: $product
-# Created: $when
-FIN
-        }
-
-        print DATA (join '|', @row) . "\n";
-        close DATA;
-    } else {
-        print "$0: $file, $!";
-    }
-}
-
-sub calculate_dupes {
-    SendSQL("SELECT * FROM duplicates");
-
-    my %dupes;
-    my %count;
-    my @row;
-    my $key;
-    my $changed = 1;
-
-    my $today = &today_dash;
-
-    # Save % count here in a date-named file
-    # so we can read it back in to do changed counters
-    # First, delete it if it exists, so we don't add to the contents of an old file
-    if (my @files = <data/duplicates/dupes$today*>) {
-        unlink @files;
-    }
-   
-    dbmopen(%count, "data/duplicates/dupes$today", 0644) || die "Can't open DBM dupes file: $!";
-
-    # Create a hash with key "a bug number", value "bug which that bug is a
-    # direct dupe of" - straight from the duplicates table.
-    while (@row = FetchSQLData()) {
-        my $dupe_of = shift @row;
-        my $dupe = shift @row;
-        $dupes{$dupe} = $dupe_of;
-    }
-
-    # Total up the number of bugs which are dupes of a given bug
-    # count will then have key = "bug number", 
-    # value = "number of immediate dupes of that bug".
-    foreach $key (keys(%dupes)) 
-    {
-        my $dupe_of = $dupes{$key};
-
-        if (!defined($count{$dupe_of})) {
-            $count{$dupe_of} = 0;
-        }
-
-        $count{$dupe_of}++;
-    }   
-
-    # Now we collapse the dupe tree by iterating over %count until
-    # there is no further change.
-    while ($changed == 1)
-    {
-        $changed = 0;
-        foreach $key (keys(%count)) {
-            # if this bug is actually itself a dupe, and has a count...
-            if (defined($dupes{$key}) && $count{$key} > 0) {
-                # add that count onto the bug it is a dupe of,
-                # and zero the count; the check is to avoid
-                # loops
-                if ($count{$dupes{$key}} != 0) {
-                    $count{$dupes{$key}} += $count{$key};
-                    $count{$key} = 0;
-                    $changed = 1;
-                }
-            }
-        }
-    }
-
-    # Remove the values for which the count is zero
-    foreach $key (keys(%count))
-    {
-        if ($count{$key} == 0) {
-            delete $count{$key};
-        }
-    }
-   
-    dbmclose(%count);
-}
-
-sub today {
-    my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
-    return sprintf "%04d%02d%02d", 1900 + $year, ++$mon, $dom;
-}
-
-sub today_dash {
-    my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
-    return sprintf "%04d-%02d-%02d", 1900 + $year, ++$mon, $dom;
-}
-