ripped out nspr20 wrong

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

mozilla/Makefile

@@ -0,0 +1,85 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and 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		= .
+
+NSPRDIR		= nsprpub
+NSPR20		= 1
+MOZILLA_CLIENT	= 1
+
+ifndef NO_MOCHA
+DIRS_JS		= js
+endif
+
+DIRS		= config coreconf $(NSPRDIR) jpeg dbm xpcom base network caps
+
+ifdef MOZ_NETCAST
+DIRS		+= netcast
+endif
+
+ifdef MOZ_JAVA
+DIRS		+= sun-java ldap ifc $(DIRS_JS) nav-java ifc/tools js/jsd
+else
+DIRS		+= sun-java nav-java $(DIRS_JS)
+endif
+
+ifndef NO_SECURITY
+DIRS		+= security
+endif
+
+DIRS		+= privacy
+
+DIRS		+= modules lib l10n cmd
+
+ifeq ($(STAND_ALONE_JAVA),1)
+DIRS		= config lib/xp $(NSPRDIR) jpeg modules/zlib sun-java ifc js ifc/tools sun-java/java
+endif
+
+include $(DEPTH)/config/rules.mk
+
+export:: envirocheck $(OBJS)
+
+# Running this rule assembles all the SDK source pieces into dist/sdk.
+# You'll need to run this rule on every platform to get all the
+# binaries (e.g. javah) copied there. You'll also have to do special
+# magic on a Mac.
+sdk-src::
+	$(SDKINSTALL) include/npapi.h $(SDK)/include/
+	$(SDKINSTALL) include/jri_md.h $(SDK)/include/
+	$(SDKINSTALL) include/jritypes.h $(SDK)/include/
+	$(SDKINSTALL) include/jri.h $(SDK)/include/
+	$(SDKINSTALL) lib/plugin/npupp.h $(SDK)/include/
+	$(SDKINSTALL) sdk/common/*.c* $(SDK)/common/
+	$(SDKINSTALL) sun-java/classsrc/$(ZIP_NAME).x $(SDK)/classes/$(ZIP_NAME)
+	$(SDKINSTALL) sdk/examples/simple/Source/*.c $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.java $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.class $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/_gen/*.h $(SDK)/examples/simple/Source/_gen/
+	$(SDKINSTALL) sdk/examples/simple/Source/_stubs/*.c $(SDK)/examples/simple/Source/_stubs/
+	$(SDKINSTALL) sdk/examples/simple/Unix/makefile.* $(SDK)/examples/simple/Unix/
+	$(SDKINSTALL) sdk/examples/simple/Testing/SimpleExample.html $(SDK)/examples/simple/Testing/
+	$(SDKINSTALL) sdk/examples/simple/readme.html $(SDK)/examples/simple/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/*.c $(SDK)/examples/UnixTemplate/Source/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Testing/Test.html $(SDK)/examples/UnixTemplate/Testing/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Unix/makefile.* $(SDK)/examples/UnixTemplate/Unix/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/readme.html $(SDK)/examples/UnixTemplate/
+
+sdk-bin::
+	cd sdk; $(MAKE); cd ..
+	$(SDKINSTALL) $(DIST)/bin/javah$(BIN_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/simple/Source/$(OBJDIR)/npsimple.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/$(OBJDIR)/nptemplate.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/

mozilla/Makefile.in

@@ -22,84 +22,106 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# The list of directories that need to be built to build the standalone
-# nglayout test program. The order is important.
-DIRS =				\
-  config			\
-  $(NULL)
+NSPRDIR		= $(topsrcdir)/nsprpub
+NSPRDIR_AC	= nsprpub
+NSPR20		= 1
+NSPR_MAKE_ARGS	= -C $(NSPRDIR) DIST=`pwd`/dist CC=$(CC) CCC=$(CXX) MOZILLA_CLIENT=$(MOZILLA_CLIENT) MOZ_DEBUG=$(MOZ_DEBUG) USE_PTHREADS=$(USE_PTHREADS) BUILD_OPT=$(BUILD_OPT) NO_MDUPDATE=$(NO_MDUPDATE) $@
 
-ifdef MOZ_BUILD_NSPR
-DIRS +=				\
-  nsprpub			\
-  $(NULL)
+ifndef NO_MOCHA
+DIRS_JS		= js
 endif
 
-DIRS +=				\
-  dbm				\
-  modules/libreg		\
-  xpcom				\
-  $(NULL)
-
-ifndef MOZ_NATIVE_ZLIB
-DIRS +=				\
-  modules/zlib			\
-  $(NULL)
+DIRS		= config coreconf 
+ifdef NSPR_AUTOCONF
+DIRS		+= $(NSPRDIR_AC)
 endif
+DIRS		+= dbm xpcom base network caps
 
 ifndef MOZ_NATIVE_JPEG
-DIRS +=				\
-  jpeg				\
-  $(NULL)
+DIRS		+= jpeg
 endif
 
-DIRS +=				\
-  modules/libutil		\
-  base				\
-  intl				\
-  js				\
-  modules/security/freenav	\
-  modules/libpref		\
-  modules/libimg		\
-  modules/oji			\
-  modules/plugin		\
-  caps				\
-  lib/xp			\
-  lib/libpwcac			\
-  network			\
-  htmlparser			\
-  expat             \
-  gfx				\
-  dom				\
-  view				\
-  widget			\
-  layout			\
-  rdf				\
-  webshell			\
-  editor			\
-  silentdl			\
-  sun-java			\
-  $(NULL)
-
-ifdef MOZ_BUILD_XPFE
-DIRS += xpfe
+ifdef MOZ_NETCAST
+DIRS		+= netcast
 endif
 
-ifdef MOZ_MAIL_NEWS
-DIRS += mailnews
+ifdef MOZ_JAVA
+DIRS		+= sun-java ldap ifc $(DIRS_JS) nav-java ifc/tools js/jsd
+else
+DIRS		+= sun-java nav-java $(DIRS_JS)
 endif
 
-include $(topsrcdir)/config/config.mk
+ifndef NO_SECURITY
+DIRS		+= security
+endif
 
+DIRS		+= privacy
+
+DIRS		+= modules lib l10n cmd
+
+ifeq ($(STAND_ALONE_JAVA),1)
+DIRS		= config lib/xp sun-java ifc js ifc/tools sun-java/java
+ifndef MOZ_NATIVE_JPEG
+DIRS		+= jpeg
+endif
+ifndef MOZ_NATIVE_ZLIB
+DIRS		+= modules/zlib
+endif
+endif
+
+ifndef NSPR_AUTOCONF
+export:: envirocheck $(OBJS)
+	$(MAKE) $(NSPR_MAKE_ARGS)
+
+libs::
+	$(MAKE) $(NSPR_MAKE_ARGS)
+               
+install::
+	$(MAKE) $(NSPR_MAKE_ARGS)
+               
+clean::
+	$(MAKE) $(NSPR_MAKE_ARGS)
+               
+realclean::
+	$(MAKE) $(NSPR_MAKE_ARGS)
+
+clobber::
+	$(MAKE) $(NSPR_MAKE_ARGS)
+               
+clobber_all::
+	$(MAKE) $(NSPR_MAKE_ARGS)
+
+endif # !NSPR_AUTOCONF
+	
 include $(topsrcdir)/config/rules.mk
 
-real_all: all
+# Running this rule assembles all the SDK source pieces into dist/sdk.
+# You'll need to run this rule on every platform to get all the
+# binaries (e.g. javah) copied there. You'll also have to do special
+# magic on a Mac.
+sdk-src::
+	$(SDKINSTALL) include/npapi.h $(SDK)/include/
+	$(SDKINSTALL) include/jri_md.h $(SDK)/include/
+	$(SDKINSTALL) include/jritypes.h $(SDK)/include/
+	$(SDKINSTALL) include/jri.h $(SDK)/include/
+	$(SDKINSTALL) lib/plugin/npupp.h $(SDK)/include/
+	$(SDKINSTALL) sdk/common/*.c* $(SDK)/common/
+	$(SDKINSTALL) sun-java/classsrc/$(ZIP_NAME).x $(SDK)/classes/$(ZIP_NAME)
+	$(SDKINSTALL) sdk/examples/simple/Source/*.c $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.java $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.class $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/_gen/*.h $(SDK)/examples/simple/Source/_gen/
+	$(SDKINSTALL) sdk/examples/simple/Source/_stubs/*.c $(SDK)/examples/simple/Source/_stubs/
+	$(SDKINSTALL) sdk/examples/simple/Unix/makefile.* $(SDK)/examples/simple/Unix/
+	$(SDKINSTALL) sdk/examples/simple/Testing/SimpleExample.html $(SDK)/examples/simple/Testing/
+	$(SDKINSTALL) sdk/examples/simple/readme.html $(SDK)/examples/simple/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/*.c $(SDK)/examples/UnixTemplate/Source/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Testing/Test.html $(SDK)/examples/UnixTemplate/Testing/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Unix/makefile.* $(SDK)/examples/UnixTemplate/Unix/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/readme.html $(SDK)/examples/UnixTemplate/
 
-real_export: export
-
-real_libs: libs
-
-real_install: install
-
-real_clobber: clobber
-
-real_depend: depend
+sdk-bin::
+	cd sdk; $(MAKE); cd ..
+	$(SDKINSTALL) $(DIST)/bin/javah$(BIN_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/simple/Source/$(OBJDIR)/npsimple.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/$(OBJDIR)/nptemplate.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/

mozilla/README/mozilla/classic-mac.html

@@ -1,443 +0,0 @@
-
-<HEAD>
-   <TITLE>Building Mozilla on the Macintosh PPC platform</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" LINK="#0000EE" VLINK="#551A8B">
-<P>
-
-<HR>
-
-</P>
-
-<H1>Building Mozilla on the Macintosh PPC platform</H1>
-
-<H2>Daniel Nunes, <A HREF="mailto:leaf@netscape.com"><TT>leaf@netscape.com</TT></A></H2>
-
-<P>v 1.1, 1998-9-29<BR>
-updated for the Pro4 IDE</P>
-
-<P>
-
-<HR>
-
-<I>How to build Mozilla on a Macintosh PPC System.</I>
-
-<HR>
-
-</P>
-
-<H2>1. <A HREF="#s1">Introduction</A></H2>
-
-<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
-
-<UL>
-   <LI><A HREF="#ss2.1">2.1 Get the Code </A></LI>
-   
-   <LI><A HREF="#ss2.2">2.2 Requirements</A></LI>
-   
-   <LI><A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
-   
-   <LI><A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
-</UL>
-
-<H2>3. <A HREF="#s3"> Common Problems </A></H2>
-
-<H2>4. <A HREF="#s4"> Credits </A></H2>
-
-<P>
-
-<HR>
-
-</P>
-
-<H2><A NAME=s1></A>1. Introduction</H2>
-
-<P>What this document is: A guide to building the Mozilla
-application. This includes:</P>
-
-<OL>
-   <LI>A listing of the development tools you will need to build
-   Mozilla.</LI>
-   
-   <LI>A list of environment variables you will need to set before
-   building.</LI>
-</OL>
-
-<P>If you're looking for documentation on developing features or
-fixing bugs, the Mozilla <A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical
-Documents </A> or <A HREF="http://www.mozilla.org/library.html">
-Library </A> are probably what you're looking for.</P>
-
-<P>
-
-<HR>
-
-</P>
-
-<H2><A NAME=s2></A>2. Building Mozilla</H2>
-
-<P>&nbsp;</P>
-
-<UL>
-   <LI>Each of the following subsections describes, or gives
-   references to descriptions of, the steps necessary to build
-   Mozilla.
-   
-   <H2><A NAME="ss2.1"></A>2.1 Get the Code</H2>
-   
-   <P>&nbsp;</P>
-   
-   <UL>
-      <LI>There are two principal ways of getting the code, <A HREF="http://www.mozilla.org/download.html">
-      ftp</A> and <A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
-      CVS will provide the most current code for building, but is
-      slower than ftp. Ftp drops are generally produced once per
-      month, and are known to compile.</LI>
-   </UL>
-   
-   <P>&nbsp;</P>
-   
-   <H2><A NAME="ss2.2"></A>2.2 Requirements</H2>
-   
-   <P>The following need to be installed:</P>
-   
-   <UL>
-      <LI>CodeWarrior (CW) Pro4 - obtainable from <A HREF="http://www.metrowerks.com">Metrowerks</A>.
-      See <A HREF="#s3">Common Sticking Points</A> if you have a
-      different version. Mozilla will no longer build with anything
-      earlier.</LI>
-      
-      <LI>PowerPlant - obtainable from the CodeWarrior CD.</LI>
-      
-      <LI>MSL - the Metrowerks Standard Library, obtainable from the
-      CodeWarrior CD</LI>
-      
-      <LI><A HREF="ftp://ftp.boingo.com//dan/WASTE/waste-13.hqx">WASTE
-      1.3</A></LI>
-      
-      <LI><A HREF="http://www.bact.wisc.edu/CWASTEEdit/CWASTEEdit.sit.hqx">CWASTE
-      1.6.2</A></LI>
-      
-      <LI><A HREF="ftp://ftp.scripting.com/userland/menuSharingToolkit4.1.sit.hqx">Menu
-      Sharing Toolkit</A> (from UserLand)</LI>
-      
-      <LI><A HREF="ftp://ftp.share.com/pub/internet-configuration/ICProgKit1.4.sit">Internet
-      Config 1.4 SDK</A></LI>
-      
-      <LI><A HREF="http://www.mooseyard.com/Jens/Software/">AEGizmos
-      1.4.2</A></LI>
-      
-      <LI><A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_tool.bin">MacPerl
-      5 MPW Tool</A></LI>
-      
-      <LI><A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_appl.bin">MacPerl
-      5 Application</A></LI>
-      
-      <LI>The module Mac:AppleEvents:Simple, which should be stored
-      in your Perl library folder under :Mac:AppleEvents:Simple.pm,
-      may be downloaded <A HREF="http://www.perl.com/CPAN-local/modules/by-module/Mac/Mac-AppleEvents-Simple-0.10.tgz">here</A>.</LI>
-      
-      <LI>The module Mac:Apps:Launch, which should be stored in your
-      Perl library folder under :Mac:Apps:Launch.pm, may be
-      downloaded <A HREF="http://www.perl.com/CPAN-local/modules/by-module/Mac/Mac-Apps-Launch-1.30.tar.gz">here</A>.</LI>
-      
-      <LI>MakeStub - MPW (installed with CodeWarrior Heaven option).
-      If you choose not to install MPW, it is located on the MacOS
-      Tools CD in "CW Pro 4 Tools:CodeWarrior MPW:MPW:Tools"</LI>
-      
-      <LI>RunTSScript - in Mozilla source distribution
-      (mozilla:build:mac:RunTSScript), needs to be installed by
-      hand</LI>
-      
-      <LI><A HREF="ftp://dev.apple.com/devworld/Tool_Chest/Core_Mac_OS_Tools/MPW_etc./MPW-GM/MPW/ToolServer.sit.hqx">ToolServer</A>
-      - or in the CW distribution (CW Pro 4 Tools:Apple Development
-      Tools:ToolServer 3.4.1.sit). <B>We recommend pulling it off the
-      CD</B> because it comes with configuration files for
-      CodeWarrior which you would have to create manually were you to
-      pull it off the net.</LI>
-      
-      <LI><A HREF="http://sunsite.cnlab-switch.ch/ftp/software/platform/macos/src/HTML/MPW_C.html">patch
-      2.1</A></LI>
-   </UL>
-   
-   <P>Hardware/OS</P>
-   
-   <UL>
-      <LI>To build Navigator, you need a fast PPC Mac. The faster the
-      better.</LI>
-      
-      <LI>You will need about 96 MB of physical RAM to "fast link"
-      the app. You can still fast link if you give your machine 96 MB
-      of virtual memory, but then the VM hit is large enough to
-      counteract any improvement. One of our beta testers had a
-      machine with only 64MB of physical RAM (VM was off) and it ran
-      out of memory trying to link. Turning VM on got it to link, but
-      build time increased greatly.</LI>
-      
-      <LI>Reports from the net indicate that the optimized version
-      (MozillaPPC) take much less RAM to build than the 96MB we
-      suggest. If you are running out of memory, try building that
-      instead of the debug version (the debug symbols require a lot
-      of RAM come link time).</LI>
-      
-      <LI>You should be ok with a 400MB disk partition, even when
-      fully built. This does not include tools like the IDE, just
-      source.</LI>
-      
-      <LI>On an HFS+ volume, a full build takes about 110MB. HFS+ is
-      good, but utilities are sparse.</LI>
-   </UL>
-   
-   <P>&nbsp;</P>
-   
-   <H2><A NAME="ss2.3"></A>2.3 Setup the Build Environment</H2>
-   
-   <P>&nbsp;</P>
-   
-   <OL>
-      <LI>Install CodeWarrior from the CD. While it is large,
-      installing the "CodeWarrior Heaven" option will guarantee that
-      you have everything you need. This will give you PowerPlant,
-      MSL, and MPW. If you choose to install less, proceed at your
-      own risk.</LI>
-      
-      <LI>In the Finder, increase the memory partition of the IDE to
-      15MB (you can get by with 12, if need be).</LI>
-      
-      <LI>Uncompress the StuffIt Archive for ToolServer. The goal is
-      to let ToolServer and MPW share the same Tools directory so you
-      don't need to have multiple versions of tools. Do the
-      following:
-      
-      <OL>
-         <LI>Open ToolServer's Tools folder. There is one file called
-         "RMetrowerks".</LI>
-         
-         <LI>Move RMetrowerks to Tools folder of MPW. MPW folder must
-         be at "Metrowerks:Codewarrior MPW:MPW" if you installed
-         Codewarrior Heaven.</LI>
-         
-         <LI>Remove ToolServer's Tools folder.</LI>
-         
-         <LI>Now create an alias of Tools folder in "CodeWarrior MPW"
-         and move it to your ToolServer folder. Rename the alias
-         (probably called "Tools alias") to "Tools"</LI>
-         
-         <LI><FONT COLOR="#FF0000"><B>IMPORTANT</B></FONT>: Make sure
-         you only have one instance of ToolServer on your machine. If
-         the build script finds the wrong one, the correct tools will
-         not be found and strange things will happen.</LI>
-      </OL>
-      </LI>
-      
-      <LI>After installing the MacPerl MPW Tool distribution (run the
-      InstallerVISE application), in the "MacPerl &#131;" folder,
-      there will be an MPW tool named "perl". Install this in MPW's
-      tools folder.</LI>
-      
-      <LI>Install the MacPerl Application (run the InstallerVISE
-      application). You can install this anywhere, but it is
-      recommended that you install it inside of your CodeWarrior
-      folder for easy reference. After installation, you will need to
-      set a preference to enable double-click launch of the perl
-      scripts. This preference is set by going under the Edit Menu to
-      Preferences. Click on the "Script" button and hit the radio
-      button "Run Scripts opened from Finder"</LI>
-      
-      <LI>Install the "patch" and "MakeStub" Tools in the tools
-      folder. Note that "MakeStub" is automatically installed by the
-      "CodeWarrior Heaven" install option.</LI>
-      
-      <LI>Install RunTSScript (found in the Mozilla source
-      distribution) in the compilers folder in your build environment
-      ("Metrowerks:Metrowerks Codewarrior:Codewarrior
-      Plugins:Compilers")</LI>
-      
-      <LI>Next, after downloading all the 3rd party software
-      components, drag WASTE, CWASTE, Menu Sharing, Internet Config,
-      and the AEGizmo folders (just as they are) into the "MacOS
-      Support" folder in your build environment.</LI>
-      
-      <LI>Create a folder inside the PowerPlant folder
-      (Metrowerks:Metrowerks CodeWarrior:MacOS Support:PowerPlant)
-      called "_Will Be Obsolete" Make sure you include the leading
-      underscore.</LI>
-      
-      <LI>Unstuff the obsolete LGA classes (located on the Reference
-      CD in "CodeWarrior Examples:MacOS Examples:PowerPlant
-      Examples:Obsolete PP Items:Old GA Classes.sit) and place the
-      resulting folder into the "_Will Be Obsolete" folder you
-      created in the previous step.</LI>
-      
-      <LI>Start ToolServer from within CodeWarrior (or use MPW if you
-      are brave enough). We're about to patch some files. Make sure
-      the ToolServer menu is in the CodeWarrior menu bar by turning
-      on the <A HREF="IDEPrefs.gif">preference</A> under the "Extras"
-      panel in the IDE Preferences (not the project preferences!).
-      The menu bar should look like this:
-      
-      <P><IMG SRC="IDEMenuBar.gif" WIDTH=359 HEIGHT=20 X-CLARIS-USEIMAGEWIDTH X-CLARIS-USEIMAGEHEIGHT ALIGN=bottom></P>
-      
-      <P>Choose "Start ToolServer" from the ToolServer menu (this is
-      the icon menu between "Window" and "Help" in the menubar
-      above). You will now see a window with no close box. This is
-      your ToolServer Worksheet where you will type (or cut &amp;
-      paste) the commands for the following steps.</P>
-      
-      <P>In case you have never used MPW/ToolServer before, the
-      following is <B>very important</B>. Pressing "return" does not
-      execute commands like you might think. It just inserts a
-      newline into the worksheet like a normal text editor. <B>To
-      actually get ToolServer to execute the command, you must press
-      "Enter" (lower right of numeric keypad).</B> This executes the
-      line that the cursor is on, and only that line. If you want to
-      execute multiple lines at once, select them all and hit
-      Enter.</P></LI>
-      
-      <LI>Set the shell variables {IDE} and {Source} to the correct
-      paths for your build environment. {IDE} is where your
-      CodeWarrior IDE is located. {Source} is the folder containing
-      the toplevel "ns" folder of the Mozilla source. Mine look like
-      this (don't forget to keep the quotes if your path includes
-      spaces), yours will almost certainly be different
-      (<FONT COLOR="#FF0000">to punctuate this, the things you need
-      to change are in red</FONT>).
-      
-      <PRE>Set IDE "<FONT COLOR="#FF0000">Develop:CW Pro 4:Metrowerks CodeWarrior:</FONT>"
-Set Source "<FONT COLOR="#FF0000">Source:FreeSource:</FONT>"</PRE></LI>
-      
-      <LI>Execute the following lines to patch menusharing.c to allow
-      it to compile with the new Universal Headers. It references an
-      obsolete header file (GestaltEqu.h).
-      
-      <PRE>directory "{IDE}MacOS Support:Menu Sharing Toolkit 4.1:"
-patch menusharing.c "{Source}mozilla:lib:mac:patches:menusharing.patch"</PRE></LI>
-      
-      <LI>You need to patch stat.mac.h to fix a problem in MSL where
-      lines were omitted.
-      
-      <PRE>directory "{IDE}Metrowerks Standard Library:MSL C:MSL Mac:Public Includes"
-patch stat.mac.h "{Source}mozilla:lib:mac:patches:stat.mac.h.patch"</PRE></LI>
-      
-      <LI>Congratulations! Now you are ready to build. Once these
-      steps are done, you don't have to repeat these setups the next
-      time!</LI>
-   </OL>
-   
-   <P>&nbsp;</P>
-   
-   <H2><A NAME="ss2.4"></A>2.4 Run the build</H2>
-   
-   <UL>
-      <LI>In the folder mozilla:build:mac:, there are several Perl
-      scripts with names of the form BuildMozillaXXX.pl, where XXX is
-      "Optimized", "Debug", "Tinderbox", et al. Each script builds
-      the corresponding version of Mozilla. If you configured the
-      MacPerl application to execute scripts that are opened from the
-      finder, all you have to do is double click on the appropriate
-      one; otherwise, launch MacPerl, and run the appropriate script
-      from the "Run Script..." menu item.
-      
-      <P>These `configured build' scripts are simple, and you might
-      want to make your own to force your build to StopForErrors(),
-      or alternatively DontStopForErrors(), et al. You can set up
-      certain build-script variables and (soon) compile-time flags.
-      Compare the supplied scripts to figure out what you might want.
-      Note that CodeWarriorLib, Moz.pm, and BuildList.pm, are
-      AppleScript libraries and Perl modules meant to be used by a
-      `configured build'. Use your favorite POD viewer (Shuck comes
-      with MacPerl) to view the documentation in the Perl
-      scripts.</P>
-      
-      <P>If there were any errors in any of the projects along the
-      way, the script will stop at that point and the IDE will tell
-      you the errors. You can fix them and make sure they current
-      project builds, but to continue the automation, you have to
-      start from the beginning by double-clicking the script again.
-      This isn't quite as bad as it sounds because the previous
-      projects are already built (unless you changed some major
-      header file). Please note that stopping the script once it has
-      started is difficult. We are working to address this issue.</P>
-      
-      <P>After the build is complete, you can find aliases to the
-      built libraries and the final Mozilla application. Debug builds
-      are built to Mozilla:dist:client_debug, while optimized builds
-      are built to Mozilla:dist:client.</P>
-      
-      <P>Don't worry too much about the numerous warnings generated
-      during the build. We try our best to get the XP teams to use
-      real compilers, but alas, they continue to write warning-laden
-      code. There is also some generated code (Java is one example)
-      that has a lot of warnings that we can't help either. If you
-      write any new code, please help us in our quest to get zero
-      warnings.</P></LI>
-   </UL>
-   </LI>
-</UL>
-
-<P>
-
-<HR>
-
-</P>
-
-<H2><A NAME=s3></A>3. Common Sticking Points</H2>
-
-<UL>
-   <LI><B>I only have CodeWarrior Pro3 or Pro2. How do i build with
-   it?</B>
-   
-   <UL>
-      <LI>Currently, the answer is, "You don't." We make use of
-      several classes in PowerPlant which recently appeared in Pro4.
-      Time to upgrade, I'm afraid. Don't even try opening the
-      projects with Pro2 because you will get data loss and have to
-      throw the project away (it won't even prompt you!)</LI>
-   </UL>
-   </LI>
-   
-   <LI><B>I'm having problems building. MacPerl tells me it can't
-   fine MemAllocatorStubs</B>
-   
-   <UL>
-      <LI>It sounds like your ToolServer environment is not setup
-      correctly. Make sure you follow the directions to the letter.
-      You could also be seeing this if you have multiple versions of
-      ToolServer on your computer and the Finder lauches the wrong
-      one. This is very common, as the <I>Carbon Dater</I> app from
-      Apple DTS contains a copy of ToolServer. Either remove all the
-      other versions of ToolServer or make sure you launch the
-      appropriate version before you start building.</LI>
-   </UL>
-   </LI>
-   
-   <LI><B>The IDE runs out of memory building jsinterp.c. What do I
-   do?</B>
-   
-   <UL>
-      <LI>We have seen this every now and then, and it only appears
-      to show up when building optimized (non-debug) builds. You can
-      normally get around this by building that file by itself
-      (select it and choose "Compile") and then continuing the make.
-      We're not sure why this is happening, so if you have any
-      answers or solutions, please let us know!</LI>
-   </UL>
-   </LI>
-</UL>
-
-<P>
-
-<HR>
-
-</P>
-
-<H2><A NAME=s4></A>4. Credits</H2>
-
-<UL>
-   <LI>The majority of this document is taken from the build document
-   included in the Mozilla source distribution at
-   README:mozilla:macbuild.htm written by Mike Pinkerton, <A HREF="mailto:pinkerton@netscape.com">
-   pinkerton@netscape.com</A>.</LI>
-</UL>
-</BODY>
-</HTML>

mozilla/README/mozilla/classic-unix.html

@@ -1,158 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Building Mozilla on unix platforms</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
-ALINK="#FF0000">
-<HR>
-<H1>
-Building Mozilla on Unix platforms</H1>
-
-<H2>
-Daniel Nunes, <TT><A HREF="mailto:leaf@netscape.com">leaf@netscape.com</A></TT></H2>
-v 1.1, June 1998
-
-<P>
-<HR><I>How to build Mozilla on a Unix System.</I>
-<HR>
-<H2>1. <A HREF="#s1">Introduction</A></H2>
-
-<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
-
-<UL>
-<LI>
-<A HREF="#ss2.1">2.1 Get the Code </A></LI>
-
-<LI>
-<A HREF="#ss2.2">2.2 Requirements</A></LI>
-
-<LI>
-<A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
-
-<LI>
-<A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
-
-<LI>
-<A HREF="#ss2.5">2.5 Run the Lizard </A></LI>
-</UL>
-
-<H2>3. <A HREF="#s3"> Common Problems </A></H2>
-
-<HR>
-<H2><A NAME="s1">1. Introduction</A></H2>
-
-<P>
-What this document is: A guide to building the Mozilla application.
-<BR>
-This includes:
-<OL>
-<LI> A listing of the development tools you will need to build Mozilla. </LI>
-<LI> A list of environment variables you will need to set before building. </LI>
-</OL>
-<P>
-If you're looking for documentation on developing features or fixing bugs,
-the Mozilla
-<A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical Documents
-</A> or <A HREF="http://www.mozilla.org/library.html"> Library </A>
-are probably what you're looking for.
-<P>
-<HR>
-<H2><A NAME="s2">2. Building Mozilla </A></H2>
-<P>
-<UL>Each of the following subsections describes, or gives references to
-descriptions of, the steps necessary to build Mozilla.
-</UL>
-<H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
-<P>
-<UL>
-There are two principal ways of getting the code,
-<A HREF="http://www.mozilla.org/download.html"> ftp</A> and
-<A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
-CVS will provide the most current code for building, but is
-slower than ftp. Ftp drops are generally produced once per month,
-and are known to compile.
-</UL>
-<P>
-<H2><A NAME="ss2.2">2.2 Requirements</A></H2>
-<UL>
-The following should be installed:
-<UL>
-<LI>Motif 1.2
-<LI>The native C/C++ compiler (or GNU C/C++ compiler 2.7.2 in lieu of the 
-    native compiler)
-<LI>GNU make 3.74 or better
-<LI>Perl (or, if you have no Perl, then set <CODE>PERL=/bin/echo</CODE>)
-</UL>
-<P>
-Your hardware should be equal to, or better than:
-<UL>
-32 MB RAM, 128 MB swap (64 MB RAM recommended)
-</UL>
-</UL>
-<P>
-<H2><A NAME="ss2.3">2.3 Setup the Build Environment</A></H2>
-<P>
-<UL>
-The following environment variables need to be set:
-<CODE>
-<PRE>
-MOZILLA_CLIENT=1
-MOZ_MEDIUM=1
-NO_MDUPDATE=1
-</PRE>
-</CODE>
-Optionally, you can set <CODE>BUILD_OPT=1</CODE> if you don't want a debug
-build.
-<P>
-If your Motif libraries are installed in a non-standard place, you can tell
-the Mozilla makefiles where to look by setting
-<CODE>MOZILLA_MOTIF_SEARCH_PATH</CODE> to point to the directory in which
-your Motif installation resides.
-<P>
-Environment variables are set by the shell, and there are two common ways 
-of setting them. <BR> 
-Type <CODE>setenv VARIABLE value</CODE> or <CODE>export VARIABLE=value</CODE>.
-<P>
-</UL>
-
-<H2><A NAME="ss2.4">2.4 Run the build </A></H2>
-<UL>
-Change to the directory you copied the source into (for example,
-<CODE>cd /builds</CODE>). If this directory was empty before you
-installed the source, there should be two directories here:
-<CODE>README</CODE> and <CODE>mozilla</CODE>.
-<CODE>
-<PRE>
-cd mozilla
-gmake
-</PRE>
-</CODE>
-</UL>
-<H2><A NAME="ss2.5">2.5 After the build </A></H2>
-<UL>
-You may notice that if you try running mozilla-export right after the build, 
-you'll run into a problem. You need to set <CODE>LD_LIBRARY_PATH</CODE> to 
-<CODE>
-${LD_LIBRARY_PATH}:/PATH_TO_SOURCE/mozilla/dist/Linux2.0.32_x86_OPT.OBJ/bin
-</CODE> (where <CODE>PATH_TO_SOURCE</CODE> is the full path to your source 
-tree) before the dynamically linked binary will run. <BR><BR>
-This varies by platform:<br>
-<UL>
-<LI>On HP-UX, the equivalent environment variable is <CODE>SHLIB_PATH</CODE>.
-<LI>On AIX, the equivalent environment variable is <CODE>LIBPATH</CODE>.
-</UL>
-</UL>
-
-<HR>
-<H2><A NAME="s3">3. Common Sticking Points</A></H2>
-<LI>My linker dies with this error: undefined reference to `_Xsetlocale'
-<UL>If this error occurs, you might have to recompile libX11.so
-with the -DX_LOCALE flag (thanks to Scott Lampert,
-<A HREF="mailto:fortunato@heavymetal.org">fortunato@heavymetal.org</A>).
-
-</UL>
-<HR>
-
-
-</BODY>
-</HTML>

mozilla/README/mozilla/classic-win.html

@@ -1,217 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Building Mozilla on Microsoft Windows 32-bit platforms</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
-ALINK="#FF0000">
-<HR>
-<H1>
-Building Mozilla on Microsoft Windows 32-bit platforms</H1>
-
-<H2>
-Daniel Nunes, <TT><A HREF="mailto:leaf@netscape.com">leaf@netscape.com</A></TT>
-</H2>
-v 1.0, June 1998
-
-<P>
-<HR><I>How to build Mozilla on a Microsoft Windows 32-bit System.</I>
-<HR>
-<H2>1. <A HREF="#s1">Introduction</A></H2>
-
-<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
-
-<UL>
-<LI>
-<A HREF="#ss2.1">2.1 Get the Code </A></LI>
-
-<LI>
-<A HREF="#ss2.2">2.2 Requirements</A></LI>
-
-<LI>
-<A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
-
-<LI>
-<A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
-</UL>
-
-<H2>3. <A HREF="#s3"> Common Problems </A></H2>
-
-<HR>
-<H2><A NAME="s1">1. Introduction</A></H2>
-
-<P>
-What this document is: A guide to building the Mozilla application.
-<BR>
-This includes:
-<OL>
-<LI> A listing of the development tools you will need to build Mozilla. </LI>
-<LI> A list of environment variables you will need to set before building. </LI>
-</OL>
-<P>
-If you're looking for documentation on developing features or fixing bugs,
-the Mozilla
-<A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical Documents
-</A> or <A HREF="http://www.mozilla.org/library.html"> Library </A>
-are probably what you're looking for.
-<P>
-<HR>
-<H2><A NAME="s2">2. Building Mozilla </A></H2>
-<P>
-<UL>Each of the following subsections describes, or gives references to
-descriptions of, the steps necessary to build Mozilla.
-<H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
-<P>
-<UL>
-There are two principal ways of getting the code, 
-<A HREF="http://www.mozilla.org/download.html"> ftp</A> and 
-<A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
-CVS will provide the most current code for building, but is
-slower than ftp. Ftp drops are generally produced once per month,
-and are known to compile.
-
-</UL>
-<P>
-<H2><A NAME="ss2.2">2.2 Requirements</A></H2>
-<UL>
-The following need to be installed:
-<UL>
-<LI>Microsoft Visual C++ version 4.2 or later
-<LI>GNU Tools for Microsoft Windows, located:
-<UL>
-<LI><A HREF="http://www.cygnus.com/misc/gnu-win32">Cygnus</A></LI>
-<LI><A HREF="http://www.gnu.org/order/ftp.html">GNU home page</A></LI>
-<LI><A HREF="ftp://prep.ai.mit.edu/pub/gnu">MIT</A></LI>
-</UL>
-Specifically, you'll need:
-<UL><CODE>
-cp.exe<BR>
-rm.exe<BR>
-uname.exe<BR>
-</CODE>
-</UL>
-Netscape has internally modified version of gmake, shmsdos and win32gnu
-that we use to get around some problems we were having keeping in sync
-with the Unix version of gmake. This version of gmake can be found in the 
-Windows Build Tools package, which can be ftp'd from
-<A HREF="http://www.mozilla.org/download-mozilla.html"> the Mozilla
-Download page</A>.
-The three files you will need are:
-<UL><CODE>
-gmake.exe<BR>
-shmsdos.exe<BR>
-uname.exe<BR>
-</CODE>
-</UL>
-
-</UL>
-<P>
-Hardware/OS
-<UL>
-<LI>Pentium 133 MHz or better</LI>
-<LI>64 MB RAM, 128 MB recommended</LI>
-<LI>250 MB NTFS or 500 MB FAT disk space</LI>
-<LI>NT 4.0 is preferred; NT 3.51 will also work.
-</LI>
-</UL>
-</UL>
-<P>
-<H2><A NAME="ss2.3">2.3 Setup the Build Environment</A></H2>
-<P>
-<UL>
-The following environment variables need to be set:
-<UL>
-<CODE>
-set MOZ_BITS=32
-<BR>
-set MOZ_DEBUG=1 (set this only if you want to build a debug build)
-<BR>
-set MOZ_MEDIUM=1
-<BR>
-set MOZ_NT=351 (if running NT3.51)
-<BR>
-set MOZ_OUT=(optional: specifies location of resultant executable)
-<BR>
-set MOZ_SRC=(top of your tree, for example: set MOZ_SRC=d:\mozilla_source 
-    if this is the directory where you checked or unzipped the source into)
-<BR>
-set MOZ_TOOLS=(the parent directory of the GNU tools 'bin' directory. The build
-    looks for MOZ_TOOLS\bin\gmake.exe, so make sure that the gmake.exe from
-    the Windows Build Tools package resides there.)
-<BR>
-set NSPR20=1
-<BR>
-set _MSC_VER=1100 (if you are running VC++ 5.0) or 1200 
-(if you are running VC++ 6.0)
-<BR>
-</CODE>
-</UL>
-<BR>
-<P>
-</UL>
-
-<H2><A NAME="ss2.4">2.4 Run the build </A></H2>
-<UL>
-Change to the directory you copied the source into (for example,
-<CODE>cd d:\mozilla_source</CODE>). If this directory was empty before you
-installed the source, there should be two directories here:
-<CODE>README</CODE> and <CODE>mozilla</CODE>.
-<CODE>
-<PRE>
-cd mozilla\config
-nmake /f makefile.win
-cd ..
-nmake /f client.mak
-</PRE>
-</CODE>
-</UL>
-</UL>
-
-<HR>
-<H2><A NAME="s3">3. Common Sticking Points</A></H2>
-<UL>
-<LI><B>nmake has a 'fatal error', listing one of the GNU commands and a 
-hexadecimal return code.</B>
-<UL>
-This will happen as a result of not having the GNU tools and Windows Build
-tools in your path. Add the directories with the appropriate binaries to your 
-path.
-</UL>
-</LI>
-<LI>
-<B>It fails with the message "'.\WIN32' unexpected": </B>
-<UL>
-You didn't properly
-set the environment variables -- you must not include a space at the end
-of the set statements (be careful if you are cut'n'pasting).
-</UL>
-</LI>
-<LI>
-<B>It fails to build, with directory-related errors: </B>
-<UL>
-The full path
-to the source must not include any spaces. Additionally, the source must
-be extracted with an intact directory structure by a utility that understands
-long filenames. If in doubt, grab Info-Zip at 
-<A HREF="ftp://ftp.cdrom.com/pub/infozip">ftp://ftp.cdrom.com/pub/infozip</A>
-</UL>
-</LI>
-<LI>
-<B>It fails immediately with the message "Cannot find specified directory": 
-</B>
-<UL>
-You didn't properly set the environment variable MOZ_TOOLS; 
-this needs to be set to the path up to, but not including, the final \bin
-directory in the path to the gnu tools. So, the path to the tool executables 
-is '%MOZ_TOOLS%\bin\<executable>'.
-</UL>
-</LI>
-<LI>
-<B>I'm not running a 32-bit windows system, how do i build?</B>
-<UL>
-Currently, the build process depends on a 32-bit operating system. 
-Windows NT 4.0 is the recommended windows operating system. 
-</UL>
-</UL>
-<HR>
-</BODY>
-</HTML>

mozilla/README/mozilla/unix-build.html

@@ -1,15 +1,16 @@
 <HTML>
 <HEAD>
-<TITLE>Building the Mozilla client on unix platforms</TITLE>
+<TITLE>Building Mozilla on unix platforms</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
 ALINK="#FF0000">
 <HR>
-<H1>Building the Mozilla client on Unix platforms</H1>
+<H1>
+Building Mozilla on Unix platforms</H1>
 
 <H2>
-Daniel Nunes, <TT><A HREF="mailto:leaf@mozilla.org">leaf@mozilla.org</A></TT></H2>
-v 1.2, 1998-11-02
+Daniel Nunes, <TT><A HREF="mailto:leaf@netscape.com">leaf@netscape.com</A></TT></H2>
+v 1.0, June 1998
 
 <P>
 <HR><I>How to build Mozilla on a Unix System.</I>
@@ -26,10 +27,10 @@ v 1.2, 1998-11-02
 <A HREF="#ss2.2">2.2 Requirements</A></LI>
 
 <LI>
-<A HREF="#ss2.3">2.3 Build the Lizard</A></LI>
+<A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
 
 <LI>
-<A HREF="#ss2.4">2.4 After the Build</A></LI>
+<A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
 </UL>
 
 <H2>3. <A HREF="#s3"> Common Problems </A></H2>
@@ -37,28 +38,19 @@ v 1.2, 1998-11-02
 <HR>
 <H2><A NAME="s1">1. Introduction</A></H2>
 
-<P>
-Perhaps you are interested in building classic Mozilla, before the 
-fall of the old layout engine, and the rise of the new. If so, the
-<B><A HREF="classic-unix.html">Classic Mozilla Build document</A></B> 
-is what you're looking for.
-
-<P>
- 
 <P>
 What this document is: A guide to building the Mozilla application.
 <BR>
 This includes:
 <OL>
 <LI> A listing of the development tools you will need to build Mozilla. </LI>
-<LI> A sample set of commands to build Mozilla using the Autoconf 
-build system. </LI>
+<LI> A list of environment variables you will need to set before building. </LI>
 </OL>
 <P>
 If you're looking for documentation on developing features or fixing bugs,
 the Mozilla
-<A HREF="../tplist.html">Technical Documents</A> or 
-<A HREF="../../../library.html"> Library </A>
+<A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical Documents
+</A> or <A HREF="http://www.mozilla.org/library.html"> Library </A>
 are probably what you're looking for.
 <P>
 <HR>
@@ -67,56 +59,24 @@ are probably what you're looking for.
 <UL>Each of the following subsections describes, or gives references to
 descriptions of, the steps necessary to build Mozilla.
 </UL>
-<UL>
 <H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
 <P>
 <UL>
-
-Eventually, there will be two principal ways of getting the code,
-<A HREF="../../../download.html"> ftp</A> and
-<A HREF="../../../cvs.html"> CVS</A>.
-CVS will provide the most current code for building, but is
-slower than ftp. Ftp drops are generally produced once per month,
-and are known to compile on some machine, somewhere.
-
-<B>For now</B>, however, you must do the following to obtain the newest 
-browser source:
-<BR>
-<CODE>
-cvs co mozilla/nglayout.mk<BR>
-cd mozilla<BR>
-gmake -f nglayout.mk pull_all<BR>
-</CODE>
-<BR>
-This should pull all the right source.
+There are two principal ways of getting the code,
+<A HREF="http://www.mozilla.org/download.html"> ftp</A> and
+<A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
+CVS will provide the least outdated code for building, but is
+slower than ftp.
 </UL>
 <P>
 <H2><A NAME="ss2.2">2.2 Requirements</A></H2>
 <UL>
-The following should be installed:
+The following need to be installed:
 <UL>
-<LI>Motif 1.2
-<LI>The native C/C++ compiler (or GNU C/C++ compiler 2.7.2 in lieu of the 
-    native compiler)
+<LI>Motif 1.2 (2.1 recommended for RedHat Linux)
+<LI>GNU C/C++ compiler 2.7.2
 <LI>GNU make 3.74 or better
-<LI>Perl5
-<LI><A HREF="../../../projects/autoconf/">Autconf</A> requirements, 
-    including NSPR.
-<LI><CODE>LD_LIBRARY_PATH</CODE> must include the path to the NSPR
-    shared objects.<BR>
-    For most people, this means adding <CODE>/usr/local/nspr/lib</CODE> 
-    to <CODE>LD_LIBRARY_PATH</CODE> 
-    (either:
-     <BR> 
-    <CODE>setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/usr/local/nspr/lib</CODE>
-     <BR>
-      or 
-     <BR>
-    <CODE>export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/nspr/lib</CODE>
-     .<BR>
-     If you get an error like "No such variable" then omit the 
-     <CODE>${LD_LIBRARY_PATH}:</CODE> part
-   )
+<LI>Perl (or, if you have no Perl, then set <CODE>PERL=/bin/echo</CODE>)
 </UL>
 <P>
 Your hardware should be equal to, or better than:
@@ -125,37 +85,51 @@ Your hardware should be equal to, or better than:
 </UL>
 </UL>
 <P>
-<H2><A NAME="ss2.3">2.3 Build the Lizard</A></H2>
+<H2><A NAME="ss2.3">2.3 Setup the Build Environment</A></H2>
 <P>
 <UL>
+The following environment variables need to be set:
 <CODE>
-autoconf<BR>
-mkdir obj-`./build/autoconf/config.guess`<BR>
-cd obj-`./build/autoconf/config.guess`<BR>
-../configure --with-nspr=/usr/local/nspr --enable-toolkit=motif<BR>
-gmake depend<BR>
-gmake<BR>
+<PRE>
+MOZILLA_CLIENT=1
+MOZ_MEDIUM=1
+NO_SECURITY=1
+NO_MDUPDATE=1
+</PRE>
 </CODE>
+Optionally, you can set <CODE>BUILD_OPT=1</CODE> if you don't want a debug
+build.
+<BR>
+Environment variables are set by the shell, and each shell may or may not have
+its own way of setting them. Type <CODE>man setenv</CODE> to find out how your
+shell sets variables, if you don't know already.
+<P>
 </UL>
-<H2><A NAME="ss2.4">2.4 After the build </A></H2>
+
+<H2><A NAME="ss2.4">2.4 Run the build </A></H2>
 <UL>
-
-<LI> <CODE>cd dist/bin</CODE> and you should see links to the objects you
-      need to run <CODE>main</CODE>. 
-
-<LI>On most unixen LD_LIBRARY_PATH must be set to wherever the necessary
-libraries are. 
-
-<UL>
-<LI>On HP-UX, the equivalent environment variable is <CODE>SHLIB_PATH</CODE>.
-<LI>On AIX, the equivalent environment variable is <CODE>LIBPATH</CODE>.
-</UL>
-</UL>
+Change to the directory you copied the source into (for example,
+<CODE>cd /builds</CODE>). If this directory was empty before you
+installed the source, there should be two directories here:
+<CODE>README</CODE> and <CODE>mozilla</CODE>.
+<CODE>
+<PRE>
+cd mozilla
+gmake
+</PRE>
+</CODE>
 </UL>
 <HR>
 <H2><A NAME="s3">3. Common Sticking Points</A></H2>
-<LI>I'm sure there are bound to be some. Send 
-<A HREF="mailto:leaf@mozilla.org"> me</A> mail. 
+<LI>My linker dies with this error: undefined reference to `_Xsetlocale'
+<UL>If this error occurs, you might have to recompile libX11.so
+with the -DX_LOCALE flag (thanks to Scott Lampert,
+<A HREF="mailto:fortunato@heavymetal.org">fortunato@heavymetal.org</A>).
+This problem stems from use of an older version of RedHat Motif.
+Moving to Motif 2.1 should resolve this. There are probably other problems
+with using the older versions of Motif, but i haven't encountered them.
+
+</UL>
 <HR>
 
 

mozilla/aclocal.m4

@@ -1,8 +0,0 @@
-dnl
-dnl Local autoconf macros used with mozilla
-dnl The contents of this file are under the Public Domain.
-dnl 
-
-builtin(include, build/autoconf/gtk.m4)dnl
-builtin(include, build/autoconf/altoptions.m4)dnl
-

mozilla/allmakefiles.sh

@@ -1,345 +0,0 @@
-#! /bin/sh
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-# allmakefiles.sh - List of all makefiles. 
-#   Appends the list of makefiles to the variable, MAKEFILES.
-#   There is no need to rerun autoconf after adding makefiles.
-#   You only need to run configure.
-#
-#   Unused makefiles may be commented out with '#'.
-#   ('#' must be the first character on the line).
-
-# add_makefiles - Shell function to add makefiles to MAKEFILES
-add_makefiles() {
-  while read line; do
-    case $line in
-      \#*|dnl*) ;;
-      *) MAKEFILES="$MAKEFILES $line" ;;
-    esac
-  done
-}
-
-if [ -z "${srcdir}" ]; then
-    srcdir=.
-fi
-
-add_makefiles <<END_NGMAKEFILES
-Makefile
-base/Makefile
-base/public/Makefile
-base/src/Makefile
-base/src/motif/Makefile
-base/src/rhapsody/Makefile
-base/src/gtk/Makefile
-base/tests/Makefile
-config/Makefile
-config/autoconf.mk
-config/mkdepend/Makefile
-config/mkdetect/Makefile
-config/ports/Makefile
-dbm/Makefile
-dbm/include/Makefile
-dbm/src/Makefile
-dbm/tests/Makefile
-dom/Makefile
-dom/public/Makefile
-dom/public/base/Makefile
-dom/public/coreDom/Makefile
-dom/public/coreEvents/Makefile
-dom/public/css/Makefile
-dom/public/events/Makefile
-dom/public/html/Makefile
-dom/src/Makefile
-dom/src/base/Makefile
-dom/src/build/Makefile
-dom/src/coreDOM/Makefile
-dom/src/css/Makefile
-dom/src/events/Makefile
-dom/src/html/Makefile
-dom/src/jsurl/Makefile
-dom/tools/Makefile
-editor/Makefile
-editor/public/Makefile
-expat/Makefile
-expat/xmlparse/Makefile
-expat/xmltok/Makefile
-gfx/Makefile
-gfx/public/Makefile
-gfx/src/Makefile
-gfx/src/gtk/Makefile
-gfx/src/ps/Makefile
-gfx/src/motif/Makefile
-gfx/src/rhapsody/Makefile
-gfx/tests/Makefile
-htmlparser/Makefile
-htmlparser/robot/Makefile
-htmlparser/src/Makefile
-htmlparser/tests/Makefile
-htmlparser/tests/grabpage/Makefile
-htmlparser/tests/logparse/Makefile
-include/Makefile
-intl/Makefile
-intl/uconv/Makefile
-intl/uconv/public/Makefile
-intl/uconv/src/Makefile
-intl/uconv/tests/Makefile
-intl/uconv/ucvja/Makefile
-intl/uconv/ucvlatin/Makefile
-intl/uconv/ucvja2/Makefile
-intl/locale/Makefile
-intl/locale/public/Makefile
-intl/locale/src/Makefile
-intl/locale/src/unix/Makefile
-intl/locale/tests/Makefile
-intl/lwbrk/Makefile
-intl/lwbrk/src/Makefile
-intl/lwbrk/public/Makefile
-intl/lwbrk/tests/Makefile
-intl/unicharutil/Makefile
-intl/unicharutil/src/Makefile
-intl/unicharutil/public/Makefile
-intl/unicharutil/tests/Makefile
-intl/unicharutil/tools/Makefile
-intl/strres/Makefile
-intl/strres/public/Makefile
-intl/strres/src/Makefile
-intl/strres/tests/Makefile
-jpeg/Makefile
-js/Makefile
-js/jsd/Makefile
-js/jsd/classes/Makefile
-js/src/Makefile
-js/src/fdlibm/Makefile
-js/src/liveconnect/Makefile
-js/src/liveconnect/classes/Makefile
-# js/src/xpcom/Makefile
-js/src/xpconnect/Makefile
-js/src/xpconnect/md/Makefile
-js/src/xpconnect/md/unix/Makefile
-js/src/xpconnect/test/Makefile
-layout/Makefile
-layout/base/Makefile
-layout/base/public/Makefile
-layout/base/src/Makefile
-layout/base/tests/Makefile
-layout/build/Makefile
-layout/events/Makefile
-layout/events/public/Makefile
-layout/events/src/Makefile
-layout/html/Makefile
-layout/html/base/Makefile
-layout/html/base/src/Makefile
-layout/html/content/Makefile
-layout/html/content/public/Makefile
-layout/html/content/src/Makefile
-layout/html/document/Makefile
-layout/html/document/src/Makefile
-layout/html/forms/Makefile
-layout/html/forms/public/Makefile
-layout/html/forms/src/Makefile
-layout/html/style/Makefile
-layout/html/style/public/Makefile
-layout/html/style/src/Makefile
-layout/html/table/Makefile
-layout/html/table/public/Makefile
-layout/html/table/src/Makefile
-layout/html/tests/Makefile
-layout/tools/Makefile
-layout/xml/Makefile
-layout/xml/content/Makefile
-layout/xml/content/public/Makefile
-layout/xml/content/src/Makefile
-layout/xml/document/Makefile
-layout/xml/document/public/Makefile
-layout/xml/document/src/Makefile
-layout/xul/Makefile
-layout/xul/base/Makefile
-layout/xul/base/src/Makefile
-layout/xul/content/Makefile
-layout/xul/content/src/Makefile
-# lib/liblayer/Makefile
-# lib/liblayer/include/Makefile
-# lib/liblayer/src/Makefile
-lib/libpwcac/Makefile
-lib/xp/Makefile
-modules/libimg/Makefile
-modules/libimg/classes/Makefile
-modules/libimg/classes/netscape/Makefile
-modules/libimg/classes/netscape/libimg/Makefile
-modules/libimg/png/Makefile
-modules/libimg/public/Makefile
-modules/libimg/src/Makefile
-modules/libpref/Makefile
-modules/libpref/admin/Makefile
-modules/libpref/l10n/Makefile
-modules/libpref/public/Makefile
-modules/libpref/src/Makefile
-modules/libreg/Makefile
-modules/libreg/include/Makefile
-modules/libreg/src/Makefile
-modules/libutil/Makefile
-modules/libutil/public/Makefile
-modules/libutil/src/Makefile
-modules/oji/Makefile
-modules/oji/public/Makefile
-modules/oji/src/Makefile
-modules/plugin/Makefile
-modules/plugin/nglsrc/Makefile
-modules/plugin/public/Makefile
-modules/plugin/src/Makefile
-modules/plugin/test/Makefile
-modules/security/freenav/Makefile
-modules/zlib/Makefile
-modules/zlib/src/Makefile
-nav-java/Makefile
-nav-java/stubs/Makefile
-nav-java/stubs/include/Makefile
-nav-java/stubs/jri/Makefile
-nav-java/stubs/src/Makefile
-network/Makefile
-network/cache/Makefile
-network/cache/nu/Makefile
-network/cache/nu/include/Makefile
-network/cache/nu/public/Makefile
-network/cache/nu/src/Makefile
-network/cache/nu/tests/Makefile
-network/cache/nu/tests/fftest/Makefile
-network/client/Makefile
-network/cnvts/Makefile
-network/cstream/Makefile
-network/main/Makefile
-network/mimetype/Makefile
-network/public/Makefile
-network/module/Makefile
-network/module/tests/Makefile
-network/protocol/Makefile
-network/protocol/about/Makefile
-network/protocol/callback/Makefile
-network/protocol/dataurl/Makefile
-network/protocol/file/Makefile
-network/protocol/ftp/Makefile
-network/protocol/gopher/Makefile
-network/protocol/http/Makefile
-network/protocol/js/Makefile
-network/protocol/ldap/Makefile
-network/protocol/marimba/Makefile
-network/protocol/remote/Makefile
-network/protocol/sockstub/Makefile
-network/util/Makefile
-rdf/Makefile
-rdf/base/Makefile
-rdf/base/idl/Makefile
-rdf/base/public/Makefile
-rdf/base/src/Makefile
-rdf/util/Makefile
-rdf/util/public/Makefile
-rdf/util/src/Makefile
-rdf/build/Makefile
-rdf/content/Makefile
-rdf/content/public/Makefile
-rdf/content/src/Makefile
-rdf/datasource/Makefile
-rdf/datasource/public/Makefile
-rdf/datasource/src/Makefile
-rdf/tests/Makefile
-rdf/tests/localfile/Makefile
-rdf/tests/rdfsink/Makefile
-sun-java/Makefile
-sun-java/stubs/Makefile
-sun-java/stubs/include/Makefile
-sun-java/stubs/jri/Makefile
-sun-java/stubs/src/Makefile
-caps/Makefile
-caps/include/Makefile
-caps/public/Makefile
-caps/src/Makefile
-view/Makefile
-view/public/Makefile
-view/src/Makefile
-webshell/Makefile
-webshell/public/Makefile
-webshell/src/Makefile
-webshell/tests/Makefile
-webshell/tests/viewer/Makefile
-webshell/tests/viewer/public/Makefile
-widget/Makefile
-widget/public/Makefile
-widget/src/Makefile
-widget/src/build/Makefile
-widget/src/motif/Makefile
-widget/src/rhapsody/Makefile
-widget/src/gtk/Makefile
-widget/src/xpwidgets/Makefile
-widget/tests/Makefile
-widget/tests/scribble/Makefile
-widget/tests/widget/Makefile
-xpcom/Makefile
-xpcom/public/Makefile
-xpcom/src/Makefile
-xpcom/tests/Makefile
-xpcom/tests/dynamic/Makefile
-xpcom/tools/Makefile
-xpcom/tools/xpidl/Makefile
-xpcom/libxpt/Makefile
-xpcom/libxpt/public/Makefile
-xpcom/libxpt/src/Makefile
-xpcom/libxpt/tests/Makefile
-xpcom/libxpt/tools/Makefile
-xpcom/libxpt/xptinfo/Makefile
-xpcom/libxpt/xptinfo/public/Makefile
-xpcom/libxpt/xptinfo/src/Makefile
-xpcom/libxpt/xptinfo/tests/Makefile
-xpcom/idl/Makefile
-silentdl/Makefile
-xpfe/Makefile
-xpfe/AppCores/Makefile
-xpfe/AppCores/public/Makefile
-xpfe/AppCores/src/Makefile
-xpfe/AppCores/xul/Makefile
-xpfe/AppCores/idl/Makefile
-xpfe/browser/Makefile
-xpfe/browser/public/Makefile
-xpfe/browser/src/Makefile
-# xpfe/xpviewer/Makefile
-# xpfe/xpviewer/src/Makefile
-# xpfe/xpviewer/public/Makefile
-xpfe/appshell/Makefile
-xpfe/appshell/src/Makefile
-xpfe/appshell/public/Makefile
-xpfe/bootstrap/Makefile
-xpfe/browser/Makefile
-xpfe/browser/src/Makefile
-# xpfe/browser/public/Makefile
-END_NGMAKEFILES
-
-if [ "$MOZ_EDITOR" ]; then
-  add_makefiles <<END_EDITOR_MAKEFILES
-editor/base/Makefile
-editor/txmgr/Makefile
-editor/txmgr/public/Makefile
-editor/txmgr/src/Makefile
-editor/txmgr/tests/Makefile
-editor/guimgr/Makefile
-editor/guimgr/src/Makefile
-editor/guimgr/public/Makefile
-END_EDITOR_MAKEFILES
-fi
-
-if [ "$MOZ_MAIL_NEWS" ]; then
-  add_makefiles < ${srcdir}/mailnews/makefiles
-fi

mozilla/base/Makefile

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

mozilla/base/Makefile.in

@@ -22,7 +22,7 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src 
+DIRS = public src
 
 ifdef ENABLE_TESTS
 DIRS += tests

mozilla/base/macbuild/BaseDebugPrefix.h

@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#define _IMPL_NS_BASE 1
-
-#include "MacPrefix_debug.h"

mozilla/base/macbuild/BasePrefix.h

@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#define _IMPL_NS_BASE 1
-
-#include "MacPrefix.h"

mozilla/base/macbuild/base.toc

@@ -1,19 +0,0 @@
-# target: baseDebug.shlb
-mozilla/base/src/mac/nsTimerMac.cpp
-mozilla/base/src/nsArena.cpp
-mozilla/base/src/nsAtomTable.cpp
-mozilla/base/src/nsBaseDLL.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/nsProperties.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/filesDebug.prefix

@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "MacPrefix_debug.h"

mozilla/base/makefile.win

@@ -18,6 +18,6 @@
 DEPTH=..
 IGNORE_MANIFEST=1
 
-DIRS=public src 
+DIRS=public src tests 
 
 include <$(DEPTH)\config\rules.mak>

mozilla/base/public/MANIFEST

@@ -2,13 +2,4 @@
 # This is a list of local files which get copied to the mozilla:dist:base directory
 #
 
-nsAutoLock.h
-nsISizeOfHandler.h
-nsFileStream.h
-nsIFileStream.h
-nsIStringStream.h
-nsFileSpec.h
-nsRepeater.h
-nsIProperties.h
-nsCaretProperties.h
-nsSpecialSystemDirectory.h
+nsISizeOfHandler.h

mozilla/base/public/Makefile

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

mozilla/base/public/Makefile.in

@@ -22,24 +22,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -D_IMPL_NS_BASE
+DEFINES = -D_IMPL_NS_BASE
 
 EXPORTS =		\
-    nsAutoLock.h	\
-    nsIProperties.h	\
     nsISizeOfHandler.h	\
-    nsCaretProperties.h \
-    nsEscape.h          \
-    nsFileSpec.h        \
-    nsFileStream.h      \
-    nsIFileStream.h     \
-    nsIStringStream.h   \
-    nsSpecialSystemDirectory.h \
     $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
-MODULE=base
+MODULE = raptor
 
 include $(topsrcdir)/config/config.mk
 

mozilla/base/public/makefile.win

@@ -20,18 +20,9 @@ IGNORE_MANIFEST=1
 
 DEFINES = -D_IMPL_NS_BASE
 
-EXPORTS =                       \
-        nsAutoLock.h            \
-        nsCaretProperties.h     \
-        nsIProperties.h         \
-        nsISizeOfHandler.h      \
-        nsEscape.h              \
-        nsFileSpec.h            \
-        nsFileStream.h          \
-        nsIFileStream.h         \
-        nsIStringStream.h       \
-        nsSpecialSystemDirectory.h \
-        $(NULL)
+EXPORTS =		\
+    nsISizeOfHandler.h	\
+    $(NULL)
 
 MODULE = raptor 
 

mozilla/base/public/nsAutoLock.h

@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-/*
-
-  A stack-based lock object that makes using PRLock a bit more
-  convenient. It acquires the monitor when constructed, and releases
-  it when it goes out of scope.
-
-  For example,
-
-    class Foo {
-    private:
-        PRLock* mLock;
-
-    public:
-        Foo(void) {
-            mLock = PR_NewLock();
-        }
-
-        virtual ~Foo(void) {
-            PR_DestroyLock(mLock);
-        }
-
-        void ThreadSafeMethod(void) {
-            // we're don't hold the lock yet...
-
-            nsAutoLock lock(mLock);
-            // ...but now we do.
-
-            // we even can do wacky stuff like return from arbitrary places w/o
-            // worrying about forgetting to release the lock
-            if (some_weird_condition)
-                return;
-
-            // otherwise do some other stuff
-        }
-
-        void ThreadSafeBlockScope(void) {
-            // we're not in the lock here...
-
-            {
-                nsAutoLock lock(mLock);
-                // but we are now, at least until the block scope closes
-            }
-
-            // ...now we're not in the lock anymore
-        }
-    };
-
- */
-
-#ifndef nsAutoLock_h__
-#define nsAutoLock_h__
-
-#include "nscore.h"
-#include "prlock.h"
-#include "prlog.h"
-
-// 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
-// nsAutoLock".
-
-class nsAutoLock {
-private:
-    PRLock* mLock;
-
-    // Not meant to be implemented. This makes it a compiler error to
-    // construct or assign an nsAutoLock object incorrectly.
-    nsAutoLock(void) {}
-    nsAutoLock(nsAutoLock& aLock) {}
-    nsAutoLock& operator =(nsAutoLock& aLock) {
-        return *this;
-    }
-
-    // Not meant to be implemented. This makes it a compiler error to
-    // attempt to create an nsAutoLock object on the heap.
-    static void* operator new(size_t size) {
-        return nsnull;
-    }
-    static void operator delete(void* memory) {}
-
-public:
-    nsAutoLock(PRLock* aLock) : mLock(aLock) {
-        PR_ASSERT(mLock);
-
-        // This will assert deep in the bowels of NSPR if you attempt
-        // to re-enter the lock.
-        PR_Lock(mLock);
-    }
-
-
-    ~nsAutoLock(void) {
-        PR_Unlock(mLock);
-    }
-};
-
-
-#endif // nsAutoLock_h__
-

mozilla/base/public/nsCaretProperties.h

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// this class is used to gather caret properties from the OS. It
-// must be implemented by each platform that wants more than
-// the generic caret properties.
-
-class nsCaretProperties
-{
-	
-	public:
-	
-												nsCaretProperties();
-		virtual							~nsCaretProperties() {}
-	
-		virtual PRInt32			GetCaretWidth() 		{ return mCaretWidth; }
-		virtual PRUint32		GetCaretBlinkRate()	{ return mBlinkRate; }
-		
-		
-	protected:
-
-	// have value for no blinking
-	
-		enum {
-			eDefaulBlinkRate					= 500,			// twice a second
-			eDefaultCaretWidth				= 20				// 20 twips = 1 pixel
-		};
-
-
-		PRInt32					mCaretWidth;			// caret width in twips
-		PRUint32				mBlinkRate;				// blink rate in milliseconds
-		
-		
-		// members for vertical placement & size?
-
-};
-
-NS_BASE nsCaretProperties* NewCaretProperties();

mozilla/base/public/nsEscape.h

@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/*	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"
-#include "nscore.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
-NS_BASE char * nsEscape(const char * str, nsEscapeMask mask);
-	/* Caller must use delete [] on the result */
-
-NS_BASE char * nsUnescape(char * str);
-	/* decode % escaped hex codes into character values,
-	 * modifies the parameter, returns the same buffer
-	 */
-
-NS_BASE 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.
-	 */
-NS_BASE 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

@@ -1,617 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//    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, nsFileSpec, nsPersistentFileDescriptor
-//      nsDirectoryIterator. Oh, and a convenience class nsAutoCString.
-//
-//  Q.  How should I represent files at run time?
-//  A.  Use nsFileSpec.  Using char* will lose information on some platforms.
-//
-//  Q.  Then what are nsFilePath and nsFileURL for?
-//  A.  Only when you need a char* parameter for legacy code.
-//
-//  Q.  How should I represent files in a persistent way (eg, in a disk file)?
-//  A.  Use nsPersistentFileDescriptor.  Convert to and from nsFileSpec at run time.
-//
-//  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
-//
-//                  nsFileSpec 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"
-#include "nsError.h"
-#include "nsString.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
-#define NS_EXPLICIT explicit
-#else
-
-#define NS_NAMESPACE_PROTOTYPE static
-#define NS_NAMESPACE struct
-#define NS_NAMESPACE_END ;
-#define NS_EXPLICIT
-
-#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 nsFileSpec;             // Preferred.  For i/o use nsInputFileStream, nsOutputFileStream
-class nsFilePath;             // This can be passed to NSPR file I/O routines, if you must.
-class nsFileURL;
-class nsPersistentFileDescriptor; // Used for storage across program launches.
-
-#define kFileURLPrefix "file://"
-#define kFileURLPrefixLength (7)
-
-class nsOutputStream;
-class nsInputStream;
-class nsIOutputStream;
-class nsIInputStream;
-class nsOutputFileStream;
-class nsInputFileStream;
-class nsOutputConsoleStream;
-class nsString;
-
-//========================================================================================
-// Conversion of native file errors to nsresult values. These are really only for use
-// in the file module, clients of this interface shouldn't really need them.
-// Error results returned from this interface have, in the low-order 16 bits,
-// native errors that are masked to 16 bits.  Assumption: a native error of 0 is success
-// on all platforms. Note the way we define this using an inline function.  This
-// avoids multiple evaluation if people go NS_FILE_RESULT(function_call()).
-#define NS_FILE_RESULT(x) ns_file_convert_result((PRInt32)x)
-nsresult ns_file_convert_result(PRInt32 nativeErr);
-#define NS_FILE_FAILURE NS_FILE_RESULT(-1)
-
-//========================================================================================
-class NS_BASE nsAutoCString
-//
-// This should be in nsString.h, but the owner would not reply to my proposal.  After four
-// weeks, I decided to put it in here.
-//
-// This is a quiet little class that acts as a sort of autoptr for
-// a const char*.  If you used to call nsString::ToNewCString(), just
-// to pass the result a parameter list, it was a nuisance having to
-// call delete [] on the result after the call.  Now you can say
-//     nsString myStr;
-//     ...
-//     f(nsAutoCString(myStr));
-// where f is declared as void f(const char*);  This call will
-// make a temporary char* pointer on the stack and delete[] it
-// when the function returns.
-//========================================================================================
-{
-public:
-    NS_EXPLICIT                  nsAutoCString(const nsString& other) : mCString(other.ToNewCString()) {}
-    virtual                      ~nsAutoCString();    
-                                 operator const char*() const { return mCString; }
-                                 operator const char*() { return mCString; }
-protected:
-                                 const char* mCString;
-}; // class nsAutoCString
-
-//========================================================================================
-class NS_BASE nsFileSpec
-//    This is whatever each platform really prefers to describe files as.  Declared first
-//  because the other two types have an embedded nsFileSpec object.
-//========================================================================================
-{
-    public:
-                                nsFileSpec();
-        NS_EXPLICIT             nsFileSpec(const char* inString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFileSpec(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFileSpec(const nsFilePath& inPath);
-        NS_EXPLICIT             nsFileSpec(const nsFileURL& inURL);
-        NS_EXPLICIT             nsFileSpec(const nsPersistentFileDescriptor& inURL);
-                                nsFileSpec(const nsFileSpec& inPath);
-        virtual                 ~nsFileSpec();
-
-        void                    operator = (const char* inPath);
-        void                    operator = (const nsString& inPath)
-                                {
-                                    const nsAutoCString path(inPath);
-                                    *this = path;
-                                }
-        void                    operator = (const nsFilePath& inPath);
-        void                    operator = (const nsFileURL& inURL);
-        void                    operator = (const nsFileSpec& inOther);
-        void                    operator = (const nsPersistentFileDescriptor& inOther);
-
-        PRBool                  operator ==(const nsFileSpec& inOther) const;
-        PRBool                  operator !=(const nsFileSpec& inOther) const;
-
-                                operator const char* () const { return GetCString(); }
-                                    // Same as GetCString (please read the comments).
-       const char*              GetCString() const;
-                                    // This is the only conversion to const char*
-                                    // that is provided, and it allows the
-                                    // path to be "passed" to legacy code.  This practice
-                                    // is VERY EVIL and should only be used to support legacy
-                                    // code.  Using it guarantees bugs on Macintosh.
-                                    // The path is cached and freed by the nsFileSpec destructor
-                                    // so do not delete (or free) it.
-
-#ifdef XP_MAC
-        // For Macintosh people, this is meant to be useful in its own right as a C++ version
-        // of the FSSpec struct.        
-                                nsFileSpec(
-                                    short vRefNum,
-                                    long parID,
-                                    ConstStr255Param name);
-                                nsFileSpec(const FSSpec& inSpec)
-                                    : mSpec(inSpec), mError(NS_OK), mPath(nsnull) {}
-        void                    operator = (const FSSpec& inSpec)
-                                    { mSpec = inSpec; mError = NS_OK; }
-
-                                operator FSSpec* () { return &mSpec; }
-                                operator const FSSpec* const () { return &mSpec; }
-                                operator  FSSpec& () { return mSpec; }
-                                operator const FSSpec& () const { return mSpec; }
-                                
-        const FSSpec&           GetFSSpec() const { return mSpec; }
-        FSSpec&                 GetFSSpec() { return mSpec; }
-        ConstFSSpecPtr          GetFSSpecPtr() const { return &mSpec; }
-        FSSpecPtr               GetFSSpecPtr() { return &mSpec; }
-        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(PRBool& 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.
-
-        PRBool                  Valid() const { return NS_SUCCEEDED(Error()); }
-        nsresult                Error() const
-                                {
-                                    #ifndef XP_MAC 
-                                    if (!mPath && NS_SUCCEEDED(mError)) 
-                                        ((nsFileSpec*)this)->mError = NS_FILE_FAILURE; 
-                                    #endif 
-                                    return mError;
-                                }
-        PRBool                  Failed() const { return NS_FAILED(Error()); }
-
-
-        friend                  NS_BASE nsOutputStream& operator << (
-                                    nsOutputStream& s,
-                                    const nsFileSpec& spec); // THIS IS FOR DEBUGGING ONLY.
-                                        // see PersistentFileDescriptor for the real deal.
-
-
-        //--------------------------------------------------
-        // 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                    SetLeafName(const nsString& inLeafName)
-                                {
-                                    const nsAutoCString leafName(inLeafName);
-                                    SetLeafName(leafName);
-                                }
-        void                    GetParent(nsFileSpec& 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 --() ?
-
-        typedef PRUint32        TimeStamp; // ie nsFileSpec::TimeStamp.  This is 32 bits now,
-                                           // but might change, eg, to a 64-bit class.  So use the
-                                           // typedef, and use a streaming operator to convert
-                                           // to a string, so that your code won't break.  It's
-                                           // none of your business what the number means.  Don't
-                                           // rely on the implementation.
-        void                    GetModDate(TimeStamp& outStamp) const;
-                                           // This will return different values on different
-                                           // platforms, even for the same file (eg, on a server).
-                                           // But if the platform is constant, it will increase after
-                                           // every file modification.
-        PRBool                  ModDateChanged(const TimeStamp& oldStamp) const
-                                {
-                                    TimeStamp newStamp;
-                                    GetModDate(newStamp);
-                                    return newStamp != oldStamp;
-                                }
-        
-        PRUint32                GetFileSize() const;
-        PRUint32                GetDiskSpaceAvailable() const;
-        
-        nsFileSpec              operator + (const char* inRelativePath) const;
-        nsFileSpec              operator + (const nsString& inRelativePath) const
-                                {
-                                    const nsAutoCString 
-                                      relativePath(inRelativePath);
-                                    return *this + relativePath;
-                                }
-        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                    operator += (const nsString& inRelativePath)
-                                {
-                                    const nsAutoCString relativePath(inRelativePath);
-                                    *this += relativePath;
-                                }
-
-        void                    MakeUnique();
-        void                    MakeUnique(const char* inSuggestedLeafName);
-        void                    MakeUnique(const nsString& inSuggestedLeafName)
-                                {
-                                    const nsAutoCString suggestedLeafName(inSuggestedLeafName);
-                                    MakeUnique(suggestedLeafName);
-                                }
-    
-        PRBool                  IsDirectory() const;
-                                    // More stringent than Exists()
-        PRBool                  IsFile() const;
-                                    // More stringent than Exists()
-        PRBool                  Exists() const;
-
-        //--------------------------------------------------
-        // Creation and deletion of objects.  These can modify the disk.
-        //--------------------------------------------------
-
-        void                    CreateDirectory(int mode = 0700 /* for unix */);
-        void                    Delete(PRBool inRecursive) const;
-        
-        nsresult                Rename(const char* inNewName); // not const: gets updated
-        nsresult                Rename(const nsString& inNewName)
-                                {
-                                    const nsAutoCString newName(inNewName);
-                                    return Rename(newName);
-                                }
-        nsresult                Copy(const nsFileSpec& inNewParentDirectory) const;
-        nsresult                Move(const nsFileSpec& inNewParentDirectory) const;
-        nsresult                Execute(const char* args) const;
-        nsresult                Execute(const nsString& args) const
-                                {
-                                    const nsAutoCString argsString(args);
-                                    return Execute(argsString);
-                                }
-
-    protected:
-    #ifdef XP_MAC
-        OSErr                   GetCatInfo(CInfoPBRec& outInfo) const;
-    #endif
-        //--------------------------------------------------
-        // Data
-        //--------------------------------------------------
-
-    protected:
-                                friend class nsFilePath;
-                                friend class nsFileURL;
-                                friend class nsDirectoryIterator;
-#ifdef XP_MAC
-        FSSpec                  mSpec;
-#endif
-        char*                   mPath;
-        nsresult                mError;
-}; // class nsFileSpec
-
-// FOR HISTORICAL REASONS:
-
-typedef nsFileSpec 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);
-        NS_EXPLICIT             nsFileURL(const char* inString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFileURL(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFileURL(const nsFilePath& inPath);
-        NS_EXPLICIT             nsFileURL(const nsFileSpec& 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 nsString& inString)
-                                {
-                                    const nsAutoCString string(inString);
-                                    *this = string;
-                                }
-        void                    operator = (const nsFilePath& inOther);
-        void                    operator = (const nsFileSpec& inOther);
-
-                                operator const char* () const { return mURL; } // deprecated.
-        const char*             GetAsString() const { return mURL; }
-
-        friend                  NS_BASE nsOutputStream& operator << (
-                                     nsOutputStream& s, const nsFileURL& spec);
-
-#ifdef XP_MAC
-                                // Accessor to allow quick assignment to a mFileSpec
-        const nsFileSpec&       GetFileSpec() const { return mFileSpec; }
-#endif
-    private:
-        // Should not be defined (only nsFilePath is to be treated as strings.
-                                operator char* ();
-    protected:
-                                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 nsFileSpec, too.
-        nsFileSpec              mFileSpec;
-#endif
-}; // class nsFileURL
-
-//========================================================================================
-class NS_BASE nsFilePath
-//    This is a string that looks like "/foo/bar/mumble fish".  Same as nsFileURL, but
-//    without the "file:// prefix", and NOT %20 ENCODED! Strings passed in must be
-//    valid unix-style paths in this format.
-//========================================================================================
-{
-    public:
-                                nsFilePath(const nsFilePath& inPath);
-        NS_EXPLICIT             nsFilePath(const char* inString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFilePath(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFilePath(const nsFileURL& inURL);
-        NS_EXPLICIT             nsFilePath(const nsFileSpec& 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 nsString& inString)
-                                {
-                                    const nsAutoCString string(inString);
-                                    *this = string;
-                                }
-        void                    operator = (const nsFileURL& inURL);
-        void                    operator = (const nsFileSpec& inOther);
-
-#ifdef XP_MAC
-    public:
-                                // Accessor to allow quick assignment to a mFileSpec
-        const nsFileSpec&       GetFileSpec() const { return mFileSpec; }
-#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 nsFileSpec, too.
-        nsFileSpec               mFileSpec;
-#endif
-}; // class nsFilePath
-
-//========================================================================================
-class NS_BASE nsPersistentFileDescriptor
-// To save information about a file's location in another file, initialize
-// one of these from your nsFileSpec, and then write this out to your output stream.
-// To retrieve the info, create one of these, read its value from an input stream.
-// and then make an nsFileSpec from it.
-//========================================================================================
-{
-    public:
-                                nsPersistentFileDescriptor() : mDescriptorString(nsnull) {}
-                                    // For use prior to reading in from a stream
-                                nsPersistentFileDescriptor(const nsPersistentFileDescriptor& inPath);
-        virtual                 ~nsPersistentFileDescriptor();
-        void					operator = (const nsPersistentFileDescriptor& inPath);
-        
-        // Conversions
-        NS_EXPLICIT             nsPersistentFileDescriptor(const nsFileSpec& inPath);
-        void					operator = (const nsFileSpec& inPath);
-        
-    	nsresult                Read(nsIInputStream* aStream);
-    	nsresult                Write(nsIOutputStream* aStream);
-    	    // writes the data to a file
-    	friend NS_BASE nsInputStream& operator >> (nsInputStream&, nsPersistentFileDescriptor&);
-    		// reads the data from a file
-    	friend NS_BASE nsOutputStream& operator << (nsOutputStream&, const nsPersistentFileDescriptor&);
-    	    // writes the data to a file
-        friend class nsFileSpec;
-
-    private:
-        // Here are the ways to get data in and out of a file.
-        void                    GetData(void*& outData, PRInt32& outSize) const;
-                                     // DON'T FREE the returned data!
-        void                    SetData(const void* inData, PRInt32 inSize);
-
-    protected:
-
-        char*                   mDescriptorString;
-
-}; // class nsPersistentFileDescriptor
-
-//========================================================================================
-class NS_BASE nsDirectoryIterator
-//  Example:
-//
-//       nsFileSpec parentDir(...); // directory over whose children we shall iterate
-//       for (nsDirectoryIterator i(parentDir); i; i++)
-//       {
-//              // do something with (const nsFileSpec&)i
-//       }
-//
-//  or:
-//
-//       for (nsDirectoryIterator i(parentDir, PR_FALSE); i; i--)
-//       {
-//              // do something with (const nsFileSpec&)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 nsFileSpec& parent,
-	                            	int iterateDirection = +1);
-#ifndef XP_MAC
-	// Macintosh currently doesn't allocate, so needn't clean up.
-	    virtual                 ~nsDirectoryIterator();
-#endif
-	    PRBool                  Exists() 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 nsFileSpec&() { return mCurrent; }
-	private:
-	    nsFileSpec              mCurrent;
-	    PRBool                  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

@@ -1,743 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0(the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright(C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//    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.
-//    Completely rewritten to integrate with nsIInputStream and nsIOutputStream (the
-//        xpcom stream objects.
-
-//========================================================================================
-//
-//  Classes defined:
-//
-//          nsInputStream, nsOutputStream
-//                These are the lightweight STATICALLY LINKED wrappers for
-//                the xpcom objects nsIInputStream and nsIOutputstream.
-//             Possible uses:
-//                If you are implementing a function that accepts one of these xpcom
-//                streams, just make one of these little jobbies on the stack, and
-//                the handy << or >> notation can be yours.
-//                
-//          nsInputFileStream, nsOutputFileStream
-//                These are the STATICALLY LINKED wrappers for the file-related
-//                versions of the above.
-//          nsIOFileStream
-//                An input and output file stream attached to the same file.
-//
-//  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:
-//
-//              nsFileSpec myPath("/Development/iotest.txt");
-//
-//	            nsOutputFileStream testStream(myPath);
-//				testStream << "Hello World" << nsEndl;
-//
-//      4.  Requires streams to be constructed using typesafe nsFileSpec specifier
-//          (not the notorious and bug prone const char*), namely nsFileSpec.  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 "nsCOMPtr.h"
-#include "nsIFileStream.h"
-
-// Defined elsewhere
-class nsFileSpec;
-class nsString;
-class nsIInputStream;
-class nsIOutputStream;
-
-//========================================================================================
-//                          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 nsInputStream
-// This is a convenience class, for use on the STACK ("new" junkies: get detoxed first).
-// Given a COM-style stream, this allows you to use the >> operators.  It also acquires and
-// reference counts its stream.
-// Please read the comments at the top of this file
-//========================================================================================
-{
-public:
-                                      nsInputStream(nsIInputStream* inStream)
-                                      :   mInputStream(do_QueryInterface(inStream))
-                                      ,   mEOF(PR_FALSE)
-                                      {}
-    virtual                           ~nsInputStream();
- 
-    nsCOMPtr<nsIInputStream>          GetIStream() const
-                                      {
-                                          return mInputStream;
-                                      }
-    char                              eof() const { return get_at_eof(); }
-    char                              get();
-    void                              close()
-                                      {
-                                          mInputStream->Close();
-                                      }
-    PRInt32                           read(void* s, PRInt32 n);
-
-    // Input streamers.  Add more as needed (int&, unsigned int& etc). (but you have to
-    // add delegators to the derived classes, too, because these operators don't inherit).
-    nsInputStream&                    operator >> (char& ch);
-
-    // Support manipulators
-    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
-                                      {
-                                           return pf(*this);
-                                      }
-
-protected:
-
-   // These certainly need to be overridden, they give the best shot we can at detecting
-   // eof in a simple nsIInputStream.
-   virtual void                       set_at_eof(PRBool atEnd)
-                                      {
-                                         mEOF = atEnd;
-                                      }
-   virtual PRBool                     get_at_eof() const
-                                      {
-                                          return mEOF;
-                                      }
-private:
-
-    nsInputStream&                    operator >> (char* buf); // TOO DANGEROUS. DON'T DEFINE.
-
-// DATA
-protected:
-    nsCOMPtr<nsIInputStream>          mInputStream;
-    PRBool                            mEOF;
-}; // class nsInputStream
-
-typedef nsInputStream nsBasicInStream; // historic support for this name
-
-//========================================================================================
-class NS_BASE nsOutputStream
-// This is a convenience class, for use on the STACK ("new" junkies, get detoxed first).
-// Given a COM-style stream, this allows you to use the << operators.  It also acquires and
-// reference counts its stream.
-// Please read the comments at the top of this file
-//========================================================================================
-{
-public:
-                                      nsOutputStream() {}
-                                      nsOutputStream(nsIOutputStream* inStream)
-                                      :   mOutputStream(do_QueryInterface(inStream))
-                                          {}
-
-    virtual                          ~nsOutputStream();
-
-    nsCOMPtr<nsIOutputStream>         GetIStream() const
-                                      {
-                                          return mOutputStream;
-                                      }
-    void                              close()
-                                      {
-                                          mOutputStream->Close();
-                                      }
-    void                              put(char c);
-    PRInt32                           write(const void* s, PRInt32 n);
-    virtual void                      flush();
-
-    // Output streamers.  Add more as needed (but you have to add delegators to the derived
-    // classes, too, because these operators don't inherit).
-    nsOutputStream&                   operator << (const char* buf);
-    nsOutputStream&                   operator << (char ch);
-    nsOutputStream&                   operator << (short val);
-    nsOutputStream&                   operator << (unsigned short val);
-    nsOutputStream&                   operator << (long val);
-    nsOutputStream&                   operator << (unsigned long val);
-    nsOutputStream&                   operator << (int val);
-    nsOutputStream&                   operator << (unsigned int val);
-
-    // Support manipulators
-    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
-                                      {
-                                           return pf(*this);
-                                      }
-
-// DATA
-protected:
-    nsCOMPtr<nsIOutputStream>          mOutputStream;
-}; // class nsOutputStream
-
-typedef nsOutputStream nsBasicOutStream; // Historic support for this name
-
-//========================================================================================
-class NS_BASE nsErrorProne
-// Common (virtual) base class for remembering errors on demand
-//========================================================================================
-{
-public:
-                                      nsErrorProne() // for delayed opening
-                                      :   mResult(NS_OK)
-                                      {
-                                      }
-    PRBool                            failed() const
-                                      {
-                                          return NS_FAILED(mResult);
-                                      }
-
-// DATA
-protected:
-    nsresult                          mResult;
-}; // class nsErrorProne
-
-//========================================================================================
-class NS_BASE nsFileClient
-// Because COM does not allow us to write functions which return a boolean value etc,
-// this class is here to take care of the tedious "declare variable then call with
-// the address of the variable" chores.
-//========================================================================================
-:    public virtual nsErrorProne
-{
-public:
-                                      nsFileClient(const nsCOMPtr<nsIFile>& inFile)
-                                      :   mFile(do_QueryInterface(inFile))
-                                      {
-                                      }
-    virtual                           ~nsFileClient() {}
-
-    void                              open(
-                                          const nsFileSpec& inFile,
-                                          int nsprMode,
-                                          PRIntn accessMode)
-                                      {
-                                          if (mFile)
-                                              mResult = mFile->Open(inFile, nsprMode, accessMode);
-                                      }
-    PRBool                            is_open() const
-                                      {
-                                          PRBool result = PR_FALSE;
-                                          if (mFile)
-                                              mFile->GetIsOpen(&result);
-                                          return result;
-                                      }
-    PRBool                            is_file() const
-                                      {
-                                          return mFile ? PR_TRUE : PR_FALSE;
-                                      }
-
-protected:
-
-                                      nsFileClient() // for delayed opening
-                                      {
-                                      }
-// DATA
-protected:
-    nsCOMPtr<nsIFile>                 mFile;
-}; // class nsFileClient
-
-//========================================================================================
-class NS_BASE nsRandomAccessStoreClient
-// Because COM does not allow us to write functions which return a boolean value etc,
-// this class is here to take care of the tedious "declare variable then call with
-// the address of the variable" chores.
-//========================================================================================
-:    public virtual nsErrorProne
-{
-public:
-                                      nsRandomAccessStoreClient() // for delayed opening
-                                      {
-                                      }
-                                      nsRandomAccessStoreClient(const nsCOMPtr<nsIRandomAccessStore>& inStore)
-                                      :   mStore(do_QueryInterface(inStore))
-                                      {
-                                      }
-    virtual                           ~nsRandomAccessStoreClient() {}
-    
-    void                              seek(PRInt32 offset)
-                                      {
-                                          seek(PR_SEEK_SET, offset);
-                                      }
-
-    void                              seek(PRSeekWhence whence, PRInt32 offset)
-                                      {
-                                          set_at_eof(PR_FALSE);
-                                          if (mStore)
-                                              mResult = mStore->Seek(whence, offset);
-                                      }
-    PRIntn                            tell()
-                                      {
-                                          PRIntn result = -1;
-                                          if (mStore)
-                                              mResult = mStore->Tell(&result);
-                                          return result;
-                                      }
-
-protected:
-
-   virtual PRBool                     get_at_eof() const
-                                      {
-                                          PRBool result = PR_TRUE;
-                                          if (mStore)
-                                              mStore->GetAtEOF(&result);
-                                          return result;
-                                      }
-
-   virtual void                       set_at_eof(PRBool atEnd)
-                                      {
-                                          if (mStore)
-                                              mStore->SetAtEOF(atEnd);
-                                      }
-
-// DATA
-protected:
-    nsCOMPtr<nsIRandomAccessStore>    mStore;
-}; // class nsRandomAccessStoreClient
-
-//========================================================================================
-class NS_BASE nsRandomAccessInputStream
-// Please read the comments at the top of this file
-//========================================================================================
-:	public nsRandomAccessStoreClient
-,	public nsInputStream
-{
-public:
-                                      nsRandomAccessInputStream(nsIInputStream* inStream)
-                                      :   nsRandomAccessStoreClient(do_QueryInterface(inStream))
-                                      ,   nsInputStream(inStream)
-                                      {
-                                      }
-    PRBool                            readline(char* s,  PRInt32 n);
-                                          // Result always null-terminated.
-                                          // Check eof() before each call.
-                                          // CAUTION: false result only indicates line was truncated
-                                          // to fit buffer, or an error occurred (OTHER THAN eof).
-
-    // Input streamers.  Unfortunately, they don't inherit!
-    nsInputStream&                    operator >> (char& ch)
-                                         { return nsInputStream::operator >>(ch); }
-    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
-                                         { return nsInputStream::operator >>(pf); }
-
-protected:
-                                      nsRandomAccessInputStream()
-                                      :  nsInputStream(nsnull)
-                                      {
-                                      }
-
-   virtual PRBool                     get_at_eof() const
-                                      {
-                                          return nsRandomAccessStoreClient::get_at_eof();
-                                      }
-
-   virtual void                       set_at_eof(PRBool atEnd)
-                                      {
-                                          nsRandomAccessStoreClient::set_at_eof(atEnd);
-                                      }
-
-}; // class nsRandomAccessInputStream
-
-//========================================================================================
-class NS_BASE nsInputStringStream
-//========================================================================================
-: public nsRandomAccessInputStream
-{
-public:
-                                      nsInputStringStream(const char* stringToRead);
-                                      nsInputStringStream(const nsString& stringToRead);
-
-    // Input streamers.  Unfortunately, they don't inherit!
-    nsInputStream&                    operator >> (char& ch)
-                                         { return nsInputStream::operator >>(ch); }
-    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
-                                         { return nsInputStream::operator >>(pf); }
-
-}; // class nsInputStringStream
-
-//========================================================================================
-class NS_BASE nsInputFileStream
-// Please read the comments at the top of this file
-//========================================================================================
-:	public nsRandomAccessInputStream
-,   public nsFileClient
-{
-public:
-	enum  { kDefaultMode = PR_RDONLY };
-                                      nsInputFileStream(nsIInputStream* inStream)
-                                      :   nsRandomAccessInputStream(inStream)
-                                      ,   nsFileClient(do_QueryInterface(inStream))
-                                      ,   mFileInputStream(do_QueryInterface(inStream))
-                                      {
-                                      }
-                                      nsInputFileStream(
-                                          const nsFileSpec& inFile,
-                                          int nsprMode = kDefaultMode,
-                                          PRIntn accessMode = 00700); // <- OCTAL
-
-    void                              Open(
-                                          const nsFileSpec& inFile,
-                                          int nsprMode = kDefaultMode,
-                                          PRIntn accessMode = 00700) // <- OCTAL
-                                      {
-                                          if (mFile)
-                                              mFile->Open(inFile, nsprMode, accessMode);
-                                      }
-
-    // Input streamers.  Unfortunately, they don't inherit!
-    nsInputStream&                    operator >> (char& ch)
-                                         { return nsInputStream::operator >>(ch); }
-    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
-                                         { return nsInputStream::operator >>(pf); }
-
-// DATA
-protected:
-    nsCOMPtr<nsIFileInputStream>      mFileInputStream;
-}; // class nsInputFileStream
-
-//========================================================================================
-class NS_BASE nsRandomAccessOutputStream
-// Please read the comments at the top of this file
-//========================================================================================
-:	public nsRandomAccessStoreClient
-,	public nsOutputStream
-{
-public:
-                                      nsRandomAccessOutputStream(nsIOutputStream* inStream)
-                                      :   nsRandomAccessStoreClient(do_QueryInterface(inStream))
-                                      ,   nsOutputStream(inStream)
-                                      {
-                                      }
-
-    // Output streamers.  Unfortunately, they don't inherit!
-    nsOutputStream&                   operator << (const char* buf)
-                                        { return nsOutputStream::operator << (buf); }
-    nsOutputStream&                   operator << (char ch)
-                                        { return nsOutputStream::operator << (ch); }
-    nsOutputStream&                   operator << (short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
-                                        { return nsOutputStream::operator << (pf); }
-
-protected:
-                                      nsRandomAccessOutputStream()
-                                      :  nsOutputStream(nsnull)
-                                      {
-                                      }
-}; // class nsRandomAccessOutputStream
-
-//========================================================================================
-class NS_BASE nsOutputStringStream
-//========================================================================================
-: public nsRandomAccessOutputStream
-{
-public:
-                                      nsOutputStringStream(char*& stringToChange);
-                                      nsOutputStringStream(nsString& stringToChange);
-
-    // Output streamers.  Unfortunately, they don't inherit!
-    nsOutputStream&                   operator << (const char* buf)
-                                        { return nsOutputStream::operator << (buf); }
-    nsOutputStream&                   operator << (char ch)
-                                        { return nsOutputStream::operator << (ch); }
-    nsOutputStream&                   operator << (short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
-                                        { return nsOutputStream::operator << (pf); }
-
-}; // class nsOutputStringStream
-
-//========================================================================================
-class NS_BASE nsOutputFileStream
-// Please read the comments at the top of this file
-//========================================================================================
-:	public nsRandomAccessOutputStream
-,	public nsFileClient
-{
-public:
-	enum  { kDefaultMode = (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE) };
-
-                                      nsOutputFileStream() {}
-                                      nsOutputFileStream(
-                                           const nsFileSpec& inFile,
-                                           int nsprMode = kDefaultMode,
-                                           PRIntn accessMode = 00700) // <- OCTAL
-                                       {
-                                          nsISupports* stream;
-                                          if (NS_FAILED(NS_NewIOFileStream(
-                                              &stream,
-                                              inFile, nsprMode, accessMode)))
-                                              return;
-                                          mFile = nsQueryInterface(stream);
-                                          mOutputStream = nsQueryInterface(stream);
-                                          mStore = nsQueryInterface(stream);
-                                          mFileOutputStream = nsQueryInterface(stream);
-                                          NS_RELEASE(stream);
-                                      }
- 
-    virtual void                      flush();
-
-    // Output streamers.  Unfortunately, they don't inherit!
-    nsOutputStream&                   operator << (const char* buf)
-                                        { return nsOutputStream::operator << (buf); }
-    nsOutputStream&                   operator << (char ch)
-                                        { return nsOutputStream::operator << (ch); }
-    nsOutputStream&                   operator << (short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
-                                        { return nsOutputStream::operator << (pf); }
-
-// DATA
-protected:
-    nsCOMPtr<nsIFileOutputStream>     mFileOutputStream;
-}; // class nsOutputFileStream
-
-//========================================================================================
-class NS_BASE nsOutputConsoleStream
-// Please read the comments at the top of this file
-//========================================================================================
-:	public nsOutputFileStream
-{
-public:
-
-                                      nsOutputConsoleStream()
-                                      {
-                                          nsISupports* stream;
-                                          if (NS_FAILED(NS_NewOutputConsoleStream(&stream)))
-                                              return;
-                                          mFile = nsQueryInterface(stream);
-                                          mOutputStream = nsQueryInterface(stream);
-                                          mFileOutputStream = nsQueryInterface(stream);
-                                          NS_RELEASE(stream);
-                                      }
-
-    // Output streamers.  Unfortunately, they don't inherit!
-    nsOutputStream&                   operator << (const char* buf)
-                                        { return nsOutputStream::operator << (buf); }
-    nsOutputStream&                   operator << (char ch)
-                                        { return nsOutputStream::operator << (ch); }
-    nsOutputStream&                   operator << (short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
-                                        { return nsOutputStream::operator << (pf); }
-
-}; // class nsOutputConsoleStream
-
-//========================================================================================
-class NS_BASE nsIOFileStream
-// Please read the comments at the top of this file
-//========================================================================================
-:	public nsInputFileStream
-,	public nsOutputStream
-{
-public:
-	enum  { kDefaultMode = (PR_RDWR | PR_CREATE_FILE) };
-
-                                      nsIOFileStream(
-                                          nsIInputStream* inInputStream
-                                      ,   nsIOutputStream* inOutputStream)
-                                      :   nsInputFileStream(inInputStream)
-                                      ,   nsOutputStream(inOutputStream)
-                                      ,   mFileOutputStream(do_QueryInterface(inOutputStream))
-                                      {
-                                      }
-                                      nsIOFileStream(
-                                           const nsFileSpec& inFile,
-                                           int nsprMode = kDefaultMode,
-                                           PRIntn accessMode = 00700) // <- OCTAL
-                                      :  nsInputFileStream(nsnull)
-                                      ,  nsOutputStream(nsnull)
-                                      {
-                                          nsISupports* stream;
-                                          if (NS_FAILED(NS_NewIOFileStream(
-                                              &stream,
-                                              inFile, nsprMode, accessMode)))
-                                              return;
-                                          mFile = nsQueryInterface(stream);
-                                          mStore = nsQueryInterface(stream);
-                                          mInputStream = nsQueryInterface(stream);
-                                          mOutputStream = nsQueryInterface(stream);
-                                          mFileInputStream = nsQueryInterface(stream);
-                                          mFileOutputStream = nsQueryInterface(stream);
-                                          NS_RELEASE(stream);
-                                      }
- 
-    virtual void                      close()
-                                      {
-                                          // Doesn't matter which of the two we close:
-                                          // they're hooked up to the same file.
-                                          nsInputFileStream::close();
-                                      }
-
-     // Output streamers.  Unfortunately, they don't inherit!
-    nsOutputStream&                   operator << (const char* buf)
-                                        { return nsOutputStream::operator << (buf); }
-    nsOutputStream&                   operator << (char ch)
-                                        { return nsOutputStream::operator << (ch); }
-    nsOutputStream&                   operator << (short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned short val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned long val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (unsigned int val)
-                                        { return nsOutputStream::operator << (val); }
-    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
-                                        { return nsOutputStream::operator << (pf); }
-
-    // Input streamers.  Unfortunately, they don't inherit!
-    nsInputStream&                    operator >> (char& ch)
-                                         { return nsInputStream::operator >>(ch); }
-    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
-                                         { return nsInputStream::operator >>(pf); }
-
-    // DATA
-protected:
-    nsCOMPtr<nsIFileOutputStream>     mFileOutputStream;
-}; // class nsIOFileStream
- 
-//========================================================================================
-//        Manipulators
-//========================================================================================
-
-NS_BASE nsOutputStream&     nsEndl(nsOutputStream& os); // outputs and FLUSHES.
-
-
-#endif /* _FILESTREAM_H_ */

mozilla/base/public/nsIFileStream.h

@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsIFileStream_h___
-#define nsIFileStream_h___
-
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "prio.h"
-
-class nsFileSpec;
-
-/* a6cf90e8-15b3-11d2-932e-00805f8add32 */
-#define NS_IFILE_IID \
-{ 0xa6cf90e8, 0x15b3, 0x11d2, \
-    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
-
-//========================================================================================
-class nsIFile
-// Represents a file, and supports Open.
-//========================================================================================
-: public nsISupports
-{
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IFILE_IID; return iid; }
-	NS_IMETHOD                         Open(
-                                           const nsFileSpec& inFile,
-                                           int nsprMode,
-                                           PRIntn accessMode) = 0;
-                                           // Note: Open() is only needed after
-                                           // an explicit Close().  All file streams
-                                           // are automatically opened on construction.
-    NS_IMETHOD                         GetIsOpen(PRBool* outOpen) = 0;
-
-}; // class nsIFile
-
-/* a6cf90e8-15b3-11d2-932e-00805f8add32 */
-#define NS_IRANDOMACCESS_IID \
-{  0xa6cf90eb, 0x15b3, 0x11d2, \
-    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
-
-//========================================================================================
-class nsIRandomAccessStore
-// Supports Seek, Tell etc.
-//========================================================================================
-: public nsISupports
-{
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IRANDOMACCESS_IID; return iid; }
-    NS_IMETHOD                         Seek(PRSeekWhence whence, PRInt32 offset) = 0;
-    NS_IMETHOD                         Tell(PRIntn* outWhere) = 0;
-
-/* "PROTECTED" */
-    NS_IMETHOD                         GetAtEOF(PRBool* outAtEOF) = 0;
-    NS_IMETHOD                         SetAtEOF(PRBool inAtEOF) = 0;
-}; // class nsIRandomAccessStore
-
-/* a6cf90e6-15b3-11d2-932e-00805f8add32 */
-#define NS_IFILEINPUTSTREAM_IID \
-{ 0xa6cf90e6, 0x15b3, 0x11d2, \
-    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
-    
-//========================================================================================
-class nsIFileInputStream
-// These are additional file-specific methods that files have, above what
-// nsIInputStream supports.  The current implementation supports both
-// interfaces.
-//========================================================================================
-: public nsIInputStream
-{
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
-}; // class nsIFileInputStream
-
-/* a6cf90e7-15b3-11d2-932e-00805f8add32 */
-#define NS_IFILEOUTPUTSTREAM_IID \
-{ 0xa6cf90e7, 0x15b3, 0x11d2, \
-    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
-
-//========================================================================================
-class nsIFileOutputStream
-// These are additional file-specific methods that files have, above what
-// nsIOutputStream supports.  The current implementation supports both
-// interfaces.
-//========================================================================================
-: public nsIOutputStream
-{
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
-    NS_IMETHOD                         Flush() = 0;
-                                           // Forces a write to disk.
-}; // class nsIFileOutputStream
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewTypicalInputFileStream(
-    nsISupports** aStreamResult,
-    const nsFileSpec& inFile
-    /*Default nsprMode == PR_RDONLY*/
-    /*Default accessmode = 0700 (octal)*/);
-// Factory method to get an nsInputStream from a file, using most common options
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewOutputConsoleStream(
-    nsISupports** aStreamResult);
-    // Factory method to get an nsOutputStream to the console.
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewTypicalOutputFileStream(
-    nsISupports** aStreamResult, // will implement all the above interfaces
-    const nsFileSpec& inFile
-    /*default nsprMode= (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE)*/
-    /*Default accessMode= 0700 (octal)*/);
-    // Factory method to get an nsOutputStream to a file - most common case.
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewTypicalIOFileStream(
-    nsISupports** aStreamResult, // will implement all the above interfaces
-    const nsFileSpec& inFile
-    /*default nsprMode = (PR_RDWR | PR_CREATE_FILE)*/
-    /*Default accessMode = 0700 (octal)*/);
-    // Factory method to get an object that implements both nsIInputStream
-    // and nsIOutputStream, associated with a single file.
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewIOFileStream(
-    nsISupports** aStreamResult, // will implement all the above interfaces
-    const nsFileSpec& inFile,
-    PRInt32 nsprMode,
-    PRInt32 accessMode);
-    // Factory method to get an object that implements both nsIInputStream
-    // and nsIOutputStream, associated with a single file.
-
-#endif /* nsIFileStream_h___ */

mozilla/base/public/nsIProperties.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#ifndef nsIProperties_h___
-#define nsIProperties_h___
-
-#include "nsID.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsISupports.h"
-#include "nsString.h"
-
-// {1A180F60-93B2-11d2-9B8B-00805F8A16D9}
-#define NS_IPROPERTIES_IID \
-{ 0x1a180f60, 0x93b2, 0x11d2, \
-  { 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
-
-// {2245E573-9464-11d2-9B8B-00805F8A16D9}
-NS_DECLARE_ID(kPropertiesCID,
-  0x2245e573, 0x9464, 0x11d2, 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9);
-
-class nsIProperties : public nsISupports
-{
-public:
-  NS_IMETHOD Load(nsIInputStream* aIn) = 0;
-  NS_IMETHOD GetProperty(const nsString& aKey, nsString& aValue) = 0;
-  NS_IMETHOD SetProperty(const nsString& aKey, nsString& aNewValue,
-                         nsString& aOldValue) = 0;
-  NS_IMETHOD Save(nsIOutputStream* aOut, const nsString& aHeader) = 0;
-  NS_IMETHOD Subclass(nsIProperties* aSubclass) = 0;
-};
-
-#endif /* nsIProperties_h___ */

mozilla/base/public/nsIStringStream.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsIStringStream_h___
-#define nsIStringStream_h___
-
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsString.h"
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewStringInputStream(
-    nsISupports** aStreamResult,
-    const nsString& aStringToRead);
-    // Factory method to get an nsInputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewStringOutputStream(
-    nsISupports** aStreamResult,
-    nsString& aStringToChange);
-    // Factory method to get an nsOutputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewCharInputStream(
-    nsISupports** aStreamResult,
-    const char* aStringToRead);
-    // Factory method to get an nsInputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewCharOutputStream(
-    nsISupports** aStreamResult,
-    char** aStringToChange);
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewStringIOStream(
-    nsISupports** aStreamResult,
-    nsString& aStringToChange);
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-// file stream interfaces in nsIFileStream.h
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewCharIOStream(
-    nsISupports** aStreamResult,
-    char** aStringToChange);
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-
-#endif /* nsIStringStream_h___ */

mozilla/base/public/nsRepeater.h

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and 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___
-
-#include "nscore.h"
-
-class EventRecord;
-
-class NS_BASE 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/nsSpecialSystemDirectory.h

@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Doug Turner <dougt@netscape.com>
- */
-
-#ifndef _NSSPECIALSYSTEMDIRECTORY_H_
-#define _NSSPECIALSYSTEMDIRECTORY_H_
-
-#include "nscore.h"
-#include "nsFileSpec.h"
-
-#ifdef XP_MAC
-#include "Types.h"
-#endif
-
-// SEE ALSO:
-//      mozilla/xpfe/appshell/public/nsFileLocations.h
-
-class NS_BASE nsSpecialSystemDirectory : public nsFileSpec
-{
-
-    public:
-        enum SystemDirectories
-        {
-            OS_DriveDirectory         =   1
-        ,   OS_TemporaryDirectory     =   2
-        ,   OS_CurrentProcessDirectory=   3
-
-        ,   Mac_SystemDirectory       =   101
-        ,   Mac_DesktopDirectory      =   102
-        ,   Mac_TrashDirectory        =   103
-        ,   Mac_StartupDirectory      =   104
-        ,   Mac_ShutdownDirectory     =   105
-        ,   Mac_AppleMenuDirectory    =   106
-        ,   Mac_ControlPanelDirectory =   107
-        ,   Mac_ExtensionDirectory    =   108
-        ,   Mac_FontsDirectory        =   109
-        ,   Mac_PreferencesDirectory  =   110
-        ,   Mac_DocumentsDirectory    =   111
-        
-        ,   Win_SystemDirectory       =   201
-        ,   Win_WindowsDirectory      =   202
-        
-        ,   Unix_LocalDirectory       =   301
-        ,   Unix_LibDirectory         =   302    
-        };
-
-                    //nsSpecialSystemDirectory();
-                    nsSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory);
-        
-    virtual         ~nsSpecialSystemDirectory();
-
-    void            operator = (SystemDirectories aSystemSystemDirectory);
- 
-#ifdef XP_MAC
-    void            operator = (OSType folderType);
-                    nsSpecialSystemDirectory(OSType folderType);
-#endif
-
-private:
-    void            operator = (const char* inPath) { *(nsFileSpec*)this = inPath; }
-
-}; // class NS_BASE nsSpecialSystemDirectory
-
-#endif

mozilla/base/public/nsStdFileStream.h

@@ -1,939 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0(the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright(C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#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/Makefile

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

mozilla/base/src/Makefile.in

@@ -17,40 +17,30 @@
 
 DEPTH=../..
 topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
 VPATH		= @srcdir@
+srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES +=-D_IMPL_NS_BASE
+DEFINES =-D_IMPL_NS_BASE
 
-LOCAL_INCLUDES += -I$(topsrcdir)/base/public
-
-DIRS = $(MOZ_TOOLKIT)
+DIRS = unix
 
 LIBRARY_NAME = raptorbase
 
 CPPSRCS =                       \
     nsArena.cpp                 \
     nsAtomTable.cpp             \
-    nsBaseDLL.cpp               \
     nsBTree.cpp                 \
     nsByteBuffer.cpp            \
     nsCRT.cpp                   \
     nsDeque.cpp                 \
-    nsEscape.cpp                \
-    nsFileSpec.cpp              \
-    nsFileStream.cpp            \
-    nsIFileStream.cpp           \
-    nsIStringStream.cpp         \
-    nsProperties.cpp            \
     nsRBTree.cpp                \
-    nsSizeOfHandler.cpp		    \
+    nsSizeOfHandler.cpp                \
     nsString.cpp                \
     nsUnicharBuffer.cpp         \
     nsUnicharInputStream.cpp    \
     nsVoidArray.cpp             \
-    nsSpecialSystemDirectory.cpp\
     $(NULL)
 
 EXPORTS =                       \
@@ -76,9 +66,9 @@ EXPORTS =                       \
     nsUnitConversion.h          \
     $(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
 
-MODULE=base
+MODULE = raptor
 
 REQUIRES = xpcom netlib raptor
 
@@ -87,6 +77,3 @@ include $(topsrcdir)/config/config.mk
 TARGET = $(LIBARY)
 
 include $(topsrcdir)/config/rules.mk
-
-test:
-	@echo OS_ARCH = $(OS_ARCH)

mozilla/base/src/gtk/Makefile.in

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

mozilla/base/src/gtk/nsCaretProperties.cpp

@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-#include "nscore.h"
-
-#include "nsCaretProperties.h"
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties::nsCaretProperties()
-:	mCaretWidth(eDefaultCaretWidth)
-,	mBlinkRate(eDefaulBlinkRate)
-{
-	// in your platform-specific class, get data from the OS in your constructor
-	
-	//mBlinkRate = 0;			// don't blink the caret
-}
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties* NewCaretProperties()
-{
-	return new nsCaretProperties();
-}

mozilla/base/src/gtk/nsTimer.cpp

@@ -1,191 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "nsCRT.h"
-#include "prlog.h"
-#include <stdio.h>
-#include <limits.h>
-#include <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;
-    NS_ADDREF(mCallback);
-    // 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/nsCaretPropertiesMac.cpp

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include <Events.h>
-
-#include "nscore.h"
-
-#include "nsCaretProperties.h"
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties::nsCaretProperties()
-:	mCaretWidth(eDefaultCaretWidth)
-,	mBlinkRate(eDefaulBlinkRate)
-{
-	// in your platform-specific class, get data from the OS in your constructor
-	
-	// MacOS calls
-	
-	mBlinkRate = ::GetCaretTime() * 1000 / 60;
-}
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties* NewCaretProperties()
-{
-	return new nsCaretProperties();
-}

mozilla/base/src/mac/nsRepeater.cpp

@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "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

@@ -20,335 +20,263 @@
 // Mac implementation of the nsITimer interface
 //
 
+// nsMacTimerPeriodical idles, 
 
 
 #include "nsITimer.h"
 #include "nsITimerCallback.h"
 #include "prlog.h"
-#include "nsRepeater.h"
-
-#include <list.h>
-#include <Events.h>
-
-
+#include <LPeriodical.h>
+#include <LArray.h>
+#include <LArrayIterator.h>
+#include <LComparator.h>
 
 #pragma mark class TimerImpl
-
-//========================================================================================
-class TimerImpl : public nsITimer 
+//
 // TimerImpl implements nsITimer API
-//========================================================================================
+// 
+class TimerImpl : public nsITimer 
 {
-    friend class TimerPeriodical;
-    
-  private:
-    nsTimerCallbackFunc mCallbackFunc;
-    nsITimerCallback * mCallbackObject;
-    void * mClosure;
-    PRUint32 mDelay;
-    PRUint32 mFireTime;  // Timer should fire when TickCount >= this number
-    TimerImpl * mPrev; 
-    TimerImpl * mNext; 
-  
-  public:
+	private:
+		nsTimerCallbackFunc mCallbackFunc;
+		nsITimerCallback * mCallbackObject;
+  	void * mClosure;
+  	PRUint32 mDelay;
+  	UInt32 mFireTime;	// Timer should fire when TickCount >= this number
+	
+	public:
 
-  // constructors
+	// constructors
 
-    TimerImpl();
+	  TimerImpl();
 
-    virtual ~TimerImpl();
-      
-     NS_DECL_ISUPPORTS
+	  virtual ~TimerImpl(){};
 
-    PRUint32 GetFireTime() const { return mFireTime; }
+	 	NS_DECL_ISUPPORTS
 
-    void Fire();
+		UInt32 GetFireTime() { return mFireTime; }
 
-  // nsITimer overrides
+		void Fire();
 
-    virtual nsresult Init(nsTimerCallbackFunc aFunc,
-                          void *aClosure,
-                          PRUint32 aDelay);
+	// nsITimer overrides
 
-    virtual nsresult Init(nsITimerCallback *aCallback,
-                          PRUint32 aDelay);
+	  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+	                        void *aClosure,
+	                        PRUint32 aDelay);
 
-    virtual void Cancel();
+		virtual nsresult Init(nsITimerCallback *aCallback,
+	                        PRUint32 aDelay);
 
-    virtual PRUint32 GetDelay();
+	  virtual void Cancel();
 
-    virtual void SetDelay(PRUint32 aDelay);
+	  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
-
+	private:
+	// Calculates mFireTime too
+		void SetDelaySelf( PRUint32 aDelay );
 };
 
 #pragma mark class TimerPeriodical
+//
+// TimerPeriodical is a singleton LPeriodical subclass that fires
+// off TimerImpl. The firing is done on idle
+// 
+class TimerPeriodical	: public LPeriodical
+{
+		static TimerPeriodical * gPeriodical;
+		
+		LArray mTimers;	// List of TimerImpl *
+	
+	public:
+		// Returns the singleton instance
+		static TimerPeriodical * GetPeriodical();
 
-//========================================================================================
-class TimerPeriodical  : public Repeater
-// TimerPeriodical is a singleton Repeater subclass that fires
-// off TimerImpl. The firing is done on idle.
-//========================================================================================
-{      
-    static TimerPeriodical * gPeriodical;
-    
-    TimerImpl* mTimers;
-  
-  public:
-    // Returns the singleton instance
-    static TimerPeriodical * GetPeriodical();
+		TimerPeriodical();
 
-    TimerPeriodical();
+		virtual ~TimerPeriodical();
+		
+		nsresult AddTimer( TimerImpl * aTimer);
+		
+		nsresult RemoveTimer( TimerImpl * aTimer);
 
-    virtual ~TimerPeriodical();
-    
-    virtual  void RepeatAction( const EventRecord &inMacEvent);
-    
-    nsresult AddTimer( TimerImpl * aTimer);
-    
-    nsresult RemoveTimer( TimerImpl * aTimer);
+		virtual	void	SpendTime( const EventRecord &inMacEvent);
+};
 
+#pragma mark class TimerImplComparator
+// 
+// TimerImplComparator compares two TimerImpl
+//
+class TimerImplComparator	: public LComparator
+{
+	virtual Int32		Compare(
+								const void*			inItemOne,
+								const void* 		inItemTwo,
+								Uint32				inSizeOne,
+								Uint32				inSizeTwo) const;
 };
 
 
-//========================================================================================
+// 
 // TimerImpl implementation
-//========================================================================================
+//
 
-NS_IMPL_ISUPPORTS(TimerImpl, nsITimer::GetIID())
+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)
-,  mPrev(nsnull)
-,  mNext(nsnull)
-#if DEBUG
-,  mSignature(eGoodTimerSignature)
-#endif
 {
-  NS_INIT_REFCNT();
+	NS_INIT_REFCNT();
+	mCallbackFunc = NULL;
+	mCallbackObject = NULL;
+	mClosure = NULL;
+	mDelay = 0;
+	mFireTime = 0;
 }
 
-//----------------------------------------------------------------------------------------
-TimerImpl::~TimerImpl()
-//----------------------------------------------------------------------------------------
-{
-  Cancel();
-  NS_IF_RELEASE(mCallbackObject);
-#if DEBUG
-  mSignature = eDeletedTimerSignature;
-#endif
-}
-
-//----------------------------------------------------------------------------------------
 nsresult TimerImpl::Init(nsTimerCallbackFunc aFunc,
-                          void *aClosure,
-                          PRUint32 aDelay)
-//----------------------------------------------------------------------------------------
+	                        void *aClosure,
+	                        PRUint32 aDelay)
 {
-  mCallbackFunc = aFunc;
-  mClosure = aClosure;
-  SetDelaySelf(aDelay);
-  return TimerPeriodical::GetPeriodical()->AddTimer(this);
+	mCallbackFunc = aFunc;
+	mClosure = aClosure;
+	SetDelaySelf(aDelay);
+	return TimerPeriodical::GetPeriodical()->AddTimer(this);
 }
 
-//----------------------------------------------------------------------------------------
 nsresult TimerImpl::Init(nsITimerCallback *aCallback,
-                          PRUint32 aDelay)
-//----------------------------------------------------------------------------------------
+	                        PRUint32 aDelay)
 {
-  NS_ADDREF(aCallback);
-  mCallbackObject = aCallback;
-  SetDelaySelf(aDelay);
-  return TimerPeriodical::GetPeriodical()->AddTimer(this);
+	mCallbackObject = aCallback;
+	SetDelaySelf(aDelay);
+	return TimerPeriodical::GetPeriodical()->AddTimer(this);
 }
 
-//----------------------------------------------------------------------------------------
 void TimerImpl::Cancel()
-//----------------------------------------------------------------------------------------
 {
-  TimerPeriodical::GetPeriodical()->RemoveTimer(this);
+	TimerPeriodical::GetPeriodical()->RemoveTimer(this);
 }
 
-//----------------------------------------------------------------------------------------
 PRUint32 TimerImpl::GetDelay()
-//----------------------------------------------------------------------------------------
 {
-  return mDelay;
+	return mDelay;
 }
 
-//----------------------------------------------------------------------------------------
 void TimerImpl::SetDelay(PRUint32 aDelay)
-//----------------------------------------------------------------------------------------
 {
-  SetDelaySelf(aDelay);
+	SetDelaySelf(aDelay);
+	// Make sure that timer was sorted
+	NS_ADDREF(this);
+	TimerPeriodical::GetPeriodical()->RemoveTimer(this);
+	TimerPeriodical::GetPeriodical()->AddTimer(this);
+	NS_RELEASE(this);
 }
 
-//----------------------------------------------------------------------------------------
 void* TimerImpl::GetClosure()
-//----------------------------------------------------------------------------------------
 {
   return mClosure;
 }
 
-//----------------------------------------------------------------------------------------
 void TimerImpl::Fire()
-//----------------------------------------------------------------------------------------
 {
-  NS_PRECONDITION(mRefCnt > 0, "Firing a disposed Timer!");
-  if (mCallbackFunc != NULL)
-  {
-    (*mCallbackFunc)(this, mClosure);
+	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
+  else if (mCallbackObject != NULL) {
+    mCallbackObject->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)
+	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::gPeriodical = NULL;
 
 TimerPeriodical * TimerPeriodical::GetPeriodical()
 {
-  if (gPeriodical == NULL)
-    gPeriodical = new TimerPeriodical();
-  return gPeriodical;
+	if (gPeriodical == NULL)
+		gPeriodical = new TimerPeriodical();
+	return gPeriodical;
 }
 
 TimerPeriodical::TimerPeriodical()
 {
-  mTimers = nsnull;
+	mTimers.SetComparator( new TimerImplComparator() );
+	mTimers.SetKeepSorted( true );
 }
 
 TimerPeriodical::~TimerPeriodical()
 {
-  PR_ASSERT(mTimers == 0);
+	PR_ASSERT(mTimers.GetCount() == 0);
 }
 
 nsresult TimerPeriodical::AddTimer( TimerImpl * aTimer)
 {
-  // make sure it's not already there
-  RemoveTimer(aTimer);
-  // keep list sorted by fire time
-  if (mTimers)
-  {
-    if (aTimer->GetFireTime() < mTimers->GetFireTime())
-    {
-      mTimers->mPrev = aTimer;
-      aTimer->mNext = mTimers;
-      mTimers = aTimer;
-    }
-    else
-    {
-      TimerImpl *t = mTimers;
-      TimerImpl *prevt;
-      // we know we will enter the while loop at least the first
-      // time, and thus prevt will be initialized
-      while (t && (t->GetFireTime() <= aTimer->GetFireTime()))
-      {
-        prevt = t;
-        t = t->mNext;
-      }
-      aTimer->mPrev = prevt;
-      aTimer->mNext = prevt->mNext;
-      prevt->mNext = aTimer;
-      if (aTimer->mNext) aTimer->mNext->mPrev = aTimer;
-    }
-  }
-  else mTimers = aTimer;
-  
-  StartRepeating();
-  return NS_OK;
+	try
+	{
+		NS_ADDREF(aTimer);
+		mTimers.AddItem( &aTimer );
+		StartRepeating();
+	}
+	catch(...)
+	{
+		return NS_ERROR_UNEXPECTED;
+	}
+	return NS_OK;
 }
 
 nsresult TimerPeriodical::RemoveTimer( TimerImpl * aTimer)
 {
-  TimerImpl* t = mTimers;
-  TimerImpl* next_t = nsnull;
-  if (t) next_t = t->mNext;
-  while (t)
-  {
-    if (t == aTimer)
-    {
-      if (mTimers == t) mTimers = t->mNext;
-      if (t->mPrev) t->mPrev->mNext = t->mNext;
-      if (t->mNext) t->mNext->mPrev = t->mPrev;
-      t->mNext = nsnull;
-      t->mPrev = nsnull;
-    }
-    t = next_t;
-    if (t) next_t = t->mNext;
-  }
- 
-  if ( mTimers == nsnull )
-    StopRepeating();
-  return NS_OK;
+	mTimers.SetComparator(LLongComparator::GetComparator(), false);
+		mTimers.Remove(&aTimer);
+	mTimers.SetComparator(new TimerImplComparator());
+
+	NS_RELEASE( aTimer );
+	if ( mTimers.GetCount() == 0 )
+		StopRepeating();
+	return NS_OK;
 }
 
 // Called through every event loop
 // Loops through the list of available timers, and 
-// fires off the appropriate ones
-void  TimerPeriodical::RepeatAction( const EventRecord &inMacEvent)
+// fires off the available ones
+void	TimerPeriodical::SpendTime( const EventRecord &inMacEvent)
 {
-  PRBool done = false;  
-  while (!done)
-  {
-    TimerImpl* t = mTimers;
-    while (t)
-    {
-      NS_ASSERTION(t->IsGoodTimer(), "Bad timer!");
-    
-      if (t->GetFireTime() <= inMacEvent.when)
-      {
-        RemoveTimer(t);
-        t->Fire();
-        break;
-      }
-      t = t->mNext;
-    }
-    done = true;
-  }
+	LArrayIterator iter(mTimers);
+	TimerImpl * timer;
+	while (iter.Next(&timer))
+	{
+		if (timer->GetFireTime() <= inMacEvent.when)
+		{
+			//NS_ADDREF(timer);
+			RemoveTimer(timer);
+			timer->Fire();
+			//NS_RELEASE(timer);
+		}
+		else
+			break;	// Items are sorted, so we do not need to iterate until the end
+	}
 }
 
-                
+//
+//  class TimerImplComparator implementation
+//
+Int32 TimerImplComparator::Compare(
+								const void*			inItemOne,
+								const void* 		inItemTwo,
+								Uint32				inSizeOne,
+								Uint32				inSizeTwo) const
+{
+	return (( TimerImpl *) inItemOne)->GetFireTime() - (( TimerImpl *) inItemTwo)->GetFireTime();
+}
+								
 NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
@@ -360,5 +288,5 @@ NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    return timer->QueryInterface(nsITimer::GetIID(), (void **) aInstancePtrResult);
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
 }

mozilla/base/src/makefile.win

@@ -26,47 +26,31 @@ LIBRARY_NAME=raptorbase
 CPPSRCS =				\
 	nsArena.cpp			\
 	nsAtomTable.cpp			\
-	nsBaseDLL.cpp			\
 	nsBTree.cpp			\
 	nsByteBuffer.cpp		\
 	nsCRT.cpp			\
 	nsDeque.cpp			\
-	nsProperties.cpp		\
 	nsRBTree.cpp			\
 	nsSizeOfHandler.cpp		\
 	nsString.cpp			\
 	nsUnicharBuffer.cpp		\
 	nsUnicharInputStream.cpp	\
 	nsVoidArray.cpp			\
-	nsFileSpec.cpp \
-	nsFileStream.cpp \
-	nsStringStream.cpp \
-	nsEscape.cpp				\
-    nsIFileStream.cpp \
-    nsSpecialSystemDirectory.cpp \
 	$(NULL)
 
 CPP_OBJS =					\
 	.\$(OBJDIR)\nsArena.obj			\
 	.\$(OBJDIR)\nsAtomTable.obj		\
-	.\$(OBJDIR)\nsBaseDLL.obj		\
 	.\$(OBJDIR)\nsBTree.obj			\
 	.\$(OBJDIR)\nsByteBuffer.obj		\
 	.\$(OBJDIR)\nsCRT.obj			\
 	.\$(OBJDIR)\nsDeque.obj			\
-	.\$(OBJDIR)\nsProperties.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 \
-	.\$(OBJDIR)\nsEscape.obj			\
-    .\$(OBJDIR)\nsIFileStream.obj       \
-    .\$(OBJDIR)\nsIStringStream.obj       \
-    .\$(OBJDIR)\nsSpecialSystemDirectory.obj \
 	$(NULL)
 
 EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
@@ -79,16 +63,16 @@ EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
 
 MODULE=raptor 
 
-REQUIRES=xpcom netlib raptor uconv
+REQUIRES=xpcom netlib raptor 
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib \
-    -I$(PUBLIC)\raptor -I$(PUBLIC)\uconv -I$(PUBLIC)\unicharutil
+    -I$(PUBLIC)\raptor 
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = raptorbase
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
-OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj .\$(OBJDIR)\nsCaretProperties.obj
+OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -98,7 +82,7 @@ LCFLAGS = \
 # These are the libraries we need to link with to create the dll
 LLIBS=				\
  $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\plc3.lib       \
+ $(DIST)\lib\libplc21.lib       \
  $(LIBNSPR)  
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

mozilla/base/src/motif/Makefile.in

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

mozilla/base/src/motif/nsCaretProperties.cpp

@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and 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 "nscore.h"
-
-#include "nsCaretProperties.h"
-
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties::nsCaretProperties()
-:	mCaretWidth(eDefaultCaretWidth)
-,	mBlinkRate(eDefaulBlinkRate)
-{
-	// in your platform-specific class, get data from the OS in your constructor
-}
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties* NewCaretProperties()
-{
-	return new nsCaretProperties();
-}

mozilla/base/src/nsAtomTable.cpp

@@ -36,10 +36,6 @@ public:
 
   void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
 
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
-
   virtual void ToString(nsString& aBuf) const;
 
   virtual const PRUnichar* GetUnicode() const;
@@ -79,7 +75,7 @@ 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*) ::operator new(size);
+  AtomImpl* ii = (AtomImpl*) new char[size];
   nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
   ii->mString[uslen] = 0;
   return ii;
@@ -134,7 +130,7 @@ NS_BASE nsIAtom* NS_NewAtom(const PRUnichar* us)
                                      (PLHashComparator) nsnull,
                                      nsnull, nsnull);
   }
-  PRUint32 uslen;
+  PRInt32 uslen;
   PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
   PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
   PLHashEntry* he = *hep;

mozilla/base/src/nsBaseDLL.cpp

@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#include "nsBaseDLL.h"
-#include "nscore.h"
-#include "nsIProperties.h"
-#include "nsProperties.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-
-static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-
-PRInt32 gLockCount = 0;
-
-NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-
-extern "C" NS_EXPORT nsresult
-NSRegisterSelf(nsISupports* aServMgr, const char* path)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  nsIComponentManager* compMgr;
-  rv = servMgr->GetService(kComponentManagerCID, 
-                           nsIComponentManager::GetIID(), 
-                           (nsISupports**)&compMgr);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = compMgr->RegisterComponent(kPropertiesCID, NULL, NULL,
-                                  path, PR_TRUE, PR_TRUE);
-
-  (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-  return rv;
-}
-
-extern "C" NS_EXPORT nsresult
-NSUnregisterSelf(nsISupports* aServMgr, const char* path)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  nsIComponentManager* compMgr;
-  rv = servMgr->GetService(kComponentManagerCID, 
-                           nsIComponentManager::GetIID(), 
-                           (nsISupports**)&compMgr);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = compMgr->UnregisterFactory(kPropertiesCID, path);
-
-  (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-  return rv;
-}
-
-extern "C" NS_EXPORT nsresult
-NSGetFactory(nsISupports* aServMgr, 
-             const nsCID& aClass,
-             const char *aClassName,
-             const char *aProgID,
-             nsIFactory** aFactory)
-{
-  nsresult  res;
-
-  if (!aFactory) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  if (aClass.Equals(kPropertiesCID)) {
-    nsPropertiesFactory *propsFactory = new nsPropertiesFactory();
-    if (!propsFactory) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    res = propsFactory->QueryInterface(kIFactoryIID, (void**) aFactory);
-    if (NS_FAILED(res)) {
-      *aFactory = nsnull;
-      delete propsFactory;
-    }
-
-    return res;
-  }
-
-  return NS_NOINTERFACE;
-}
-
-extern "C" NS_EXPORT PRBool
-NSCanUnload(nsISupports* serviceMgr)
-{
-  return PR_FALSE;      // XXX can we unload this?
-}

mozilla/base/src/nsBaseDLL.h

@@ -1,26 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#ifndef nsBaseDLL_h___
-#define nsBaseDLL_h___
-
-#include "prtypes.h"
-
-extern PRInt32 gLockCount;
-
-#endif /* nsBaseDLL_h___ */

mozilla/base/src/nsByteBuffer.cpp

@@ -23,25 +23,25 @@
 
 class ByteBufferImpl : public nsIByteBuffer {
 public:
-  ByteBufferImpl(PRUint32 aBufferSize);
+  ByteBufferImpl(PRInt32 aBufferSize);
   ~ByteBufferImpl();
 
   NS_DECL_ISUPPORTS
-  virtual PRUint32 GetLength(void) const;
-  virtual PRUint32 GetBufferSize(void) const;
+  virtual PRInt32 GetLength() const;
+  virtual PRInt32 GetBufferSize() const;
   virtual char* GetBuffer() const;
-  virtual PRBool Grow(PRUint32 aNewSize);
+  virtual PRBool Grow(PRInt32 aNewSize);
   virtual PRInt32 Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                       PRUint32 aKeep);
+                       PRInt32 aKeep);
 
   char* mBuffer;
-  PRUint32 mSpace;
-  PRUint32 mLength;
+  PRInt32 mSpace;
+  PRInt32 mLength;
 };
 
-ByteBufferImpl::ByteBufferImpl(PRUint32 aBufferSize)
+ByteBufferImpl::ByteBufferImpl(PRInt32 aBufferSize)
 {
-  if (aBufferSize < MIN_BUFFER_SIZE) {
+  if (PRUint32(aBufferSize) < MIN_BUFFER_SIZE) {
     aBufferSize = MIN_BUFFER_SIZE;
   }
   mSpace = aBufferSize;
@@ -56,30 +56,30 @@ NS_IMPL_ISUPPORTS(ByteBufferImpl,kByteBufferIID)
 ByteBufferImpl::~ByteBufferImpl()
 {
   if (nsnull != mBuffer) {
-    delete[] mBuffer;
+    delete mBuffer;
     mBuffer = nsnull;
   }
   mLength = 0;
 }
 
-PRUint32 ByteBufferImpl::GetLength(void) const
+PRInt32 ByteBufferImpl::GetLength() const
 {
   return mLength;
 }
 
-PRUint32 ByteBufferImpl::GetBufferSize(void) const
+PRInt32 ByteBufferImpl::GetBufferSize() const
 {
   return mSpace;
 }
 
-char* ByteBufferImpl::GetBuffer(void) const
+char* ByteBufferImpl::GetBuffer() const
 {
   return mBuffer;
 }
 
-PRBool ByteBufferImpl::Grow(PRUint32 aNewSize)
+PRBool ByteBufferImpl::Grow(PRInt32 aNewSize)
 {
-  if (aNewSize < MIN_BUFFER_SIZE) {
+  if (PRUint32(aNewSize) < MIN_BUFFER_SIZE) {
     aNewSize = MIN_BUFFER_SIZE;
   }
   char* newbuf = new char[aNewSize];
@@ -87,7 +87,7 @@ PRBool ByteBufferImpl::Grow(PRUint32 aNewSize)
     if (0 != mLength) {
       nsCRT::memcpy(newbuf, mBuffer, mLength);
     }
-    delete[] mBuffer;
+    delete mBuffer;
     mBuffer = newbuf;
     return PR_TRUE;
   }
@@ -95,10 +95,10 @@ PRBool ByteBufferImpl::Grow(PRUint32 aNewSize)
 }
 
 PRInt32 ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                             PRUint32 aKeep)
+                             PRInt32 aKeep)
 {
   NS_PRECONDITION(nsnull != aStream, "null stream");
-  NS_PRECONDITION(aKeep <= mLength, "illegal keep count");
+  NS_PRECONDITION(PRUint32(aKeep) <= PRUint32(mLength), "illegal keep count");
   if ((nsnull == aStream) || (PRUint32(aKeep) > PRUint32(mLength))) {
     // whoops
     *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
@@ -112,8 +112,9 @@ PRInt32 ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
 
   // Read in some new data
   mLength = aKeep;
-  PRUint32 nb;
-  *aErrorCode = aStream->Read(mBuffer + aKeep, mSpace - aKeep, &nb);
+  PRInt32 amount = mSpace - aKeep;
+  PRInt32 nb;
+  *aErrorCode = aStream->Read(mBuffer, aKeep, amount, &nb);
   if (NS_SUCCEEDED(*aErrorCode)) {
     mLength += nb;
   }
@@ -124,7 +125,7 @@ PRInt32 ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
 
 NS_BASE nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
                                   nsISupports* aOuter,
-                                  PRUint32 aBufferSize)
+                                  PRInt32 aBufferSize)
 {
   if (nsnull != aOuter) {
     return NS_ERROR_NO_AGGREGATION;

mozilla/base/src/nsCRT.cpp

@@ -33,10 +33,6 @@
 
 
 #include "nsCRT.h"
-#include "nsUnicharUtilCIID.h"
-#include "nsIServiceManager.h"
-#include "nsICaseConversion.h"
-
 
 // XXX Bug: These tables don't lowercase the upper 128 characters properly
 
@@ -90,7 +86,6 @@ static const unsigned char kLower2Upper[256] = {
   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,
@@ -113,77 +108,21 @@ static const PRUnichar kIsoLatin1ToUCS2[256] = {
 //----------------------------------------------------------------------
 
 #define TOLOWER(_ucs2) \
-  (((_ucs2) < 128) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
+  (((_ucs2) < 256) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
 
 #define TOUPPER(_ucs2) \
-  (((_ucs2) < 128) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
-
-class HandleCaseConversionShutdown : public nsIShutdownListener {
-public :
-   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
-   HandleCaseConversionShutdown(void) { NS_INIT_REFCNT(); }
-   virtual ~HandleCaseConversionShutdown(void) {}
-   NS_DECL_ISUPPORTS
-};
-static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
-static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
-
-static nsICaseConversion * gCaseConv = NULL; 
-
-static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
-NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown, kIShutdownListenerIID);
-
-nsresult
-HandleCaseConversionShutdown::OnShutdown(const nsCID& cid, nsISupports* service)
-{
-    if (cid.Equals(kUnicharUtilCID)) {
-        NS_ASSERTION(service == gCaseConv, "wrong service!");
-        nsrefcnt cnt = gCaseConv->Release();
-        gCaseConv = NULL;
-    }
-    return NS_OK;
-}
-
-static HandleCaseConversionShutdown* gListener = NULL;
-
-static void StartUpCaseConversion()
-{
-    nsresult err;
-
-    if ( NULL == gListener )
-    {
-      gListener = new HandleCaseConversionShutdown();
-      gListener->AddRef();
-    }
-    err = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
-                                        (nsISupports**) &gCaseConv, gListener);
-}
-static void CheckCaseConversion()
-{
-    if(NULL == gCaseConv )
-      StartUpCaseConversion();
-
-    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
-   
-}
+  (((_ucs2) < 256) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
 
 static PRUnichar _ToLower(PRUnichar aChar)
 {
-  PRUnichar oLower;
-  CheckCaseConversion();
-  nsresult err = gCaseConv->ToLower(aChar, &oLower);
-  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
-  return ( NS_SUCCEEDED(err) ) ? oLower : aChar ;
+  // XXX need i18n code here
+  return aChar;
 }
 
 static PRUnichar _ToUpper(PRUnichar aChar)
 {
-  nsresult err;
-  PRUnichar oUpper;
-  CheckCaseConversion();
-  err = gCaseConv->ToUpper(aChar, &oUpper);
-  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
-  return ( NS_SUCCEEDED(err) ) ? oUpper : aChar ;
+  // XXX need i18n code here
+  return aChar;
 }
 
 //----------------------------------------------------------------------
@@ -198,63 +137,9 @@ PRUnichar nsCRT::ToLower(PRUnichar aChar)
   return TOLOWER(aChar);
 }
 
-PRBool nsCRT::IsUpper(PRUnichar aChar)
+PRInt32 nsCRT::strlen(const PRUnichar* s)
 {
-  return aChar != nsCRT::ToLower(aChar);
-}
-
-PRBool nsCRT::IsLower(PRUnichar aChar)
-{
-  return aChar != nsCRT::ToUpper(aChar);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// My lovely strtok routine
-
-#define IS_DELIM(m, c)          ((m)[(c) >> 3] & (1 << ((c) & 7)))
-#define SET_DELIM(m, c)         ((m)[(c) >> 3] |= (1 << ((c) & 7)))
-#define DELIM_TABLE_SIZE        32
-
-char* nsCRT::strtok(char* str, const char* delims, char* *newStr)
-{
-  NS_ASSERTION(str, "Unlike regular strtok, the first argument cannot be null.");
-
-  char delimTable[DELIM_TABLE_SIZE];
-  PRUint32 i;
-  char* result;
-
-  for (i = 0; i < DELIM_TABLE_SIZE; i++)
-    delimTable[i] = '\0';
-
-  for (i = 0; i < DELIM_TABLE_SIZE && delims[i]; i++) {
-    SET_DELIM(delimTable, delims[i]);
-  }
-  NS_ASSERTION(delims[i] == '\0', "too many delimiters");
-
-  // skip to beginning
-  while (*str && IS_DELIM(delimTable, *str)) {
-    str++;
-  }
-  result = str;
-
-  // fix up the end of the token
-  while (*str) {
-    if (IS_DELIM(delimTable, *str)) {
-      *str++ = '\0';
-      break;
-    }
-    str++;
-  }
-  *newStr = str;
-
-  return str == result ? NULL : result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-PRUint32 nsCRT::strlen(const PRUnichar* s)
-{
-  PRUint32 len = 0;
+  PRInt32 len = 0;
   if(s) {
     while (*s++ != 0) {
       len++;
@@ -294,11 +179,11 @@ PRInt32 nsCRT::strcmp(const PRUnichar* s1, const PRUnichar* s2)
  * @param   s1 and s2 both point to unichar strings
  * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
  */
-PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRInt32 n)
 {
   if(s1 && s2) { 
-    if(n != 0) {
-      do {
+    if(0<n) {
+      while (--n >= 0) {
         PRUnichar c1 = *s1++;
         PRUnichar c2 = *s2++;
         if (c1 != c2) {
@@ -306,8 +191,9 @@ PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
           return 1;
         }
         if ((0==c1) || (0==c2)) break;
-      } while (--n != 0);
+      }
     }
+    else return 1;
   }
   return 0;
 }
@@ -348,7 +234,7 @@ PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const PRUnichar* s2)
  * @param   s1 and s2 both point to unichar strings
  * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
  */
-PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRInt32 n)
 {
   if(s1 && s2) {
     if(0<n){
@@ -365,7 +251,7 @@ PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
         }
         if ((0==c1) || (0==c2)) break;
       }
-    }
+    } else return 1;
   }
   return 0;
 }
@@ -404,11 +290,11 @@ PRInt32 nsCRT::strcmp(const PRUnichar* s1, const char* s2)
  * @param   s2 points to cstring
  * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
  */
-PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRInt32 n)
 {
   if(s1 && s2) {
-    if(n != 0){
-      do {
+    if(0<n){
+      while (--n >= 0) {
         PRUnichar c1 = *s1++;
         PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
         if (c1 != c2) {
@@ -416,8 +302,8 @@ PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRUint32 n)
           return 1;
         }
         if ((0==c1) || (0==c2)) break;
-      } while (--n != 0);
-    }
+      }
+    } else return 1;
   }
   return 0;
 }
@@ -458,11 +344,11 @@ PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const char* s2)
  * @param   s2 points to cstring
  * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
  */
-PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRInt32 n)
 {
   if(s1 && s2){
-    if(n != 0){
-      do {
+    if(0<n){
+      while (--n >= 0) {
         PRUnichar c1 = *s1++;
         PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
         if (c1 != c2) {
@@ -474,21 +360,12 @@ PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRUint32 n)
           }
         }
         if (c1 == 0) break;
-      } while (--n != 0);
-    }
+      }
+    } else return 1;
   }
   return 0;
 }
 
-PRUnichar* nsCRT::strdup(const PRUnichar* str)
-{
-  PRUint32 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;
@@ -502,10 +379,10 @@ PRUint32 nsCRT::HashValue(const PRUnichar* us)
   return rv;
 }
 
-PRUint32 nsCRT::HashValue(const PRUnichar* us, PRUint32* uslenp)
+PRUint32 nsCRT::HashValue(const PRUnichar* us, PRInt32* uslenp)
 {
   PRUint32 rv = 0;
-  PRUint32 len = 0;
+  PRInt32 len = 0;
   PRUnichar ch;
   while ((ch = *us++) != 0) {
     // FYI: rv = rv*37 + ch

mozilla/base/src/nsCRT.h

@@ -23,69 +23,28 @@
 #include "plstr.h"
 #include "nscore.h"
 
-#define CR '\015'
-#define LF '\012'
-#define VTAB '\013'
-#define FF '\014'
-#define TAB '\011'
-#define CRLF "\015\012"     /* A CR LF equivalent string */
-
-
-// This macro can be used in a class declaration for classes that want
-// to ensure that their instance memory is zeroed.
-#define NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW \
-  void* operator new(size_t sz) {             \
-    void* rv = ::operator new(sz);            \
-    if (rv) {                                 \
-      nsCRT::zero(rv, sz);                    \
-    }                                         \
-    return rv;                                \
-  }                                           \
-  void operator delete(void* ptr) {           \
-    ::operator delete(ptr);                   \
-  }
-
-// This macro works with the next macro to declare a non-inlined
-// version of the above.
-#define NS_DECL_ZEROING_OPERATOR_NEW \
-  void* operator new(size_t sz);     \
-  void operator delete(void* ptr);
-
-#define NS_IMPL_ZEROING_OPERATOR_NEW(_class) \
-  void* _class::operator new(size_t sz) {    \
-    void* rv = ::operator new(sz);           \
-    if (rv) {                                \
-      nsCRT::zero(rv, sz);                   \
-    }                                        \
-    return rv;                               \
-  }                                          \
-  void _class::operator delete(void* ptr) {  \
-    ::operator delete(ptr);                  \
-  }
-
 /// 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, PRUint32 aCount) {
+  static void memcpy(void* aDest, const void* aSrc, PRInt32 aCount) {
     ::memcpy(aDest, aSrc, (size_t)aCount);
   }
 
-  static void memmove(void* aDest, const void* aSrc, PRUint32 aCount) {
+  static void memmove(void* aDest, const void* aSrc, PRInt32 aCount) {
     ::memmove(aDest, aSrc, (size_t)aCount);
   }
 
-  static void memset(void* aDest, PRUint8 aByte, PRUint32 aCount) {
+  static void memset(void* aDest, PRUint8 aByte, PRInt32 aCount) {
     ::memset(aDest, aByte, aCount);
   }
 
-  static void zero(void* aDest, PRUint32 aCount) {
+  static void zero(void* aDest, PRInt32 aCount) {
     ::memset(aDest, 0, (size_t)aCount);
   }
 
@@ -93,18 +52,13 @@ public:
    @param s the string in question
    @return the length of s
    */
-  static PRUint32 strlen(const char* s) {
-    return PRUint32(::strlen(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 PRUint32(PL_strcmp(s1, s2));
-  }
-
-  static PRUint32 strncmp(const char* s1, const char* s2,
-                         PRUint32 aMaxLen) {
-    return PRInt32(PL_strncmp(s1, s2, aMaxLen));
+    return PRInt32(PL_strcmp(s1, s2));
   }
 
   /// Case-insensitive string comparison.
@@ -113,73 +67,42 @@ public:
   }
 
   /// Case-insensitive string comparison with length
-  static PRInt32 strncasecmp(const char* s1, const char* s2, PRUint32 aMaxLen) {
+  static PRInt32 strncasecmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
     return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
   }
 
-  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
-    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
-  }
-  
-  static char* strdup(const char* str) {
-    return PL_strdup(str);
-  }
-
-  /**
-    How to use this fancy (thread-safe) version of strtok: 
-
-    void main( void ) {
-      printf( "%s\n\nTokens:\n", string );
-      // Establish string and get the first token:
-      char* newStr;
-      token = nsCRT::strtok( string, seps, &newStr );   
-      while( token != NULL ) {
-        // While there are tokens in "string"
-        printf( " %s\n", token );
-        // Get next token:
-        token = nsCRT::strtok( newStr, seps, &newStr );
-      }
-    }
-
-  */
-  static char* strtok(char* str, const char* delims, char* *newStr); 
-
   /// Like strlen except for ucs2 strings
-  static PRUint32 strlen(const PRUnichar* s);
+  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,
-                         PRUint32 aMaxLen);
+                         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,
-                             PRUint32 aMaxLen);
+                             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,
-                         PRUint32 aMaxLen);
+                         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,
-                             PRUint32 aMaxLen);
-
-  // Note: uses new[] to allocate memory, so you must use delete[] to
-  // free the memory
-  static PRUnichar* strdup(const PRUnichar* str);
+                             PRInt32 aMaxLen);
 
   /// Compute a hashcode for a ucs2 string
   static PRUint32 HashValue(const PRUnichar* s1);
 
   /// Same as above except that we return the length in s1len
-  static PRUint32 HashValue(const PRUnichar* s1, PRUint32* s1len);
+  static PRUint32 HashValue(const PRUnichar* s1, PRInt32* s1len);
 
   /// String to integer.
   static PRInt32 atoi( const PRUnichar *string );
@@ -187,10 +110,6 @@ public:
   static PRUnichar ToUpper(PRUnichar aChar);
 
   static PRUnichar ToLower(PRUnichar aChar);
-  
-  static PRBool IsUpper(PRUnichar aChar);
-
-  static PRBool IsLower(PRUnichar aChar);
 };
 
 #endif /* nsCRT_h___ */

mozilla/base/src/nsDeque.cpp

@@ -16,7 +16,7 @@
  * Reserved.
  */
 
- 
+
 #include "nsDeque.h"
 #include "nsCRT.h"
 
@@ -28,8 +28,8 @@
  * @update	gess4/18/98
  * @return  new deque
  */
-nsDeque::nsDeque(nsDequeFunctor* aDeallocator) {
-  mDeallocator=aDeallocator;
+nsDeque::nsDeque(nsDequeFunctor& aMemDestroyer) : mMemDestroyer(aMemDestroyer) {
+  mMemDestroyer=aMemDestroyer;
   mCapacity=eGrowthDelta;
   mOrigin=mSize=0;
   mData=new void*[mCapacity];
@@ -44,10 +44,6 @@ nsDeque::~nsDeque() {
   Erase();
   delete [] mData;
   mData=0;
-  if(mDeallocator) {
-    delete mDeallocator;
-  }
-  mDeallocator=0;
 }
 
 
@@ -63,13 +59,6 @@ PRInt32 nsDeque::GetSize(void) const {
   return mSize;
 }
 
-void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
-  if(mDeallocator) {
-    delete mDeallocator;
-  }
-  mDeallocator=aDeallocator;
-}
-
 /**
  * Remove all items from container without destroying them.
  *
@@ -78,9 +67,7 @@ void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
  * @return
  */
 nsDeque& nsDeque::Empty() {
-  if((0<mCapacity) && (mData)) {
-    nsCRT::zero(mData,mCapacity*sizeof(mData));
-  }
+  nsCRT::zero(mData,mCapacity*sizeof(mData));
   mSize=0;
   mOrigin=0;
   return *this;
@@ -93,20 +80,18 @@ nsDeque& nsDeque::Empty() {
  * @return  this
  */
 nsDeque& nsDeque::Erase() {
-  if(mDeallocator) {
-    ForEach(*mDeallocator);
-  }
+  ForEach(mMemDestroyer);
   return Empty();
 }
 
 
 /**
- * This method adds an item to the end of the deque. 
+ * This method adds an item to the end of the queue. 
  * This operation has the potential to cause the 
  * underlying buffer to resize.
  *
  * @update	gess4/18/98
- * @param   anItem: new item to be added to deque
+ * @param   anItem: new item to be added to queue
  * @return  nada
  */
 nsDeque& nsDeque::Push(void* anItem) {
@@ -137,50 +122,6 @@ nsDeque& nsDeque::Push(void* anItem) {
 }
 
 
-/**
- * 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.
@@ -189,7 +130,7 @@ void* nsDeque::Pop(void) {
  * @param   nada
  * @return  last item in container
  */
-void* nsDeque::PopFront() {
+void* nsDeque::Pop() {
   void* result=0;
   if(mSize>0) {
     result=mData[mOrigin];
@@ -220,6 +161,28 @@ void* nsDeque::Peek() {
   return result;
 }
 
+/**
+ * Remove and return the last item in the container.
+ * 
+ * @update	gess4/18/98
+ * @param   none
+ * @return  ptr to last item in container
+ */
+void* nsDeque::PopBack(void) {
+  void* result=0;
+  if(mSize>0) {
+    int offset=mOrigin+mSize;
+    if(offset>=mCapacity) 
+      offset-=mCapacity;
+    result=mData[offset-1];
+    mData[offset-1]=0;
+    mSize--;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
 /**
  * Call this to retrieve the ith element from this container.
  * Keep in mind that accessing the underlying elements is 

mozilla/base/src/nsDeque.h

@@ -71,7 +71,7 @@ public:
 class NS_BASE nsDeque {
 friend class nsDequeIterator;
   public:
-                       nsDeque(nsDequeFunctor* aDeallocator);
+                       nsDeque(nsDequeFunctor& aMemDestroyer);
                       ~nsDeque();
             
   /**
@@ -93,15 +93,6 @@ friend class nsDequeIterator;
    * @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.
@@ -112,16 +103,6 @@ friend class nsDequeIterator;
    */
   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.
    * 
@@ -132,16 +113,14 @@ friend class nsDequeIterator;
   void* Peek(void);
   
   /**
-   * method used to retrieve ptr to
-   * ith member in container. DOesn't remove
-   * that item.
-   *
+   * Remove and return the last item in the container.
+   * 
    * @update	gess4/18/98
-   * @param   index of desired item
-   * @return  ptr to ith element in list
+   * @param   none
+   * @return  ptr to first item in container
    */
-  void* ObjectAt(int anIndex) const;
-  
+  void* PopBack(void);
+    
   /**
    * Remove all items from container without destroying them
    * 
@@ -201,8 +180,6 @@ friend class nsDequeIterator;
    */
   const void* FirstThat(nsDequeFunctor& aFunctor) const;
 
-  void SetDeallocator(nsDequeFunctor* aDeallocator);
-
   /**
    * Perform automated selftest on the deque
    *
@@ -217,7 +194,7 @@ protected:
   PRInt32         mSize;
   PRInt32         mCapacity;
   PRInt32         mOrigin;
-  nsDequeFunctor* mDeallocator;
+  nsDequeFunctor& mMemDestroyer;
   void**          mData;
 
 
@@ -252,6 +229,17 @@ private:
    */
   nsDeque& operator=(const nsDeque& anOther);
 
+  /**
+   * PRIVATE method used to retrieve ptr to
+   * ith member in container. DOesn't remove
+   * that item.
+   *
+   * @update	gess4/18/98
+   * @param   index of desired item
+   * @return  ptr to ith element in list
+   */
+  void* ObjectAt(int anIndex) const;
+
 };
 
 /******************************************************

mozilla/base/src/nsEscape.cpp

@@ -1,168 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-//	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 '%'
-
-//----------------------------------------------------------------------------------------
-NS_BASE char* nsEscape(const char * str, nsEscapeMask mask)
-//----------------------------------------------------------------------------------------
-{
-    if(!str)
-        return NULL;
-    return nsEscapeCount(str, (PRInt32)PL_strlen(str), mask, NULL);
-}
-
-//----------------------------------------------------------------------------------------
-NS_BASE char* nsEscapeCount(
-    const char * str,
-    PRInt32 len,
-    nsEscapeMask mask,
-    PRInt32* out_len)
-//----------------------------------------------------------------------------------------
-{
-	if (!str)
-		return 0;
-
-    int i, extra = 0;
-    char* hexChars = "0123456789ABCDEF";
-
-	register const unsigned char* src = (const unsigned char *) str;
-    for (i = 0; i < len; i++)
-	{
-        if (!IS_OK(*src++))
-            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;
-	src = (const unsigned char *) str;
-	if (mask == url_XPAlphas)
-	{
-	    for (i = 0; i < len; i++)
-		{
-			unsigned char c = *src++;
-			if (IS_OK(c))
-				*dst++ = c;
-			else if (c == ' ')
-				*dst++ = '+'; /* convert spaces to pluses */
-			else 
-			{
-				*dst++ = HEX_ESCAPE;
-				*dst++ = hexChars[c >> 4];		/* high nibble */
-				*dst++ = hexChars[c & 0x0f];	/* low nibble */
-			}
-		}
-	}
-	else
-	{
-	    for (i = 0; i < len; i++)
-		{
-			unsigned char c = *src++;
-			if (IS_OK(c))
-				*dst++ = c;
-			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;
-}
-
-//----------------------------------------------------------------------------------------
-NS_BASE char* nsUnescape(char * str)
-//----------------------------------------------------------------------------------------
-{
-	nsUnescapeCount(str);
-	return str;
-}
-
-//----------------------------------------------------------------------------------------
-NS_BASE 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

@@ -1,975 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-#include "nsFileSpec.h"
-
-#include "nsFileStream.h"
-#include "nsDebug.h"
-#include "nsEscape.h"
-
-#include "prtypes.h"
-#include "plstr.h"
-#include "plbase64.h"
-#include "prmem.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, PRBool 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
-
-//----------------------------------------------------------------------------------------
-nsresult ns_file_convert_result(PRInt32 nativeErr)
-//----------------------------------------------------------------------------------------
-{
-    return nativeErr ?
-        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES,((nativeErr)&0xFFFF))
-        : NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-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 nsnull;
-    strcpy(newPath, inString);
-    return newPath;
-} // nsFileSpecHelpers::StringDup
-
-//----------------------------------------------------------------------------------------
-char* nsFileSpecHelpers::AllocCat(
-    const char* inString1,
-    const char* inString2)
-//----------------------------------------------------------------------------------------
-{
-    if (!inString1)
-        return inString2 ? StringDup(inString2) : (char*)nsnull;
-    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*)nsnull;
-        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);
-    PRBool trailingSeparator = (lastSeparator + 1 == ioPath + oldLength);
-    if (trailingSeparator)
-    {
-        *lastSeparator = '\0';
-        lastSeparator = strrchr(ioPath, inSeparator);
-    }
-    if (lastSeparator)
-        lastSeparator++; // point at the trailing string
-    else
-        lastSeparator = ioPath; // the full monty
-    *lastSeparator = '\0'; // strip the current leaf name
-
-    int newLength = (lastSeparator - ioPath) + strlen(inLeafName) + int(trailingSeparator);
-    if (newLength > oldLength)
-    {
-        char* newPath = StringDup(ioPath, newLength + 1);
-        delete [] ioPath;
-        ioPath = newPath;
-    }
-    strcat(ioPath, inLeafName);
-    if (trailingSeparator)
-    {
-        // If the original ended in a slash, then the new one should, too.
-        char sepStr[2] = "/";
-        *sepStr = inSeparator;
-        strcat(ioPath, sepStr);
-    }
-} // nsFileSpecHelpers::LeafReplace
-
-//----------------------------------------------------------------------------------------
-char* nsFileSpecHelpers::GetLeaf(const char* inPath, char inSeparator)
-// Returns a pointer to an allocated string representing the leaf.
-//----------------------------------------------------------------------------------------
-{
-    if (!inPath)
-        return nsnull;
-    const char* lastSeparator = strrchr(inPath, inSeparator);
-    
-    // If there was no separator, then return a copy of the caller's path.
-    if (!lastSeparator)
-        return StringDup(inPath);
-
-    // So there's at least one separator.  What's just after it?
-    // If the separator was not the last character, return the trailing string.
-    const char* leafPointer = lastSeparator + 1;
-    if (*leafPointer)
-        return StringDup(leafPointer);
-
-    // So now, separator was the last character. Poke in a null instead.
-    *(char*)lastSeparator = '\0'; // Should use const_cast, but Unix has old compiler.
-    leafPointer = strrchr(inPath, inSeparator);
-    char* result = leafPointer ? StringDup(++leafPointer) : StringDup(inPath);
-    // Restore the poked null before returning.
-    *(char*)lastSeparator = inSeparator;
-#ifdef XP_PC
-	// If it's a drive letter use the colon notation.
-	if (!leafPointer && strlen(result) == 2 && result[1] == '|')
-	    result[1] = ':';
-#endif
-    return result;
-} // nsFileSpecHelpers::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)
-    {
-        nsFileSpec spec;
-
-		*currentEnd = '\0';
-        
-#ifdef XP_PC
-        /* 
-           if we have a drive letter path, we must make sure that the inital path has a '/' on it, or
-           Canonify will turn "/c|" into a path relative to the running executable.
-        */
-        if (pathCopy[0] == '/' && pathCopy[2] == '|')
-        {
-            char* startDir = nsFileSpecHelpers::StringDup( pathCopy, (strlen(pathCopy) + 1) );
-            strcat(startDir, "/");
-
-            spec = nsFilePath(startDir, PR_FALSE);
-		    
-            delete [] startDir;
-        }
-        else
-        {
-            spec = nsFilePath(pathCopy, PR_FALSE);
-
-        }
-#else
-        spec = nsFilePath(pathCopy, PR_FALSE);
-#endif        
-        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;
-            
-            *currentEnd = '\0';
-
-			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;
-} // nsFileSpecHelpers::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, PRBool 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
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-nsFileURL::nsFileURL(const nsString& inString, PRBool inCreateDirs)
-//----------------------------------------------------------------------------------------
-:    mURL(nsnull)
-{
-    const nsAutoCString aString(inString);
-    const char* aCString = (const char*) aString;
-    if (!inString)
-    	return;
-    NS_ASSERTION(strstr(aCString, kFileURLPrefix) == aCString, "Not a URL!");
-    // Make canonical and absolute.
-	nsFilePath path(aCString + kFileURLPrefixLength, inCreateDirs);
-	*this = path;
-} // nsFileURL::nsFileURL
-#endif
-
-//----------------------------------------------------------------------------------------
-nsFileURL::nsFileURL(const nsFileURL& inOther)
-//----------------------------------------------------------------------------------------
-:    mURL(nsFileSpecHelpers::StringDup(inOther.mURL))
-#ifdef XP_MAC
-,    mFileSpec(inOther.GetFileSpec())
-#endif
-{
-} // nsFileURL::nsFileURL
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-nsFileURL::nsFileURL(const nsFilePath& inOther)
-//----------------------------------------------------------------------------------------
-:    mURL(nsnull)
-{
-    *this = inOther;
-} // nsFileURL::nsFileURL
-#endif
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-nsFileURL::nsFileURL(const nsFileSpec& inOther)
-:    mURL(nsnull)
-//----------------------------------------------------------------------------------------
-{
-    *this = inOther;
-} // nsFileURL::nsFileURL
-#endif
-
-//----------------------------------------------------------------------------------------
-nsFileURL::~nsFileURL()
-//----------------------------------------------------------------------------------------
-{
-    delete [] mURL;
-}
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-void nsFileURL::operator = (const char* inString)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpecHelpers::StringAssign(mURL, inString);
-    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
-} // nsFileURL::operator =
-#endif
-
-//----------------------------------------------------------------------------------------
-void nsFileURL::operator = (const nsFileURL& inOther)
-//----------------------------------------------------------------------------------------
-{
-    mURL = nsFileSpecHelpers::StringAssign(mURL, inOther.mURL);
-#ifdef XP_MAC
-    mFileSpec = inOther.GetFileSpec();
-#endif
-} // nsFileURL::operator =
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-void nsFileURL::operator = (const nsFilePath& inOther)
-//----------------------------------------------------------------------------------------
-{
-    delete [] mURL;
-	char* original = (char*)(const char*)inOther; // we shall modify, but restore.
-#ifdef XP_PC
-	// because we don't want to escape the '|' character, change it to a letter.
-    NS_ASSERTION(original[2] == '|', "No drive letter part!");
-    original[2] = 'x';
-    char* escapedPath = nsEscape(original, url_Path);
-    original[2] = '|'; // restore it
-    escapedPath[2] = '|';
-#else
-    char* escapedPath = nsEscape(original, url_Path);
-#endif
-    if (escapedPath)
-	    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, escapedPath);
-    delete [] escapedPath;
-} // nsFileURL::operator =
-#endif
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-void nsFileURL::operator = (const nsFileSpec& inOther)
-//----------------------------------------------------------------------------------------
-{
-    *this = nsFilePath(inOther);
-} // nsFileURL::operator =
-#endif
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& operator << (nsOutputStream& s, const nsFileURL& url)
-//----------------------------------------------------------------------------------------
-{
-    return (s << url.mURL);
-}
-
-//========================================================================================
-//                                nsFilePath implementation
-//========================================================================================
-
-nsFilePath::nsFilePath(const nsFilePath& inPath)
-    : mPath(nsFileSpecHelpers::StringDup(inPath.mPath))
-#ifdef XP_MAC
-    , mFileSpec(inPath.mFileSpec)
-#endif
-{
-}
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const char* inString, PRBool 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
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsString& inString, PRBool inCreateDirs)
-//----------------------------------------------------------------------------------------
-:    mPath(inString.ToNewCString())
-{
-    NS_ASSERTION(strstr(mPath, kFileURLPrefix) != mPath, "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
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsFileURL& inOther)
-//----------------------------------------------------------------------------------------
-:    mPath(nsFileSpecHelpers::StringDup(inOther.mURL + kFileURLPrefixLength))
-{
-}
-#endif
-
-#ifdef XP_UNIX
-//----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsFileSpec& inOther)
-//----------------------------------------------------------------------------------------
-:    mPath(nsFileSpecHelpers::StringDup(inOther.mPath))
-{
-}
-#endif // XP_UNIX
-
-//----------------------------------------------------------------------------------------
-nsFilePath::~nsFilePath()
-//----------------------------------------------------------------------------------------
-{
-    delete [] mPath;
-}
-
-#ifdef XP_UNIX
-//----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsFileSpec& 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
-    mFileSpec = inString;
-	nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(mFileSpec));
-#else
-	nsFileSpecHelpers::StringAssign(mPath, inString);
-#ifdef XP_PC
-	nsFileSpecHelpers::UnixToNative(mPath);
-#endif
-    // Make canonical and absolute.
-    nsFileSpecHelpers::Canonify(mPath, PR_FALSE /* XXX? */);
-#ifdef XP_PC
-	nsFileSpecHelpers::NativeToUnix(mPath);
-#endif
-#endif // XP_MAC
-}
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsFileURL& inOther)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(inOther));
-}
-#endif
-
-//----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsFilePath& inOther)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpecHelpers::StringAssign(mPath, inOther.mPath);
-#ifdef XP_MAC
-    mFileSpec = inOther.GetFileSpec();
-#endif
-}
-
-//========================================================================================
-//                                nsFileSpec implementation
-//========================================================================================
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec()
-//----------------------------------------------------------------------------------------
-:    mPath(nsnull)
-,    mError(NS_OK)
-{
-}
-#endif
-
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const nsPersistentFileDescriptor& inDescriptor)
-//----------------------------------------------------------------------------------------
-:    mPath(nsnull)
-{
-	*this = inDescriptor;
-}
-
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const nsFileURL& inURL)
-//----------------------------------------------------------------------------------------
-:    mPath(nsnull)
-{
-    *this = nsFilePath(inURL); // convert to unix path first
-}
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::MakeUnique(const char* inSuggestedLeafName)
-//----------------------------------------------------------------------------------------
-{
-    if (inSuggestedLeafName && *inSuggestedLeafName)
-        SetLeafName(inSuggestedLeafName);
-
-    MakeUnique();
-} // nsFileSpec::MakeUnique
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::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 ((int)strlen(leafName) > (int)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;
-} // nsFileSpec::MakeUnique
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator = (const nsFileURL& inURL)
-//----------------------------------------------------------------------------------------
-{
-    *this = nsFilePath(inURL); // convert to unix path first
-}
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator = (const nsPersistentFileDescriptor& inDescriptor)
-//----------------------------------------------------------------------------------------
-{
-
-	void* data;
-	PRInt32 dataSize;
-    inDescriptor.GetData(data, dataSize);
-    
-#ifdef XP_MAC
-    char* decodedData = PL_Base64Decode((const char*)data, (int)dataSize, nsnull);
-    // Cast to an alias record and resolve.
-	AliasHandle aliasH = nsnull;
-	mError = NS_FILE_RESULT(PtrToHand(decodedData, &(Handle)aliasH, (dataSize * 3) / 4));
-	PR_Free(decodedData);
-	if (NS_SUCCEEDED(mError))
-		return; // not enough memory?
-
-	Boolean changed;
-	mError = NS_FILE_RESULT(::ResolveAlias(nsnull, aliasH, &mSpec, &changed));
-	DisposeHandle((Handle) aliasH);
-	delete [] mPath;
-#else
-    nsFileSpecHelpers::StringAssign(mPath, (char*)data);
-    mError = NS_OK;
-#endif
-}
-
-//========================================================================================
-//                                UNIX & WIN nsFileSpec implementation
-//========================================================================================
-
-#ifdef XP_UNIX
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const nsFilePath& inPath)
-//----------------------------------------------------------------------------------------
-:    mPath(nsFileSpecHelpers::StringDup((const char*)inPath))
-,    mError(NS_OK)
-{
-}
-#endif // XP_UNIX
-
-#ifdef XP_UNIX
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator = (const nsFilePath& inPath)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpecHelpers::StringAssign(mPath, (const char*)inPath);
-    mError = NS_OK;
-}
-#endif //XP_UNIX
-
-#if defined(XP_UNIX) || defined(XP_PC)
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-:    mPath(nsFileSpecHelpers::StringDup(inSpec.mPath))
-,    mError(NS_OK)
-{
-}
-#endif //XP_UNIX
-
-#if defined(XP_UNIX) || defined(XP_PC)
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const char* inString, PRBool inCreateDirs)
-//----------------------------------------------------------------------------------------
-:    mPath(nsFileSpecHelpers::StringDup(inString))
-,    mError(NS_OK)
-{
-    // Make canonical and absolute.
-    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
-}
-#endif //XP_UNIX,PC
-
-#if defined(XP_UNIX) || defined(XP_PC)
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const nsString& inString, PRBool inCreateDirs)
-//----------------------------------------------------------------------------------------
-:    mPath(inString.ToNewCString())
-,    mError(NS_OK)
-{
-    // Make canonical and absolute.
-    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
-}
-#endif //XP_UNIX,PC
-
-//----------------------------------------------------------------------------------------
-nsFileSpec::~nsFileSpec()
-//----------------------------------------------------------------------------------------
-{
-    delete [] mPath;
-}
-
-#if defined(XP_UNIX) || defined(XP_PC)
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator = (const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-{
-    mPath = nsFileSpecHelpers::StringAssign(mPath, inSpec.mPath);
-    mError = inSpec.Error();
-}
-#endif //XP_UNIX
-
-
-#if defined(XP_UNIX) || defined(XP_PC)
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator = (const char* inString)
-//----------------------------------------------------------------------------------------
-{
-    mPath = nsFileSpecHelpers::StringAssign(mPath, inString);
-    // Make canonical and absolute.
-    nsFileSpecHelpers::Canonify(mPath, PR_FALSE /* XXX? */);
-    mError = NS_OK;
-}
-#endif //XP_UNIX
-
-#if (defined(XP_UNIX) || defined(XP_PC))
-//----------------------------------------------------------------------------------------
-nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec)
-//----------------------------------------------------------------------------------------
-{
-#ifdef NS_DEBUG
-    static PRBool warnedOnce = PR_FALSE;
-    if (!warnedOnce)
-    {
-        NS_WARNING("This is for debugging only.  Do not call this in shipped version!");
-        warnedOnce = PR_TRUE;
-    }
-#endif // NS_DEBUG
-    return (s << spec.GetCString());
-}
-#endif // DEBUG ONLY!
-
-//----------------------------------------------------------------------------------------
-nsFileSpec nsFileSpec::operator + (const char* inRelativePath) const
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpec result = *this;
-    result += inRelativePath;
-    return result;
-} // nsFileSpec::operator +
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::operator == (const nsFileSpec& inOther) const
-//----------------------------------------------------------------------------------------
-{
-
-#ifdef XP_MAC
-    if ( inOther.mSpec.vRefNum == mSpec.vRefNum &&
-        inOther.mSpec.parID   == mSpec.parID &&
-        EqualString(inOther.mSpec.name, mSpec.name, false, true))
-        return PR_TRUE;
-#else
-    PRBool amEmpty = !mPath || !*mPath;
-    PRBool heEmpty = !inOther.mPath || !*inOther.mPath;
-    if (amEmpty) // we're the same if he's empty...
-        return heEmpty;
-    if (heEmpty) // ('cuz I'm not...)
-        return PR_FALSE;
-	#if defined(XP_PC)
-	   // windows does not care about case.
-	   if (_stricmp(mPath, inOther.mPath ) == 0)
-	       return PR_TRUE;
-	#else
-	   if (strcmp(mPath, inOther.mPath ) == 0)
-	       return PR_TRUE;
-	#endif
-#endif
-   return PR_FALSE;
-}
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::operator != (const nsFileSpec& inOther) const
-//----------------------------------------------------------------------------------------
-{
-    return (! (*this == inOther) );
-}
-
-#ifndef XP_MAC
-//----------------------------------------------------------------------------------------
-const char* nsFileSpec::GetCString() const
-// This is the only automatic conversion to const char*
-// that is provided, and it allows the
-// path to be "passed" to NSPR file routines.  This practice
-// is VERY EVIL and should only be used to support legacy
-// code.  Using it guarantees bugs on Macintosh. The path is NOT allocated, so do
-// not even think of deleting (or freeing) it.
-//----------------------------------------------------------------------------------------
-{
-    return mPath;
-}
-#endif
-
-//========================================================================================
-//	class nsPersistentFileDescriptor
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsPersistentFileDescriptor::nsPersistentFileDescriptor(const nsPersistentFileDescriptor& inDesc)
-//----------------------------------------------------------------------------------------
-    : mDescriptorString(nsFileSpecHelpers::StringDup(inDesc.mDescriptorString))
-{
-} // nsPersistentFileDescriptor::nsPersistentFileDescriptor
-
-//----------------------------------------------------------------------------------------
-void nsPersistentFileDescriptor::operator = (const nsPersistentFileDescriptor& inDesc)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpecHelpers::StringAssign(mDescriptorString, inDesc.mDescriptorString);
-} // nsPersistentFileDescriptor::operator =
-
-//----------------------------------------------------------------------------------------
-nsPersistentFileDescriptor::nsPersistentFileDescriptor(const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-    : mDescriptorString(nsnull)
-{
-	*this = inSpec;
-} // nsPersistentFileDescriptor::nsPersistentFileDescriptor
-
-//----------------------------------------------------------------------------------------
-void nsPersistentFileDescriptor::operator = (const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-{
-#ifdef XP_MAC
-    if (inSpec.Error())
-    	return;
-	AliasHandle	aliasH;
-	OSErr err = NewAlias(nil, inSpec.GetFSSpecPtr(), &aliasH);
-	if (err != noErr)
-		return;
-
-	PRUint32 bytes = GetHandleSize((Handle) aliasH);
-	HLock((Handle) aliasH);
-	char* buf = PL_Base64Encode((const char*)*aliasH, bytes, nsnull);
-	DisposeHandle((Handle) aliasH);
-
-    nsFileSpecHelpers::StringAssign(mDescriptorString, buf);
-    PR_Free(buf);
-#else
-    nsFileSpecHelpers::StringAssign(mDescriptorString, inSpec.GetCString());
-#endif // XP_MAC
-} // nsPersistentFileDescriptor::operator =
-
-//----------------------------------------------------------------------------------------
-nsPersistentFileDescriptor::~nsPersistentFileDescriptor()
-//----------------------------------------------------------------------------------------
-{
-    delete [] mDescriptorString;
-} // nsPersistentFileDescriptor::~nsPersistentFileDescriptor
-
-//----------------------------------------------------------------------------------------
-void nsPersistentFileDescriptor::GetData(void*& outData, PRInt32& outSize) const
-//----------------------------------------------------------------------------------------
-{
-    outSize = PL_strlen(mDescriptorString);
-    outData = mDescriptorString;
-}
-
-//----------------------------------------------------------------------------------------
-void nsPersistentFileDescriptor::SetData(const void* inData, PRInt32 inSize)
-//----------------------------------------------------------------------------------------
-{
-	delete [] mDescriptorString;
-	mDescriptorString = new char[1 + inSize];
-	if (!mDescriptorString)
-	    return;
-	memcpy(mDescriptorString, inData, inSize);
-	mDescriptorString[inSize] = '\0';
-}
-
-#define MAX_PERSISTENT_DATA_SIZE 1000
-
-//----------------------------------------------------------------------------------------
-nsresult nsPersistentFileDescriptor::Read(nsIInputStream* aStream)
-//----------------------------------------------------------------------------------------
-{
-    nsInputStream inputStream(aStream);
-    inputStream >> *this;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-nsresult nsPersistentFileDescriptor::Write(nsIOutputStream* aStream)
-//----------------------------------------------------------------------------------------
-{
-    nsOutputStream outputStream(aStream);
-    outputStream << *this;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-nsInputStream& operator >> (nsInputStream& s, nsPersistentFileDescriptor& d)
-// reads the data from a file
-//----------------------------------------------------------------------------------------
-{
-	char bigBuffer[MAX_PERSISTENT_DATA_SIZE + 1];
-	// The first 8 bytes of the data should be a hex version of the data size to follow.
-	PRInt32 bytesRead = 8;
-	bytesRead = s.read(bigBuffer, bytesRead);
-	if (bytesRead != 8)
-		return s;
-	bigBuffer[8] = '\0';
-	sscanf(bigBuffer, "%lx", (PRUint32*)&bytesRead);
-	if (bytesRead > MAX_PERSISTENT_DATA_SIZE)
-		return s; // preposterous.
-	// Now we know how many bytes to read, do it.
-	s.read(bigBuffer, bytesRead);
-	d.SetData(bigBuffer, bytesRead);
-	return s;
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& operator << (nsOutputStream& s, const nsPersistentFileDescriptor& d)
-// writes the data to a file
-//----------------------------------------------------------------------------------------
-{
-	char littleBuf[9];
-	PRInt32 dataSize;
-	void* data;
-	d.GetData(data, dataSize);
-	// First write (in hex) the length of the data to follow.  Exactly 8 bytes
-	sprintf(littleBuf, "%0.8x", dataSize);
-	s << littleBuf;
-	// Now write the data itself
-	s << d.mDescriptorString;
-	return s;
-}
-
-//========================================================================================
-//	class nsAutoCString
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsAutoCString::~nsAutoCString()
-//----------------------------------------------------------------------------------------
-{
-	delete [] (char*)mCString;
-}

mozilla/base/src/nsFileStream.cpp

@@ -1,321 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-//	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 "nsIStringStream.h"
-
-#include <string.h>
-#include <stdio.h>
-
-
-//========================================================================================
-//          nsInputStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsInputStream::~nsInputStream()
-//----------------------------------------------------------------------------------------
-{
-}
-
-//----------------------------------------------------------------------------------------
-char nsInputStream::get()
-//----------------------------------------------------------------------------------------
-{
-	char c;
-    read(&c, sizeof(c));
-    return c;
-}
-
-//----------------------------------------------------------------------------------------
-PRInt32 nsInputStream::read(void* s, PRInt32 n)
-//----------------------------------------------------------------------------------------
-{
-  if (!mInputStream)
-      return 0;
-  PRInt32 result = 0;
-  mInputStream->Read((char*)s, n, (PRUint32*)&result);
-  if (result < n)
-      set_at_eof(PR_TRUE);
-  return result;
-} // nsInputStream::read
-
-//----------------------------------------------------------------------------------------
-static void TidyEndOfLine(char*& cp)
-// Assumes that cp is pointing at \n or \r.  Nulls out the character, checks for
-// a second terminator (of the opposite persuasion), and returns cp pointing past the
-// entire eol construct (one or two characters).
-//----------------------------------------------------------------------------------------
-{
-    char ch = *cp;
-    *cp++ = '\0'; // terminate at the newline, then skip past it
-    if ((ch == '\n' && *cp == '\r') || (ch == '\r' && *cp == '\n'))
-        cp++; // possibly a pair.
-}
-
-//----------------------------------------------------------------------------------------
-nsInputStream& nsInputStream::operator >> (char& c)
-//----------------------------------------------------------------------------------------
-{
-	c = get();
-	return *this;
-}
-
-//========================================================================================
-//          nsOutputStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsOutputStream::~nsOutputStream()
-//----------------------------------------------------------------------------------------
-{
-}
-
-//----------------------------------------------------------------------------------------
-void nsOutputStream::put(char c)
-//----------------------------------------------------------------------------------------
-{
-    write(&c, sizeof(c));
-}
-
-//----------------------------------------------------------------------------------------
-PRInt32 nsOutputStream::write(const void* s, PRInt32 n)
-//----------------------------------------------------------------------------------------
-{
-  if (!mOutputStream)
-      return 0;
-  PRInt32 result = 0;
-  mOutputStream->Write((char*)s, n, (PRUint32*)&result);
-  return result;
-} // nsOutputStream::write
-
-//----------------------------------------------------------------------------------------
-void nsOutputStream::flush()
-//----------------------------------------------------------------------------------------
-{
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (char c)
-//----------------------------------------------------------------------------------------
-{
-	put(c);
-	return *this;
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (const char* s)
-//----------------------------------------------------------------------------------------
-{
-	write(s, strlen(s));
-	return *this;
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (short val)
-//----------------------------------------------------------------------------------------
-{
-	char buf[30];
-	sprintf(buf, "%hd", val);
-	return (*this << buf);
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (unsigned short val)
-//----------------------------------------------------------------------------------------
-{
-	char buf[30];
-	sprintf(buf, "%hu", val);
-	return (*this << buf);
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (long val)
-//----------------------------------------------------------------------------------------
-{
-	char buf[30];
-	sprintf(buf, "%ld", val);
-	return (*this << buf);
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (unsigned long val)
-//----------------------------------------------------------------------------------------
-{
-	char buf[30];
-	sprintf(buf, "%lu", val);
-	return (*this << buf);
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (int val)
-//----------------------------------------------------------------------------------------
-{
-	char buf[30];
-	sprintf(buf, "%d", val);
-	return (*this << buf);
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsOutputStream::operator << (unsigned int val)
-//----------------------------------------------------------------------------------------
-{
-	char buf[30];
-	sprintf(buf, "%u", val);
-	return (*this << buf);
-}
-
-//========================================================================================
-//          nsRandomAccessInputStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-PRBool nsRandomAccessInputStream::readline(char* s, PRInt32 n)
-// This will truncate if the buffer is too small.  Result will always be null-terminated.
-//----------------------------------------------------------------------------------------
-{
-    PRBool bufferLargeEnough = PR_TRUE; // result
-    if (!s || !n)
-        return PR_TRUE;
-
-    PRIntn position = tell();
-    if (position < 0)
-        return PR_FALSE;
-    PRInt32 bytesRead = read(s, n - 1);
-    if (failed())
-        return PR_FALSE;
-    s[bytesRead] = '\0'; // always terminate at the end of the buffer
-    char* tp = strpbrk(s, "\n\r");
-    if (tp)
-    {
-        TidyEndOfLine(tp);
-        bytesRead = (tp - s);
-    }
-    else if (!eof())
-        bufferLargeEnough = PR_FALSE;
-    position += bytesRead;
-    seek(position);
-    return bufferLargeEnough;
-} // nsRandomAccessInputStream::readline
-
-//========================================================================================
-//          nsInputStringStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsInputStringStream::nsInputStringStream(const char* stringToRead)
-//----------------------------------------------------------------------------------------
-{
-	nsISupports* stream;
-	if (NS_FAILED(NS_NewCharInputStream(&stream, stringToRead)))
-		return;
-	mInputStream = nsQueryInterface(stream);
-	mStore = nsQueryInterface(stream);
-	NS_RELEASE(stream);
-}
-
-//----------------------------------------------------------------------------------------
-nsInputStringStream::nsInputStringStream(const nsString& stringToRead)
-//----------------------------------------------------------------------------------------
-{
-	nsISupports* stream;
-	if (NS_FAILED(NS_NewStringInputStream(&stream, stringToRead)))
-		return;
-	mInputStream = nsQueryInterface(stream);
-	mStore = nsQueryInterface(stream);
-	NS_RELEASE(stream);
-}
-
-//========================================================================================
-//          nsOutputStringStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsOutputStringStream::nsOutputStringStream(char*& stringToChange)
-//----------------------------------------------------------------------------------------
-{
-	nsISupports* stream;
-	if (NS_FAILED(NS_NewCharOutputStream(&stream, &stringToChange)))
-		return;
-	mOutputStream = nsQueryInterface(stream);
-	mStore = nsQueryInterface(stream);
-	NS_RELEASE(stream);
-}
-
-//----------------------------------------------------------------------------------------
-nsOutputStringStream::nsOutputStringStream(nsString& stringToChange)
-//----------------------------------------------------------------------------------------
-{
-	nsISupports* stream;
-	if (NS_FAILED(NS_NewStringOutputStream(&stream, stringToChange)))
-		return;
-	mOutputStream = nsQueryInterface(stream);
-	mStore = nsQueryInterface(stream);
-	NS_RELEASE(stream);
-}
-
-//========================================================================================
-//          nsInputFileStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsInputFileStream::nsInputFileStream(
-	const nsFileSpec& inFile,
-	int nsprMode,
-	PRIntn accessMode)
-//----------------------------------------------------------------------------------------
-{
-	nsISupports* stream;
-	if (NS_FAILED(NS_NewIOFileStream(&stream, inFile, nsprMode, accessMode)))
-        return;
-	mFile = nsQueryInterface(stream);
-	mInputStream = nsQueryInterface(stream);
-	mStore = nsQueryInterface(stream);
-	mFileInputStream = nsQueryInterface(stream);
-	NS_RELEASE(stream);
-} // nsInputFileStream::nsInputFileStream
-
-//========================================================================================
-//          nsOutputFileStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-void nsOutputFileStream::flush()
-//----------------------------------------------------------------------------------------
-{
-	if (mFileOutputStream)
-		mFileOutputStream->Flush();
-}
-
-//========================================================================================
-//        Manipulators
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsOutputStream& nsEndl(nsOutputStream& os)
-//----------------------------------------------------------------------------------------
-{
-    os.put('\n');
-    os.flush();
-    return os;
-} // nsEndl

mozilla/base/src/nsGenericCaretProperties.cpp

@@ -1,22 +0,0 @@
-
-
-#include "nscore.h"
-
-#include "nsCaretProperties.h"
-
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties::nsCaretProperties()
-:	mCaretWidth(eDefaultCaretWidth)
-,	mBlinkRate(eDefaulBlinkRate)
-{
-	// in your platform-specific class, get data from the OS in your constructor
-}
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties* NewCaretProperties()
-{
-	return new nsCaretProperties();
-}

mozilla/base/src/nsIAtom.h

@@ -35,8 +35,6 @@ class nsISizeOfHandler;
  */
 class nsIAtom : public nsISupports {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IATOM_IID; return iid; }
-
   /**
    * Translate the unicode string into the stringbuf.
    */

mozilla/base/src/nsIBaseStream.h

@@ -31,8 +31,6 @@
 class nsIBaseStream : public nsISupports {
 public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
-
     /** Close the stream. */
     NS_IMETHOD
     Close(void) = 0;
@@ -40,18 +38,19 @@ public:
 
 /** Error codes */
 //@{ 
+// XXX fix up the values so they are not total hacks... MMP
 /// End of file
-#define NS_BASE_STREAM_EOF            NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 1)
+#define NS_BASE_STREAM_EOF            0x80001001
 /// Stream closed
-#define NS_BASE_STREAM_CLOSED         NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 2)
+#define NS_BASE_STREAM_CLOSED         0x80001002
 /// Error from the operating system
-#define NS_BASE_STREAM_OSERROR        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 3)
+#define NS_BASE_STREAM_OSERROR        0x80001003
 /// Illegal arguments
-#define NS_BASE_STREAM_ILLEGAL_ARGS   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 4)
+#define NS_BASE_STREAM_ILLEGAL_ARGS   0x80001004
 /// For unichar streams
-#define NS_BASE_STREAM_NO_CONVERTER   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 5)
+#define NS_BASE_STREAM_NO_CONVERTER   0x80001005
 /// For unichar streams
-#define NS_BASE_STREAM_BAD_CONVERSION NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 6)
+#define NS_BASE_STREAM_BAD_CONVERSION 0x80001006
 //@}
 
 

mozilla/base/src/nsIByteBuffer.h

@@ -31,27 +31,26 @@ class nsIInputStream;
 class nsIByteBuffer : public nsISupports {
 public:
   /** @return length of buffer, i.e. how many bytes are currently in it. */
-  virtual PRUint32 GetLength(void) const = 0;
+  virtual PRInt32 GetLength() const = 0;
 
   /** @return number of bytes allocated in the buffer */
-  virtual PRUint32 GetBufferSize(void) const = 0;
+  virtual PRInt32 GetBufferSize() const = 0;
 
   /** @return the buffer */
-  virtual char* GetBuffer(void) const = 0;
+  virtual char* GetBuffer() const = 0;
 
   /** Grow buffer to aNewSize bytes. */
-  virtual PRBool Grow(PRUint32 aNewSize) = 0;
+  virtual PRBool Grow(PRInt32 aNewSize) = 0;
 
   /** Fill the buffer with data from aStream.  Don't grow the buffer, only
    *  read until length of buffer equals buffer size. */
   virtual PRInt32 Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                        PRUint32 aKeep) = 0;
+                       PRInt32 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);
+                                         PRInt32 aBufferSize = 0);
 
 #endif /* nsIByteBuffer_h___ */
-

mozilla/base/src/nsIFileStream.cpp

@@ -1,456 +0,0 @@
-#include "nsIFileStream.h"
-#include "nsFileSpec.h"
-
-#include "prerror.h"
-
-#ifdef XP_MAC
-#include "pprio.h" // To get PR_ImportFile
-#else
-#include "prio.h"
-#endif
-
-#ifdef XP_MAC
-#include <Errors.h>
-#include <iostream>
-#endif
-
-//========================================================================================
-class FileImpl
-    : public nsIRandomAccessStore
-    , public nsIFileOutputStream
-    , public nsIFileInputStream
-    , public nsIFile
-//========================================================================================
-{
-    public:
-                                        FileImpl(PRFileDesc* inDesc)
-                                            : mFileDesc(inDesc)
-                                            , mFailed(PR_FALSE)
-                                            , mEOF(PR_FALSE)
-                                            , mLength(-1)
-                                        {
-                                            NS_INIT_REFCNT();
-                                        }
-                                        FileImpl(
-                                            const nsFileSpec& inFile,
-                                            int nsprMode,
-                                            PRIntn accessMode)
-                                            : mFileDesc(nsnull)
-                                            , mFailed(PR_FALSE)
-                                            , mEOF(PR_FALSE)
-                                        {
-                                            NS_INIT_REFCNT();
-                                            Open(inFile, nsprMode, accessMode);
-                                        }
-        virtual                         ~FileImpl()
-                                        {
-                                            Close();
-                                        }
-        
-        // nsISupports interface
-                                        NS_DECL_ISUPPORTS
-
-		// nsIFile interface
-        NS_IMETHOD                      Open(
-                                            const nsFileSpec& inFile,
-                                            int nsprMode,
-                                            PRIntn accessMode);
-        NS_IMETHOD                      Close();
-        NS_IMETHOD                      Seek(PRSeekWhence whence, PRInt32 offset);
-
-        NS_IMETHOD                      GetIsOpen(PRBool* outOpen)
-                                        {
-                                            *outOpen = (mFileDesc != nsnull);
-                                            return NS_OK;
-                                        }
-        NS_IMETHOD                      Tell(PRIntn* outWhere);
-
-		// nsIInputStream interface
-        NS_IMETHOD                      GetLength(PRUint32 *aLength)
-                                        {
-                                            NS_PRECONDITION(aLength != nsnull, "null ptr");
-                                            if (!aLength)
-                                                return NS_ERROR_NULL_POINTER;
-                                            if (mLength < 0)
-                                                return NS_FILE_RESULT(NS_ERROR_UNEXPECTED);
-                                            *aLength = mLength;
-                                            return NS_OK;
-                                        }
-		NS_IMETHOD                      Read(char* aBuf,
-			                                PRUint32 aCount,
-					                        PRUint32 *aReadCount)
-								        {
-								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
-								            if (!aBuf)
-								                return NS_ERROR_NULL_POINTER;
-								            NS_PRECONDITION(aReadCount != nsnull, "null ptr");
-								            if (!aReadCount)
-								                return NS_ERROR_NULL_POINTER;
-								            if (!mFileDesc)
-								                return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
-								            if (mFailed)
-								                return NS_ERROR_FAILURE;
-								            PRInt32 bytesRead = PR_Read(mFileDesc, aBuf, aCount);
-								            if (bytesRead < 0)
-								            {
-								                *aReadCount = 0;
-								                mFailed = PR_TRUE;
-								                return NS_FILE_RESULT(PR_GetError());
-								            }
-								            *aReadCount = bytesRead;
-								            return NS_OK;
-								        }
-		// nsIOutputStream interface
-		NS_IMETHOD                      Write(const char* aBuf,
-			                                PRUint32 aCount,
-					                        PRUint32 *aWriteCount)
-								        {
-								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
-								            NS_PRECONDITION(aWriteCount != nsnull, "null ptr");
-
-
-								#ifdef XP_MAC
-								            // Calling PR_Write on stdout is sure suicide.
-								            if (mFileDesc == PR_STDOUT || mFileDesc == PR_STDERR)
-								            {
-								                cout.write(aBuf, aCount);
-								                *aWriteCount = aCount;
-								                return NS_OK;
-								            }
-								#endif
-								            if (!mFileDesc)
-								                return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
-								            if (mFailed)
-								               return NS_ERROR_FAILURE;
-								            PRInt32 bytesWrit = PR_Write(mFileDesc, aBuf, aCount);
-								            if (bytesWrit != (PRInt32)aCount)
-								            {
-								                mFailed = PR_TRUE;
-								                *aWriteCount = 0;
-								                return NS_FILE_RESULT(PR_GetError());
-								            }
-								            *aWriteCount = bytesWrit;
-								            return NS_OK;
-								        }
-        NS_IMETHOD                      Flush();
-
-        NS_IMETHOD                      GetAtEOF(PRBool* outAtEOF)
-        						        {
-        						            *outAtEOF = mEOF;
-        						            return NS_OK;
-        						        }
-        NS_IMETHOD                      SetAtEOF(PRBool inAtEOF)
-        						        {
-        						            mEOF = inAtEOF;
-        						            return NS_OK;
-        						        }
-
-    protected:
-    
-        PRFileDesc*                     mFileDesc;
-        int                             mNSPRMode;
-        PRBool                          mFailed;
-        PRBool                          mEOF;
-        PRInt32                         mLength;
-}; // class FileImpl
-
-#define SAY_I_IMPLEMENT(classname)               \
-  if (aIID.Equals(classname::GetIID()))          \
-  {                                              \
-      *aInstancePtr = (void*)((classname*)this); \
-      NS_ADDREF_THIS();                          \
-      return NS_OK;                              \
-  }
-
-NS_IMPL_RELEASE(FileImpl)
-NS_IMPL_ADDREF(FileImpl)
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP FileImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-//----------------------------------------------------------------------------------------
-{
-  if (!aInstancePtr)
-    return NS_ERROR_NULL_POINTER;
-
-  *aInstancePtr = nsnull;
-
-  SAY_I_IMPLEMENT(nsIFile)
-  SAY_I_IMPLEMENT(nsIRandomAccessStore)
-  SAY_I_IMPLEMENT(nsIOutputStream)
-  SAY_I_IMPLEMENT(nsIInputStream)
-  SAY_I_IMPLEMENT(nsIFileInputStream)
-  SAY_I_IMPLEMENT(nsIFileOutputStream)
-  // Note that we derive from two copies of nsIBaseStream (and hence
-  // of nsISupports), one through
-  // nsIOutputStream, the other through nsIInputStream.  Resolve this
-  // by giving them a specific one
-  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->GetIID()))
-  {
-      *aInstancePtr = (void*)((nsIBaseStream*)(nsIOutputStream*)this);
-      NS_ADDREF_THIS();
-      return NS_OK;
-  }
-  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID()))
-  {
-      *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this);
-      NS_ADDREF_THIS();
-      return NS_OK;
-  }
-  return NS_NOINTERFACE;
-} // FileImpl::QueryInterface
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP FileImpl::Open(
-    const nsFileSpec& inFile,
-    int nsprMode,
-    PRIntn accessMode)
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc)
-        if ((nsprMode & mNSPRMode) == nsprMode)
-            return NS_OK;
-        else
-            return NS_FILE_RESULT(PR_ILLEGAL_ACCESS_ERROR);
-        
-    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 NS_FILE_RESULT(PR_ILLEGAL_ACCESS_ERROR);
-
-#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.Error() != noErr)
-        return NS_FILE_RESULT(inFile.Error());
-    OSErr err = noErr;
-#if DEBUG
-    const OSType kCreator = 'CWIE';
-#else
-    const OSType kCreator = 'MOSS';
-#endif
-    // Resolve the alias to the original file.
-    nsFileSpec original = inFile;
-    PRBool ignoredResult;
-    original.ResolveAlias(ignoredResult);
-    const FSSpec& spec = original.operator const FSSpec&();
-    if (nsprMode & PR_CREATE_FILE)
-        err = FSpCreate(&spec, kCreator, 'TEXT', 0);
-    if (err == dupFNErr)
-        err = noErr;
-    if (err != noErr)
-        return NS_FILE_RESULT(err);
-    
-    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 NS_FILE_RESULT(err);
-
-    if ((mFileDesc = PR_ImportFile(refnum)) == 0)
-        return NS_FILE_RESULT(PR_GetError());
-#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*)nsFileSpec(inFile), nsprMode, accessMode)) == 0)
-        return NS_FILE_RESULT(PR_GetError());
-#endif
-     mNSPRMode = nsprMode;
-     mLength = PR_Available(mFileDesc);
-     return NS_OK;
-} // FileImpl::Open
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP FileImpl::Seek(PRSeekWhence whence, PRInt32 offset)
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || !mFileDesc) 
-       return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
-    mFailed = PR_FALSE; // reset on a seek.
-    mEOF = PR_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 = 0;
-    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 = PR_TRUE;
-    }
-    if (newPosition >= fileSize) // nb: not "else if".
-    {
-        newPosition = fileSize;
-        mEOF = PR_TRUE;
-    }
-    if (PR_Seek(mFileDesc, newPosition, PR_SEEK_SET) < 0)
-        mFailed = PR_TRUE;
-    return NS_OK;
-} // FileImpl::Seek
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP FileImpl::Tell(PRIntn* outWhere)
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || !mFileDesc) 
-       return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
-    *outWhere = PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
-    return NS_OK;
-} // FileImpl::Tell
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP FileImpl::Close()
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || !mFileDesc) 
-       return NS_OK;
-    if (PR_Close(mFileDesc) == PR_SUCCESS)
-        mFileDesc = 0;
-    else
-        return NS_FILE_RESULT(PR_GetError());
-    return NS_OK;
-} // FileImpl::close
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP FileImpl::Flush()
-//----------------------------------------------------------------------------------------
-{
-#ifdef XP_MAC
-    if (mFileDesc == PR_STDOUT || mFileDesc == PR_STDERR)
-    {
-        cout.flush();
-        return NS_OK;
-    }
-#endif
-    if (!mFileDesc) 
-        return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
-    PRBool itFailed = PR_Sync(mFileDesc) != PR_SUCCESS;
-#ifdef XP_MAC
-    // On unix, it seems to fail always.
-    if (itFailed)
-        mFailed = PR_TRUE;
-#endif
-    return NS_OK;
-} // FileImpl::flush
-
-//----------------------------------------------------------------------------------------
-NS_BASE nsresult NS_NewTypicalInputFileStream(
-    nsISupports** aResult,
-    const nsFileSpec& inFile
-    /*Default nsprMode == PR_RDONLY*/
-    /*Default accessmode = 0700 (octal)*/)
-// Factory method to get an nsInputStream from a file, using most common options
-//----------------------------------------------------------------------------------------
-{
-    return NS_NewIOFileStream(aResult, inFile, PR_RDONLY, 0700);
-}
-
-//----------------------------------------------------------------------------------------
-NS_BASE nsresult NS_NewOutputConsoleStream(
-    nsISupports** aResult)
-// Factory method to get an nsOutputStream to the console.
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aResult != nsnull, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    FileImpl* stream = new FileImpl(PR_STDOUT);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_BASE nsresult NS_NewTypicalOutputFileStream(
-    nsISupports** aResult,
-    const nsFileSpec& inFile
-    /*default nsprMode= (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE)*/
-    /*Default accessMode= 0700 (octal)*/)
-// Factory method to get an nsOutputStream to a file - most common case.
-//----------------------------------------------------------------------------------------
-{
-    return NS_NewIOFileStream(
-        aResult,
-        inFile,
-        (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE),
-        0700);
-}
-
-//----------------------------------------------------------------------------------------
-NS_BASE nsresult NS_NewIOFileStream(
-    nsISupports** aResult,
-    const nsFileSpec& inFile,
-    PRInt32 nsprMode /*default = (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE)*/,
-    PRInt32 accessMode /*Default = 0700 (octal)*/)
-    // Factory method to get an object that implements both nsIInputStream
-    // and nsIOutputStream, associated with a file.
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aResult != nsnull, "null ptr");
-    if (!aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    FileImpl* stream = new FileImpl(inFile, nsprMode, accessMode);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_BASE nsresult NS_NewTypicalIOFileStream(
-    nsISupports** aResult,
-    const nsFileSpec& inFile
-    /*default nsprMode= (PR_RDWR | PR_CREATE_FILE)*/
-    /*Default accessMode= 0700 (octal)*/)
-    // Factory method to get an object that implements both nsIInputStream
-    // and nsIOutputStream, associated with a single file.
-//----------------------------------------------------------------------------------------
-{
-    return NS_NewIOFileStream(
-        aResult,
-        inFile,
-        (PR_RDWR | PR_CREATE_FILE),
-        0700);
-}

mozilla/base/src/nsIInputStream.h

@@ -28,8 +28,6 @@
 class nsIInputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
-
     /** 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
@@ -37,11 +35,12 @@ public:
      *  @return error status
      */
     NS_IMETHOD
-    GetLength(PRUint32 *aLength) = 0;
+    GetLength(PRInt32 *aLength) = 0;
 
     /** Read data from the stream.
      *  @param aErrorCode the error code if an error occurs
      *  @param aBuf the buffer into which the data is read
+     *  @param aOffset the start offset of the data
      *  @param aCount the maximum number of bytes to read
      *  @param aReadCount out parameter to hold the number of
      *         bytes read, eof if 0. if an error occurs, the
@@ -49,7 +48,7 @@ public:
      *  @return error status
      */   
     NS_IMETHOD
-    Read(char* aBuf, PRUint32 aCount, PRUint32 *aReadCount) = 0; 
+    Read(char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aReadCount) = 0; 
 };
 
 #endif /* nsInputStream_h___ */

mozilla/base/src/nsIOutputStream.h

@@ -29,10 +29,9 @@
 class nsIOutputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
-
     /** 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
@@ -40,7 +39,7 @@ public:
      *  @return error status
      */   
     NS_IMETHOD
-    Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteCount) = 0; 
+    Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aWriteCount) = 0; 
 };
 
 

mozilla/base/src/nsIStringStream.cpp

@@ -1,463 +0,0 @@
-#include "nsIStringStream.h"
-#include "nsIFileStream.h"
-
-#include "prerror.h"
-#include "nsFileSpec.h"
-#include "plstr.h"
-
-//========================================================================================
-class BasicStringImpl
-    : public nsIOutputStream
-    , public nsIInputStream
-    , public nsIRandomAccessStore
-//========================================================================================
-{
-    public:
-                                        BasicStringImpl()
-                                            : mResult(NS_OK)
-                                            , mEOF(PR_FALSE)
-                                            , mOffset(0)
-                                        {
-                                            NS_INIT_REFCNT();
-                                        }
-        virtual                         ~BasicStringImpl()
-                                        {
-                                        }
-        NS_IMETHOD                      Seek(PRSeekWhence whence, PRInt32 offset);
-
-        NS_IMETHOD                      Tell(PRIntn* outWhere)
-                                        {
-                                            *outWhere = mOffset;
-                                            return NS_OK;
-                                        }
-
-        NS_IMETHOD                      GetAtEOF(PRBool* outAtEOF)
-        						        {
-        						            *outAtEOF = mEOF;
-        						            return NS_OK;
-        						        }
-        NS_IMETHOD                      SetAtEOF(PRBool inAtEOF)
-        						        {
-        						            mEOF = inAtEOF;
-        						            return NS_OK;
-        						        }
-
-        NS_IMETHOD                      GetLength(PRUint32 *aLength)
-                                        {
-                                            NS_PRECONDITION(aLength != nsnull, "null ptr");
-                                            if (!aLength)
-                                                return NS_ERROR_NULL_POINTER;
-                                            *aLength = length();
-                                            return NS_OK;
-                                        }
-		NS_IMETHOD                      Read(char* aBuf,
-			                                PRUint32 aCount,
-					                        PRUint32 *aReadCount)
-								        {
-								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
-								            if (!aBuf)
-								                return NS_ERROR_NULL_POINTER;
-								            NS_PRECONDITION(aReadCount != nsnull, "null ptr");
-								            if (!aReadCount)
-								                return NS_ERROR_NULL_POINTER;
-								            if (NS_FAILED(mResult))
-								                return mResult;
-								            PRInt32 bytesRead = read(aBuf, aCount);
-								            if (NS_FAILED(mResult))
-								            {
-								                *aReadCount = 0;
-								                return mResult;
-								            }
-								            *aReadCount = bytesRead;
-								            if (bytesRead < aCount)
-								                SetAtEOF(PR_TRUE);
-								            return NS_OK;
-								        }
-		// nsIOutputStream interface
-		NS_IMETHOD                      Write(const char* aBuf,
-			                                PRUint32 aCount,
-					                        PRUint32 *aWriteCount)
-								        {
-								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
-								            NS_PRECONDITION(aWriteCount != nsnull, "null ptr");
-
-								            if (NS_FAILED(mResult))
-								                return mResult;
-								            PRInt32 bytesWrit = write(aBuf, aCount);
-								            if (NS_FAILED(mResult))
-								            {
-								                *aWriteCount = 0;
-								                return mResult;
-								            }
-								            *aWriteCount = bytesWrit;
-								            return NS_OK;
-								        }
-    public:
-        
-        // nsISupports interface
-                                        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD                      Close() { return NS_OK; }
-
-		// nsIInputStream interface
-        NS_IMETHOD                      Flush() { return NS_OK; }
-
-    
-    public:
-        nsresult                        get_result() const { return mResult; }
-        
-    protected:
-    
-        virtual PRInt32                 length() const = 0;
-        virtual PRInt32                 read(char* buf, PRUint32 count) = 0;
-        virtual PRInt32                 write(const char*, PRUint32)
-                                        {
-                                            NS_ASSERTION(PR_FALSE, "Write to a const string");
-                                            mResult = NS_FILE_RESULT(PR_ILLEGAL_ACCESS_ERROR);
-                                            return -1;
-                                        }
-        
-    protected:
- 
-        PRUint32                        mOffset;
-        nsresult                        mResult;
-        PRBool                          mEOF;
-}; // class BasicStringImpl
-
-//========================================================================================
-class ConstCharImpl
-    : public BasicStringImpl
-//========================================================================================
-{
-    public:
-                                        ConstCharImpl(const char* inString)
-                                            : mConstString(inString)
-                                            , mLength(inString ? strlen(inString) : 0)
-                                        {
-                                        }
-                                       
-    protected:
-    
-        virtual PRInt32                 length() const
-                                        {
-                                            return mLength;
-                                        }
-
-        virtual PRInt32                 read(char* buf, PRUint32 aCount)
-                                        {
-                                            PRInt32 maxCount = mLength - mOffset;
-                                            if (aCount > maxCount)
-                                                aCount = maxCount;
-                                            memcpy(buf, mConstString + mOffset, aCount);
-                                            mOffset += aCount;
-                                            return aCount;
-                                        }
-        
-
-    protected:
-    
-        const char*                     mConstString;
-        size_t                          mLength;
-        
-}; // class ConstCharImpl
-
-//========================================================================================
-class CharImpl
-    : public ConstCharImpl
-//========================================================================================
-{
-    enum { kAllocQuantum = 256 };
-    
-    public:
-                                        CharImpl(char** inString)
-                                            : ConstCharImpl(*inString)
-                                            , mString(*inString)
-                                            , mAllocLength(mLength + 1)
-                                            , mOriginalLength(mLength)
-                                        {
-                                            if (!mString)
-                                            {
-                                                mAllocLength += kAllocQuantum;
-                                                mString = new char[mAllocLength];
-	                                            if (!mString)
-	                                            {
-	                                                mResult = NS_ERROR_OUT_OF_MEMORY;
-	                                                return;
-	                                            }
-	                                            mConstString = mString;
-	                                            *mString = '\0';
-	                                            
-                                            }
-                                        }
-
-        virtual PRInt32                 write(const char* buf, PRUint32 aCount)
-                                        {
-                                            PRInt32 maxCount = mAllocLength - 1 - mOffset;
-                                            if (aCount > maxCount)
-                                            {
-                                                
-                                                do {
-                                                    maxCount += kAllocQuantum;
-                                                } while (aCount > maxCount);
-                                                mAllocLength = maxCount + 1 + mOffset;
-                                                char* newString = new char[mAllocLength];
-	                                            if (!newString)
-	                                            {
-	                                                mResult = NS_ERROR_OUT_OF_MEMORY;
-	                                                return 0;
-	                                            }
-                                                strcpy(newString, mString);
-                                                delete [] mString;
-                                                mString = newString;
-                                                mConstString = newString;
-                                            }
-                                            memcpy(mString + mOffset, buf, aCount);
-                                            mOffset += aCount;
-                                            if (mOffset > mOriginalLength)
-                                                mString[mOffset] = 0;
-                                            return aCount;
-                                        }
-    protected:
-    
-        char*&                          mString;
-        size_t                          mOriginalLength;
-        size_t                          mAllocLength;
-        
-}; // class CharImpl
-                                       
-//========================================================================================
-class ConstStringImpl
-    : public ConstCharImpl
-//========================================================================================
-{
-    public:
-                                        ConstStringImpl(const nsString& inString)
-                                            : ConstCharImpl(inString.ToNewCString())
-                                        {
-                                        }
-
-                                        ~ConstStringImpl()
-                                        {
-                                            delete [] (char*)mConstString;
-                                        }
-
-    protected:
-    
-    protected:
-    
-}; // class ConstStringImpl
-
-
-//========================================================================================
-class StringImpl
-    : public ConstStringImpl
-//========================================================================================
-{
-    public:
-                                        StringImpl(nsString& inString)
-                                            : ConstStringImpl(inString)
-                                            , mString(inString)
-                                        {
-                                        }
-
-    protected:
-    
-        virtual PRInt32                 write(const char* buf, PRUint32 count)
-                                        {
-                                            // Clone our string as chars
-                                            char* cstring = mString.ToNewCString();
-                                            // Make a CharImpl and do the write
-                                            CharImpl chars(&cstring);
-                                            chars.Seek(PR_SEEK_SET, mOffset);
-                                            // Get the bytecount and result from the CharImpl
-                                            PRInt32 result = chars.write(buf,count);
-                                            mResult = chars.get_result();
-                                            // Set our string to match the new chars
-                                            mString = cstring;
-                                            // Set our const string also...
-                                            delete [] (char*)mConstString;
-                                            mConstString = cstring;
-                                            return result;
-                                        }
-    protected:
-    
-        nsString&                        mString;
-        
-}; // class StringImpl
-
-#define SAY_I_IMPLEMENT(classname)               \
-  if (aIID.Equals(classname::GetIID()))          \
-  {                                              \
-      *aInstancePtr = (void*)((classname*)this); \
-      NS_ADDREF_THIS();                          \
-      return NS_OK;                              \
-  }
-
-NS_IMPL_RELEASE(BasicStringImpl)
-NS_IMPL_ADDREF(BasicStringImpl)
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP BasicStringImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-//----------------------------------------------------------------------------------------
-{
-  if (!aInstancePtr)
-    return NS_ERROR_NULL_POINTER;
-
-  *aInstancePtr = nsnull;
-
-  SAY_I_IMPLEMENT(nsIRandomAccessStore)
-  SAY_I_IMPLEMENT(nsIOutputStream)
-  SAY_I_IMPLEMENT(nsIInputStream)
-  // Note that we derive from two copies of nsIBaseStream (and hence
-  // of nsISupports), one through
-  // nsIOutputStream, the other through nsIInputStream.  Resolve this
-  // by giving them a specific one
-  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->GetIID()))
-  {
-      *aInstancePtr = (void*)((nsIBaseStream*)(nsIOutputStream*)this);
-      NS_ADDREF_THIS();
-      return NS_OK;
-  }
-  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID()))
-  {
-      *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this);
-      NS_ADDREF_THIS();
-      return NS_OK;
-  }
-  return NS_NOINTERFACE;
-} // StringImpl::QueryInterface
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP BasicStringImpl::Seek(PRSeekWhence whence, PRInt32 offset)
-//----------------------------------------------------------------------------------------
-{
-    mResult = NS_OK; // reset on a seek.
-    mEOF = PR_FALSE; // reset on a seek.
-    PRInt32 fileSize = length();
-    PRInt32 newPosition;
-    switch (whence)
-    {
-        case PR_SEEK_CUR: newPosition = mOffset + offset; break;
-        case PR_SEEK_SET: newPosition = offset; break;
-        case PR_SEEK_END: newPosition = fileSize + offset; break;
-    }
-    if (newPosition < 0)
-    {
-        newPosition = 0;
-        mResult = NS_FILE_RESULT(PR_FILE_SEEK_ERROR);
-    }
-    if (newPosition >= fileSize)
-    {
-        newPosition = fileSize;
-        mEOF = PR_TRUE;
-    }
-    mOffset = newPosition;
-    return NS_OK;
-} // StringImpl::Seek
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewStringInputStream(
-    nsISupports** aStreamResult,
-    const nsString& aStringToRead)
-    // Factory method to get an nsInputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    if (! aStreamResult)
-        return NS_ERROR_NULL_POINTER;
-
-    ConstStringImpl* stream = new ConstStringImpl(aStringToRead);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewStringOutputStream(
-    nsISupports** aStreamResult,
-    nsString& aStringToChange)
-    // Factory method to get an nsOutputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    if (! aStreamResult)
-        return NS_ERROR_NULL_POINTER;
-
-    StringImpl* stream = new StringImpl(aStringToChange);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewCharInputStream(
-    nsISupports** aStreamResult,
-    const char* aStringToRead)
-    // Factory method to get an nsInputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    if (! aStreamResult)
-        return NS_ERROR_NULL_POINTER;
-
-    ConstCharImpl* stream = new ConstCharImpl(aStringToRead);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewCharOutputStream(
-    nsISupports** aStreamResult,
-    char** aStringToChange)
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    NS_PRECONDITION(aStringToChange != nsnull, "null ptr");
-    if (!aStreamResult || !aStringToChange)
-        return NS_ERROR_NULL_POINTER;
-
-    CharImpl* stream = new CharImpl(aStringToChange);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewStringIOStream(
-    nsISupports** aStreamResult,
-    nsString& aStringToChange)
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-// file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    return NS_NewStringOutputStream(aStreamResult, aStringToChange);
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_BASE nsresult NS_NewCharIOStream(
-    nsISupports** aStreamResult,
-    char** aStringToChange)
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    return NS_NewCharOutputStream(aStreamResult, aStringToChange);
-}

mozilla/base/src/nsITimer.h

@@ -45,8 +45,6 @@ typedef void
  */
 class nsITimer : public nsISupports {
 public:  
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMER_IID)
-  
   /**
    * Initialize a timer to fire after the given millisecond interval.
    * This version takes a function to call and a closure to pass to

mozilla/base/src/nsITimerCallback.h

@@ -35,9 +35,7 @@ class nsITimer;
  */
 class nsITimerCallback : public nsISupports {
 public:  
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMERCALLBACK_IID)
-
-  virtual void Notify(nsITimer *timer) = 0;
+  virtual void Notify(nsITimer *timer)=0;
 };
 
 #endif

mozilla/base/src/nsIUnicharBuffer.h

@@ -41,6 +41,6 @@ public:
 extern NS_BASE nsresult
   NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
                       nsISupports* aOuter,
-                      PRUint32 aBufferSize = 0);
+                      PRInt32 aBufferSize = 0);
 
 #endif /* nsIUnicharBuffer_h___ */

mozilla/base/src/nsIUnicharInputStream.h

@@ -25,15 +25,27 @@ class nsString;
 { 0x2d97fbf0, 0x93b5, 0x11d1,        \
   {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
 
+#define NS_IB2UCONVERTER_IID  \
+{ 0x35e40290, 0x93b5, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/// Enumeration of character set ids.
+enum nsCharSetID {
+  eCharSetID_IsoLatin1 = 0,
+  eCharSetID_UTF8,
+  eCharSetID_ShiftJis
+  // XXX more i'm sure...
+};
+
 /** Abstract unicode character input stream
  *  @see nsIInputStream
  */
 class nsIUnicharInputStream : public nsISupports {
 public:
   NS_IMETHOD Read(PRUnichar* aBuf,
-                  PRUint32 aOffset,
-                  PRUint32 aCount,
-                  PRUint32 *aReadCount) = 0;
+                  PRInt32 aOffset,
+                  PRInt32 aCount,
+                  PRInt32 *aReadCount) = 0;
   NS_IMETHOD Close() = 0;
 };
 
@@ -47,6 +59,21 @@ extern NS_BASE nsresult
   NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
                                  nsString* aString);
 
+/// Abstract interface for converting from bytes to unicode characters
+class nsIB2UConverter : public nsISupports {
+public:
+  /** aDstLen is updated to indicate how much data was translated into
+   * aDst; aSrcLen is updated to indicate how much data was used in
+   * the source buffer.
+   */
+  virtual PRInt32 Convert(PRUnichar* aDst,
+                          PRInt32 aDstOffset,
+                          PRInt32& aDstLen,
+                          const char* aSrc,
+                          PRInt32 aSrcOffset,
+                          PRInt32& aSrcLen) = 0;
+};
+
 /** Create a new nsUnicharInputStream that provides a converter for the
  * byte input stream aStreamToWrap. If no converter can be found then
  * nsnull is returned and the error code is set to
@@ -57,6 +84,15 @@ extern NS_BASE nsresult
                         nsISupports* aOuter,
                         nsIInputStream* aStreamToWrap,
                         PRInt32 aBufferSize = 0,
-                        nsString* aCharSet = nsnull);
+                        nsCharSetID aCharSet = eCharSetID_IsoLatin1);
+
+/** Create a new nsB2UConverter for the given character set. When given
+ * nsnull, the converter for iso-latin1 to unicode is provided. If no
+ * converter can be found, nsnull is returned.
+ */
+extern NS_BASE nsresult
+  NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
+                     nsISupports* aOuter,
+                     nsCharSetID aCharSet = eCharSetID_IsoLatin1);
 
 #endif /* nsUnicharInputStream_h___ */

mozilla/base/src/nsInt64.h

@@ -26,17 +26,12 @@
  * 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
+class NS_BASE nsInt64
 {
-private:
+    private:
     PRInt64 mValue;
 
-public:
+    public:
     /**
      * Construct a new 64-bit integer.
      */
@@ -227,7 +222,7 @@ public:
 /**
  * Add two 64-bit integers.
  */
-inline const nsInt64
+const nsInt64
 operator +(const nsInt64& aObject1, const nsInt64& aObject2) {
     return nsInt64(aObject1) += aObject2;
 }

mozilla/base/src/nsProperties.cpp

@@ -1,312 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#define NS_IMPL_IDS
-#include "nsID.h"
-
-#include "nsBaseDLL.h"
-#include "nsCRT.h"
-#include "nsIInputStream.h"
-#include "nsIProperties.h"
-#include "nsIUnicharInputStream.h"
-#include "nsProperties.h"
-#include "plhash.h"
-#include "pratom.h"
-
-class nsProperties : public nsIProperties
-{
-public:
-  nsProperties();
-  virtual ~nsProperties();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD Load(nsIInputStream* aIn);
-  NS_IMETHOD GetProperty(const nsString& aKey, nsString& aValue);
-  NS_IMETHOD SetProperty(const nsString& aKey, nsString& aNewValue,
-                         nsString& aOldValue);
-  NS_IMETHOD Save(nsIOutputStream* aOut, const nsString& aHeader);
-  NS_IMETHOD Subclass(nsIProperties* aSubclass);
-
-  PRInt32 Read();
-  PRInt32 SkipLine(PRInt32 c);
-  PRInt32 SkipWhiteSpace(PRInt32 c);
-
-  nsIUnicharInputStream* mIn;
-  nsIProperties*         mSubclass;
-  struct PLHashTable*    mTable;
-};
-
-nsProperties::nsProperties()
-{
-  NS_INIT_REFCNT();
-
-  mIn = nsnull;
-  mSubclass = NS_STATIC_CAST(nsIProperties*, this);
-  mTable = nsnull;
-}
-
-PR_STATIC_CALLBACK(PRIntn)
-FreeHashEntries(PLHashEntry* he, PRIntn i, void* arg)
-{
-  delete[] (PRUnichar*)he->key;
-  delete[] (PRUnichar*)he->value;
-  return HT_ENUMERATE_REMOVE;
-}
-
-nsProperties::~nsProperties()
-{
-  if (mTable) {
-    // Free the PRUnicode* pointers contained in the hash table entries
-    PL_HashTableEnumerateEntries(mTable, FreeHashEntries, 0);
-    PL_HashTableDestroy(mTable);
-    mTable = nsnull;
-  }
-}
-
-NS_DEFINE_IID(kIPropertiesIID, NS_IPROPERTIES_IID);
-
-NS_IMPL_ISUPPORTS(nsProperties, kIPropertiesIID)
-
-NS_IMETHODIMP
-nsProperties::Load(nsIInputStream *aIn)
-{
-  PRInt32  c;
-  nsresult ret;
-
-  ret = NS_NewConverterStream(&mIn, nsnull, aIn);
-  if (ret != NS_OK) {
-    cout << "NS_NewConverterStream failed" << endl;
-    return NS_ERROR_FAILURE;
-  }
-  c = Read();
-  while (1) {
-    c = SkipWhiteSpace(c);
-    if (c < 0) {
-      break;
-    }
-    else if ((c == '#') || (c == '!')) {
-      c = SkipLine(c);
-      continue;
-    }
-    else {
-      nsAutoString key("");
-      while ((c >= 0) && (c != '=') && (c != ':')) {
-        key.Append((PRUnichar) c);
-        c = Read();
-      }
-      if (c < 0) {
-        break;
-      }
-      char *trimThese = " \t";
-      key.Trim(trimThese, PR_FALSE, PR_TRUE);
-      c = Read();
-      nsAutoString value("");
-      while ((c >= 0) && (c != '\r') && (c != '\n')) {
-        if (c == '\\') {
-          c = Read();
-          if ((c == '\r') || (c == '\n')) {
-            c = SkipWhiteSpace(c);
-          }
-          else {
-            value.Append('\\');
-          }
-        }
-        value.Append((PRUnichar) c);
-        c = Read();
-      }
-      value.Trim(trimThese, PR_TRUE, PR_TRUE);
-      nsAutoString oldValue("");
-      mSubclass->SetProperty(key, value, oldValue);
-    }
-  }
-  mIn->Close();
-  NS_RELEASE(mIn);
-  NS_ASSERTION(!mIn, "unexpected remaining reference");
-
-  return NS_OK;
-}
-
-static PLHashNumber
-HashKey(const PRUnichar *aString)
-{
-  return (PLHashNumber) nsCRT::HashValue(aString);
-}
-
-static PRIntn
-CompareKeys(const PRUnichar *aStr1, const PRUnichar *aStr2)
-{
-  return nsCRT::strcmp(aStr1, aStr2) == 0;
-}
-
-NS_IMETHODIMP
-nsProperties::SetProperty(const nsString& aKey, nsString& aNewValue,
-  nsString& aOldValue)
-{
-  // XXX The ToNewCString() calls allocate memory using "new" so this code
-  // causes a memory leak...
-#if 0
-  cout << "will add " << aKey.ToNewCString() << "=" << aNewValue.ToNewCString() << endl;
-#endif
-  if (!mTable) {
-    mTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
-      (PLHashComparator) CompareKeys,
-      (PLHashComparator) nsnull, nsnull, nsnull);
-    if (!mTable) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-
-  const PRUnichar *key = aKey.GetUnicode();  // returns internal pointer (not a copy)
-  PRUint32 len;
-  PRUint32 hashValue = nsCRT::HashValue(key, &len);
-  PLHashEntry **hep = PL_HashTableRawLookup(mTable, hashValue, key);
-  PLHashEntry *he = *hep;
-  if (he && aOldValue) {
-    // XXX fix me
-  }
-  PL_HashTableRawAdd(mTable, hep, hashValue, aKey.ToNewUnicode(),
-                     aNewValue.ToNewUnicode());
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsProperties::Save(nsIOutputStream* aOut, const nsString& aHeader)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsProperties::Subclass(nsIProperties* aSubclass)
-{
-  if (aSubclass) {
-    mSubclass = aSubclass;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsProperties::GetProperty(const nsString& aKey, nsString& aValue)
-{
-  const PRUnichar *key = aKey;
-  PRUint32 len;
-  PRUint32 hashValue = nsCRT::HashValue(key, &len);
-  PLHashEntry **hep = PL_HashTableRawLookup(mTable, hashValue, key);
-  PLHashEntry *he = *hep;
-  if (he) {
-    aValue = (const PRUnichar*)he->value;
-    return NS_OK;
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-PRInt32
-nsProperties::Read()
-{
-  PRUnichar  c;
-  PRUint32  nRead;
-  nsresult  ret;
-
-  ret = mIn->Read(&c, 0, 1, &nRead);
-  if (ret == NS_OK) {
-    return c;
-  }
-
-  return -1;
-}
-
-#define IS_WHITE_SPACE(c) \
-  (((c) == ' ') || ((c) == '\t') || ((c) == '\r') || ((c) == '\n'))
-
-PRInt32
-nsProperties::SkipWhiteSpace(PRInt32 c)
-{
-  while ((c >= 0) && IS_WHITE_SPACE(c)) {
-    c = Read();
-  }
-
-  return c;
-}
-
-PRInt32
-nsProperties::SkipLine(PRInt32 c)
-{
-  while ((c >= 0) && (c != '\r') && (c != '\n')) {
-    c = Read();
-  }
-  if (c == '\r') {
-    c = Read();
-  }
-  if (c == '\n') {
-    c = Read();
-  }
-
-  return c;
-}
-
-nsPropertiesFactory::nsPropertiesFactory()
-{
-  NS_INIT_REFCNT();
-}
-
-nsPropertiesFactory::~nsPropertiesFactory()
-{
-}
-
-NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-
-NS_IMPL_ISUPPORTS(nsPropertiesFactory, kIFactoryIID);
-
-NS_IMETHODIMP
-nsPropertiesFactory::CreateInstance(nsISupports* aOuter, REFNSIID aIID,
-  void** aResult)
-{
-  if (aOuter) {
-    return NS_ERROR_NO_AGGREGATION;
-  }
-  if (!aResult) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  *aResult = nsnull;
-  nsProperties* props = new nsProperties();
-  if (!props) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  nsresult ret = props->QueryInterface(aIID, aResult);
-  if (NS_FAILED(ret)) {
-    delete props;
-  }
-
-  return ret;
-}
-
-NS_IMETHODIMP
-nsPropertiesFactory::LockFactory(PRBool aLock)
-{
-  if (aLock) {
-    PR_AtomicIncrement(&gLockCount);
-  }
-  else {
-    PR_AtomicDecrement(&gLockCount);
-  }
-
-  return NS_OK;
-}

mozilla/base/src/nsProperties.h

@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#ifndef nsProperties_h___
-#define nsProperties_h___
-
-#include "nsIFactory.h"
-
-class nsPropertiesFactory : public nsIFactory
-{
-public:
-  nsPropertiesFactory();
-  virtual ~nsPropertiesFactory();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD CreateInstance(nsISupports* aOuter, REFNSIID aIID,
-                            void** aResult);
-  NS_IMETHOD LockFactory(PRBool aLock);
-};
-
-#endif /* nsProperties_h___ */

mozilla/base/src/nsSpecialSystemDirectory.cpp

@@ -1,369 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Doug Turner <dougt@netscape.com>
- */
-
-#include "nsSpecialSystemDirectory.h"
-#include "nsDebug.h"
-
-#ifdef XP_MAC
-#include <Folders.h>
-#include <Files.h>
-#include <Memory.h>
-#include <Processes.h>
-#elif defined(XP_PC)
-#include <windows.h>
-#include <stdlib.h>
-#include <stdio.h>
-#elif defined(XP_UNIX)
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#endif
-
-#include "plstr.h"
-
-#if XP_PC
-//----------------------------------------------------------------------------------------
-static char* MakeUpperCase(char* aPath)
-//----------------------------------------------------------------------------------------
-{
-  // windows does not care about case.  push to uppercase:
-  int length = strlen(aPath);
-  for (int i = 0; i < length; i++)
-      if (islower(aPath[i]))
-        aPath[i] = _toupper(aPath[i]);
-    
-  return aPath;
-}
-#endif
-
-//----------------------------------------------------------------------------------------
-static void GetCurrentProcessDirectory(nsFileSpec& aFileSpec)
-//----------------------------------------------------------------------------------------
-{
-#ifdef XP_PC
-    char buf[MAX_PATH];
-    if ( ::GetModuleFileName(0, buf, sizeof(buf)) ) {
-        // chop of the executable name by finding the rightmost backslash
-        char* lastSlash = PL_strrchr(buf, '\\');
-        if (lastSlash)
-            *(lastSlash + 1) = '\0';
-
-        aFileSpec = buf;
-        return;
-    }
-
-#elif defined(XP_MAC)
-    // get info for the the current process to determine the directory
-    // its located in
-    OSErr err;
-    ProcessSerialNumber psn;
-    if (!(err = GetCurrentProcess(&psn)))
-    {
-        ProcessInfoRec pInfo;
-        FSSpec         tempSpec;
-
-        // initialize ProcessInfoRec before calling
-        // GetProcessInformation() or die horribly.
-        pInfo.processName = nil;
-        pInfo.processAppSpec = &tempSpec;
-        pInfo.processInfoLength = sizeof(ProcessInfoRec);
-
-        if (!(err = GetProcessInformation(&psn, &pInfo)))
-        {
-            FSSpec appFSSpec = *(pInfo.processAppSpec);
-            long theDirID = appFSSpec.parID;
-
-            Str255 name;
-            CInfoPBRec catInfo;
-            catInfo.dirInfo.ioCompletion = NULL;
-            catInfo.dirInfo.ioNamePtr = (StringPtr)&name;
-            catInfo.dirInfo.ioVRefNum = appFSSpec.vRefNum;
-            catInfo.dirInfo.ioDrDirID = theDirID;
-            catInfo.dirInfo.ioFDirIndex = -1; // -1 = query dir in ioDrDirID
-
-            if (!(err = PBGetCatInfoSync(&catInfo)))
-            {
-                aFileSpec = nsFileSpec(appFSSpec.vRefNum,
-                                       catInfo.dirInfo.ioDrParID,
-                                       name);
-                return;
-            }
-        }
-    }
-
-#elif defined(XP_UNIX)
-
-    // In the absence of a good way to get the executable directory let
-    // us try this for unix:
-    //	- if MOZILLA_FIVE_HOME is defined, that is it
-    //	- else give the current directory
-    char buf[MAXPATHLEN];
-    char *moz5 = getenv("MOZILLA_FIVE_HOME");
-    if (moz5)
-    {
-        aFileSpec = moz5;
-        return;
-    }
-    else
-    {
-        if (getcwd(buf, sizeof(buf)))
-        {
-            aFileSpec = buf;
-            return;
-        }
-    }
-
-#endif
-
-    NS_ERROR("unable to get current process directory");
-}
-
-//nsSpecialSystemDirectory::nsSpecialSystemDirectory()
-//:    nsFileSpec(nsnull)
-//{
-//}
-
-//----------------------------------------------------------------------------------------
-nsSpecialSystemDirectory::nsSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory)
-//----------------------------------------------------------------------------------------
-:    nsFileSpec(nsnull)
-{
-    *this = aSystemSystemDirectory;
-}
-
-//----------------------------------------------------------------------------------------
-nsSpecialSystemDirectory::~nsSpecialSystemDirectory()
-//----------------------------------------------------------------------------------------
-{
-}
-
-//----------------------------------------------------------------------------------------
-void nsSpecialSystemDirectory::operator = (SystemDirectories aSystemSystemDirectory)
-//----------------------------------------------------------------------------------------
-{
-    *this = (const char*)nsnull;
-    switch (aSystemSystemDirectory)
-    {
-        
-        case OS_DriveDirectory:
-#ifdef XP_PC
-        {
-            char path[_MAX_PATH];
-            PRInt32 len = GetWindowsDirectory( path, _MAX_PATH );
-            if (len)
-            {
-                if ( path[1] == ':' && path[2] == '\\' )
-                    path[3] = 0;
-            }
-            *this = MakeUpperCase(path);
-        }
-#elif defined(XP_MAC)
-        {
-            *this = kVolumeRootFolderType;
-        }
-#else
-        *this = "/";
-#endif
-        break;
-
-            
-        case OS_TemporaryDirectory:
-#ifdef XP_PC
-            char path[_MAX_PATH];
-            if ( GetEnvironmentVariable(TEXT("TMP"), path, _MAX_PATH) == 0 ) 
-                if (GetEnvironmentVariable(TEXT("TEMP"), path, _MAX_PATH))
-                {
-                    // still not set!
-                    PRInt32 len = GetWindowsDirectory( path, _MAX_PATH );
-                    if (len)
-                    {
-                        strcat( path, "temp" );
-                    }
-                }
-
-            strcat( path, "\\" );
-            *this = MakeUpperCase(path);
-#elif defined(XP_MAC)
-            *this = kTemporaryFolderType;
-        
-#elif defined(XP_UNIX)
-            *this = "/tmp/";
-#endif
-        break;
-
-        case OS_CurrentProcessDirectory:
-            GetCurrentProcessDirectory(*this);
-            break;
-
-#ifdef XP_MAC
-        case Mac_SystemDirectory:
-            *this = kSystemFolderType;
-            break;
-
-        case Mac_DesktopDirectory:
-            *this = kDesktopFolderType;
-            break;
-
-        case Mac_TrashDirectory:
-            *this = kTrashFolderType;
-            break;
-
-        case Mac_StartupDirectory:
-            *this = kStartupFolderType;
-            break;
-
-        case Mac_ShutdownDirectory:
-            *this = kShutdownFolderType;
-            break;
-
-        case Mac_AppleMenuDirectory:
-            *this = kAppleMenuFolderType;
-            break;
-
-        case Mac_ControlPanelDirectory:
-            *this = kControlPanelFolderType;
-            break;
-
-        case Mac_ExtensionDirectory:
-            *this = kExtensionFolderType;
-            break;
-
-        case Mac_FontsDirectory:
-            *this = kFontsFolderType;
-            break;
-
-        case Mac_PreferencesDirectory:
-            *this = kPreferencesFolderType;
-            break;
-
-        case Mac_DocumentsDirectory:
-            *this = kDocumentsFolderType;
-            break;
-#endif
-            
-#ifdef XP_PC
-        case Win_SystemDirectory:
-        {    
-            char path[_MAX_PATH];
-            PRInt32 len = GetSystemDirectory( path, _MAX_PATH );
-        
-            // Need enough space to add the trailing backslash
-            if (len > _MAX_PATH-2)
-                break;
-            path[len]   = '\\';
-            path[len+1] = '\0';
-
-            *this = MakeUpperCase(path);
-
-            break;
-        }
-
-        case Win_WindowsDirectory:
-        {    
-            char path[_MAX_PATH];
-            PRInt32 len = GetWindowsDirectory( path, _MAX_PATH );
-            
-            // Need enough space to add the trailing backslash
-            if (len > _MAX_PATH-2)
-                break;
-            
-            path[len]   = '\\';
-            path[len+1] = '\0';
-
-            *this = MakeUpperCase(path);
-            break;
-        }
-
-#endif        
-
-#ifdef XP_UNIX
-        case Unix_LocalDirectory:
-            *this = "/usr/local/netscape/";
-            break;
-
-        case Unix_LibDirectory:
-            *this = "/usr/local/lib/netscape/";
-            break;
-#endif        
-
-        default:
-            break;    
-    }
-}
-
-
-
-#ifdef XP_MAC
-//----------------------------------------------------------------------------------------
-nsSpecialSystemDirectory::nsSpecialSystemDirectory(OSType folderType)
-//----------------------------------------------------------------------------------------
-{
-	*this = folderType;
-}
-
-//----------------------------------------------------------------------------------------
-void nsSpecialSystemDirectory::operator = (OSType folderType)
-//----------------------------------------------------------------------------------------
-{
-    CInfoPBRec cinfo;
-    DirInfo *dipb=(DirInfo *)&cinfo;
-    
-    // Call FindFolder to fill in the vrefnum and dirid
-    for (int attempts = 0; attempts < 2; attempts++)
-    {
-        mError = NS_FILE_RESULT(
-            FindFolder(
-                kOnSystemDisk,
-                folderType,
-                true,
-                &dipb->ioVRefNum,
-                &dipb->ioDrDirID));
-        if (NS_SUCCEEDED(mError))
-            break;
-        if (attempts > 0)
-		    return;
-		switch (folderType)
-		{
-	    case kDocumentsFolderType:
-	        // Find folder will find this, as long as it exists.
-	        // The "create" parameter, however, is sadly ignored.
-	        // How do we internationalize this?
-	        *this = kVolumeRootFolderType;
-	        *this += "Documents";
-	        CreateDirectory();
-	        break;
-		} // switch
-    } // for
-    StrFileName filename;
-    filename[0] = '\0';
-    dipb->ioNamePtr = (StringPtr)&filename;
-    dipb->ioFDirIndex = -1;
-    
-    mError = NS_FILE_RESULT(PBGetCatInfoSync(&cinfo));
-    if (NS_SUCCEEDED(mError))
-    {
-	    mError = NS_FILE_RESULT(FSMakeFSSpec(dipb->ioVRefNum, dipb->ioDrParID, filename, &mSpec));
-    }
-}
-#endif // XP_MAC

mozilla/base/src/nsStdFileStream.cpp

@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-//	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.cpp

@@ -27,11 +27,6 @@
 #include "prdtoa.h"
 #include "nsISizeOfHandler.h"
 
-
-#include "nsUnicharUtilCIID.h"
-#include "nsIServiceManager.h"
-#include "nsICaseConversion.h"
-
 const PRInt32 kGrowthDelta = 8;
 const PRInt32 kNotFound = -1;
 PRUnichar gBadChar = 0;
@@ -44,114 +39,6 @@ PRUnichar kCommonEmptyBuffer[100];   //shared by all strings; NEVER WRITE HERE!!
 PRBool nsString::mSelfTested = PR_FALSE;   
 
 
-
-#define NOT_USED 0xfffd
-
-static PRUint16 PA_HackTable[] = {
-	NOT_USED,
-	NOT_USED,
-	0x201a,  /* SINGLE LOW-9 QUOTATION MARK */
-	0x0192,  /* LATIN SMALL LETTER F WITH HOOK */
-	0x201e,  /* DOUBLE LOW-9 QUOTATION MARK */
-	0x2026,  /* HORIZONTAL ELLIPSIS */
-	0x2020,  /* DAGGER */
-	0x2021,  /* DOUBLE DAGGER */
-	0x02c6,  /* MODIFIER LETTER CIRCUMFLEX ACCENT */
-	0x2030,  /* PER MILLE SIGN */
-	0x0160,  /* LATIN CAPITAL LETTER S WITH CARON */
-	0x2039,  /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
-	0x0152,  /* LATIN CAPITAL LIGATURE OE */
-	NOT_USED,
-	NOT_USED,
-	NOT_USED,
-
-	NOT_USED,
-	0x2018,  /* LEFT SINGLE QUOTATION MARK */
-	0x2019,  /* RIGHT SINGLE QUOTATION MARK */
-	0x201c,  /* LEFT DOUBLE QUOTATION MARK */
-	0x201d,  /* RIGHT DOUBLE QUOTATION MARK */
-	0x2022,  /* BULLET */
-	0x2013,  /* EN DASH */
-	0x2014,  /* EM DASH */
-	0x02dc,  /* SMALL TILDE */
-	0x2122,  /* TRADE MARK SIGN */
-	0x0161,  /* LATIN SMALL LETTER S WITH CARON */
-	0x203a,  /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
-	0x0153,  /* LATIN SMALL LIGATURE OE */
-	NOT_USED,
-	NOT_USED,
-	0x0178   /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
-};
-
-static PRUnichar gToUCS2[256];
-
-class CTableConstructor {
-public:
-  CTableConstructor(){
-    PRUnichar* cp = gToUCS2;
-    PRInt32 i;
-    for (i = 0; i < 256; i++) {
-      *cp++ = PRUnichar(i);
-    }
-    cp = gToUCS2;
-    for (i = 0; i < 32; i++) {
-      cp[0x80 + i] = PA_HackTable[i];
-    }
-  }
-};
-static CTableConstructor gTableConstructor;
-
-//---- XPCOM code to connect with UnicharUtil
-
-class HandleCaseConversionShutdown2 : public nsIShutdownListener {
-public :
-   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
-   HandleCaseConversionShutdown2(void) { NS_INIT_REFCNT(); }
-   virtual ~HandleCaseConversionShutdown2(void) {}
-   NS_DECL_ISUPPORTS
-};
-static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
-static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
-
-static nsICaseConversion * gCaseConv = NULL; 
-
-static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
-NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown2, kIShutdownListenerIID);
-
-nsresult
-HandleCaseConversionShutdown2::OnShutdown(const nsCID& cid, nsISupports* service)
-{
-    if (cid.Equals(kUnicharUtilCID)) {
-        NS_ASSERTION(service == gCaseConv, "wrong service!");
-        nsrefcnt cnt = gCaseConv->Release();
-        gCaseConv = NULL;
-    }
-    return NS_OK;
-}
-
-static HandleCaseConversionShutdown2* gListener = NULL;
-
-static void StartUpCaseConversion()
-{
-    nsresult err;
-
-    if ( NULL == gListener )
-    {
-      gListener = new HandleCaseConversionShutdown2();
-      gListener->AddRef();
-    }
-    err = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
-                                        (nsISupports**) &gCaseConv, gListener);
-}
-static void CheckCaseConversion()
-{
-    if(NULL == gCaseConv )
-      StartUpCaseConversion();
-
-    // NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
-   
-}
-
 /***********************************************************************
   IMPLEMENTATION NOTES:
 
@@ -182,15 +69,15 @@ nsString::nsString() {
 /**
  * This constructor accepts an isolatin string
  * @update	gess7/30/98
- * @param   aCString is a ptr to a 1-byte cstr
+ * @param   anISOLatin1 is a ptr to a 1-byte cstr
  */
-nsString::nsString(const char* aCString) {  
+nsString::nsString(const char* anISOLatin1) {  
   mLength=mCapacity=0;
   mStr = kCommonEmptyBuffer;
-  if(aCString) {
-    PRInt32 len=strlen(aCString);
+  if(anISOLatin1) {
+    PRInt32 len=strlen(anISOLatin1);
     EnsureCapacityFor(len);
-    this->SetString(aCString,len);
+    this->SetString(anISOLatin1,len);
   }
 }
 
@@ -272,7 +159,7 @@ PRBool nsString::IsOrdered(void) const {
   if(mLength>1) {
     PRInt32 theIndex;
     for(theIndex=1;theIndex<mLength;theIndex++) {
-      if(mStr[theIndex-1]>mStr[theIndex]) {
+      if(mStr[theIndex-1]>=mStr[theIndex]) {
         result=PR_FALSE;
         break;
       }
@@ -350,7 +237,7 @@ const PRUnichar* nsString::GetUnicode(void) const{
   return mStr;
 }
 
-nsString::operator const PRUnichar*() const{
+nsString::operator PRUnichar*() const{
   return mStr;
 }
 
@@ -432,12 +319,12 @@ nsString nsString::operator+(const nsString& aString){
 /**
  * create a new string by adding this to the given buffer.
  * @update	gess 7/27/98
- * @param   aCString is a ptr to cstring to be added to this
+ * @param   anISOLatin1 is a ptr to cstring to be added to this
  * @return  newly created string
  */
-nsString nsString::operator+(const char* aCString) {
+nsString nsString::operator+(const char* anISOLatin1) {
   nsString temp(*this);
-  temp.Append(aCString);
+  temp.Append(anISOLatin1);
   return temp;
 }
 
@@ -487,16 +374,6 @@ nsString nsString::operator+(PRUnichar aChar) {
  */
 void nsString::ToLowerCase()
 {
-  // I18N code begin
-  CheckCaseConversion();
-  if(gCaseConv) {
-    nsresult err = gCaseConv->ToLower(mStr, mStr, mLength);
-    if( NS_SUCCEEDED(err))
-      return;
-  }
-  // I18N code end
-
-  // somehow UnicharUtil return failed, fallback to the old ascii only code
   chartype* cp = mStr;
   chartype* end = cp + mLength;
   while (cp < end) {
@@ -514,16 +391,6 @@ void nsString::ToLowerCase()
  */
 void nsString::ToUpperCase()
 {
-  // I18N code begin
-  CheckCaseConversion();
-  if(gCaseConv) {
-    nsresult err = gCaseConv->ToUpper(mStr, mStr, mLength);
-    if( NS_SUCCEEDED(err))
-      return;
-  }
-  // I18N code end
-
-  // somehow UnicharUtil return failed, fallback to the old ascii only code
   chartype* cp = mStr;
   chartype* end = cp + mLength;
   while (cp < end) {
@@ -535,24 +402,6 @@ void nsString::ToUpperCase()
   }
 }
 
-/**
- * Converts all chars in given string to UCS2
- */
-void nsString::ToUCS2(PRInt32 aStartOffset){
-  if(aStartOffset<mLength){
-    chartype* cp = &mStr[aStartOffset];
-    chartype* end = cp + mLength;
-    while (cp < end) {
-      unsigned char ch = (unsigned char)*cp;
-      if( 0x0080 == (0xFFE0 & (*cp)) ) // limit to only 0x0080 to 0x009F
-        *cp=gToUCS2[ch];
-      cp++;
-    }
-  }
-}
-
-
-
 /**
  * Converts chars in this to lowercase, and
  * stores them in aOut
@@ -563,19 +412,6 @@ void nsString::ToLowerCase(nsString& aOut) const
 {
   aOut.EnsureCapacityFor(mLength);
   aOut.mLength = mLength;
-
-  // I18N code begin
-  CheckCaseConversion();
-  if(gCaseConv) {
-    nsresult err = gCaseConv->ToLower(mStr, aOut.mStr, mLength);
-    (*(aOut.mStr+mLength)) = 0;
-    if( NS_SUCCEEDED(err))
-      return;
-  }
-  // I18N code end
-
-  // somehow UnicharUtil return failed, fallback to the old ascii only code
-
   chartype* to = aOut.mStr;
   chartype* from = mStr;
   chartype* end = from + mLength;
@@ -599,18 +435,6 @@ void nsString::ToUpperCase(nsString& aOut) const
 {
   aOut.EnsureCapacityFor(mLength);
   aOut.mLength = mLength;
-
-  // I18N code begin
-  CheckCaseConversion();
-  if(gCaseConv) {
-    nsresult err = gCaseConv->ToUpper(mStr, aOut.mStr, mLength);
-    (*(aOut.mStr+mLength)) = 0;
-    if( NS_SUCCEEDED(err))
-      return;
-  }
-  // I18N code end
-
-  // somehow UnicharUtil return failed, fallback to the old ascii only code
   chartype* to = aOut.mStr;
   chartype* from = mStr;
   chartype* end = from + mLength;
@@ -634,10 +458,9 @@ nsString* nsString::ToNewString() const {
 }
 
 /**
- * Creates an aCString clone of this string
- * NOTE: Call delete[] when you're done with this copy. NOT free!
+ * Creates an ISOLatin1 clone of this string
  * @update	gess 7/27/98
- * @return  ptr to new aCString string
+ * @return  ptr to new isolatin1 string
  */
 char* nsString::ToNewCString() const
 {
@@ -717,78 +540,60 @@ float nsString::ToFloat(PRInt32* aErrorCode) const
 }
 
 /**
- * Perform numeric string to int conversion with given radix.
- * @update	gess 10/01/98
+ * Perform string to int conversion.
+ * @update	gess 7/27/98
  * @param   aErrorCode will contain error if one occurs
- * @param   aRadix tells us what base to expect the string in.
- * @return  int rep of string value; aErrorCode gets set too: NS_OK, NS_ERROR_ILLEGAL_VALUE
+ * @return  int rep of string value
  */
-PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
-  PRInt32     result = 0;
-  PRInt32     decPt=Find(PRUnichar('.'),0);
-  PRUnichar*  cp = (-1==decPt) ? mStr + mLength-1 : mStr+decPt-1;
-  char        digit=0;
-  PRUnichar   theChar;
-  PRInt32     theShift=0;
-  PRInt32     theMult=1;
+PRInt32 nsString::ToInteger(PRInt32* aErrorCode) const {
+  PRInt32 rv = 0;
+  PRUnichar* cp = mStr;
+  PRUnichar* end = mStr + mLength;
 
-  *aErrorCode = (0<mLength) ? NS_OK : NS_ERROR_ILLEGAL_VALUE;
-
-
-  // Skip trailing non-numeric...
-  while (cp >= mStr) {
-    theChar = *cp;
-    if((theChar>='0') && (theChar<='9')){
+  // Skip leading whitespace
+  while (cp < end) {
+    PRUnichar ch = *cp;
+    if (!IsSpace(ch)) {
       break;
     }
-    else if((theChar>='a') && (theChar<='f')) {
-      break;
-    }
-    else if((theChar>='A') && (theChar<='F')) {
-      break;
-    }
-    cp--;
+    cp++;
+  }
+  if (cp == end) {
+    *aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
+    return rv;
   }
 
-    //now iterate the numeric chars and build our result
-  while(cp>=mStr) {
-    theChar=*cp--;
-    if((theChar>='0') && (theChar<='9')){
-      digit=theChar-'0';
-    }
-    else if((theChar>='a') && (theChar<='f')) {
-      digit=(theChar-'a')+10;
-    }
-    else if((theChar>='A') && (theChar<='F')) {
-      digit=(theChar-'A')+10;
-    }
-    else if('-'==theChar) {
-      result=-result;
-      break;
-    }
-    else if(('+'==theChar) || (' '==theChar)) { //stop in a good state if you see this...
-      break;
-    }
-    else if((('x'==theChar) || ('X'==theChar)) && (16==aRadix)) {  
-      //stop in a good state.
-      break;
-    }
-    else{
-      *aErrorCode=NS_ERROR_ILLEGAL_VALUE;
-      result=0;
-      break;
-    }
-    result+=digit*theMult;
-    theMult*=aRadix;
+  // Check for sign
+  PRUnichar sign = '+';
+  if ((*cp == '+') || (*cp == '-')) {
+    sign = *cp++;
   }
-  
-  return result;
+  if (cp == end) {
+    *aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
+    return rv;
+  }
+
+  // Convert the number
+  while (cp < end) {
+    PRUnichar ch = *cp++;
+    if ((ch < '0') || (ch > '9')) {
+      *aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
+      break;
+    }
+    rv = rv * 10 + (ch - '0');
+  }
+
+  if (sign == '-') {
+    rv = -rv;
+  }
+  *aErrorCode = NS_OK;
+  return rv;
 }
 
 /**
  * assign given PRUnichar* to this string
  * @update	gess 7/27/98
- * @param   PRUnichar: buffer to be assigned to this 
+ * @param   anISOLatin1: buffer to be assigned to this 
  * @return  this
  */
 nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
@@ -814,19 +619,16 @@ nsString& nsString::SetString(const PRUnichar* aStr,PRInt32 aLength) {
 /**
  * assign given char* to this string
  * @update	gess 7/27/98
- * @param   aCString: buffer to be assigned to this 
+ * @param   anISOLatin1: buffer to be assigned to this 
  * @return  this
  */
-nsString& nsString::SetString(const char* aCString,PRInt32 aLength) {
-  if(aCString!=0) {
-    PRInt32 len=(aLength<0) ? nsCRT::strlen(aCString) : aLength; 
+nsString& nsString::SetString(const char* anISOLatin1,PRInt32 aLength) {
+  if(anISOLatin1!=0) {
+    PRInt32 len=(aLength<0) ? nsCRT::strlen(anISOLatin1) : aLength; 
     if(mCapacity<=len) 
       EnsureCapacityFor(len);
-    const unsigned char* from = (const unsigned char*) aCString;
-    const unsigned char* end = from + len;
-    PRUnichar* dst = mStr;
-    while (from < end) {
-      *dst++ = PRUnichar(*from++);
+    for(int i=0;i<len;i++) {
+      mStr[i]=chartype(anISOLatin1[i]);
     }
     mLength=len;
     mStr[mLength]=0;
@@ -841,7 +643,7 @@ nsString& nsString::SetString(const char* aCString,PRInt32 aLength) {
 /**
  * assign given char* to this string
  * @update	gess 7/27/98
- * @param   PRUnichar: buffer to be assigned to this 
+ * @param   anISOLatin1: buffer to be assigned to this 
  * @return  this
  */
 nsString& nsString::operator=(const PRUnichar* aStr) {
@@ -862,11 +664,11 @@ nsString& nsString::operator=(const nsString& aString) {
 /**
  * assign given char* to this string
  * @update	gess 7/27/98
- * @param   aCString: buffer to be assigned to this 
+ * @param   anISOLatin1: buffer to be assigned to this 
  * @return  this
  */
-nsString& nsString::operator=(const char* aCString) {
-  return SetString(aCString);
+nsString& nsString::operator=(const char* anISOLatin1) {
+  return SetString(anISOLatin1);
 }
 
 
@@ -911,17 +713,14 @@ nsString& nsString::Append(const nsString& aString,PRInt32 aLength) {
  * @param   aString : string to be appended to this
  * @return  this
  */
-nsString& nsString::Append(const char* aCString,PRInt32 aLength) {
-  if(aCString!=0) {
-    PRInt32 len=(aLength<0) ? strlen(aCString) : aLength;
+nsString& nsString::Append(const char* anISOLatin1,PRInt32 aLength) {
+  if(anISOLatin1!=0) {
+    PRInt32 len=(aLength<0) ? strlen(anISOLatin1) : aLength;
     if(mLength+len >= mCapacity) {
       EnsureCapacityFor(mLength+len);
     }
-    const unsigned char* from = (const unsigned char*) aCString;
-    const unsigned char* end = from + len;
-    PRUnichar* to = mStr + mLength;
-    while (from < end) {
-      *to++ = PRUnichar(*from++);
+    for(int i=0;i<len;i++) {
+      mStr[mLength+i]=chartype(anISOLatin1[i]);
     }
     mLength+=len;
     mStr[mLength]=0;
@@ -994,11 +793,11 @@ nsString& nsString::operator+=(const nsString &aString) {
 /**
  * append given buffer to this string
  * @update	gess 7/27/98
- * @param   aCString: buffer to be appended to this
+ * @param   anISOLatin1: buffer to be appended to this
  * @return  this
  */
-nsString& nsString::operator+=(const char* aCString) {
-  return Append(aCString);
+nsString& nsString::operator+=(const char* anISOLatin1) {
+  return Append(anISOLatin1);
 }
 
 
@@ -1068,7 +867,7 @@ nsString& nsString::Append(float aFloat){
  *  @param   aCount -- number of chars to copy
  *  @return  number of chars copied
  */
-PRInt32 nsString::Left(nsString& aCopy,PRInt32 aCount) const {
+PRInt32 nsString::Left(nsString& aCopy,PRInt32 aCount) {
   return Mid(aCopy,0,aCount);
 }
 
@@ -1083,7 +882,7 @@ PRInt32 nsString::Left(nsString& aCopy,PRInt32 aCount) const {
  *  @param   anOffset -- position where copying begins
  *  @return  number of chars copied
  */
-PRInt32 nsString::Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) const {
+PRInt32 nsString::Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) {
   if(anOffset<mLength) {
     aCount=(anOffset+aCount<=mLength) ? aCount : mLength-anOffset;
 
@@ -1110,7 +909,7 @@ PRInt32 nsString::Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) const {
  *  @param  aCount -- number of chars to copy
  *  @return number of chars copied
  */
-PRInt32 nsString::Right(nsString& aCopy,PRInt32 aCount) const {
+PRInt32 nsString::Right(nsString& aCopy,PRInt32 aCount) {
   PRInt32 offset=(mLength-aCount<0) ? 0 : mLength-aCount;
   return Mid(aCopy,offset,aCount);
 }
@@ -1126,9 +925,8 @@ PRInt32 nsString::Right(nsString& aCopy,PRInt32 aCount) const {
  *  @param  aCount -- number of chars to be copied from aCopy
  *  @return number of chars inserted into this.
  */
-PRInt32 nsString::Insert(const nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) {
+PRInt32 nsString::Insert(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) {
   aCount=(aCount>aCopy.mLength) ? aCopy.mLength : aCount; //don't try to copy more than you are given
-  if (aCount < 0) aCount = aCopy.mLength;
   if(0<=anOffset) {
     if(aCount>0) {
 
@@ -1309,8 +1107,8 @@ PRBool nsString::IsSpace(PRUnichar aChar) {
  *  @return  this
  */
 nsString& nsString::Trim(const char* aTrimSet,
-                         PRBool aEliminateLeading,
-                         PRBool aEliminateTrailing)
+                               PRBool aEliminateLeading,
+                               PRBool aEliminateTrailing)
 {
   PRUnichar* from = mStr;
   PRUnichar* end = mStr + mLength-1;
@@ -1367,13 +1165,12 @@ nsString& nsString::Trim(const char* aTrimSet,
 nsString& nsString::CompressWhitespace( PRBool aEliminateLeading,
                                               PRBool aEliminateTrailing)
 {
-  
-  Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing);
-
   PRUnichar* from = mStr;
   PRUnichar* end = mStr + mLength;
   PRUnichar* to = from;
 
+  Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing);
+
     //this code converts /n, /t, /r into normal space ' ';
     //it also eliminates runs of whitespace...
   while (from < end) {
@@ -1409,28 +1206,6 @@ nsString& nsString::StripWhitespace()
   return StripChars("\r\t\n");
 }
 
-/**
- *  This method is used to replace all occurances of the
- *  given source char with the given dest char
- *  
- *  @param  
- *  @return *this 
- */
-nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
-  PRUnichar* from = mStr;
-  PRUnichar* end = mStr + mLength;
-
-  while (from < end) {
-    PRUnichar ch = *from;
-    if(ch==aSourceChar) {
-      *from = aDestChar;
-    }
-    from++;
-  }
-
-  return *this;
-}
-
 /**
  *  Search for given character within this string.
  *  This method does so by using a binary search,
@@ -1460,18 +1235,18 @@ PRInt32 nsString::BinarySearch(PRUnichar aChar) const {
  *  Search for given buffer within this string
  *  
  *  @update  gess 3/25/98
- *  @param   aCStringBuf - charstr to be found
+ *  @param   anISOLatin1Buf - charstr to be found
  *  @return  offset in string, or -1 (kNotFound)
  */
-PRInt32 nsString::Find(const char* aCStringBuf) const{
-  NS_ASSERTION(0!=aCStringBuf,kNullPointerError);
+PRInt32 nsString::Find(const char* anISOLatin1Buf) const{
+  NS_ASSERTION(0!=anISOLatin1Buf,kNullPointerError);
   PRInt32 result=kNotFound;
-  if(aCStringBuf) {
-    PRInt32 len=strlen(aCStringBuf);
+  if(anISOLatin1Buf) {
+    PRInt32 len=strlen(anISOLatin1Buf);
     if((0<len) && (len<=mLength)) { //only enter if abuffer length is <= mStr length.
       PRInt32 max=mLength-len;
       for(PRInt32 offset=0;offset<=max;offset++) 
-        if(0==nsCRT::strncmp(&mStr[offset],aCStringBuf,len)) 
+        if(0==nsCRT::strncmp(&mStr[offset],anISOLatin1Buf,len)) 
           return offset;  //in this case, 0 means they match
     }
   }
@@ -1548,11 +1323,11 @@ PRInt32 nsString::Find(PRUnichar aChar, PRInt32 anOffset) const{
  *  @param   
  *  @return  
  */
-PRInt32 nsString::FindCharInSet(const char* anAsciiSet,PRInt32 anOffset) const{
-  NS_ASSERTION(0!=anAsciiSet,kNullPointerError);
-  if(anAsciiSet && (strlen(anAsciiSet))) {
+PRInt32 nsString::FindCharInSet(const char* anISOLatin1Set,PRInt32 anOffset) const{
+  NS_ASSERTION(0!=anISOLatin1Set,kNullPointerError);
+  if(anISOLatin1Set && (strlen(anISOLatin1Set))) {
     for(PRInt32 i=anOffset;i<mLength;i++){
-      char* pos=strchr(anAsciiSet,char(mStr[i]));
+      char* pos=strchr(anISOLatin1Set,char(mStr[i]));
       if(pos)
         return i;
     }
@@ -1585,11 +1360,11 @@ PRInt32 nsString::FindCharInSet(nsString& aSet,PRInt32 anOffset) const{
  *  @param   
  *  @return   
  */
-PRInt32 nsString::RFindCharInSet(const char* anAsciiSet,PRInt32 anOffset) const{
-  NS_ASSERTION(0!=anAsciiSet,kNullPointerError);
-  if(anAsciiSet && strlen(anAsciiSet)) {
+PRInt32 nsString::RFindCharInSet(const char* anISOLatin1Set,PRInt32 anOffset) const{
+  NS_ASSERTION(0!=anISOLatin1Set,kNullPointerError);
+  if(anISOLatin1Set && strlen(anISOLatin1Set)) {
     for(PRInt32 i=mLength-1;i>0;i--){
-      char* pos=strchr(anAsciiSet,char(mStr[i]));
+      char* pos=strchr(anISOLatin1Set,char(mStr[i]));
       if(pos) 
         return i;
     }
@@ -1670,17 +1445,17 @@ PRInt32 nsString::RFind(const nsString& aString,PRBool aIgnoreCase) const{
  *  @param   
  *  @return  
  */
-PRInt32 nsString::RFind(const char* anAsciiSet,PRBool aIgnoreCase) const{
-  NS_ASSERTION(0!=anAsciiSet,kNullPointerError);
+PRInt32 nsString::RFind(const char* anISOLatin1Set,PRBool aIgnoreCase) const{
+  NS_ASSERTION(0!=anISOLatin1Set,kNullPointerError);
 
-  if(anAsciiSet) {
-    PRInt32 len=strlen(anAsciiSet);
+  if(anISOLatin1Set) {
+    PRInt32 len=strlen(anISOLatin1Set);
     if((len) && (len<=mLength)) { //only enter if abuffer length is <= mStr length.
       for(PRInt32 offset=mLength-len;offset>=0;offset--) {
         PRInt32 result=0;
         if(aIgnoreCase) 
-          result=nsCRT::strncasecmp(&mStr[offset],anAsciiSet,len);
-        else result=nsCRT::strncmp(&mStr[offset],anAsciiSet,len);
+          result=nsCRT::strncasecmp(&mStr[offset],anISOLatin1Set,len);
+        else result=nsCRT::strncmp(&mStr[offset],anISOLatin1Set,len);
         if(0==result)
           return offset;  //in this case, 0 means they match
       }
@@ -1700,7 +1475,7 @@ PRInt32 nsString::RFind(const char* anAsciiSet,PRBool aIgnoreCase) const{
  */
 PRInt32 nsString::RFind(PRUnichar aChar,PRBool aIgnoreCase) const{
   chartype uc=nsCRT::ToUpper(aChar);
-  for(PRInt32 offset=mLength-1;offset>=0;offset--) 
+  for(PRInt32 offset=mLength-1;offset>0;offset--) 
     if(aIgnoreCase) {
       if(nsCRT::ToUpper(mStr[offset])==uc)
         return offset;
@@ -1718,12 +1493,12 @@ PRInt32 nsString::RFind(PRUnichar aChar,PRBool aIgnoreCase) const{
 /**
  * Compares given cstring to this string. 
  * @update	gess 7/27/98
- * @param   aCString pts to a cstring
+ * @param   anISOLatin1 pts to a cstring
  * @param   aIgnoreCase tells us how to treat case
  * @return  -1,0,1
  */
-PRInt32 nsString::Compare(const char *aCString,PRBool aIgnoreCase,PRInt32 aLength) const {
-  NS_ASSERTION(0!=aCString,kNullPointerError);
+PRInt32 nsString::Compare(const char *anISOLatin1,PRBool aIgnoreCase,PRInt32 aLength) const {
+  NS_ASSERTION(0!=anISOLatin1,kNullPointerError);
 
   if(-1!=aLength) {
 
@@ -1731,23 +1506,16 @@ PRInt32 nsString::Compare(const char *aCString,PRBool aIgnoreCase,PRInt32 aLengt
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
-    if (maxlen == 0) {
-      if ((mLength == 0) && (aLength == 0))
-        return 0;
-      if (mLength == 0)
-        return -1;
-      return 1;
-    }
     if (aIgnoreCase) {
-      return nsCRT::strncasecmp(mStr,aCString,maxlen);
+      return nsCRT::strncasecmp(mStr,anISOLatin1,maxlen);
     }
-    return nsCRT::strncmp(mStr,aCString,maxlen);
+    return nsCRT::strncmp(mStr,anISOLatin1,maxlen);
   }
 
   if (aIgnoreCase) {
-    return nsCRT::strcasecmp(mStr,aCString);
+    return nsCRT::strcasecmp(mStr,anISOLatin1);
   }
-  return nsCRT::strcmp(mStr,aCString);
+  return nsCRT::strcmp(mStr,anISOLatin1);
 }
 
 /**
@@ -1758,17 +1526,10 @@ PRInt32 nsString::Compare(const char *aCString,PRBool aIgnoreCase,PRInt32 aLengt
  */
 PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
   int maxlen=(S.mLength<mLength) ? S.mLength : mLength;
-  if (maxlen == 0) {
-    if ((mLength == 0) && (S.mLength == 0))
-      return 0;
-    if (mLength == 0)
-      return -1;
-    return 1;
-  }
   if (aIgnoreCase) {
-    return nsCRT::strcasecmp(mStr,S.mStr);
+    return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
   }
-  return nsCRT::strcmp(mStr,S.mStr);
+  return nsCRT::strncmp(mStr,S.mStr,maxlen);
 }
 
 /**
@@ -1785,13 +1546,6 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
     //In some cases, this can speed up the string comparison.
 
     int maxlen=(aLength<mLength) ? aLength : mLength;
-    if (maxlen == 0) {
-      if ((mLength == 0) && (aLength == 0))
-        return 0;
-      if (mLength == 0)
-        return -1;
-      return 1;
-    }
     if (aIgnoreCase) {
       return nsCRT::strncasecmp(mStr,aString,maxlen);
     }
@@ -1807,7 +1561,6 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
 PRBool nsString::operator==(const nsString &S) const {return Equals(S);}      
 PRBool nsString::operator==(const char *s) const {return Equals(s);}
 PRBool nsString::operator==(const PRUnichar *s) const {return Equals(s);}
-PRBool nsString::operator==(PRUnichar *s) const {return Equals(s);}
 PRBool nsString::operator!=(const nsString &S) const {return PRBool(Compare(S)!=0);}
 PRBool nsString::operator!=(const char *s) const {return PRBool(Compare(s)!=0);}
 PRBool nsString::operator!=(const PRUnichar *s) const {return PRBool(Compare(s)!=0);}
@@ -2023,11 +1776,11 @@ nsAutoString::nsAutoString()
  * @param 
  * @return
  */
-nsAutoString::nsAutoString(const char* aCString) 
+nsAutoString::nsAutoString(const char* isolatin1) 
   : nsString()
 {
   INIT_AUTO_STRING();
-  SetString(aCString);
+  SetString(isolatin1);
 }
 
 /**
@@ -2159,6 +1912,7 @@ ostream& operator<<(ostream& os,nsAutoString& aString){
 }
 
 
+
 /**
  * 
  * @update	gess 7/27/98
@@ -2178,7 +1932,7 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
   if(len>0)
     ::fwrite(cp, 1, len, out);
   if (cp != buf) {
-    delete [] cp;
+    delete cp;
   }
   return (int) len;
 }
@@ -2191,17 +1945,6 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
  * @return
  */
 void nsString::SelfTest(void) {
-
-  nsAutoString a("foobar");
-  nsAutoString b("foo");
-  nsAutoString c(".5111");
-  nsAutoString d(" 5");
-  PRInt32 result=a.Compare(b);
-  PRInt32 result2=result;
-  result=c.ToInteger(&result2);
-  result=d.ToInteger(&result2);
-  result2=result;
-
 #if 0
 
   static const char* kConstructorError = kConstructorError;

mozilla/base/src/nsString.h

@@ -54,9 +54,9 @@ nsString();
 
 /**
  * This constructor accepts an isolatin string
- * @param   an ascii is a ptr to a 1-byte cstr
+ * @param   anISOLatin1 is a ptr to a 1-byte cstr
  */
-nsString(const char* aCString);
+nsString(const char* anISOLatin1);
 
 /**
  * This is our copy constructor 
@@ -136,7 +136,7 @@ const PRUnichar* GetUnicode(void) const;
  * @param 
  * @return
  */
-operator const PRUnichar*() const;
+operator PRUnichar*() const;
 
 /**
  * Retrieve unicode char at given index
@@ -184,10 +184,10 @@ 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
+ * @param   anISOLatin1 is a ptr to cstring to be added to this
  * @return  newly created string
  */
-nsString operator+(const char* aCString);
+nsString operator+(const char* anISOLatin1);
 
 /**
  * create a new string by adding this to the given char.
@@ -225,12 +225,6 @@ void ToLowerCase(nsString& aString) const;
  */
 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
  */
@@ -243,9 +237,8 @@ void ToUpperCase(nsString& aString) const;
 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
+ * Creates an ISOLatin1 clone of this string
+ * @return  ptr to new isolatin1 string
  */
 char* ToNewCString() const;
 
@@ -282,7 +275,7 @@ float ToFloat(PRInt32* aErrorCode) const;
  * @param   aErrorCode will contain error if one occurs
  * @return  int rep of string value
  */
-PRInt32 ToInteger(PRInt32* aErrorCode,PRInt32 aRadix=10) const;
+PRInt32 ToInteger(PRInt32* aErrorCode) const;
 
 /**********************************************************************
   String manipulation methods...                
@@ -290,7 +283,7 @@ PRInt32 ToInteger(PRInt32* aErrorCode,PRInt32 aRadix=10) const;
 
 /**
  * assign given PRUnichar* to this string
- * @param   aStr: buffer to be assigned to this 
+ * @param   anISOLatin1: 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
@@ -299,12 +292,12 @@ nsString& SetString(const PRUnichar* aStr,PRInt32 aLength=-1);
 
 /**
  * assign given char* to this string
- * @param   aCString: buffer to be assigned to this 
+ * @param   anISOLatin1: 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);
+nsString& SetString(const char* anISOLatin1,PRInt32 aLength=-1);
 
 /**
  * assign given string to this one
@@ -315,10 +308,10 @@ nsString& operator=(const nsString& aString);
 
 /**
  * assign given char* to this string
- * @param   aCString: buffer to be assigned to this 
+ * @param   anISOLatin1: buffer to be assigned to this 
  * @return  this
  */
-nsString& operator=(const char* aCString);
+nsString& operator=(const char* anISOLatin1);
 
 /**
  * assign given char to this string
@@ -350,10 +343,10 @@ nsString& operator+=(const nsString& aString);
 
 /**
  * append given buffer to this string
- * @param   aCString: buffer to be appended to this
+ * @param   anISOLatin1: buffer to be appended to this
  * @return  this
  */
-nsString& operator+=(const char* aCString);
+nsString& operator+=(const char* anISOLatin1);
 
 /**
  * append given buffer to this string
@@ -385,7 +378,7 @@ nsString& Append(const nsString& aString,PRInt32 aLength=-1);
             if you want me to determine its length
  * @return  this
  */
-nsString& Append(const char* aCString,PRInt32 aLength=-1);
+nsString& Append(const char* anISOLatin1,PRInt32 aLength=-1);
 
 /**
  * append given string to this string
@@ -434,7 +427,7 @@ nsString& Append(float aFloat);
  *  @param   aCount -- number of chars to copy
  *  @return  number of chars copied
  */
-PRInt32 Left(nsString& aCopy,PRInt32 aCount) const;
+PRInt32 Left(nsString& aCopy,PRInt32 aCount);
 
 /*
  *  Copies n characters from this string to given string,
@@ -446,7 +439,7 @@ PRInt32 Left(nsString& aCopy,PRInt32 aCount) const;
  *  @param   anOffset -- position where copying begins
  *  @return  number of chars copied
  */
-PRInt32 Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) const;
+PRInt32 Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount);
 
 /*
  *  Copies n characters from this string to given string,
@@ -457,7 +450,7 @@ PRInt32 Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount) const;
  *  @param  aCount -- number of chars to copy
  *  @return number of chars copied
  */
-PRInt32 Right(nsString& aCopy,PRInt32 aCount) const;
+PRInt32 Right(nsString& aCopy,PRInt32 aCount);
 
 /*
  *  This method inserts n chars from given string into this
@@ -468,7 +461,7 @@ PRInt32 Right(nsString& aCopy,PRInt32 aCount) const;
  *  @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);
+PRInt32 Insert(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount=-1);
 
 /**
  * Insert a single unicode char into this string at
@@ -499,15 +492,6 @@ nsString& Cut(PRInt32 anOffset,PRInt32 aCount);
  */
 nsString& StripChars(const char* aSet);
 
-/**
- *  This method is used to replace all occurances of the
- *  given source char with the given dest char
- *  
- *  @param  
- *  @return *this 
- */
-nsString& ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar);
-
 /**
  *  This method strips whitespace throughout the string
  *  
@@ -622,7 +606,7 @@ PRInt32 RFindCharInSet(nsString& aString,PRInt32 anOffset=0) const;
  * @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 char* anISOLatin1,PRBool aIgnoreCase=PR_FALSE) const;
 PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE) const;
 PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE) const;
 
@@ -657,7 +641,6 @@ virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRI
 PRBool  operator==(const nsString &aString) const;
 PRBool  operator==(const char *aString) const;
 PRBool  operator==(const PRUnichar* aString) const;
-PRBool  operator==(PRUnichar* aString) const;
 
 /**
  * These methods perform a !compare of a given string type to this 
@@ -683,7 +666,7 @@ PRBool  operator<(const PRUnichar* aString) const;
  * @return  TRUE or FALSE
  */
 PRBool  operator>(const nsString &S) const;
-PRBool  operator>(const char *aCString) const;
+PRBool  operator>(const char *anISOLatin1) const;
 PRBool  operator>(const PRUnichar* aString) const;
 
 /**
@@ -692,7 +675,7 @@ PRBool  operator>(const PRUnichar* aString) const;
  * @return  TRUE or FALSE
  */
 PRBool  operator<=(const nsString &S) const;
-PRBool  operator<=(const char *aCString) const;
+PRBool  operator<=(const char *anISOLatin1) const;
 PRBool  operator<=(const PRUnichar* aString) const;
 
 /**
@@ -701,7 +684,7 @@ PRBool  operator<=(const PRUnichar* aString) const;
  * @return  TRUE or FALSE
  */
 PRBool  operator>=(const nsString &S) const;
-PRBool  operator>=(const char* aCString) const;
+PRBool  operator>=(const char *anISOLatin1) const;
 PRBool  operator>=(const PRUnichar* aString) const;
 
 /**
@@ -781,13 +764,12 @@ public:
                 nsAutoString(const nsString& other);
                 nsAutoString(const nsAutoString& other);
                 nsAutoString(PRUnichar aChar);
-                nsAutoString(const char* aCString);
+                nsAutoString(const char* isolatin1);
                 nsAutoString(const PRUnichar* us, PRInt32 uslen = -1);
   virtual       ~nsAutoString();
 
   nsAutoString& operator=(const nsString& aString) {nsString::operator=(aString); return *this;}
-  nsAutoString& operator=(const nsAutoString& aString) {nsString::operator=(aString); return *this;}
-  nsAutoString& operator=(const char* aCString) {nsString::operator=(aCString); return *this;}
+  nsAutoString& operator=(const char* anISOLatin1) {nsString::operator=(anISOLatin1); return *this;}
   nsAutoString& operator=(char aChar) {nsString::operator=(aChar); return *this;}
   nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::operator=(aBuffer); return *this;}
   nsAutoString& operator=(PRUnichar aChar) {nsString::operator=(aChar); return *this;}

mozilla/base/src/nsTime.h

@@ -27,12 +27,7 @@
  * 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
+class NS_BASE nsTime
 {
 private:
     nsInt64 mValue;
@@ -44,18 +39,6 @@ public:
     nsTime(void) : mValue(PR_Now()) {
     }
 
-    /**
-     * Construct the time from a string.
-     */
-    nsTime(const char* dateStr, PRBool defaultToGMT) {
-        PRInt64 time;
-        PRStatus status = PR_ParseTimeString(dateStr, defaultToGMT, &time);
-        if (status == PR_SUCCESS)
-            mValue = time;
-        else
-            mValue = LL_ZERO;
-    }
-
     /**
      * Construct a time from a PRTime.
      */

mozilla/base/src/nsUnicharBuffer.cpp

@@ -23,7 +23,7 @@
 
 class UnicharBufferImpl : public nsIUnicharBuffer {
 public:
-  UnicharBufferImpl(PRUint32 aBufferSize);
+  UnicharBufferImpl(PRInt32 aBufferSize);
   ~UnicharBufferImpl();
 
   NS_DECL_ISUPPORTS
@@ -35,13 +35,13 @@ public:
                        PRInt32 aKeep);
 
   PRUnichar* mBuffer;
-  PRUint32 mSpace;
-  PRUint32 mLength;
+  PRInt32 mSpace;
+  PRInt32 mLength;
 };
 
-UnicharBufferImpl::UnicharBufferImpl(PRUint32 aBufferSize)
+UnicharBufferImpl::UnicharBufferImpl(PRInt32 aBufferSize)
 {
-  if (aBufferSize < MIN_BUFFER_SIZE) {
+  if (PRUint32(aBufferSize) < MIN_BUFFER_SIZE) {
     aBufferSize = MIN_BUFFER_SIZE;
   }
   mSpace = aBufferSize;
@@ -56,7 +56,7 @@ NS_IMPL_ISUPPORTS(UnicharBufferImpl,kUnicharBufferIID)
 UnicharBufferImpl::~UnicharBufferImpl()
 {
   if (nsnull != mBuffer) {
-    delete[] mBuffer;
+    delete mBuffer;
     mBuffer = nsnull;
   }
   mLength = 0;
@@ -87,7 +87,7 @@ PRBool UnicharBufferImpl::Grow(PRInt32 aNewSize)
     if (0 != mLength) {
       nsCRT::memcpy(newbuf, mBuffer, mLength * sizeof(PRUnichar));
     }
-    delete[] mBuffer;
+    delete mBuffer;
     mBuffer = newbuf;
     return PR_TRUE;
   }
@@ -115,10 +115,8 @@ PRInt32 UnicharBufferImpl::Fill(nsresult* aErrorCode,
   // 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);
+  PRInt32 nb;
+  *aErrorCode = aStream->Read(mBuffer, aKeep, amount, &nb);
   if (NS_SUCCEEDED(*aErrorCode)) {
     mLength += nb;
   }
@@ -129,7 +127,7 @@ PRInt32 UnicharBufferImpl::Fill(nsresult* aErrorCode,
 
 NS_BASE nsresult NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
                                      nsISupports* aOuter,
-                                     PRUint32 aBufferSize)
+                                     PRInt32 aBufferSize)
 {
   if (nsnull != aOuter) {
     return NS_ERROR_NO_AGGREGATION;

mozilla/base/src/nsUnicharInputStream.cpp

@@ -15,14 +15,9 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-
-#define NS_IMPL_IDS
 #include "nsIUnicharInputStream.h"
 #include "nsIByteBuffer.h"
 #include "nsIUnicharBuffer.h"
-#include "nsIServiceManager.h"
-#include "nsICharsetConverterManager.h"
-#include "nsIUnicodeDecoder.h"
 #include "nsString.h"
 #include "nsCRT.h"
 #include <fcntl.h>
@@ -42,14 +37,14 @@ public:
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD Read(PRUnichar* aBuf,
-                  PRUint32 aOffset,
-                  PRUint32 aCount,
-                  PRUint32 *aReadCount);
+                  PRInt32 aOffset,
+                  PRInt32 aCount,
+                  PRInt32 *aReadCount);
   NS_IMETHOD Close();
 
   nsString* mString;
-  PRUint32 mPos;
-  PRUint32 mLen;
+  PRInt32 mPos;
+  PRInt32 mLen;
 };
 
 StringUnicharInputStream::StringUnicharInputStream(nsString* aString)
@@ -68,17 +63,16 @@ StringUnicharInputStream::~StringUnicharInputStream()
 }
 
 nsresult StringUnicharInputStream::Read(PRUnichar* aBuf,
-                                        PRUint32 aOffset,
-                                        PRUint32 aCount,
-                                        PRUint32 *aReadCount)
+                                        PRInt32 aOffset,
+                                        PRInt32 aCount,
+                                        PRInt32 *aReadCount)
 {
   if (mPos >= mLen) {
     *aReadCount = 0;
     return (nsresult)-1;
   }
   const PRUnichar* us = mString->GetUnicode();
-  NS_ASSERTION(mLen >= mPos, "unsigned madness");
-  PRUint32 amount = mLen - mPos;
+  PRInt32 amount = mLen - mPos;
   if (amount > aCount) {
     amount = aCount;
   }
@@ -120,36 +114,65 @@ NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
 
 //----------------------------------------------------------------------
 
-/**
- * This function used to be public, with the NS_BASE declaration. I am 
- * changing it right now into a module private visibility because there are
- * better and more xpcom-like ways to get a Converter.
- */
+class IsoLatin1Converter : public nsIB2UConverter {
+public:
+  IsoLatin1Converter();
 
-nsresult NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult, nsISupports* aOuter, nsString* aCharSet);
-nsresult
-NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult,
+  NS_DECL_ISUPPORTS
+  virtual PRInt32 Convert(PRUnichar* aDst,
+                          PRInt32 aDstOffset,
+                          PRInt32& aDstLen,
+                          const char* aSrc,
+                          PRInt32 aSrcOffset,
+                          PRInt32& aSrcLen);
+};
+
+IsoLatin1Converter::IsoLatin1Converter()
+{
+  NS_INIT_REFCNT();
+}
+
+NS_DEFINE_IID(kIB2UConverterIID, NS_IB2UCONVERTER_IID);
+NS_IMPL_ISUPPORTS(IsoLatin1Converter,kIB2UConverterIID);
+
+PRInt32 IsoLatin1Converter::Convert(PRUnichar* aDst,
+                                    PRInt32 aDstOffset,
+                                    PRInt32& aDstLen,
+                                    const char* aSrc,
+                                    PRInt32 aSrcOffset,
+                                    PRInt32& aSrcLen)
+{
+  PRInt32 amount = aSrcLen;
+  if (aSrcLen > aDstLen) {
+    amount = aDstLen;
+  }
+  const char* end = aSrc + amount;
+  while (aSrc < end) {
+    PRUint8 isoLatin1 = PRUint8(*aSrc++);
+    /* XXX insert table based lookup converter here */
+    *aDst++ = isoLatin1;
+  }
+  aDstLen = amount;
+  aSrcLen = amount;
+  return NS_OK;
+}
+
+NS_BASE nsresult
+NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
                    nsISupports* aOuter,
-                   nsString* aCharSet)
+                   nsCharSetID aCharSet)
 {
   if (nsnull != aOuter) {
     return NS_ERROR_NO_AGGREGATION;
   }
-
-  // Create converter
-  nsresult res;
-  nsICharsetConverterManager * ccm;
-  nsAutoString defaultCharset("ISO-8859-1");
-
-  if (aCharSet == nsnull) aCharSet = &defaultCharset;
-  res = nsServiceManager::GetService(kCharsetConverterManagerCID, 
-      kICharsetConverterManagerIID, (nsISupports**)&ccm);
-  if (NS_FAILED(res)) return res;
-
-  res = ccm->GetUnicodeDecoder(aCharSet, aInstancePtrResult);
-  nsServiceManager::ReleaseService(kCharsetConverterManagerCID, ccm);
-
-  return res;
+  if (eCharSetID_IsoLatin1 != aCharSet) {
+    return NS_BASE_STREAM_NO_CONVERTER;
+  }
+  IsoLatin1Converter* it = new IsoLatin1Converter();
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kIB2UConverterIID, (void**)aInstancePtrResult);
 }
 
 //----------------------------------------------------------------------
@@ -157,32 +180,32 @@ NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult,
 class ConverterInputStream : public nsIUnicharInputStream {
 public:
   ConverterInputStream(nsIInputStream* aStream,
-                       nsIUnicodeDecoder* aConverter,
-                       PRUint32 aBufSize);
+                       nsIB2UConverter* aConverter,
+                       PRInt32 aBufSize);
   ~ConverterInputStream();
 
   NS_DECL_ISUPPORTS
   NS_IMETHOD Read(PRUnichar* aBuf,
-                  PRUint32 aOffset,
-                  PRUint32 aCount,
-                  PRUint32 *aReadCount);
+                  PRInt32 aOffset,
+                  PRInt32 aCount,
+                  PRInt32 *aReadCount);
   NS_IMETHOD Close();
 
 protected:
   PRInt32 Fill(nsresult * aErrorCode);
 
   nsIInputStream* mInput;
-  nsIUnicodeDecoder* mConverter;
+  nsIB2UConverter* mConverter;
   nsIByteBuffer* mByteData;
-  PRUint32 mByteDataOffset;
+  PRInt32 mByteDataOffset;
   nsIUnicharBuffer* mUnicharData;
-  PRUint32 mUnicharDataOffset;
-  PRUint32 mUnicharDataLength;
+  PRInt32 mUnicharDataOffset;
+  PRInt32 mUnicharDataLength;
 };
 
 ConverterInputStream::ConverterInputStream(nsIInputStream* aStream,
-                                           nsIUnicodeDecoder* aConverter,
-                                           PRUint32 aBufferSize)
+                                           nsIB2UConverter* aConverter,
+                                           PRInt32 aBufferSize)
 {
   NS_INIT_REFCNT();
   mInput = aStream; aStream->AddRef();
@@ -227,12 +250,11 @@ nsresult ConverterInputStream::Close()
 }
 
 nsresult ConverterInputStream::Read(PRUnichar* aBuf,
-                                    PRUint32 aOffset,
-                                    PRUint32 aCount,
-                                    PRUint32 *aReadCount)
+                                    PRInt32 aOffset,
+                                    PRInt32 aCount,
+                                    PRInt32 *aReadCount)
 {
-  NS_ASSERTION(mUnicharDataLength >= mUnicharDataOffset, "unsigned madness");
-  PRUint32 rv = mUnicharDataLength - mUnicharDataOffset;
+  PRInt32 rv = mUnicharDataLength - mUnicharDataOffset;
   nsresult errorCode;
   if (0 == rv) {
     // Fill the unichar buffer
@@ -260,8 +282,7 @@ PRInt32 ConverterInputStream::Fill(nsresult * aErrorCode)
     return -1;
   }
 
-  NS_ASSERTION(mByteData->GetLength() >= mByteDataOffset, "unsigned madness");
-  PRUint32 remainder = mByteData->GetLength() - mByteDataOffset;
+  PRInt32 remainder = mByteData->GetLength() - mByteDataOffset;
   mByteDataOffset = remainder;
   PRInt32 nb = mByteData->Fill(aErrorCode, mInput, remainder);
   if (nb <= 0) {
@@ -277,8 +298,8 @@ PRInt32 ConverterInputStream::Fill(nsresult * aErrorCode)
   // Now convert as much of the byte buffer to unicode as possible
   PRInt32 dstLen = mUnicharData->GetBufferSize();
   PRInt32 srcLen = remainder + nb;
-  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, &dstLen,
-                                    mByteData->GetBuffer(), 0, &srcLen);
+  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, dstLen,
+                                    mByteData->GetBuffer(), 0, srcLen);
   mUnicharDataOffset = 0;
   mUnicharDataLength = dstLen;
   mByteDataOffset += srcLen;
@@ -291,14 +312,14 @@ NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
                       nsISupports* aOuter,
                       nsIInputStream* aStreamToWrap,
                       PRInt32 aBufferSize,
-                      nsString* aCharSet)
+                      nsCharSetID aCharSet)
 {
   if (nsnull != aOuter) {
     return NS_ERROR_NO_AGGREGATION;
   }
 
   // Create converter
-  nsIUnicodeDecoder* converter;
+  nsIB2UConverter* converter;
   nsresult rv = NS_NewB2UConverter(&converter, nsnull, aCharSet);
   if (NS_OK != rv) {
     return rv;
@@ -307,7 +328,7 @@ NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
   // Create converter input stream
   ConverterInputStream* it =
     new ConverterInputStream(aStreamToWrap, converter, aBufferSize);
-  NS_RELEASE(converter);
+  converter->Release();
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
   }

mozilla/base/src/nsVoidArray.cpp

@@ -18,7 +18,6 @@
 #include "nsVoidArray.h"
 #include "nsCRT.h"
 #include "nsISizeOfHandler.h"
-#include "nsString.h"
 
 static PRInt32 kGrowArrayBy = 8;
 
@@ -226,186 +225,3 @@ PRBool nsVoidArray::EnumerateBackwards(nsVoidArrayEnumFunc aFunc, void* 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

@@ -71,55 +71,4 @@ private:
   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

@@ -64,18 +64,6 @@ typedef PRUcs2 PRUnichar;
 // 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
@@ -136,33 +124,4 @@ typedef PRUcs2 PRUnichar;
 #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
-
-// unix now determines this automatically
-#ifndef XP_UNIX
-#define HAVE_CPP_NEW_CASTS // we'll be optimistic.
-#endif
-
-#if defined(HAVE_CPP_NEW_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

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

@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and 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 "nscore.h"
-
-#include "nsCaretProperties.h"
-
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties::nsCaretProperties()
-:	mCaretWidth(eDefaultCaretWidth)
-,	mBlinkRate(eDefaulBlinkRate)
-{
-	// in your platform-specific class, get data from the OS in your constructor
-}
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties* NewCaretProperties()
-{
-	return new nsCaretProperties();
-}

mozilla/base/src/rhapsody/nsTimer.cpp

@@ -1,200 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "nsCRT.h"
-#include "prlog.h"
-#include <stdio.h>
-#include <limits.h>
-
-//
-// 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/Makefile

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

mozilla/base/src/unix/Makefile.in

@@ -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=raptor
+
+REQUIRES=xpcom raptor 
+
+DEFINES = -D_IMPL_NS_WIDGET 
+
+CPPSRCS= \
+	nsTimer.cpp 
+
+CPP_OBJS=				\
+ ./$(OBJDIR)/nsTimer.o		\
+ $(NULL)
+
+include $(topsrcdir)/config/config.mk
+
+TARGETS = $(LIBRARY)
+
+include $(topsrcdir)/config/rules.mk
+
+

mozilla/base/src/unix/README

@@ -1,6 +0,0 @@
-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

@@ -1,449 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-//    This file 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>
-#include <limits.h>
-#include "nsError.h"
-
-#if defined(IRIX) || defined(OSF1) || defined(SOLARIS) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC) || defined(DGUX)
-#include <sys/statvfs.h> /* for statvfs() */
-#define STATFS statvfs
-#elif defined(SCO_SV)
-#define _SVID3/* for statvfs.h */
-#include <sys/statvfs.h>  /* for statvfs() */
-#define STATFS statvfs
-#elif defined(HPUX) 
-#include <sys/vfs.h>      /* for statfs() */
-#define STATFS statfs
-#elif defined(LINUX)
-#include <sys/vfs.h>      /* for statfs() */
-#define STATFS statfs
-#elif defined(SUNOS4)
-#include <sys/vfs.h>      /* for statfs() */
-extern "C" int statfs(char *, struct statfs *);
-#define STATFS statfs
-#else
-#if defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(RHAPSODY) || defined(FREEBSD)
-#include <sys/mount.h>/* for statfs() */
-#define STATFS statfs
-#else
-#include <sys/statfs.h>  /* for statfs() */
-#define STATFS statfs
-extern "C" int statfs(char *, struct statfs *);
-#endif
-#endif
-
-#if defined(OSF1)
-extern "C" int statvfs(const char *, struct statvfs *);
-#endif
- 
- //----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::Canonify(char*& ioPath, PRBool 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 nsFileSpec::SetLeafName(const char* inLeafName)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpecHelpers::LeafReplace(mPath, '/', inLeafName);
-} // nsFileSpec::SetLeafName
-
-//----------------------------------------------------------------------------------------
-char* nsFileSpec::GetLeafName() const
-//----------------------------------------------------------------------------------------
-{
-    return nsFileSpecHelpers::GetLeaf(mPath, '/');
-} // nsFileSpec::GetLeafName
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::Exists() const
-//----------------------------------------------------------------------------------------
-{
-    struct stat st;
-    return 0 == stat(mPath, &st); 
-} // nsFileSpec::Exists
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetModDate(TimeStamp& outStamp) const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (stat(mPath, &st) == 0) 
-        outStamp = st.st_mtime; 
-    else
-        outStamp = 0;
-} // nsFileSpec::GetModDate
-
-//----------------------------------------------------------------------------------------
-PRUint32 nsFileSpec::GetFileSize() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (stat(mPath, &st) == 0) 
-        return (PRUint32)st.st_size; 
-    return 0;
-} // nsFileSpec::GetFileSize
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsFile() const
-//----------------------------------------------------------------------------------------
-{
-    struct stat st;
-    return 0 == stat(mPath, &st) && S_ISREG(st.st_mode); 
-} // nsFileSpec::IsFile
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsDirectory() const
-//----------------------------------------------------------------------------------------
-{
-    struct stat st;
-    return 0 == stat(mPath, &st) && S_ISDIR(st.st_mode); 
-} // nsFileSpec::IsDirectory
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetParent(nsFileSpec& outSpec) const
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpecHelpers::StringAssign(outSpec.mPath, mPath);
-    char* cp = strrchr(outSpec.mPath, '/');
-    if (cp)
-        *cp = '\0';
-} // nsFileSpec::GetParent
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator += (const char* inRelativePath)
-//----------------------------------------------------------------------------------------
-{
-    if (!inRelativePath || !mPath)
-        return;
-    
-    char endChar = mPath[strlen(mPath) - 1];
-    if (endChar == '/')
-        nsFileSpecHelpers::ReallocCat(mPath, "x");
-    else
-        nsFileSpecHelpers::ReallocCat(mPath, "/x");
-    SetLeafName(inRelativePath);
-} // nsFileSpec::operator +=
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::CreateDirectory(int mode)
-//----------------------------------------------------------------------------------------
-{
-    // Note that mPath is canonical!
-    mkdir(mPath, mode);
-} // nsFileSpec::CreateDirectory
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::Delete(PRBool inRecursive) const
-// To check if this worked, call Exists() afterwards, see?
-//----------------------------------------------------------------------------------------
-{
-    if (IsDirectory())
-    {
-        if (inRecursive)
-        {
-            for (nsDirectoryIterator i(*this); i.Exists(); i++)
-            {
-                nsFileSpec& child = (nsFileSpec&)i;
-                child.Delete(inRecursive);
-            }        
-        }
-        rmdir(mPath);
-    }
-    else
-        remove(mPath);
-} // nsFileSpec::Delete
-
-
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Rename(const char* inNewName)
-//----------------------------------------------------------------------------------------
-{
-    // This function should not be used to move a file on disk. 
-    if (strchr(inNewName, '/')) 
-        return NS_FILE_FAILURE;
-
-    if (PR_Rename(mPath, inNewName) != 0)
-    {
-        return NS_FILE_FAILURE;
-    }
-    SetLeafName(inNewName);
-    return NS_OK;
-} // nsFileSpec::Rename
-
-//----------------------------------------------------------------------------------------
-static int CrudeFileCopy(const char* in, const char* out)
-//----------------------------------------------------------------------------------------
-{
-	struct stat in_stat;
-	int stat_result = -1;
-
-	char	buf [1024];
-	FILE	*ifp, *ofp;
-	int	rbytes, wbytes;
-
-	if (!in || !out)
-		return -1;
-
-	stat_result = stat (in, &in_stat);
-
-	ifp = fopen (in, "r");
-	if (!ifp) 
-	{
-		return -1;
-	}
-
-	ofp = fopen (out, "w");
-	if (!ofp)
-	{
-		fclose (ifp);
-		return -1;
-	}
-
-	while ((rbytes = fread (buf, 1, sizeof(buf), ifp)) > 0)
-	{
-		while (rbytes > 0)
-		{
-			if ( (wbytes = fwrite (buf, 1, rbytes, ofp)) < 0 )
-			{
-				fclose (ofp);
-				fclose (ifp);
-				unlink(out);
-				return -1;
-			}
-			rbytes -= wbytes;
-		}
-	}
-	fclose (ofp);
-	fclose (ifp);
-
-	if (stat_result == 0)
-		{
-		chmod (out, in_stat.st_mode & 0777);
-		}
-
-	return 0;
-} // nsFileSpec::Rename
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Copy(const nsFileSpec& inParentDirectory) const
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-    nsresult result = NS_FILE_FAILURE;
-
-    if (inParentDirectory.IsDirectory() && (! IsDirectory() ) )
-    {
-        char *leafname = GetLeafName();
-        char* destPath = nsFileSpecHelpers::StringDup(
-            inParentDirectory.GetCString(),
-            strlen(inParentDirectory.GetCString()) + 1 + strlen(leafname));
-        strcat(destPath, "/");
-        strcat(destPath, leafname);
-        delete [] leafname;
-
-        result = NS_FILE_RESULT(CrudeFileCopy(GetCString(), destPath));
-        
-        delete [] destPath;
-    }
-    return result;
-} // nsFileSpec::Copy
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Move(const nsFileSpec& inNewParentDirectory) const
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-    nsresult result = NS_FILE_FAILURE;
-
-    if (inNewParentDirectory.IsDirectory() && (! IsDirectory() ) )
-    {
-        char *leafname = GetLeafName();
-        char* destPath
-            = nsFileSpecHelpers::StringDup(
-                inNewParentDirectory.GetCString(),
-                strlen(inNewParentDirectory.GetCString()) + 1 + strlen(leafname));
-        strcat(destPath, "/");
-        strcat(destPath, leafname);
-        delete [] leafname;
-
-        result = NS_FILE_RESULT(CrudeFileCopy(GetCString(), destPath));
-        if (result == NS_OK)
-	{
-    // cast to fix const-ness
-		((nsFileSpec*)this)->Delete(PR_FALSE);
-	}
-	delete [] destPath;
-    }
-    return result;
-} 
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Execute(const char* inArgs ) const
-//----------------------------------------------------------------------------------------
-{
-    nsresult result = NS_FILE_FAILURE;
-    
-    if (! IsDirectory())
-    {
-        char* fileNameWithArgs
-	        = nsFileSpecHelpers::StringDup(mPath, strlen(mPath) + 1 + strlen(inArgs));
-        strcat(fileNameWithArgs, " ");
-        strcat(fileNameWithArgs, inArgs);
-
-        result = NS_FILE_RESULT(system(fileNameWithArgs));
-        delete [] fileNameWithArgs; 
-    } 
-
-    return result;
-
-} // nsFileSpec::Execute
-
-//----------------------------------------------------------------------------------------
-PRUint32 nsFileSpec::GetDiskSpaceAvailable() const
-//----------------------------------------------------------------------------------------
-{
-    char curdir [MAXPATHLEN];
-    if (!mPath || !*mPath)
-    {
-        (void) getcwd(curdir, MAXPATHLEN);
-        if (!curdir)
-            return ULONG_MAX;  /* hope for the best as we did in cheddar */
-    }
-    else
-        sprintf(curdir, "%.200s", mPath);
- 
-    struct STATFS fs_buf;
-    if (STATFS(curdir, &fs_buf) < 0)
-        return ULONG_MAX; /* hope for the best as we did in cheddar */
- 
-#ifdef DEBUG_DISK_SPACE
-    printf("DiskSpaceAvailable: %d bytes\n", 
-       fs_buf.f_bsize * (fs_buf.f_bavail - 1));
-#endif
-    return fs_buf.f_bsize * (fs_buf.f_bavail - 1);
-} // nsFileSpec::GetDiskSpace()
-
-//========================================================================================
-//                                nsDirectoryIterator
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator::nsDirectoryIterator(
-    const nsFileSpec& inDirectory
-,   int /*inIterateDirection*/)
-//----------------------------------------------------------------------------------------
-    : mCurrent(inDirectory)
-    , mExists(PR_FALSE)
-    , mDir(nsnull)
-{
-    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 = PR_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 = PR_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

@@ -23,13 +23,9 @@ LIBRARY_NAME=gmbase
 MODULE=raptor 
 REQUIRES=xpcom raptor 
 
-CPPSRCS=	nsTimer.cpp 						\
-					nsCaretProperties.cpp		\
-					$(NULL)
-					
-CPP_OBJS=	.\$(OBJDIR)\nsTimer.obj 						\
-					.\$(OBJDIR)\nsCaretProperties.obj 	\
-					$(NULL)
+CPPSRCS=nsTimer.cpp 
+
+CPP_OBJS=.\$(OBJDIR)\nsTimer.obj 
 
 LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor 
 
@@ -42,4 +38,3 @@ include <$(DEPTH)\config\rules.mak>
 
 libs:: $(OBJS)
 	$(MAKE_INSTALL) $(OBJDIR)\nsTimer.obj ..\$(OBJDIR)
-	$(MAKE_INSTALL) $(OBJDIR)\nsCaretProperties.obj ..\$(OBJDIR)

mozilla/base/src/windows/nsCaretProperties.cpp

@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-#include "nscore.h"
-
-#include "nsCaretProperties.h"
-
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties::nsCaretProperties()
-:	mCaretWidth(eDefaultCaretWidth)
-,	mBlinkRate(eDefaulBlinkRate)
-{
-	// in your platform-specific class, get data from the OS in your constructor
-	mCaretWidth = 30;			// 2 pixel caret on Windows
-}
-
-
-//-----------------------------------------------------------------------------
-nsCaretProperties* NewCaretProperties()
-{
-	return new nsCaretProperties();
-}

mozilla/base/src/windows/nsFileSpecWin.cpp

@@ -1,480 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-//	This file is included by nsFileSpec.cp, and includes the Windows-specific
-//	implementations.
-
-#include <sys/stat.h>
-#include <direct.h>
-#include <limits.h>
-#include <stdlib.h>
-#include "prio.h"
-#include "nsError.h"
-
-#include "windows.h"
-
-#ifdef UNICODE
-#define CreateDirectoryW  CreateDirectory
-#else
-#define CreateDirectoryA  CreateDirectory
-#endif 
-
-//----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::Canonify(char*& ioPath, PRBool 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;
-}
-
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const nsFilePath& inPath)
-//----------------------------------------------------------------------------------------
-:	mPath(NULL)
-{
-	*this = inPath;
-}
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator = (const nsFilePath& inPath)
-//----------------------------------------------------------------------------------------
-{
-	nsFileSpecHelpers::StringAssign(mPath, (const char*)inPath);
-	nsFileSpecHelpers::UnixToNative(mPath);
-	mError = NS_OK;
-} // nsFileSpec::operator =
-
-//----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-:	mPath(NULL)
-{
-	*this = inSpec;
-} // nsFilePath::nsFilePath
-
-//----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-{
-	nsFileSpecHelpers::StringAssign(mPath, inSpec.mPath);
-	nsFileSpecHelpers::NativeToUnix(mPath);
-} // nsFilePath::operator =
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::SetLeafName(const char* inLeafName)
-//----------------------------------------------------------------------------------------
-{
-	nsFileSpecHelpers::LeafReplace(mPath, '\\', inLeafName);
-} // nsFileSpec::SetLeafName
-
-//----------------------------------------------------------------------------------------
-char* nsFileSpec::GetLeafName() const
-//----------------------------------------------------------------------------------------
-{
-	return nsFileSpecHelpers::GetLeaf(mPath, '\\');
-} // nsFileSpec::GetLeafName
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::Exists() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-	return 0 == stat(mPath, &st); 
-} // nsFileSpec::Exists
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetModDate(TimeStamp& outStamp) const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (stat(mPath, &st) == 0) 
-        outStamp = st.st_mtime; 
-    else
-        outStamp = 0;
-} // nsFileSpec::GetModDate
-
-//----------------------------------------------------------------------------------------
-PRUint32 nsFileSpec::GetFileSize() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (stat(mPath, &st) == 0) 
-        return (PRUint32)st.st_size; 
-    return 0;
-} // nsFileSpec::GetFileSize
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsFile() const
-//----------------------------------------------------------------------------------------
-{
-  struct stat st;
-  return 0 == stat(mPath, &st) && (_S_IFREG & st.st_mode); 
-} // nsFileSpec::IsFile
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsDirectory() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-	return 0 == stat(mPath, &st) && (_S_IFDIR & st.st_mode); 
-} // nsFileSpec::IsDirectory
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetParent(nsFileSpec& outSpec) const
-//----------------------------------------------------------------------------------------
-{
-	nsFileSpecHelpers::StringAssign(outSpec.mPath, mPath);
-	char* cp = strrchr(outSpec.mPath, '\\');
-	if (cp)
-		*cp = '\0';
-} // nsFileSpec::GetParent
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator += (const char* inRelativePath)
-//----------------------------------------------------------------------------------------
-{
-	if (!inRelativePath || !mPath)
-		return;
-	
-	if (mPath[strlen(mPath) - 1] == '\\')
-		nsFileSpecHelpers::ReallocCat(mPath, "x");
-	else
-		nsFileSpecHelpers::ReallocCat(mPath, "\\x");
-	
-	// If it's a (unix) relative path, make it native
-	char* dosPath = nsFileSpecHelpers::StringDup(inRelativePath);
-	nsFileSpecHelpers::UnixToNative(dosPath);
-	SetLeafName(dosPath);
-	delete [] dosPath;
-} // nsFileSpec::operator +=
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::CreateDirectory(int /*mode*/)
-//----------------------------------------------------------------------------------------
-{
-	// Note that mPath is canonical!
-	mkdir(mPath);
-} // nsFileSpec::CreateDirectory
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::Delete(PRBool inRecursive) const
-//----------------------------------------------------------------------------------------
-{
-    if (IsDirectory())
-    {
-	    if (inRecursive)
-        {
-            for (nsDirectoryIterator i(*this); i.Exists(); i++)
-                {
-                    nsFileSpec& child = (nsFileSpec&)i;
-                    child.Delete(inRecursive);
-                }		
-        }
-	    rmdir(mPath);
-    }
-	else
-    {
-        remove(mPath);
-    }
-} // nsFileSpec::Delete
-
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Rename(const char* inNewName)
-//----------------------------------------------------------------------------------------
-{
-    // This function should not be used to move a file on disk. 
-    if (strchr(inNewName, '/')) 
-        return NS_FILE_FAILURE;
-
-    if (PR_Rename(*this, inNewName) != NS_OK)
-    {
-        return NS_FILE_FAILURE;
-    }
-    SetLeafName(inNewName);
-    return NS_OK;
-} // nsFileSpec::Rename
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Copy(const nsFileSpec& inParentDirectory) const
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-
-    if (inParentDirectory.IsDirectory() && (! IsDirectory() ) )
-    {
-        char *leafname = GetLeafName();
-        char* destPath = nsFileSpecHelpers::StringDup(inParentDirectory, ( strlen(inParentDirectory) + 1 + strlen(leafname) ) );
-        strcat(destPath, "\\");
-        strcat(destPath, leafname);
-        delete [] leafname;
-        
-        // CopyFile returns non-zero if succeeds
-        int copyOK = CopyFile(*this, destPath, true);
-
-        delete[] destPath;
-
-        if (copyOK)
-        {
-            return NS_OK;
-        }
-    }
-
-    return NS_FILE_FAILURE;
-} // nsFileSpec::Copy
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Move(const nsFileSpec& nsNewParentDirectory) const
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-
-    if (nsNewParentDirectory.IsDirectory() && (! IsDirectory() ) )
-    {
-        char *leafname = GetLeafName();
-        char *destPath = nsFileSpecHelpers::StringDup(nsNewParentDirectory, ( strlen(nsNewParentDirectory) + 1 + strlen(leafname) ));
-        strcat(destPath, "\\");
-        strcat(destPath, leafname);
-        delete [] leafname;
-
-        // MoveFile returns non-zero if succeeds
-        int copyOK = MoveFile(*this, destPath);
- 
-        delete [] destPath;
-
-        if (copyOK)
-        {
-            return NS_OK;
-        }
-    }
-
-    return NS_FILE_FAILURE;
-} // nsFileSpec::Move
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Execute(const char* inArgs ) const
-//----------------------------------------------------------------------------------------
-{
-    
-    if (! IsDirectory())
-    {
-        char* fileNameWithArgs = NULL;
-
-	    fileNameWithArgs = nsFileSpecHelpers::StringDup(mPath, ( strlen(mPath) + 1 + strlen(inArgs) ) );
-        strcat(fileNameWithArgs, " ");
-        strcat(fileNameWithArgs, inArgs);
-
-        int execResult = WinExec( fileNameWithArgs, SW_NORMAL );
-        
-        delete [] fileNameWithArgs;
-
-        if (execResult > 31)
-        {
-            return NS_OK;
-        }
-    }
-
-    return NS_FILE_FAILURE;
-} // nsFileSpec::Execute
-
-//----------------------------------------------------------------------------------------
-PRUint32 nsFileSpec::GetDiskSpaceAvailable() const
-//----------------------------------------------------------------------------------------
-{
-	char aDrive[_MAX_DRIVE + 2];
-	_splitpath( mPath, aDrive, NULL, NULL, NULL);
-
-	if (aDrive[0] == '\0')
-	{
-        // The back end is always trying to pass us paths that look
-        //   like /c|/netscape/mail.  See if we've got one of them
-        if (strlen(mPath) > 2 && mPath[0] == '/' && mPath[2] == '|')
-        {
-            aDrive[0] = mPath[1];
-            aDrive[1] = ':';
-            aDrive[2] = '\0';
-        }
-        else
-        {
-            // Return bogus large number and hope for the best
-            return ULONG_MAX; 
-        }
-    }
-
-	strcat(aDrive, "\\");
-
-	DWORD dwSectorsPerCluster = 0;
-	DWORD dwBytesPerSector = 0;
-	DWORD dwFreeClusters = 0;
-	DWORD dwTotalClusters = 0;
-	if (!GetDiskFreeSpace(aDrive, 
-						&dwSectorsPerCluster, 
-						&dwBytesPerSector, 
-						&dwFreeClusters, 
-						&dwTotalClusters))
-	{
-		return ULONG_MAX; // Return bogus large number and hope for the best
-	}
-
-	//	We can now figure free disk space.
-	return dwFreeClusters * dwSectorsPerCluster * dwBytesPerSector;
-} // nsFileSpec::GetDiskSpaceAvailable()
-
-//========================================================================================
-//								nsDirectoryIterator
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator::nsDirectoryIterator(
-	const nsFileSpec& inDirectory
-,	int inIterateDirection)
-//----------------------------------------------------------------------------------------
-	: mCurrent(inDirectory)
-	, mDir(nsnull)
-	, mExists(PR_FALSE)
-{
-    mDir = PR_OpenDir(inDirectory);
-	mCurrent += "dummy";
-    ++(*this);
-} // nsDirectoryIterator::nsDirectoryIterator
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator::~nsDirectoryIterator()
-//----------------------------------------------------------------------------------------
-{
-    if (mDir)
-	    PR_CloseDir(mDir);
-} // nsDirectoryIterator::nsDirectoryIterator
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
-//----------------------------------------------------------------------------------------
-{
-	mExists = PR_FALSE;
-	if (!mDir)
-		return *this;
-    PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); // Ignore '.' && '..'
-	if (entry)
-    {
-      mExists = PR_TRUE;
-      mCurrent.SetLeafName(entry->name);
-    }
-	return *this;
-} // nsDirectoryIterator::operator ++
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator& nsDirectoryIterator::operator -- ()
-//----------------------------------------------------------------------------------------
-{
-	return ++(*this); // can't do it backwards.
-} // nsDirectoryIterator::operator --
-

mozilla/base/tests/CvtURL.cpp

@@ -23,9 +23,12 @@
 #include "prprf.h"
 #include "prtime.h"
 
-static nsString* ConvertCharacterSetName(const char* aName)
+static nsCharSetID ConvertCharacterSetName(const char* aName)
 {
-  return new nsString(aName);
+  if (nsCRT::strcasecmp(aName, "iso-latin-1") == 0) {
+    return eCharSetID_IsoLatin1;
+  }
+  return (nsCharSetID) -1;
 }
 
 int main(int argc, char** argv)
@@ -36,7 +39,7 @@ int main(int argc, char** argv)
   }
 
   char* characterSetName = argv[2];
-  nsString* cset = ConvertCharacterSetName(characterSetName);
+  nsCharSetID cset = ConvertCharacterSetName(characterSetName);
   if (PRInt32(cset) < 0) {
     printf("illegal character set name: '%s'\n", characterSetName);
     return -1;
@@ -52,9 +55,8 @@ int main(int argc, char** argv)
   }
 
   // Get an input stream from the url
-  nsresult ec;
-  nsIInputStream* in;
-  ec = NS_OpenURL(url, &in);
+  PRInt32 ec;
+  nsIInputStream* in = url->Open(&ec);
   if (nsnull == in) {
     printf("open of url('%s') failed: error=%x\n", urlName, ec);
     return -1;
@@ -73,7 +75,7 @@ int main(int argc, char** argv)
   PRInt32 count = 0;
   for (;;) {
     PRUnichar buf[1000];
-    PRUint32 nb;
+    PRInt32 nb;
     ec = uin->Read(buf, 0, 1000, &nb);
     if (ec < 0) {
       if (ec != NS_BASE_STREAM_EOF) {

mozilla/base/tests/FilesTest.cpp

@@ -1,928 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsSpecialSystemDirectory.h"
-
-//#include "string.h"
-//void* operator new(size_t n) { return malloc(n); }
-
-struct FilesTest
-{
-    FilesTest() : mConsole() {}
-
-    int RunAllTests();
-    
-    void WriteStuff(nsOutputStream& s);
-    int InputStream(const char* relativePath);
-    int FileSizeAndDate(const char* relativePath);
-    int OutputStream(const char* relativePath);
-    int IOStream(const char* relativePath);
-    int StringStream();
-    int Parent(const char* relativePath, nsFileSpec& outParent);
-    int Delete(nsFileSpec& victim);
-    int CreateDirectory(nsFileSpec& victim);
-    int CreateDirectoryRecursive(const char* aPath);
-    int IterateDirectoryChildren(nsFileSpec& startChild);
-    int CanonicalPath(const char* relativePath);
-    int Persistence(const char* relativePath);
-    int FileSpecEquality(const char *aFile, const char *bFile);
-    int Copy(const char*  sourceFile, const char* targDir);
-    int Move(const char*  sourceFile, const char*  targDir);
-    int Rename(const char*  sourceFile, const char* newName);
-
-    int Execute(const char* appName, const char* args);
-
-    int SpecialSystemDirectories();
-
-    void Banner(const char* bannerString);
-    int Passed();
-    int Failed(const char* explanation = nsnull);
-    void Inspect();
-        
-	nsOutputConsoleStream mConsole;
-};
-
-//----------------------------------------------------------------------------------------
-void FilesTest::Banner(const char* bannerString)
-//----------------------------------------------------------------------------------------
-{
-    mConsole
-        << nsEndl
-        << "---------------------------" << nsEndl
-        << bannerString << " Test"       << nsEndl
-        << "---------------------------" << nsEndl;
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::Passed()
-//----------------------------------------------------------------------------------------
-{
-    ((nsOutputStream&)mConsole) << "Test passed.";
-    mConsole << nsEndl;
-    return 0; // for convenience
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::Failed(const char* explanation)
-//----------------------------------------------------------------------------------------
-{
-    mConsole << "ERROR : Test failed." << nsEndl;
-    if (explanation)
-        mConsole << "REASON: " << explanation << nsEndl;
-    return -1; // for convenience
-}
-
-//----------------------------------------------------------------------------------------
-void FilesTest::Inspect()
-//----------------------------------------------------------------------------------------
-{
-    mConsole << nsEndl << "^^^^^^^^^^ PLEASE INSPECT OUTPUT FOR ERRORS" << nsEndl;
-}
-
-//----------------------------------------------------------------------------------------
-void FilesTest::WriteStuff(nsOutputStream& s)
-//----------------------------------------------------------------------------------------
-{
-    // Initialize a URL from a string without suffix.  Change the path to suit your machine.
-    nsFileURL fileURL("file:///Development/MPW/MPW%20Shell", PR_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
-    nsFileSpec 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, PR_TRUE); // relative path.
-    const char* pathAsString = (const char*)myTextFilePath;
-    nsFileSpec mySpec(myTextFilePath);
-    {
-        mConsole << "WRITING IDENTICAL OUTPUT TO " << pathAsString << nsEndl << nsEndl;
-        nsOutputFileStream testStream(mySpec);
-        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;
-    }
-	FileSizeAndDate(relativePath);
-    return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::StringStream()
-//----------------------------------------------------------------------------------------
-{
-    char* string1 = nsnull, *string2 = nsnull;
-    {
-        mConsole << "WRITING USUAL STUFF TO string1" << nsEndl << nsEndl;
-        nsOutputStringStream streamout(string1);
-        FilesTest::WriteStuff(streamout);
-    }
-    {
-        nsInputStringStream streamin(string1);
-        nsOutputStringStream streamout2(string2);
-        mConsole << "READING LINES FROM string1, writing to string2"
-            << nsEndl << nsEndl;
-        while (!streamin.eof())
-        {
-            char line[5000]; // Use a buffer longer than the file!
-            streamin.readline(line, sizeof(line));
-            streamout2 << line << nsEndl;
-        }
-        if (strcmp(string1, string2) != 0)
-        {
-            mConsole << "Results disagree!" << nsEndl;
-            mConsole << "First string is:" << nsEndl;
-            mConsole << string1 << nsEndl << nsEndl;
-            mConsole << "Second string is:" << nsEndl;
-            mConsole << string2 << nsEndl << nsEndl;
-            return Failed();
-        }
-    }
-    return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::IOStream(const char* relativePath)
-//----------------------------------------------------------------------------------------
-{
-    nsFilePath myTextFilePath(relativePath, PR_TRUE); // relative path.
-    const char* pathAsString = (const char*)myTextFilePath;
-    nsFileSpec mySpec(myTextFilePath);
-    mConsole
-        << "Replacing \"path\" by \"ZUUL\" in " << pathAsString << nsEndl << nsEndl;
-    nsIOFileStream testStream(mySpec);
-    if (!testStream.is_open())
-    {
-        mConsole
-            << "ERROR: File "
-            << pathAsString
-            << " could not be opened for input+output"
-            << nsEndl;
-        return -1;
-    }
-    char line[5000]; // Use a buffer longer than the file!
-    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::Persistence(
-    const char* relativePathToWrite)
-//----------------------------------------------------------------------------------------
-{
-    nsFilePath myTextFilePath(relativePathToWrite, PR_TRUE);
-    const char* pathAsString = (const char*)myTextFilePath;
-    nsFileSpec mySpec(myTextFilePath);
-
-    nsIOFileStream testStream(mySpec, (PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE));
-    if (!testStream.is_open())
-    {
-        mConsole
-            << "ERROR: File "
-            << pathAsString
-            << " could not be opened for input+output"
-            << nsEndl;
-        return -1;
-    }
-    
-    nsPersistentFileDescriptor myPersistent(mySpec);
-    mConsole
-        << "Writing persistent file data " << pathAsString << nsEndl << nsEndl;
-    
-    testStream.seek(0); // check that the seek compiles
-    testStream << myPersistent;
-    
-    testStream.seek(0);
-    
-    nsPersistentFileDescriptor mySecondPersistent;
-    testStream >> mySecondPersistent;
-    
-    mySpec = mySecondPersistent;
-#ifdef XP_MAC
-    if (mySpec.Error())
-        return Failed();
-#endif
-
-    if (!mySpec.Exists())
-        return Failed();
-    
-    return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::InputStream(const char* relativePath)
-//----------------------------------------------------------------------------------------
-{
-    nsFilePath myTextFilePath(relativePath, PR_TRUE);
-    const char* pathAsString = (const char*)myTextFilePath;
-    mConsole << "READING BACK DATA FROM " << pathAsString << nsEndl << nsEndl;
-    nsFileSpec mySpec(myTextFilePath);
-    nsInputFileStream testStream2(mySpec);
-    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::FileSizeAndDate(const char* relativePath)
-//----------------------------------------------------------------------------------------
-{
-    nsFilePath myTextFilePath(relativePath, PR_TRUE);
-    const char* pathAsString = (const char*)myTextFilePath;
-    mConsole << "Info for " << pathAsString << nsEndl;
-
-    nsFileSpec mySpec(myTextFilePath);
-    mConsole << "Size " << mySpec.GetFileSize() << nsEndl;
-
-    static nsFileSpec::TimeStamp oldStamp = 0;
-    nsFileSpec::TimeStamp newStamp = 0;
-    mySpec.GetModDate(newStamp);
-    mConsole << "Date " << newStamp << nsEndl;
-    if (oldStamp != newStamp && oldStamp != 0)
-        mConsole << "Date has changed by " << (newStamp - oldStamp) << " seconds" << nsEndl << nsEndl;
-    oldStamp = newStamp;
-    return 0;
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::Parent(
-    const char* relativePath,
-    nsFileSpec& outParent)
-//----------------------------------------------------------------------------------------
-{
-    nsFilePath myTextFilePath(relativePath, PR_TRUE);
-    const char* pathAsString = (const char*)myTextFilePath;
-    nsFileSpec 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(nsFileSpec& 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(PR_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(PR_TRUE);
-    if (victim.Exists())
-    {
-        mConsole
-            << "ERROR: Directory "
-            << "\n\t" << (const char*)victimPath
-            << "\n has NOT been deleted despite the recursion option!"
-            << nsEndl;
-        return -1;
-    }
-    
-    return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::CreateDirectory(nsFileSpec& dirSpec)
-//----------------------------------------------------------------------------------------
-{
-    nsFilePath dirPath(dirSpec);
-	mConsole
-		<< "Testing CreateDirectory() using"
-		<< "\n\t" << (const char*)dirPath
-		<< nsEndl;
-		
-	dirSpec.CreateDirectory();
-	if (!dirSpec.Exists())
-		return Failed();
-	dirSpec.Delete(PR_TRUE);
-	return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::CreateDirectoryRecursive(const char* aPath)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpec dirSpec(aPath, PR_TRUE);
-	mConsole
-		<< "Testing nsFilePath(X, PR_TRUE) using"
-		<< "\n\t" << (const char*)aPath
-		<< nsEndl;
-		
-    return Passed();
-}
-
-
-
-//----------------------------------------------------------------------------------------
-int FilesTest::IterateDirectoryChildren(nsFileSpec& startChild)
-//----------------------------------------------------------------------------------------
-{
-    // - Test of directory iterator
-
-    nsFileSpec 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.Exists(); i++)
-    {
-        char* itemName = ((nsFileSpec&)i).GetLeafName();
-        mConsole << '\t' << itemName << nsEndl;
-        delete [] itemName;
-    }
-
-    mConsole << "Backwards listing of " << (const char*)grandparentPath << ":" << nsEndl;
-    for (nsDirectoryIterator j(grandparent, -1); j.Exists(); j--)
-    {
-        char* itemName = ((nsFileSpec&)j).GetLeafName();
-        mConsole << '\t' << itemName << nsEndl;
-        delete [] itemName;
-    }
-    Inspect();
-    return 0;
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::CanonicalPath(
-    const char* relativePath)
-//----------------------------------------------------------------------------------------
-{
-    nsFilePath myTextFilePath(relativePath, PR_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;
-    }
-    return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::FileSpecEquality(const char *aFile, const char *bFile)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpec aFileSpec(aFile, PR_FALSE);
-    nsFileSpec bFileSpec(bFile, PR_FALSE);
-    nsFileSpec cFileSpec(bFile, PR_FALSE);  // this should == bFile
-    
-    if (aFileSpec != bFileSpec &&
-        bFileSpec == cFileSpec )
-    {
-        return Passed();
-    }
-
-    return Failed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::Copy(const char* file, const char* dir)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpec dirPath(dir, PR_TRUE);
-        
-    dirPath.CreateDirectory();
-    if (! dirPath.Exists())
-        return Failed();
-    
-
-    nsFileSpec mySpec(file, PR_TRUE); // relative path.
-    {
-        nsIOFileStream testStream(mySpec); // creates the file
-        // Scope ends here, file gets closed
-    }
-    
-    nsFileSpec filePath(file);
-    if (! filePath.Exists())
-        return Failed();
-   
-    nsresult error = filePath.Copy(dirPath);
-
-    dirPath += filePath.GetLeafName();
-    if (! dirPath.Exists() || ! filePath.Exists() || NS_FAILED(error))
-        return Failed();
-
-   return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::Move(const char* file, const char* dir)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpec dirPath(dir, PR_TRUE);
-        
-    dirPath.CreateDirectory();
-    if (! dirPath.Exists())
-        return Failed();
-    
-
-    nsFileSpec srcSpec(file, PR_TRUE); // relative path.
-    {
-       nsIOFileStream testStream(srcSpec); // creates the file
-       // file gets closed here because scope ends here.
-    };
-    
-    if (! srcSpec.Exists())
-        return Failed();
-   
-    nsresult error = srcSpec.Move(dirPath);
-
-
-    dirPath += srcSpec.GetLeafName();
-    if (! dirPath.Exists() || srcSpec.Exists() || NS_FAILED(error))
-        return Failed();
-
-    return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::Execute(const char* appName, const char* args)
-//----------------------------------------------------------------------------------------
-{
-    nsFileSpec appPath(appName, PR_FALSE);
-    if (!appPath.Exists())
-        return Failed();
-    
-    nsresult error = appPath.Execute(args);    
-    if (NS_FAILED(error))
-        return Failed();
-
-    return Passed();
-}
-
-//----------------------------------------------------------------------------------------
-int FilesTest::SpecialSystemDirectories()
-//----------------------------------------------------------------------------------------
-{
-     mConsole << "Please verify that these are the paths to various system directories:" << nsEndl;
-
-
-    nsSpecialSystemDirectory systemDir(nsSpecialSystemDirectory::OS_DriveDirectory);
-    if (!systemDir.Valid())
-		return Failed();
-    
-    mConsole << "OS_DriveDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        (nsOutputStream)mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::OS_TemporaryDirectory;
-    mConsole << "OS_TemporaryDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        (nsOutputStream)mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::OS_CurrentProcessDirectory;
-    mConsole << "OS_CurrentProcessDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        (nsOutputStream)mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-    
-#ifdef XP_MAC
-    systemDir = nsSpecialSystemDirectory::Mac_SystemDirectory;
-    mConsole << "Mac_SystemDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_DesktopDirectory;
-    mConsole << "Mac_DesktopDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_TrashDirectory;
-    mConsole << "Mac_TrashDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_StartupDirectory;
-    mConsole << "Mac_StartupDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_ShutdownDirectory;
-    mConsole << "Mac_ShutdownDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_AppleMenuDirectory;
-    mConsole << "Mac_AppleMenuDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_ControlPanelDirectory;
-    mConsole << "Mac_ControlPanelDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_ExtensionDirectory;
-    mConsole << "Mac_ExtensionDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_FontsDirectory;
-    mConsole << "Mac_FontsDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_PreferencesDirectory;
-    mConsole << "Mac_PreferencesDirectory yields \t";
-
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Mac_DocumentsDirectory;
-    mConsole << "Mac_DocumentsDirectory yields \t";
-
-    if (systemDir.Valid())
-    {
-        mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-#elif XP_PC
-    systemDir = nsSpecialSystemDirectory::Win_SystemDirectory;
-    mConsole << "Win_SystemDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        (nsOutputStream)mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Win_WindowsDirectory;
-    mConsole << "Win_WindowsDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        (nsOutputStream)mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-#else
-    systemDir = nsSpecialSystemDirectory::Unix_LocalDirectory;
-    mConsole << "Unix_LocalDirectory yields \t";
-    if (systemDir.Valid())
-    {
-        (nsOutputStream)mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-
-    systemDir = nsSpecialSystemDirectory::Unix_LibDirectory;
-    mConsole << "Unix_LibDirectory yields \t";
-
-    if (systemDir.Valid())
-    {
-        (nsOutputStream)mConsole << systemDir << nsEndl;
-    }
-    else
-    {
-        mConsole <<   "nsnull"  << nsEndl;
-        return Failed();
-    }
-#endif    
-    
-    return Passed();
-} // FilesTest::SpecialSystemDirectories
-
-
-//----------------------------------------------------------------------------------------
-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;
-	FileSizeAndDate("mumble/iotest.txt");
-
-	if (InputStream("mumble/iotest.txt") != 0)
-		return -1;
-	
-    Banner("StringStream");
-    if (StringStream() != 0)
-        return -1;
-        
-	Banner("Parent");
-	nsFileSpec 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("CreateDirectoryRecursive Relative (using nsFileSpec)");
-	if (CreateDirectoryRecursive("mumble/dir1/dir2/dir3/") != 0)
-		return -1;
-#ifdef XP_PC
-    Banner("CreateDirectoryRecursive Absolute (using nsFileSpec)");
-	if (CreateDirectoryRecursive("c:\\temp\\dir1\\dir2\\dir3\\") != 0)
-		return -1;
-#endif
-
-	Banner("IterateDirectoryChildren");
-	if (IterateDirectoryChildren(parent) != 0)
-		return -1;
-    
-    Banner("nsFileSpec equality");
-    if (FileSpecEquality("mumble/a", "mumble/b") != 0)
-        return -1;
-
-    Banner("Copy");
-    if (Copy("mumble/copyfile.txt", "mumble/copy") != 0)
-        return -1;
-    
-    Banner("Move");
-    if (Move("mumble/moveFile.txt", "mumble/move") != 0)
-        return -1;
-    Banner("Execute");
-#ifdef XP_MAC
-    // This path is hard-coded to test on jrm's machine.  Finding an app
-    // on an arbitrary Macintosh would cost more trouble than it's worth.
-    // Change path to suit.
-    if NS_FAILED(Execute("/Projects/Nav45_BRANCH/ns/cmd/macfe/"\
-        "projects/client45/Client45PPC", ""))
-#elif XP_PC
-    if NS_FAILED(Execute("c:\\windows\\notepad.exe", ""))
-#else
-    if NS_FAILED(Execute("/bin/ls", "/"))
-#endif
-        return -1;
-
-    Banner("Special System Directories");
-    if (SpecialSystemDirectories() != 0)
-        return -1;
-
-	Banner("Persistence");
-	if (Persistence("mumble/filedesc.dat") != 0)
-		return -1;
-
-	Banner("Delete again (to clean up our mess)");
-	if (Delete(parent) != 0)
-		return -1;
-		
-    return 0;
-} // FilesTest::RunAllTests
-
-//----------------------------------------------------------------------------------------
-int main()
-// For use with DEBUG defined.
-//----------------------------------------------------------------------------------------
-{
-    FilesTest tester;
-    return tester.RunAllTests();
-} // main

mozilla/base/tests/Makefile

@@ -0,0 +1,62 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+
+REQUIRES=xpcom netlib
+
+include $(DEPTH)/config/config.mk
+
+CPPSRCS = \
+	TestAtoms.cpp	\
+	TestCRT.cpp	\
+	$(NULL)
+
+INCLUDES+=-I../src 
+
+OBJS	= $(CPPSRCS:.cpp=.o)
+
+EX_LIBS = \
+	$(DIST)/lib/libraptorbase.a \
+	$(DIST)/lib/libxpcom.a  \
+	$(DIST)/lib/libplc21.a	\
+	$(DIST)/lib/libplds21.a	\
+	$(DIST)/lib/libnspr21.a	\
+	$(NULL)
+
+PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
+
+TARGETS = $(PROGS)
+
+include $(DEPTH)/config/rules.mk
+
+# needed for mac linux
+ifeq (linux,$(ARCH))
+OS_LIBS += /usr/lib/libdl.so
+endif
+
+$(OBJDIR)/%.o: %.cpp
+	@$(MAKE_OBJDIR)
+	$(CCC) -o $@ $(CFLAGS) -c $*.cpp
+
+$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
+	@$(MAKE_OBJDIR)
+	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
+
+install:: $(TARGETS)
+	$(INSTALL) $(PROGS) $(DIST)/bin
+

mozilla/base/tests/Makefile.in

@@ -1,3 +1,4 @@
+#!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
@@ -14,53 +15,53 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH		= ../..
+DEPTH=../..
 topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
 VPATH		= @srcdir@
+srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS = TestAtoms.cpp TestCRT.cpp CvtURL.cpp FilesTest.cpp PropertiesTest.cpp TestAutoLock.cpp
+REQUIRES=xpcom netlib
 
-LIBS		= \
-	-lnetlib \
-	-labouturl \
-	-lfileurl \
-	-lremoturl \
-	-lgophurl \
-	-lnetcnvts \
-	-lsockstuburl \
-	-lftpurl \
-	-lmimetype \
-	-lpwcac \
-	-lhttpurl \
-	-lnetwork \
-	-lnetutil \
-	-lnetcache \
-	-lgmbase$(MOZ_TOOLKIT) \
-	$(TK_LIBS) \
-	-lpref \
-	-lsecfree \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lxp \
-	-lraptorbase \
-	-lxpcom \
-	-lreg \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
+include $(topsrcdir)/config/config.mk
+
+CPPSRCS = \
+	TestAtoms.cpp	\
+	TestCRT.cpp	\
 	$(NULL)
 
-SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
+INCLUDES+=-I$(srcdir)/../src 
+
+OBJS	= $(CPPSRCS:.cpp=.o)
+
+EX_LIBS = \
+	$(DIST)/lib/libraptorbase.a \
+	$(DIST)/lib/libxpcom.a  \
+	$(DIST)/lib/libplc21.a	\
+	$(DIST)/lib/libplds21.a	\
+	$(DIST)/lib/libnspr21.a	\
+	$(NULL)
+
+PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
+
+TARGETS = $(PROGS)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(srcdir)/../src
-
 # needed for mac linux
-ifeq ($(OS_ARCH),Linux)
-ifneq ($(OS_RELEASE),1.2)
-OS_LIBS		+= /usr/lib/libdl.so
-endif
+ifeq (linux,$(ARCH))
+OS_LIBS += /usr/lib/libdl.so
 endif
 
+$(OBJDIR)/%.o: %.cpp
+	@$(MAKE_OBJDIR)
+	$(CCC) -o $@ $(CFLAGS) -c $<
+
+$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
+	@$(MAKE_OBJDIR)
+	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
+
+install:: $(TARGETS)
+	$(INSTALL) $(PROGS) $(DIST)/bin
+

mozilla/base/tests/PropertiesTest.cpp

@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#define NS_IMPL_IDS
-
-#include "nsXPComCIID.h"
-#include "nsIEventQueueService.h"
-#include "nsINetService.h"
-#include "nsIProperties.h"
-#include "nsIServiceManager.h"
-#include "nsIURL.h"
-#include "nsIComponentManager.h"
-#ifdef XP_PC
-#include "plevent.h"
-#endif
-
-#define TEST_URL "resource:/res/test.properties"
-
-#ifdef XP_PC
-#define NETLIB_DLL "netlib.dll"
-#define RAPTORBASE_DLL "raptorbase.dll"
-#define XPCOM_DLL "xpcom32.dll"
-#else
-#ifdef XP_MAC
-#define NETLIB_DLL "NETLIB_DLL"
-#define RAPTORBASE_DLL "base.shlb"
-#define XPCOM_DLL "XPCOM_DLL"
-#else
-#define NETLIB_DLL "libnetlib.so"
-#define RAPTORBASE_DLL "libraptorbase.so"
-#define XPCOM_DLL "libxpcom32.so"
-#endif
-#endif
-static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
-static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID);
-static NS_DEFINE_IID(kIPropertiesIID, NS_IPROPERTIES_IID);
-static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
-
-
-#ifdef XP_MAC  // have not build this on PC and UNIX yet so make it #ifdef XP_MAC
-extern "C" void NS_SetupRegistry();
-#endif
-
-int
-main(int argc, char *argv[])
-{
-  nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL,
-    PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL,
-    PR_FALSE, PR_FALSE);
-#ifdef XP_MAC    // have not build this on PC and UNIX yet so make it #ifdef XP_MAC
-  NS_SetupRegistry(); 
-#endif
-  
-  nsresult ret;
-  nsIEventQueueService* pEventQueueService = nsnull;
-  ret = nsServiceManager::GetService(kEventQueueServiceCID,
-    kIEventQueueServiceIID, (nsISupports**) &pEventQueueService);
-  if (NS_FAILED(ret)) {
-    printf("cannot get event queue service\n");
-    return 1;
-  }
-  ret = pEventQueueService->CreateThreadEventQueue();
-  if (NS_FAILED(ret)) {
-    printf("CreateThreadEventQueue failed\n");
-    return 1;
-  }
-  nsINetService* pNetService = nsnull;
-  ret = nsServiceManager::GetService(kNetServiceCID, kINetServiceIID,
-    (nsISupports**) &pNetService);
-  if (NS_FAILED(ret)) {
-    printf("cannot get net service\n");
-    return 1;
-  }
-  nsIURL *url = nsnull;
-  ret = pNetService->CreateURL(&url, nsString(TEST_URL), nsnull, nsnull,
-    nsnull);
-  if (NS_FAILED(ret)) {
-    printf("cannot create URL\n");
-    return 1;
-  }
-  nsIInputStream *in = nsnull;
-  ret = pNetService->OpenBlockingStream(url, nsnull, &in);
-  if (NS_FAILED(ret)) {
-    printf("cannot open stream\n");
-    return 1;
-  }
-  nsIProperties *props = nsnull;
-  ret = nsComponentManager::CreateInstance(kPropertiesCID, NULL,
-    kIPropertiesIID, (void**) &props);
-  if (NS_FAILED(ret)) {
-    printf("create nsIProperties failed\n");
-    return 1;
-  }
-  props->Load(in);
-  int i = 1;
-  while (1) {
-    char name[16];
-    sprintf(name, "%d", i);
-    nsAutoString v("");
-    props->GetProperty(name, v);
-    if (!v.Length()) {
-      break;
-    }
-    char *value = v.ToNewCString();
-    cout << "\"" << i << "\"=\"" << value << "\"" << endl;
-    i++;
-  }
-
-  return 0;
-}

mozilla/base/tests/TestAutoLock.cpp

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/*
-
-  Some tests for nsAutoLock.
-
- */
-
-#include "nsAutoLock.h"
-#include "prthread.h"
-
-PRLock* gLock;
-int gCount;
-
-static void run(void* arg)
-{
-    for (int i = 0; i < 1000000; ++i) {
-        nsAutoLock guard(gLock);
-        ++gCount;
-        PR_ASSERT(gCount == 1);
-        --gCount;
-    }
-}
-
-
-int main(int argc, char** argv)
-{
-    gLock = PR_NewLock();
-    gCount = 0;
-
-    // This shouldn't compile
-    //nsAutoLock* l1 = new nsAutoLock(theLock);
-    //delete l1;
-
-    // Create a block-scoped lock. This should compile.
-    {
-        nsAutoLock l2(gLock);
-    }
-
-    // Fork a thread to access the shared variable in a tight loop
-    PRThread* t1 =
-        PR_CreateThread(PR_SYSTEM_THREAD,
-                        run,
-                        nsnull,
-                        PR_PRIORITY_NORMAL,
-                        PR_GLOBAL_THREAD,
-                        PR_JOINABLE_THREAD,
-                        0);
-
-    // ...and now do the same thing ourselves
-    run(nsnull);
-
-    // Wait for the background thread to finish, if necessary.
-    PR_JoinThread(t1);
-    return 0;
-}

mozilla/base/tests/makefile.win

@@ -22,21 +22,15 @@ PROG0 = .\$(OBJDIR)\TimerTest.exe
 PROG1 = .\$(OBJDIR)\TestAtoms.exe
 PROG2 = .\$(OBJDIR)\CvtURL.exe
 PROG3 = .\$(OBJDIR)\TestCRT.exe
-PROG4 = .\$(OBJDIR)\FilesTest.exe
-PROG5 = .\$(OBJDIR)\PropertiesTest.exe
-PROG6 = .\$(OBJDIR)\TestAutoLock.exe
 RESFILE = timer.res
 PROGRAMS = $(PROG0) $(PROG1) \
 !ifdef MODULAR_NETLIB
         $(PROG2) \
 	$(PROG3) \
-	$(PROG5) \
 !endif
-	$(PROG4) \
-        $(PROG6) \
-	$(NULL)
+        $(NULL)
 
-LINCS=-I..\src -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib -I$(PUBLIC)\raptor
+LINCS=-I..\src -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib
 
 LLIBS=				\
  $(DIST)\lib\xpcom32.lib	\
@@ -45,7 +39,7 @@ LLIBS=				\
  $(DIST)\lib\netlib.lib         \
 !endif
  $(LIBNSPR)			\
- $(DIST)\lib\plc3.lib	\
+ $(DIST)\lib\libplc21.lib	\
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
  $(GLOWDIR)\glowcode.lib	\
 !endif
@@ -59,11 +53,7 @@ install:: $(PROGRAMS)
 !ifdef MODULAR_NETLIB
 	$(MAKE_INSTALL) $(PROG2) $(DIST)\bin
 	$(MAKE_INSTALL) $(PROG3) $(DIST)\bin
-	$(MAKE_INSTALL) $(PROG5) $(DIST)\bin
-	$(MAKE_INSTALL) test.properties $(DIST)\bin\res
 !endif
-	$(MAKE_INSTALL) $(PROG4) $(DIST)\bin
-        $(MAKE_INSTALL) $(PROG6) $(DIST)\bin
 
 clobber::
 	rm -f $(DIST)\bin\TimerTest.exe
@@ -71,11 +61,7 @@ clobber::
 !ifdef MODULAR_NETLIB
 	rm -f $(DIST)\bin\CvtURL.exe
 	rm -f $(DIST)\bin\TestCRT.exe
-	rm -f $(DIST)\bin\PropertiesTest.exe
-	rm -f $(DIST)\bin\res\test.properties
 !endif
-	rm -f $(DIST)\bin\FilesTest.exe
-        rm -f $(DIST)\bin\TestAutoLock.exe
 
 # Move this into config/obj.inc when it's allowed
 .cpp{.\$(OBJDIR)\}.exe:
@@ -97,16 +83,8 @@ $(PROG0): $(OBJDIR) TimerTest.cpp $(RESFILE)
 
 $(PROG1): $(OBJDIR) TestAtoms.cpp
 
-$(PROG4): $(OBJDIR) FilesTest.cpp
-
 !ifdef MODULAR_NETLIB
 $(PROG2): $(OBJDIR) CvtURL.cpp
 
 $(PROG3): $(OBJDIR) TestCRT.cpp
-
-$(PROG5): $(OBJDIR) PropertiesTest.cpp
 !endif
-
-$(PROG6): $(OBJDIR) TestAutoLock.cpp
-
-

mozilla/base/tests/test.properties

@@ -1,26 +0,0 @@
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL. You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All Rights
-# Reserved.
-#
-1=1
- 2=2
-3 =3
- 4 =4
-5=5
-6= 6
-7=7 
-8= 8 
-# this is a comment
-9=this is the first part of a continued line \
- and here is the 2nd part