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

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

mozilla/directory/perldap/CREDITS

@@ -1,48 +0,0 @@
-This is a short list of people that have contributed to the success of
-this project.
-
-
-* Leif Hedstrom <leif@perldap.org>
-
-	- Project lead.
-	- Wrote some of the API code,  and most of OO layers (Conn.pm,
-	  Entry.pm etc.)
-	- Unix portability test.
-	- Port to Windows/NT and ActivePerl.
-
-
-* Kevin McCarthy
-
-	- Bug fixes, tons of contribution, particularly to the API.xs file.
-
-
-* Michelle Hedstrom <mwyner@perldap.org>
-
-	- Testing, bug fixes, and documentation, as well as working on new
-          modules for PerLDAP v2.0.
-
-
-* Clayton Donley
-
-	  - Wrote some of the initial API code (API.xs and API.pm).
-
-
-* John Kristian
-
-	- Rewrote the entire LDIF module, great stuff!
-
-
-* Netscape Netcenter team (Kevin Burns, Max Block, Mark Takacs etc.)
-
-	- Tons of ideas and requests for features.
-	- Discovering bugs daily (great, thanks... ;-).
-
-
-* Bob Ferguson
-
-	- Primary guinea pig for all my NT builds.
-
-
-* Everyone else that I've forgot to mention:
-
-	- Thanks for testing and debugging this package!

mozilla/directory/perldap/ChangeLog

@@ -1,785 +0,0 @@
-2005-01-27  Leif Hedstrom  <leif@ogre.com>
-
-	* Conn.pm (new): Fixed the nspr option to truly be an on/off flag,
-	if we need to support shared in the future, we can do so with another
-	option.
-
-	* typemap: Kludgy fix for "void *", used for the prldap options.
-
-	* API.xs: Made it work properly, the arguments were totally wrong.
-
-	* Conn.pm (new): Added support for the timeout (for NSPR enabled
-	connections only!).
-	(init): Honor this timeout option.
-	(setNSPRTimeout): Fix for sending down the timeout options.
-	(installNSPR): The "shared" argument wasn't properly passed down to the
-	API when used on an established connection.
-
-2005-01-05  Leif Hedstrom  <leif@ogre.com>
-
-	* Conn.pm (init): Bad "my" declaration.
-
-2005-01-04  Leif Hedstrom  <leif@ogre.com>
-
-	* LDIF.pm: Changed all calls to new to use the class method directly.
-
-	* Utils.pm: Changed all calls to new to use the class method directly.
-
-	* Entry.pm: Changed all calls to new to use the class method directly.
-
-	* Conn.pm: Changed all calls to new to use the class method directly.
-
-	* Makefile.PL: Fixes for missing NSPR libraries, even though the prldap
-	libraries are available...
-
-2004-12-28  Leif Hedstrom  <leif@ogre.com>
-
-	* Conn.pm (new): Added the entryclass argument.
-	(newEntry): Honor the new entryclass setting.
-	(nextEntry): Ditto.
-	(delete): Changed to check if the provided entry is proper
-	Mozilla::LDAP::Entry (or subclass) type.
-	(add): Ditto.
-
-2004-11-02  Leif Hedstrom  <leif@ogre.com>
-
-	* API.xs (internal_sortcmp_proc): Added support for Perl sort functions.
-	(ldap_multi_sort_entries): Ditto.
-	(ldap_sort_entries): Ditto.
-
-	* Conn.pm: Cleaned up NSPR code, fixed some bugs.
-	(search): Added support for sortattrs, using multisort.
-	(search): Fixed parsing of the attrs.
-	(setOption): Set an "arbitrary" option.
-	(getOption): Getter.
-	(setSizelimit): Set the sizelimit.
-	(getSizelimit): Getter.
-	(init): Added the callback, this has at least the potential of making
-	it possible to parse some server controls as returned by the
-	asyncronous bind.
-	(setOption): Added support for hash style arguments.
-
-2004-10-28  Leif Hedstrom  <leif@ogre.com>
-
-	* Entry.pm (attrModified): Removed some dead code.
-
-	* Conn.pm (add): Fixed so we don't try to add attributes that have been
-	deleted (From Donaldo).
-
-2004-10-19  Leif Hedstrom  <leif@ogre.com>
-
-	* Conn.pm (new): Add NSPR option.
-	(installNSPR): Try to fix the problem by rebinding if this is called.
-	(installNSPR): Now works as a class (static) method.
-
-2004-10-17  Leif Hedstrom  <leif@ogre.com>
-
-	* Conn.pm (close): Removed $ret, it was always 1 anyways.
-
-	* Entry.pm (move): Added support for hash-style arguments.
-	(copy): Added support for hash-style arguments.
-	(removeValue): Added support for hash-style arguments, cleaned up some
-	local variable statements.
-	(removeDNValue): Added support for hash-style arguments.
-	(addValue): Added support for hash-style arguments.
-	(addDNValue): Added support for hash-style arguments
-	(getValues): Cleaned up arguments.
-	(hasValue): Added support for hash-style arguments.
-	(hasValue): Make sure to lower-case the attribute, this was a bug.
-	(hasDNValue): Support hash-style arguments.
-	(matchValue): Support hash-style arguments.
-	(matchDNValue): Support hash-style arguments.
-	(setDN): Support hash-style arguments.
-
-2004-10-15  Leif Hedstrom  <leif@ogre.com>
-
-	* API.xs (prldap_set_session_option): New function to set the IO
-	timeout option when using NSPR I/O etc..
-
-	* API.pm: Fixed all indentation, added PRLDAP_OPT_IO_MAX_TIMEOUT and
-	prldap_get_session_option.
-
-	* constant.h (constant): Fixed indentation, and added
-	PRLDAP_OPT_IO_MAX_TIMEOUT.
-
-2004-10-14  Leif Hedstrom  <leif@ogre.com>
-
-	* Entry.pm (isEntryModified): Added new method, which indicates that
-	something in the entry has been modified.
-
-	* Conn.pm (newEntry): You can now provide the DN as an argument.
-
-	* Entry.pm (unRemove): Fixed, old bug solved by Kevin...
-
-	* Conn.pm (newEntry): Simplified this to use the normal constructor.
-	(searchURL): Avoid the warnings...
-
-	* Entry.pm (DESTROY): Fixed core dump during destructor.
-
-	* Conn.pm (getErrorCode): Added support for hash-style args.
-	(browse): Added support for hash-style args.
-	(browse): The hash-style arguments now also supports attrsonly.
-	(compare): Added hash-style args.
-	(search): Got rid of the annoying warning finally, for undefined hash
-	value.
-
-	* API.xs (prldap_install_routines): New function, to modify an existing
-	LDAP * handle (ld) to use NSPR I/O, threading etc.
-
-	* API.pm: Added the NSPR section to symbols.
-
-	* Conn.pm (installNSPR): Added this function, to support NSPR.
-
-	* Makefile.PL: Added all the NSPR/NSS dependt libraries as well, for
-	better compiling results.
-
-	* Conn.pm (getVersion): Added this getter as well.
-
-	* Makefile.PL: Added LD_RUN_PATH stuff.
-
-2004-10-13  Leif Hedstrom  <leif@ogre.com>
-
-	* Conn.pm (search): Fix for bug 4633, we can now return some
-	number of entries even if we hit SIZE/TIME-LIMIT.
-	(searchURL): Dito.
-	(getErrorCode): Dito.
-	(getErrorString): Dito.
-	(modifyRDN): Changed argument handling.
-	(search): Support hash style arguments now.
-	(searchURL): Support hash style arguments.
-
-	* Entry.pm (addDNValue): Added a "nocase" (optional) argument.
-	(addValue): Dito.
-
-	* Conn.pm (setVersion): New function, change the LDAP protocol version
-	on the connection.
-	(update): Performance optimization, faster check if the %mod structure
-	is empty or not.
-	(update): Fix for bug #77368, $conn->update() returns false if there
-	are no changes being made. Seems more reasonable to not consider that a
-	failure I think.
-	(update): Changed to use ldap_modify_ext_s().
-
-	* Utils.pm (ldapArgs): Added support for -V, and defaulting to LDAP v3
-	now.
-
-2003-06-24  Leif Hedstrom  <leif@perldap.org>
-
-	* Makefile.PL: Lots of changes to support modern C-SDK.
-
-2003-06-24  Leif Hedstrom  <leif@perldap.org>
-
-	* API.xs, typemap: Changed `na' to `PL_na'. This means we now
-	only support Perl 5.005 or later.
-
-2000-09-19  Leif Hedstrom  <leif@perldap.org>
-
-	* Conn.pm (update): Bug fix to allow us to delete() an attribute,
-	call update(), and then add new values (or the same values...) to
-	the entry again.
-
-2000-09-19  Leif Hedstrom  <leif@perldap.org>
-
-	* Entry.pm (DESTROY): Bug fix from daniel.hams@db.com (Daniel
-	Hams) to avoid warnings from Apache and mod_perl.
-
-2000-09-13  Leif Hedstrom  <leif@perldap.org>
-
-	* Utils.pm (askPassword): Oops, stupid typo here, should be
-	"unless $prompt" of course...
-
-2000-09-13  Leif Hedstrom  <leif@perldap.org>
-
-	* Entry.pm (isDeleted): Removed a test which made this function
-	not working at all... :)
-
-2000-09-13  Leif Hedstrom  <leif@perldap.org>
-
-	* Removed an if defined() to avoid warnings with Perl v5.6.
-
-2000-06-24  Wolfram Schmidt  <wschmidt@decefix.iao.fhg.de>
-
-	* Entry.pm (FIRSTKEY): Fix bug for deleting all attributes and calling
-	keys.
-
-2000-05-30  Kevin McCarthy  <kevin@perldap.org>
-
-	* Makefile.PL: Added fix so API.xs compiles under Perl 5.6
-	(POLLUTE=>1)
-
-2000-05-30  Leif Hedstrom  <leif@perldap.org>
-
-	* Lots of small fixes...
-
-1999-09-07  Leif Hedstrom  <leif@perldap.org>
-
-	* API.xs (avref2charptrptr): Fixed potential core dump, if the
-	argument passed wasn't a proper array.
-	(avref2berptrptr): Ditto.
-
-1999-09-06  Leif Hedstrom  <leif@perldap.org>
-
-	* Conn.pm (search): Removed $res and $resv, set the internal data
-	element directly.
-	(searchURL): Ditto.
-
-1999-08-25  John Kristian <kristian@netscape.com>
-
-	* Entry.pm (printLDIF): Bug fix.
-
-	* LDIF.pm: Cleaned out memory leaks.
-
-1999-08-24  Leif Hedstrom  <leif@netscape.com>
-
-	* Merged v1.3.x into trunk, tagged it as v1.4, and released it!
-
-1999-08-19  Leif Hedstrom  <leif@netscape.com>
-
-	* Changed internal version numbering again, just called this plain
-	v1.4.
-
-	* Entry.pm (FIRSTKEY): Bug fix, we'd crap out if there are no
-	attributes in the returned entry.
-	(NEXTKEY): Ditto.
-
-1999-08-18  Leif Hedstrom  <leif@netscape.com>
-
-	* Set version number to v1.4! Woohoo! Also tagged it as v1.3.4,
-	last "development" release.
-
-1999-08-17  Leif Hedstrom  <leif@netscape.com>
-
-	* Makefile.PL: Fixes for Windows/NT, cleaned out some code etc.
-	(MY::postamble): Support for "make html".
-
-	* MANIFEST: Updated with all new files etc.
-
-	* test.pl: Renamed to oldtest.pl, to avoid "make test" to fail.
-
-1999-08-16  Kevin McCarthy  <kmccarth@perldap.org> and Leif Hedstrom
-
-	* API.xs: Cleaned most all the memory allocation changes, we are
-	changing it to use the LDAP_OPT_MEMALLOC_FN_PTRS option in the
-	C-SDK instead (much cleaner!).
-	(perldap_init): New function, set up the memory management
-	handlers. This is called when the API module is loaded.
-	(perldap_malloc): New function, our memory management method(s).
-	(perldap_calloc): Ditto.
-	(perldap_realloc): Ditto.
-	(perldap_free): Ditto.
-
-1999-08-16  Kevin McCarthy  <kmccarth@perldap.org>
-
-	* API.xs: Cleaned up prototypes, changed strdup() to use a
-	Perl'ified version, change a number of free()'s to use Safefree.
-	(ldap_value_free_perl): New function, similar to
-	ldap_mods_free_perl(), to avoid memory problems (on NT and
-	ActivePerl primarily).
-	(StrDup): New function, to handle strdup() calls in a safe way.
-	(ber_bvfree_perl): Ditto.
-	(ber_bvecfree_perl): Ditto.
-
-1999-08-15  Leif Hedstrom  <leif@netscape.com>
-
-	* API.xs (ldap_mods_free_perl): Modified version of
-	ldap_mods_free(), which uses Perl native free method instead of
-	the things from the LDAP SDK. This fixes some nasty issues with
-	Windows/NT and ActiveState Perl. Woohoo!!!
-
-1999-08-14  Leif Hedstrom  <leif@netscape.com> and Kevin McCarthy
-
-	* Entry.pm (setValues): Implemented bug fix for bug id 7131, where
-	the "_save_" structures weren't set properly when using setValues().
-
-1999-08-14  Kevin McCarthy  <kmccarth@perldap.org>
-
-	* Conn.pm (update): Rewrote to optimize add/remove vs replace
-	operations. Basically, we'll try to do whatever seems to be the
-	smallest amount of work for the LDAP server now.
-
-1999-08-13  Leif Hedstrom  <leif@netscape.com>
-
-	* Makefile.PL: Cleaned up code, and added support for linking in
-	the missing libraries need for some missing symbols.
-
-1999-08-13  Michelle Wyner  <mwyner@netscape.com>
-
-	* Entry.pm: Updated documentation, and cleaned it up.
-
-	* Conn.pm: Ditto.
-
-1999-08-12  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (move): Changed name, was rename(), is now move().
-
-1999-08-10  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (setValues): Renamed, used to be setValue(), which is
-	now an alias to setValues().
-	(getValues): New method, to get the array of values.
-	(STORE): Fixed tests around DN handling, making sure it's not
-	treated as an array. I also optimized a couple of tests, since we
-	now filter out "DN" earlier in the funtion(s).
-	(attrModified): Ditto.
-	(attrClean): Ditto.
-	(unRemove): Ditto.
-	(removeValue): Ditto.
-	(addValue): Ditto.
-
-1999-08-08  Leif Hedstrom  <leif@netscape.com> and Kevin McCarthy
-
-	* Entry.pm (setValue): Remove _delete_ flag, if set.
-
-	* Conn.pm (close): Fixed memory leak, moved code from the DESTROY
-	method over here.
-	(DESTROY): Call the close() method.
-	(getErrorCode): We now return LDAP_SUCCESS if there is no LDAP
-	connection handle.
-	(getErrorString): Ditto.
-
-	* Entry.pm (STORE): Bug fix for large attribute sets.
-	(attrModified): Ditto.
-	(removeValue): Ditto.
-	(addValue): Ditto.
-	(EXISTS): Fix for bug 4368, cleaning up the code, and avoid the
-	double calls.
-
-1999-08-06  Leif Hedstrom  <leif@netscape.com> and Kevin McCarthy
-
-	* API.xs: Added some more tests around free() statements. These
-	are most likely never triggered, but better safe than sorrow (and
-	the overhead of testing this is insignificant).
-
-	* Conn.pm (browse): Added this function, to make it easy to browse
-	an entry.
-	(compare): Compare an attribute value against a DN/entry, without
-	having to do the search.
-
-	* Entry.pm (removeValue): Fixed loop bug.
-	(addValue): Ditto.
-	(hasValue): Ditto.
-	(matchValue): Fixed loop bug, and also missing normalization in
-	half of the case statement.
-	(rename): Added this new method, to rename attributes.
-	(copy): Added, to copy attributes.
-
-	* Merged v1.2.3 with v1.3 branch.
-
-1999-08-06  Kevin McCarthy  <kmccarth@perldap.org>
-
-	* Entry.pm (addDNValue): Bug fix, index for norm was wrong.
-
-	* Entry.pm (size): Optimzied for performance.
-
-1999-07-25  Kevin McCarthy  <kmccarth@perldap.org>
-
-        * API.xs: Fixed memory allocation problems in parsing and
-        generating the LDAPMods structure.
-
-1999-06-22  Leif Hedstrom  <leif@netscape.com>
-
-        * Conn.pm (add): Fixed bug 3342, thanks to Kevin McCarthy for
-        debugging this, and providing a patch. This fixes the problem with
-        adding new entries that has binary data.
-
-1999-03-23  Leif Hedstrom  <leif@netscape.com>
-
-	* Changed versioning numbers for all .pm files.
-
-1999-03-22  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm: Removed all _self_obj_ stuff...
-
-	* Conn.pm: Ditto.
-
-	* Conn.pm: Cleanup in use statements, and "use strict".
-	(search): Avoid warnings of uninitialized variables.
-	(searchURL): Ditto.
-	(modifyRDN): Bugfix, we did not update the appropriate DN in the
-	self object (very minor...).
-
-	* Entry.pm: Cleanup in use statements, and "use strict".
-	(BEGIN): Added this initializer, to use the new LDIF module.
-	(STORE): Fixed bug where we would not ignore the internal instance
-	variables properly.
-
-	* Utils.pm: Cleanup in all use statements, and "use strict". Also
-	enforces the VERSION control feature.
-
-	* Merged v1.2.1 to devel-branch-1_3, and tagged v1.3.1.
-
-1999-03-21  Leif Hedstrom  <leif@netscape.com>
-
-	* Checked in v1.2.1(beta).
-
-1999-03-19  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (add): Fixed the code so that it will handle hash array,
-	as the documentation indicates. (Pointed out by Kevin Burns).
-	(add): Code cleanup in the add() method.
-
-1999-03-18  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm: Changed back some of the "my" definitions, to make
-	sure arrays are properly reset.
-	(setValue): Added the _modified_ flag, from Stephen P. Schaefer
-	<stephen@networks.com>.
-	(addValue): Bug fix, when calling delete, and then
-	addValue(). From Stephen P. Schaefer as well.
-
-	* Conn.pm: Ditto. This fixes the bug where qsearch/printLDIF()
-	would print multiple values.
-
-1999-03-12  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm: Changed docs for modifyRDN(), it was wrong...
-
-1999-03-11  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (new): Added this method, so that "new ...::Entry" will
-	work as expected.
-
-1999-03-09  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm: Tons of changes to handling the save/modified/deleted
-	attribute values.
-	(DESTROY): Added this destructor again, this time it does seem to
-	help quite a lot! Whoohoo...
-
-	* Conn.pm (update): Bug fix for bug #2530, keeping sort order for
-	attribute values.
-
-1999-03-08  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (unRemove): Bug fix, this was terribly horked, please
-	let's try it to make sure it works...
-
-	* Conn.pm (newEntry): Bug fix, forgot to give it the self_obj
-	member value... Sigh.
-
-1999-03-05  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (DELETE): We now handle the event that someone tries to
-	delete an internal attribute.
-
-	* Conn.pm (update): Bug: We forgot to test for existance of
-	"_save_" before trying to loop over it.
-
-	* Entry.pm (attrClean): Added this method, to make it easier to
-	reset the internal state of en Entry. This is used primarily by
-	the Conn.pm package.
-	(unRemove): Bug Fix: $selfl changed to $self...
-
-1999-02-28  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (matchValue): Added support for the normalization,
-	which should have been done before... Bug #2854.
-
-	* Conn.pm (printError): Changed to use ldap_err2string instead of
-	ldap_perror.
-
-	* Utils.pm (ldapArgs): Changed "root" to "base" in the LD
-	structure.
-	(userCredentials): Ditto.
-
-	* Conn.pm: Changed documentation to reflect the "base/root"
-	change.
-
-1999-01-06  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (nextEntry): Fixed (tried to fix...) the bug with
-	missing attributes. I hope this will work, at a minimum I'm sure
-	it won't hurt. The idea is to keep the case on the attribute type
-	when requesting the values_len().
-
-1999-01-11  Leif Hedstrom  <leif@netscape.com>
-
-	* API.xs: Added IF statements around all ldap_value_free() calls.
-
-1999-01-05  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (getRes): Ooops, didn't return the appropriate
-	value... :(
-	(init): Changed test for LDAP_SUCCESS, to always return 0 or 1.
-	(close): Ditto.
-	(delete): Ditto.
-	(add): Ditto.
-	(modifyRDN): Ditto.
-	(update): Ditto.
-	(simpleAuth): Ditto.
-
-	* Entry.pm (NEXTKEY): Don't return the last $key if it's one that
-	should be hidden.
-
-	* Conn.pm (newEntry): New method, to create an empty LDAP::Entry
-	object. It is properly "tied" into the appropriate object.
-
-1999-01-04  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (setDN): Added third optional argument, to enfoce DN
-	normalization.
-	(getDN): Ditto.
-	(hasDNValue): Ditto.
-	(matchDNValue): Ditto.
-
-	* Entry.pm (removeValue): Added support for DN normalization
-	(optional argument).
-	(addValue): Ditto
-	(getDN): Ditto.
-
-1998-12-31  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (DESTROY): Added this method, don't know if it actually
-	makes any sense at all... :(
-
-	* Conn.pm (add): Use _oc_order_ to find a list of attributes, to
-	avoide calling the TIEHASH methods.
-	(update): Ditto.
-	(ALL): Clean out some "my" definitions.
-
-	* Entry.pm (unRemove): New function, to undo remove opertaions on
-	an attribute.
-	(DELETE): Bug-fix, don't undef the attribute, it would prevent us
-	from updating it properly in the Conn::update() method.
-	(remove): Ditto.
-
-	* Conn.pm (nextEntry): Return $obj instead of blessing the %entry
-	(again).
-
-1998-12-25  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (POD): Changed examples from $conn -> $entry.
-
-1998-12-17  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (DESTROY): undef the Perl data after doing a
-	ldap_msgfree(), bug #1964.
-	(search): Ditto.
-	(searchURL): Ditto.
-	(nextEntry): Changed the order of setting numattr, to make sure
-	it's zero if we don't find anything.
-
-1998-12-16  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (FIRSTKEY): Modified to honor the oc_order.
-	(NEXTKEY): Ditto.
-	(markModified): Made as an alias for attrModified().
-
-	* Conn.pm (nextEntry): Added code to handle internal counters for
-	number of attributes in oc_order. This is used/needed for the
-	FIRSTKEY and NEXTKEY methods in the Entry/Tie::Hash object.
-
-	* Entry.pm (isAttr): New method, to make sure an attribute name
-	really is a valid LDAP attribute.
-	(FIRSTKEY): Now we'll handle each() and keys() properly, whooohoo!
-	(NEXTKEY): Ditto.
-
-1998-12-15  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (isDeleted): Added new method, almost identical to isModified().
-	(EXISTS): New method, to implement the EXISTS functionality.
-
-	* API.xs (RET_CPP): Test for NULL pointers, bug #1387.
-	(RET_BVPP): Ditto.
-
-	* Utils.pm (ldapArgs): Fixed bug where "-s 0" would not be honored
-	(I'm an idiot, OK?).
-
-1998-12-14  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (getRes): New method, to return the internal result message.
-	(getLD): Use defined() around test for existence.
-
-1998-12-11  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (new): Make sure binddn and bindpasswd are set to the
-	empty string unless specified.
-	(init): Make sure certdb is defined before trying to use it.
-	(setDefaultRebindProc): Added default auth method, unless
-	explicitly specified.
-
-	* Utils.pm (askPassword): Added support for Term::ReadKey.
-	(askPassword): Moved the eval "use ..." here.
-	(userCredentials): Removed verbose print statement.
-	(askPassword): Added an optional argument to print a prompt;
-
-	* Conn.pm (setDefaultRebindProc): Added a default "auth" value, if
-	not provided in the call.
-
-1998-12-04  Leif Hedstrom  <leif@netscape.com>
-
-	* Makefile.PL: Modified so that "silent" install will actually
-	echo what options it's setting.
-	It will now croak() if the SDK dir specified doesn't exist.
-
-	* INSTALL: Updated to reflect new v1.1 stuff. Added links to the
-	FAQ.
-
-	* README: Ditto. Also changed some of the binary install
-	information, which might not be useful anyways...
-
-	* Makefile.PL: Added "filters" to remove .dll and .sl from shared
-	libraries when creating link options. I also replaced the code to
-	put the valid library extensions into a variable (bug #1344).
-
-	* Makefile.PL: Fixed some crap with the config parsing, and ENV
-	handling (for silent installs).
-
-1998-12-03  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (update): Bug fix, now we empty the hash array before
-	examining changed attributes (bug #1385).
-
-	* Makefile.PL: Added the "-nolinenumbers" XSUBS options (bug #1329).
-
-1998-09-26  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (init): Cleaned out _perror() calls.
-	(delete): Added support for calling delete() with an Entry::
-	object as paramter.
-	(new): Cleaned out some dead code for $ref.
-
-	* Entry.pm (setValue): New method, to avoid having to use Perl
-	assignment statements to set an entire attribute value.
-
-1998-09-18  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (init): Changed call to ldapssl_client_init() to pass a
-	0 value as the handle pointer. This avoids a Perl compiler warning.
-
-1998-09-12  Leif Hedstrom  <leif@netscape.com>
-
-	* LDIF.pm (readEntries): Changed tests for empty arguments, to use
-	defined().
-
-	* Utils.pm (ldapArgs): Bug fix, we used the wrong option for the
-	certificate (-P) when checking to set the LDAP port.
-	(normalizeDN): Chagned tests for empty arguments, to use use defined().
-
-	* Entry.pm (STORE): Changed tests for empty arguments, to use
-	defined().
-	(DELETE): Ditto.
-	(attrModified): Ditto.
-	(isModified): Ditto.
-	(remove): Ditto.
-	(removeValue): Ditto.
-	(addValue): Ditto.
-	(hasValue): Ditto.
-	(matchValue): Ditto.
-	(setDN): Ditto.
-	(size): Ditto.
-	(exists): Ditto.
-
-	* Conn.pm (printError): Changed test for $str to see if it's defined.
-	(delete): Cleaned up code around $dn.
-	(modifyRDN): Cleaned up testes around $dn and $del.
-
-1998-09-11  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (modifyRDN): We now preserve the case of the DN/RDN, but
-	still treat RDNs as CIS when comparing strings.
-
-1998-09-08  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (setDefaultRebindProc): Bug fix, it had the Ldapc:: crap
-	stil in there... :-(.
-	(simpleAuth): New method, to do simple authentication rebind.
-
-1998-09-07  Leif Hedstrom  <leif@netscape.com>
-
-	* Makefile.PL: Changed all <> to <STDIN>, to support command line
-	arguments for MakeMaker.
-
-1998-09-03  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (nextEntry): Fixed bug with case sensitivity.
-
-1998-08-18  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (setDefaultRebindProc): It's back!
-	Officially released PerLDAP v1.0.
-
-1998-08-13  Leif Hedstrom  <leif@netscape.com>
-
-	* Makefile.PL: Fixed so that automated installs works.
-
-	* Conn.pm (update): Fixed narly bug with ldap_modify()...
-
-	* All: Cleaned up some hash indexes, to make sure they are
-	properly quoted, and there are no conflicts to resolve.
-	
-	* Entry.pm (STORE): Fixed a bug with attribute names not being
-	properly added to _oc_order_.
-	(addValue): Ditto, added the same code as for STORE.
-
-1998-08-06  Leif Hedstrom  <leif@netscape.com>
-
-	* Entry.pm (printLDIF): Copied/modified from the Utils.pm library.
-	(isModified): Added this function, thought it might be useful.
-
-1998-08-03  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (modifyRDN): Fixed! It also has an option to take an
-	"external" DN as an argument, if supplied.
-
-1998-08-02  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (getErrorCode): Now takes two optional arguments, to
-	return the match string, and extra error string. Note that these
-	two arguments are pointers to strings!
-
-	* API.xs(ldap_get_lderrno): Fixed this function, at least it seems
-	to work now...
-
-	* Conn.pm (getLD): Added this function, convenient way to get the
-	LD from the OO layer.
-
-1998-07-30  Leif Hedstrom  <leif@netscape.com>
-
-	* Conn.pm (modifyRDN): New method, to rename the RDN of the entry.
-
-	* Utils.pm (answer): New function, from LdapUtils.pm.
-
-	* Conn.pm (delete): Fixed references to normalizeDN.
-
-	* Utils.pm (userCredentials): Added this function, to make it easy
-	to get credentials when binding as a user.
-	(normalizeDN): Fixed bugs, because of calling convention...
-
-	* Conn.pm (getError): Fixed bug with passing read-only argument.
-
-1998-07-29  Leif Hedstrom  <leif@netscape.com>
-
-	* Utils.pm (unixCrypt): Moved from my LdapUtils.pm module.
-	Added askPassword to the export tag.
-
-	* Conn.pm (new): Added support for passing a hash array of all the
-	parameters, as returned by the ldapArgs() function.
-
-	* Utils.pm (str2Scope): New function, for converting strings
-	(subtree) to a numerical scope value (2).
-	(askPassword): Ditto, ask for a password, interactively.
-	(ldapArgs): Ditto, handle common LDAP command line arguments.
-
-	* Makefile.PL: Minor change, to do regex match on OS version for
-	MSWin.
-
-	* Entry.pm: Changed all _XXX hash values to also end with a _,
-	hence making it easier to isolate them (/^_.*_$/).
-
-	* Conn.pm (nextEntry): Changed to accept that the attributes are
-	now arrays, not pointers to arrays. We still consider them as
-	pointers internally though, it's cleaner API.
-
-	* API.pm: Changed to use the native Exporter function to export
-	tags into EXPORT_OK.
-
-1998-07-22  Leif Hedstrom  <leif@netscape.com>
-
-	* LDIF.pm (readEntry): Moved from my LdapUtils.pm package.
-
-	* Utils.pm (printEntry): Moved from the ::Connection class, and
-	marked it as "obsolete".
-	(encodeBase64): Moved from my LdapUtils.pm package.
-	(decodeBase64): Ditto.
-

mozilla/directory/perldap/INSTALL

@@ -1,112 +0,0 @@
-PerLDAP installation instructions
-==================================
-
-Building this package is fairly straight forward, but requires some
-knowledge about using compilers and compiler tools on your system. If you
-are uncomfortable using these tools, we recommend you get one of the
-prebuilt binary distributions instead.
-
-
-Prerequisites
-=============
-
-In order to build the module, you'll need
-
-	- Perl, version 5.005 or later, although it's only been
-	tested and developed using 5.008.
-
-	- An ANSI-C compiler, e.g. gcc-2.x, or Visual C++ 5.0.
-
-	- The LDAP client libraries and include files, either from the
-	mozilla.org source, or precompiled packages from sun.com
-	(http://wwws.sun.com/software/download/app_dev.html#sdks)
-	See the README file for information on retrieving binaries.
-
-You can download (or CVS checkout) the Directory SDK source, see further
-information available on
-
-	http://www.mozilla.org/directory/
-
-RedHat also provide C-SDK builds, available at
-
-	ftp://ftp.redhat.com/pub/redhat/ldapsdk/
-
-For NSPR and NSS (SSL) support, you might also need to download those
-SDKs, for instance
-
-      ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6.1/
-      ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_RTM/
-
-
-There's also a semi-obsoloete FAQ at
-
-	http://www.mozilla.org/directory/faq/perldap-faq.html
-
-
-
-Building
-========
-
-This package uses the normal Perl5 MakeMaker installation system. To
-generate a Makefile appropriate for your platform, run perl on the
-provided Makefile.PL script, e.g.
-
-	% perl Makefile.PL
-
-
-You might have to use the command `perl5' or `perl-5.004', depending on
-how you installed Perl-5. The script will now ask you a few questions to
-find the necessary library and include files. A typical configuration
-session is
-
-    computer (13:19) 1096/1 $ perl Makefile.PL
- 
-    PerLDAP - Perl 5 Module for LDAP
-    ================================
-    Directory containing 'include' and 'lib' directory of the Netscape
-    LDAP Software Developer Kit (default: /usr): /usr/local/ldapsdk5
-    Using LDAPv3 Developer Kit (default: yes)?
-    Include SSL Support (default: yes)?
-    Libraries to link with (default: -lldap50 -lssldap50 -lssl3):
-    Writing Makefile for Mozilla::LDAP::API
-
-The important question is where your LDAP SDK is installed, in the example
-above the base directory is /usr/local/ldapsdk5. This directory should have two
-subdirectories, named "lib" and "include". If you installed the SDK in the
-standard /usr hierarchy, use the default value as provided by the install
-script.
-
-Assuming you get no errors or warning, proceed with the build and install:
-
-	$ make
-	$ make install
-
-
-That should be it!
-
-
-Automated Configuration and Installs
-====================================
-
-The Makefile.PL script also honors a set of environment variables to make
-it possible to do configuration and installs non-interactively. The
-variables are
-
-        LDAPSDKDIR    - Full path to the C SDK base directory
-        LDAPSDKSSL    - Set to "N" to disable SSL (SSL is default)
-	LDAPPR        - Enable prldap_ functionality (off by default)
-
-
-With these variables set, you will not be asked any of the questions above
-(but it will echo the paramaters). Just run the Makefile.PL script, and
-finish the build, e.g.
-
-        $ perl5 Makefile.PL
-	$ make
-	$ make install
-
-RPM
-===
-
-The script Makefile.PL.rpm is used instead of Makefile.PL for building the RPM.
-See the spec file perl-Mozilla-LDAP.spec for more details.

mozilla/directory/perldap/MANIFEST

@@ -1,41 +0,0 @@
-ChangeLog
-API.pm
-API.xs
-MANIFEST
-Makefile.PL
-PerLDAP.ppd
-constant.h
-typemap
-Entry.pm
-Conn.pm
-LDIF.pm
-Utils.pm
-README
-INSTALL
-CREDITS
-RELEASE
-MPL-1.1.txt
-test_api/search.pl
-test_api/write.pl
-test_api/api.pl
-t/conn.pl
-t/entry.pl
-t/ChangeLog
-t/api.t
-t/conn.t
-t/entry.t
-t/ldif.t
-t/utils.t
-examples/ChangeLog
-examples/lfinger.pl
-examples/qsearch.pl
-examples/monitor.pl
-examples/ldappasswd.pl
-examples/rmentry.pl
-examples/tabdump.pl
-examples/modattr.pl
-examples/rename.pl
-examples/psoftsync.pl
-examples/changes2ldif.pl
-examples/rand_mods.pl
-META.yml                                 Module meta-data (added by MakeMaker)

mozilla/directory/perldap/META.yml

@@ -1,10 +0,0 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         PerLDAP
-version:      1.5
-version_from: API.pm
-installdirs:  site
-requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17

mozilla/directory/perldap/MPL-1.1.txt

@@ -1,567 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-     ----------------------------------------------------------------------
-
-     AMENDMENTS
-
-     The Netscape Public License Version 1.1 ("NPL") consists of the
-     Mozilla Public License Version 1.1 with the following Amendments,
-     including Exhibit A-Netscape Public License.  Files identified with
-     "Exhibit A-Netscape Public License" are governed by the Netscape
-     Public License Version 1.1.
-
-     Additional Terms applicable to the Netscape Public License.
-          I. Effect.
-          These additional terms described in this Netscape Public
-          License -- Amendments shall apply to the Mozilla Communicator
-          client code and to all Covered Code under this License.
-
-          II. "Netscape's Branded Code" means Covered Code that Netscape
-          distributes and/or permits others to distribute under one or more
-          trademark(s) which are controlled by Netscape but which are not
-          licensed for use under this License.
-
-          III. Netscape and logo.
-          This License does not grant any rights to use the trademarks
-          "Netscape", the "Netscape N and horizon" logo or the "Netscape
-          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
-          "Smart Browsing" even if such marks are included in the Original
-          Code or Modifications.
-
-          IV. Inability to Comply Due to Contractual Obligation.
-          Prior to licensing the Original Code under this License, Netscape
-          has licensed third party code for use in Netscape's Branded Code.
-          To the extent that Netscape is limited contractually from making
-          such third party code available under this License, Netscape may
-          choose to reintegrate such code into Covered Code without being
-          required to distribute such code in Source Code form, even if
-          such code would otherwise be considered "Modifications" under
-          this License.
-
-          V. Use of Modifications and Covered Code by Initial Developer.
-               V.1. In General.
-               The obligations of Section 3 apply to Netscape, except to
-               the extent specified in this Amendment, Section V.2 and V.3.
-
-               V.2. Other Products.
-               Netscape may include Covered Code in products other than the
-               Netscape's Branded Code which are released by Netscape
-               during the two (2) years following the release date of the
-               Original Code, without such additional products becoming
-               subject to the terms of this License, and may license such
-               additional products on different terms from those contained
-               in this License.
-
-               V.3. Alternative Licensing.
-               Netscape may license the Source Code of Netscape's Branded
-               Code, including Modifications incorporated therein, without
-               such Netscape Branded Code becoming subject to the terms of
-               this License, and may license such Netscape Branded Code on
-               different terms from those contained in this License.
-
-          VI. Litigation.
-          Notwithstanding the limitations of Section 11 above, the
-          provisions regarding litigation in Section 11(a), (b) and (c) of
-          the License shall apply to all disputes relating to this License.
-
-     EXHIBIT A-Netscape Public License.
-
-          "The contents of this file are subject to the Netscape Public
-          License Version 1.1 (the "License"); you may not use this file
-          except in compliance with the License. You may obtain a copy of
-          the License at http://www.mozilla.org/NPL/
-
-          Software distributed under the License is distributed on an "AS
-          IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-          implied. See the License for the specific language governing
-          rights and limitations under the License.
-
-          The Original Code is Mozilla Communicator client code, released
-          March 31, 1998.
-
-          The Initial Developer of the Original Code is Netscape
-          Communications Corporation. Portions created by Netscape are
-          Copyright (C) 1998-1999 Netscape Communications Corporation. All
-          Rights Reserved.
-
-          Contributor(s): ______________________________________.
-
-          Alternatively, the contents of this file may be used under the
-          terms of the _____ license (the "[___] License"), in which case
-          the provisions of [______] License are applicable  instead of
-          those above.  If you wish to allow use of your version of this
-          file only under the terms of the [____] License and not to allow
-          others to use your version of this file under the NPL, indicate
-          your decision by deleting  the provisions above and replace  them
-          with the notice and other provisions required by the [___]
-          License.  If you do not delete the provisions above, a recipient
-          may use your version of this file under either the NPL or the
-          [___] License."

mozilla/directory/perldap/Makefile.PL

@@ -1,451 +0,0 @@
-#############################################################################
-# $Id: Makefile.PL,v 1.16.2.16 2010-08-03 20:27:49 nkinder%redhat.com Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    The Makefile "source".
-
-require 5.005;
-
-use ExtUtils::MakeMaker;
-use ExtUtils::Liblist;
-use Config;
-use Carp;
-
-$osname   = $Config{'osname'};
-if ($osname =~ /mswin/i)
-{
-   $dir_sep = "\\";
-} else {
-   $dir_sep = "/";
-}
-
-$ldapsdk_loc = $ENV{"LDAPSDKDIR"}; # Full Path to C SDK Top-Level
-$include_ldap = $ENV{"LDAPSDKINCDIR"}; # Full Path to C SDK Include file directory
-$lib_ldap = $ENV{"LDAPSDKLIBDIR"}; # Full Path to C SDK Library directory
-$ldapsdk_ssl = $ENV{"LDAPSDKSSL"}; # N to exclude SSL
-$ldapsdk_pr = $ENV{"LDAPPR"};      # Y to include prldap_ functions
-$nspr_loc = $ENV{"NSPRDIR"};       # Full Path to NSPR Top-Level
-$include_nspr = $ENV{"NSPRINCDIR"};       # Full Path to NSPR include dir
-$lib_nspr = $ENV{"NSPRLIBDIR"};       # Full Path to NSPR lib dir
-$nss_loc = $ENV{"NSSDIR"};       # Full Path to NSS Top-Level
-$lib_nss = $ENV{"NSSLIBDIR"};       # Full Path to NSS lib dir
-$use_openldap = $ENV{"USE_OPENLDAP"}; # Y to use OpenLDAP instead of MozLDAP
-
-$libexts = "so|sl|a|lib|dll|dylib";
-$default_root = "${dir_sep}usr";
-
-# every linux distribution has the OpenLDAP SDK in /usr/lib and /usr/include, so
-# we need to use a different default to avoid problems
-if (!$use_openldap) {
-   if ($osname eq "linux") {
-      $default_root = "/opt/mozldap";
-   }
-
-   # examine our build environment - see if we are being built as part of the overall
-   # mozilla build process - if so, we can default a lot of things based on that
-   # for example, if perldap was checked out in mozilla/directory/perldap, and
-   # nspr in mozilla/nsprpub, and nss in mozilla/security, and the ldap c sdk in
-   # mozilla/directory/c-sdk, and everything was built according to the usual
-   # build instructions, then we can just use ../../dist/public/ldap as our
-   # include file location and ../../dist/lib as our lib location
-   if ( !$include_ldap && -d '../../dist/public/ldap' ) {
-      $include_ldap = "..${dir_sep}..${dir_sep}dist${dir_sep}public${dir_sep}ldap";
-   }
-   if ( !$lib_ldap && -d '../../dist/lib' ) {
-      $lib_ldap = "..${dir_sep}..${dir_sep}dist${dir_sep}lib";
-   }
-
-   # find the path to NSPR
-   if (!$nspr_loc && !$include_nspr && !$lib_nspr && -d '../../dist') {
-      require File::Find;
-      $nspr_loc = findNSPR('../../dist');
-      $include_nspr = $nspr_loc . "/include";
-      $lib_nspr = $nspr_loc . "/lib";
-   }
-} else {
-   if ($osname eq "linux") {
-      $default_root = "/usr";
-   }
-}
-
-print "\nPerLDAP - Perl 5 Module for LDAP\n";
-print     "================================\n";
-
-$silent = 1;
-if ($use_openldap)
-{
-   print "Directory containing 'include' and 'lib' directory of the OpenLDAP\n";
-   print "LDAP client libraries (default: $default_root, Enter \"n\" to specify\n" .
-      "explicit include and lib directories): ";
-} else {
-   print "Directory containing 'include' and 'lib' directory of the Mozilla\n";
-   print "LDAP Software Developer Kit (default: $default_root, Enter \"n\" to\n" .
-      "specify explicit include and lib directories): ";
-}
-
-if (!$ldapsdk_loc)
-{
-   $silent = 0;
-   chomp ($ldapsdk_loc = <STDIN>);
-   $ldapsdk_loc = $default_root unless $ldapsdk_loc =~ /\S/;
-   if (! -d $ldapsdk_loc) {
-	   $ldapsdk_loc = undef;
-   }
-} else {
-  print "$ldapsdk_loc\n";
-}
-
-if (!$include_ldap && $ldapsdk_loc) {
-   $include_ldap = $ldapsdk_loc . $dir_sep . "include";
-}
-if (!$ldapsdk_loc) {
-   if ($use_openldap) {
-      print "Directory containing 'include' files of the OpenLDAP\n";
-      print "LDAP client libraries (default: $include_ldap): ";
-   } else {
-      print "Directory containing 'include' files of the Mozilla\n";
-      print "LDAP Software Developer Kit (default: $include_ldap): ";
-   }
-   if (! -f "$include_ldap${dir_sep}ldap.h") {
-      $silent = 0;
-	  chomp ($input = <STDIN>);
-	  $include_ldap = $input if $input =~ /\S/;
-	  croak("Missing required include file $include_ldap${dir_sep}ldap.h") unless -f "$include_ldap${dir_sep}ldap.h";
-  } else {
-	  print "$include_ldap\n";
-  }
-}
-
-if (!$lib_ldap && $ldapsdk_loc) {
-   $lib_ldap = $ldapsdk_loc . $dir_sep . "lib";
-}
-if (!$ldapsdk_loc) {
-   if ($use_openldap) {
-      print "Directory containing 'lib' files of the OpenLDAP\n";
-      print "LDAP client libraries (default: $lib_ldap): ";
-   } else {
-      print "Directory containing 'lib' files of the Mozilla\n";
-      print "LDAP Software Developer Kit (default: $lib_ldap): ";
-   }
-   if (! -d "$lib_ldap") {
-      $silent = 0;
-	  chomp ($input = <STDIN>);
-	  $lib_ldap = $input if $input =~ /\S/;
-	  croak("Missing required lib directory $lib_ldap") unless -d "$lib_ldap";
-  } else {
-	  print "$lib_ldap\n";
-  }
-}
-
-print "Include SSL Support (default: yes)?  ";
-if (!$ldapsdk_ssl)
-{
-   $silent = 0;
-   chomp ($ldapsdk_ssl = <STDIN>);
-} else {
-  print "$ldapsdk_ssl\n";
-}
-$ssl_def = "-DUSE_SSL" unless ($ldapsdk_ssl =~ /^n/i);
-
-if (!$use_openldap) {
-   # see if ldap and nspr files are in the same place
-   if ( -f "$include_ldap${dir_sep}nspr.h" ) {
-      $nspr_loc = $ldapsdk_loc;
-   }
-
-   print "Directory containing NSPR API 'include' and 'lib'\n";
-   print "directories for NSPR support (type 'n' or 'none' to omit) (default: $nspr_loc): ";
-   if (!$ENV{NSPRDIR} && !$ENV{NSPRINCDIR} && !$ENV{NSPRLIBDIR}) {
-      $silent = 0;
-      chomp ($input = <STDIN>);
-      if ($input =~ /^n/i) {
-         $nspr_loc = undef;
-      } elsif ($input =~ /\S/) {
-          $nspr_loc = $input;
-      }
-   } else {
-      print "$nspr_loc\n";
-   }
-
-   if ($nspr_loc) {
-      if (!$lib_nspr) {
-         $lib_nspr = $nspr_loc . ${dir_sep} . 'lib';
-      }
-      if (!$include_nspr) {
-         $include_nspr = $nspr_loc . ${dir_sep} . 'include';
-      }
-      croak("Missing required include file $include_nspr${dir_sep}nspr.h") unless -f "$include_nspr${dir_sep}nspr.h";
-      $pr_def = "-DPRLDAP"
-   }
-
-   print "Directory containing NSS API 'lib'\n";
-   print "directories for NSS support (type 'n' or 'none' to omit) (default: $nss_loc): ";
-   if (!$ENV{NSSDIR} && !$ENV{NSSLIBDIR}) {
-      $silent = 0;
-      chomp ($input = <STDIN>);
-      if ($input =~ /^n/i) {
-         $nss_loc = undef;
-      } elsif ($input =~ /\S/) {
-          $nss_loc = $input;
-      }
-   } else {
-      print "$nss_loc\n";
-   }
-
-   if ($nss_loc) {
-      if (!$lib_nss) {
-         $lib_nss = $nss_loc . ${dir_sep} . 'lib';
-      }
-   }
-}
-
-opendir(DIR,$lib_ldap);
-if (!$use_openldap && $ssl_def)
-{
-   @libfiles = grep{/ldap\d|ssl\d|nss\d|pl[cd]\d|nspr\d|ldappr\d/} readdir(DIR);
-} else {
-   @libfiles = grep{/ldap|lber/} readdir(DIR);
-}
-closedir(DIR);
-
-if (!$use_openldap) {
-   if ($lib_nspr && -d $lib_nspr) {
-      opendir(DIR,$lib_nspr);
-      push @libfiles, grep{/pl[cd]\d|nspr\d|ssl\d|nss\d/} readdir(DIR);
-      closedir(DIR);
-   }
-
-   if ($lib_nss && -d $lib_nss) {
-      opendir(DIR,$lib_nss);
-      push @libfiles, grep{/ssl\d|nss\d/} readdir(DIR);
-      closedir(DIR);
-   }
-}
-
-@libs = ();
-foreach $candidate (@libfiles) {
-   next if $candidate !~ /($libexts)$/;
-   $candidate =~ s/^lib//;
-   if ($osname !~ /mswin/i) {
-     $candidate =~ s/\.($libexts)$//;
-   }
-   push(@libs, $candidate) unless grep(/^$candidate$/, @libs);
-}
-
-if (!$use_openldap) {
-   if ($osname =~ /mswin/i) {
-      @ldaplib = grep{/^nsldap\d.*$/} @libs;
-      @prldaplib = grep{/^nsldappr.*$/} @libs;
-      @lberlib = grep{/^nslber.*$/} @libs;
-      @ldapslib = grep{/^nsldapssl.*$/} @libs if $ssl_def;
-   } else {
-      @ldaplib = grep{/^ldap\d.*$/} @libs;
-      @prldaplib = grep{/^prldap.*$/} @libs;
-      @lberlib = grep{/^lber.*$/} @libs;
-      @ldapslib = grep{/^ssldap.*$/} @libs if $ssl_def;
-   }
-
-   @ssllib = grep{/^ssl\d.*$/} @libs if $ssl_def;
-   @nsslib = grep{/^nss\d.*$/} @libs if $ssl_def;
-   @plclib = grep{/^plc\d.*$/} @libs if $ssl_def;
-   @pldslib = grep{/^plds\d.*$/} @libs if $ssl_def;
-   @nsprlib = grep{/^nspr\d.*$/} @libs;
-} else {
-   # We only need to link with libldap and lilber when using OpenLDAP.
-   @ldaplib = grep{/^ldap\.*$/} @libs;
-   @lberlib = grep{/^lber\.*$/} @libs;
-   # We don't really use PRLDAP when using OpenLDAP, but we want to provide
-   # stubs for the PRLDAP functions.
-   $openldap_def = "-DUSE_OPENLDAP -DPRLDAP";
-}
-
-
-if ($#ldaplib < 0)
-{
-   die "No LDAP libraries found.";
-}
-
-if ($use_openldap && ($#lberlib < 0))
-{
-   die "No LBER libraries found.";
-}
-
-if ($#ldaplib > 0)
-{
-   print "Located multiple libraries:\n";
-   foreach $alib (@ldaplib)
-   {
-      print " - $alib\n";
-   }
-}
-
-# construct linker libraries string
-$lline = "";
-
-# add libraries in order of dependencies
-$lline .= " -l$ldapslib[0]" if ($#ldapslib >= 0);
-
-#
-# Add "main" LDAP library to link line, and the NSPR version
-# as well (if available).
-#
-$lline .= " -l$prldaplib[0]" if ($#prldaplib >= 0);
-$lline .= " -l$ldaplib[0]";
-
-#
-# Add lber library if using OpenLDAP
-#
-if ($use_openldap)
-{
-   $lline .= " -l$lberlib[0]";
-}
-
-#
-# Add SSL libraries, if needed
-#
-$lline .= " -L$lib_nss" if ($lib_nss);
-$lline .= " -l$ssllib[0]" if ($#ssllib >= 0);
-$lline .= " -l$nsslib[0]" if ($#nsslib >= 0);
-
-# Add the NSS/NSPR libraries, if needed
-$lline .= " -L$lib_nspr" if ($lib_nspr);
-$lline .= " -l$plclib[0]" if ($#plclib >= 0);
-$lline .= " -l$pldslib[0]" if ($#pldslib >= 0);
-$lline .= " -l$nsprlib[0]" if ($#nsprlib >= 0);
-
-print "Libraries to link with (default: $lline):  ";
-if (!$silent)
-{
-   chomp ($lib_line = <STDIN>);
-   $lib_line = $lline unless $lib_line =~ /\S/;
-} else {
-  $lib_line = $lline;
-  print "\n";
-}
-
-$lib_line = "-L$lib_ldap $lib_line";
-
-# Include directories etc.
-$my_includes = "";
-$my_includes .= " -I$include_ldap" unless ($include_ldap eq "/usr/include");
-$my_includes .= " -I$include_nspr" if $pr_def;
-
-# Add system dependant stuff here...
-@extras = ();
-if ($osname =~ /mswin/i)
-{
-   $my_extlib = "$lib_ldap\\$ldaplib[0]";
-   $my_extlib .= " $lib_ldap\\$lberlib[0]" if $#lberlib >= 0;
-   push(@extras, 'dynamic_lib' => {
-     'OTHERLDFLAGS' => "kernel32.lib oldnames.lib" });
-} else {
-   $my_extlib = "";
-}
-
-if ($^O eq 'MSWin32' and $Config{archname} =~ /-object\b/i) {
-   push(@extras, CAPI => 'TRUE');
-}
-
-
-#
-# See if we need to add an LD_RUN_PATH. This seems to have changed
-# somewhere between Perl 5.8.0 and 5.8.5. So, on some systems this
-# will add an extra LD_RUN_PATH ...
-#
-@liblist = ExtUtils::Liblist->ext($lib_line);
-if ($liblist[3] ne "")
-{
-  use Config;
-  push(@extras,
-       'LD'	=> 'LD_RUN_PATH=$(LD_RUN_PATH)' . " $Config{ld}",
-       );
-}
-
-
-#
-# Ok, let's do it!
-#
-print "\n######### before WriteMakefile #############\n";
-WriteMakefile(
-              'ABSTRACT'	=> 'Perl methods for LDAP C API calls',
-              'AUTHOR'		=> 'Leif Hedstrom <leif@ogre.com>',
-	      'NAME'		=> 'Mozilla::LDAP::API',
-	      'DISTNAME'	=> 'PerLDAP',
-
-	      'VERSION_FROM'	=> 'API.pm',
-	      'INC'		=> $my_includes,
-	      'LIBS'		=> [$lib_line],
-	      'MYEXTLIB'	=> $my_extlib,
-	      'DEFINE'		=> "$ssl_def $pr_def $openldap_def",
-	      'XSOPT'		=> "-nolinenumbers",
-	      @extras
-);
-
-print "\n######### after WriteMakefile #############\n";
-
-#
-# Generate a "make HTML" target
-#
-sub MY::postamble
-{
-  '
-.SUFFIXES: .pm .html
-.PHONY: html
-
-.pm.html:
-	pod2html --netscape $< > $@
-
-html:	Entry.html Conn.html Utils.html API.html LDIF.html $(FIRST_MAKEFILE)
-	@rm -f pod2html-itemcache pod2html-dircache
-'
-}
-
-sub find_helper {
-   if (/nspr\.h/) {
-	   $nspr_loc = File::Basename::dirname($File::Find::dir);
-   }
-}
-
-sub findNSPR {
-   my $dir = shift;
-   File::Find::find(\&find_helper, $dir);
-   return $nspr_loc;
-}

mozilla/directory/perldap/Makefile.PL.rpm

@@ -1,103 +0,0 @@
-#############################################################################
-# $Id: Makefile.PL.rpm,v 1.1.2.3 2007-06-14 09:21:15 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    The Makefile "source".
-#    This has been heavily modified to simply use pkg-config
-#    to get the components necessary to build.
-
-require 5.005;
-
-use ExtUtils::MakeMaker;
-use ExtUtils::Liblist;
-use Config;
-use Carp;
-
-# name of package to use for pkg-config
-$ldappkgname = $ENV{"LDAPPKGNAME"} || "mozldap6";
-
-print "\nPerLDAP - Perl 5 Module for LDAP\n";
-print     "================================\n";
-$cflags = `pkg-config --cflags $ldappkgname`;
-chomp($cflags);
-print "Using CFLAGS = $cflags\n";
-print     "================================\n";
-$libs = `pkg-config --libs $ldappkgname`;
-chomp($libs);
-print "Using LIBS = $libs\n";
-
-#
-# Ok, let's do it!
-#
-print "\n######### before WriteMakefile #############\n";
-WriteMakefile(
-              'ABSTRACT'	=> 'Perl methods for LDAP C API calls',
-              'AUTHOR'		=> 'Leif Hedstrom <leif@ogre.com>',
-	      'NAME'		=> 'Mozilla::LDAP::API',
-	      'DISTNAME'	=> 'PerLDAP',
-
-	      'VERSION_FROM'	=> 'API.pm',
-	      'INC'		=> $cflags,
-	      'LIBS'		=> [$libs],
-	      'MYEXTLIB'	=> $my_extlib,
-	      'DEFINE'		=> "-DUSE_SSL -DPRLDAP",
-	      'XSOPT'		=> "-nolinenumbers",
-	      @extras
-);
-
-print "\n######### after WriteMakefile #############\n";
-
-#
-# Generate a "make HTML" target
-#
-sub MY::postamble
-{
-  '
-.SUFFIXES: .pm .html
-.PHONY: html
-
-.pm.html:
-	pod2html --netscape $< > $@
-
-html:	Entry.html Conn.html Utils.html API.html LDIF.html $(FIRST_MAKEFILE)
-	@rm -f pod2html-itemcache pod2html-dircache
-'
-}

mozilla/directory/perldap/PerLDAP.ppd

@@ -1,10 +0,0 @@
-<SOFTPKG NAME="PerLDAP" VERSION="1,5,0,0">
-    <TITLE>PerLDAP</TITLE>
-    <ABSTRACT>Perl methods for LDAP C API calls</ABSTRACT>
-    <AUTHOR>Leif Hedstrom &lt;leif@ogre.com&gt;</AUTHOR>
-    <IMPLEMENTATION>
-        <OS NAME="MSWin32" />
-        <ARCHITECTURE NAME="MSWin32-x86-multi-thread-5.8" />
-        <CODEBASE HREF="package.tar.gz" />
-    </IMPLEMENTATION>
-</SOFTPKG>

mozilla/directory/perldap/README

@@ -1,128 +0,0 @@
-#############################################################################
-#                                                                           #
-#            PerLDAP v1.5 - A Perl Developers' Kit for LDAP		    #
-#                                                                           #
-#############################################################################
-
-
-What is PerLDAP?
-================
-
-PerLDAP is a set of modules written in Perl and C that allow developers to
-leverage their existing Perl knowledge to easily access and manage LDAP-
-enabled directories.  PerLDAP makes it very easy to search, add, delete,
-and modify directory entries.  For example, Perl developers can easily
-build web applications to access information stored in a directory or
-create directory sync tools between directories and other services.
-
-PerLDAP is an open source development project, the result of a joint effort
-between Netscape, Leif Hedstrom, Clayton Donley and several other
-contributors. PerLDAP currently provides the basic functions to allow Perl
-users to access and manipulate directories easily.
-
-
-
-Compiling the PerLDAP Sources
-=============================
-
-The source to PerLDAP is available on the Mozilla site at:
-
-  http://www.mozilla.org/directory/
-
-You can either retrieve the .tar/zip file with the source distribution, or
-use CVS to checkout the module directly. The name of the CVS module is
-PerLDAP, and it checks out the directory
-
-  mozilla/directory/perldap
-
-Further instructions for using CVS and Mozilla is available at
-
-  http://www.mozilla.org/cvs.html
-
-and an FAQ for PerLDAP is at
-
-  http://www.mozilla.org/directory/faq/perldap-faq.html
-
-
-Instructions for building the source can be found in the INSTALL file
-in the source distribution. The latest stable release of PerLDAP is
-v1.5, not further development is planned at this time due to lack of time
-and resources.
-
-
-Getting Started
-===============
-
-Documentation for this module is in standard Perl 'pod' format.  HTML
-versions of this documentation can also be found on the Netscape DevEdge
-site at:  http://developer.netscape.com/tech/directory/.
-
-Additionally, many good examples can be found in the 'examples' directory.
-
-
-Modules and Examples Included
-=============================
-
-Mozilla::LDAP::API - Low level interface between Perl and the LDAP C API
-Mozilla::LDAP::Entry - Perl methods for manipulating entry objects
-Mozilla::LDAP::Conn - Perl methods for performing LDAP operations
-Mozilla::LDAP::LDIF - Perl methods for utilizing LDIF
-Mozilla::LDAP::Utils - Some convenient LDAP related utilities
-test_api/search.pl - Tests low level API search calls
-test_api/write.pl  - Tests low level API write calls
-test_api/api.pl - Tests ALL low level LDAPv2 calls
-examples/lfinger.pl - LDAP version of the regular Unix finger command.
-examples/qsearch.pl - Simple ldapsearch replacement.
-examples/monitor.pl - Retrieve status information from an LDAP server.
-examples/ldappasswd.pl - Change the LDAP password for a user.
-examples/rmentry.pl - Remove an entire entry from the database.
-examples/rename.pl - Rename (modRDN) an entry.
-examples/tabdump.pl - Dump LDAP information into a tab separated file.
-examples/psoftsync.pl - Synchronize LDAP with a PeopleSoft "dump" file.
-
-
-All examples support the "standard" LDAP command line options, which are
-
-        -h hostname     LDAP server name
-        -p port #       LDAP port, default is 389 (or 636 for SSL)
-        -b base DN      LDAP Base-DN
-        -D bind DN      LDAP bind DN (connect to server as this "user")
-        -w bind pswd    Password to bind to the server
-        -P certfile     Use SSL, with the publick keys from this file
-
-
-Note that the examples currently only support Simple Authentication
-(passwords), the Client Authentication features (using certificates) will
-be used in the next release. All examples also honors the environment
-variable LDAP_BASEDN, set it to your systems base DN, e.g.
-
-        % setenv LDAP_BASEDN 'dc=netscape,dc=com'
-
-or for Bourne shell
-
-        # LDAP_BASEDN='dc=netscape,dc=com'; export LDAP_BASEDN
-
-
-Reporting problems and bugs
-===========================
-
-Address all bug reports and comments to the Mozilla newsgroups at:
-
-   news://news.mozilla.org/netscape.public.mozilla.directory
-
-
-License/Copyright
-=================
-
-Portions by Netscape (c) Copyright 1998 Netscape Communications Corp, Inc.
-Portions by Leif Hedstrom (c) Copyright 2003 Leif Hedstrom
-Portions by Clayton Donley (c) Copyright 1998 Clayton Donley
-
-This code is available under the mozilla.org tri-license.
-See http://www.mozilla.org/MPL/ .
-
-Known Bugs
-==========
-
- - The Rebind operation on NT does NOT work properly when set to a Perl
-   function.  This is being investigated.

mozilla/directory/perldap/RELEASE

@@ -1,131 +0,0 @@
-#############################################################################
-#                                                                           #
-#                        PerLDAP Release Notes		                    #
-#                                                                           #
-#############################################################################
-
-VERSION 1.5.3 - Aug 2010
-========================
-This is an update release with the following goals:
-
-   - Allow PerLDAP to use the OpenLDAP client libraries behind the
-     scenes.
-   - Avoid using deprecated functions in the underlying LDAP client
-     library.
-
-VERSION 1.5.2 - Jul 2007
-========================
-
-Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=389731
-PerLDAP crashes when a bad URL is passed
-
-VERSION 1.5.1 - May 2007
-========================
-This version is the officially tri-licensed version.  All code
-is licensed under the MPL/GPL/LGPL tri-license, as all of the
-other Mozilla components.  All code was either granted permission
-by the copyright holder, or was rewritten in a clean-room
-implementation.
-
-VERSION 1.5 - Feb 2006
-======================
-
-This is an update release, with a few goals:
-
-   - Support for latest Mozilla and Sun C-SDK (v5.x)
-   - Now defaults to LDAP v3 protocol, but you can downgrade to v2 easily
-   - Fully support Perl 5.005 and later
-   - Added "hash" style prototypes to all class methods that takes more
-     than one argument
-
-Many, many thanks to Rich Megginson for taking charge of the (broken) build
-and configuration process.
-
-
-New functionality
------------------
-
-Conn.pm:
-	* setVersion() - Set the LDAP protocol version
-	* getVersion() - Get the current LDAP protocol in use
-	* installNSPR() - Make the connection use NSPR I/O etc.
-	* setNSPRTimeout() - Set the connection timeout, in ms
-
-API.xs:
-	* Added support for prldap_install_routines().
-
-
-
-VERSION 1.4 - AUGUST 18, 1999
-=============================
-
-This is primarily a bug fix release, however there are 5 new methods
-introduced as well.  Brief descriptions follow in this document.  To get
-full examples and a larger summary, see the PerLDAP Programmer's Guide.
-
-
-New Methods Added
------------------
-
-Entry.pm:
-	* getValues() - returns the array of values.
-	* move() - move one attribute to another, and delete the original.
-	* copy() - copy one attribute to another.
-	
-Conn.pm:
-	* browse() - makes it easy to browse an entry.
-	* compare() - compare an attribute value against a DN/entry
-		    without having to do the search.	
-
-
-Bug Fixes and other changes
----------------------------
-
-Entry.pm:
-	* addDNValue() - fixed wrong index for norm.
-	* matchValue() - fixed missing normalization in half of case statement. 
-	* setValue() - remove _delete_ flag if set, fix for saving state.
-	* STORE - fixed not ignoring the internal instance variables properly.
-	* Fixed numerous bugs for large attribute sets.
-	* Fixed bug 4368 ("exists vs. EXISTS").
-	* Fixed several loop bugs.
-	* Removed all _self_obj_  references, it's obsolete in this
-	  version.
-	* We support each() and keys() now on the Entry object, to loop
-	  through all attribute names (types).
-
-
-Conn.pm:
-	* close() - fixed memory leak.
-	* modifyRDN() - fixed problem where we weren't updating the
-			appropriate DN in the self object.
-	* Fixed bug 3342 (problems adding entries with binary data).
-	* getErrorCode()/getErrorString() - return LDAP_SUCCESS if no
-					    LDAP connection handle.
-	* add() - fixed code to handle hash array as docs indicate.
-	* update() - optimization for "replace" vs "add/delete", we try to
-		     use whatever LDAPMod is most efficient.
-
-LDIF.pm:
-
-	* Complete rewrite, by John Kristian <kristian@netscape.com>.
-
-API.xs:
-	* Fixed memory allocation problems, replacing all memory management
-	  routines. This solves all known issues with ActiveState Perl.
-	* More safety checks around calls to *_free().
-
-	
-Miscellaneous
--------------
-
-	* Various other optimizations on tests and such.
-	* Fixed most (all?) known memory leaks.
-	* Fixed a lot of problems with Makefile.PL, adding some new targets
-	  (like "make html"). Add a skeleton to "make test".
-	* Fixed numerous small bugs, as reported to Mozilla.
-	* We produce less warnings now, and try to "use strict" when
-	  appropriate.
-	* We have a new versioning scheme, conforming to standard
-	  Perl. We'll change this again when Perl's new versioning system
-	  is in place (allowing versions like 1.2.3).

mozilla/directory/perldap/Utils.pm

@@ -1,351 +0,0 @@
-#############################################################################
-# $Id: Utils.pm,v 1.14.2.6 2007-06-14 09:21:15 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Lots of Useful Little Utilities, for LDAP related operations.
-
-require 5.005;
-package Mozilla::LDAP::Utils;
-
-use Mozilla::LDAP::API 1.5 qw(:constant);
-use Mozilla::LDAP::Conn;
-use Exporter;
-
-use strict;
-use vars qw($VERSION @ISA %EXPORT_TAGS);
-
-@ISA = qw(Exporter);
-$VERSION = "1.5";
-
-%EXPORT_TAGS = (
-		all => [qw(normalizeDN
-			   isUrl
-			   printEntry
-			   printentry
-			   str2Scope
-			   askPassword
-			   ldapArgs
-			   userCredentials
-			   answer)]
-		);
-
-
-# Add Everything in %EXPORT_TAGS to @EXPORT_OK
-Exporter::export_ok_tags('all');
-
-
-#############################################################################
-# Normalize the DN string (first argument), and return the new, normalized,
-# string (DN). This is useful to make sure that two syntactically
-# identical DNs compare (eq) as the same string.
-#
-sub normalizeDN
-{
-  my ($dn) = @_;
-  my (@vals);
-
-  return "" unless (defined($dn) && ($dn ne ""));
-
-  @vals = Mozilla::LDAP::API::ldap_explode_dn(lc $dn, 0);
-
-  return join(",", @vals);
-}
-
-
-#############################################################################
-# Checks if a string is a properly formed LDAP URL.
-#
-sub isURL
-{
-  return ldap_is_ldap_url($_[0]);
-}
-
-
-#############################################################################
-# Print an entry, in LDIF format. This is sort of obsolete, we encourage
-# you to use the :;LDAP::LDIF class instead.
-#
-sub printEntry
-{
-  my $entry = $_[0];
-  my ($attr);
-
-  local $_;
-
-  print "dn: ", $entry->{"dn"},"\n";
-  foreach $attr (@{$entry->{"_oc_order_"}})
-    {
-      next if ($attr =~ /^_.+_$/);
-      next if $entry->{"_${attr}_deleted_"};
-      foreach (@{$entry->{$attr}})
-	{
-	  print "$attr: $_\n";
-	}
-    }
-
-  print "\n";
-}
-*printentry = \*printEntry;
-
-
-#############################################################################
-# Convert a "human" readable string to an LDAP scope value
-#
-sub str2Scope
-{
-  my ($str) = $_[0];
-
-  return $str if ($str =~ /^[0-9]+$/);
-
-  if ($str =~ /^sub/i)
-    {
-      return LDAP_SCOPE_SUBTREE;
-    }
-  elsif ($str =~ /^base/i)
-    {
-      return LDAP_SCOPE_BASE;
-    }
-  elsif ($str =~ /^one/i)
-    {
-      return LDAP_SCOPE_ONELEVEL;
-    }
-
-  # Default...
-  return LDAP_SCOPE_SUBTREE;
-}
-
-
-#############################################################################
-# Ask for a password, without displaying it on the TTY.
-#
-sub askPassword
-{
-  my ($prompt) = shift;
-  my ($promptstr) = shift;
-  my ($hasReadKey) = 0;
-
-  eval "use Term::ReadKey";
-  $hasReadKey=1 unless ($@);
-
-  if ($prompt) {
-      if ($promptstr) {
-          print $promptstr;
-      } else {
-          print "LDAP password: ";
-      }
-  }
-  if ($hasReadKey)
-    {
-      ReadMode(2);
-      chop($_ = ReadLine(0));
-      ReadMode(0);
-    }
-  else
-    {
-      system('/bin/stty -echo');
-      chop($_ = <STDIN>);
-      system('/bin/stty echo');
-    }
-  print "\n";
-
-  return $_;
-}
-
-
-#############################################################################
-# Handle some standard LDAP options, and construct a nice little structure
-# that we can use later on. We really should have some appropriate defaults,
-# perhaps from an Mozilla::LDAP::Config module.
-#
-sub ldapArgs
-{
-  my ($bind, $base) = @_;
-  my (%ld);
-
-  $main::opt_v = $main::opt_n if defined($main::opt_n);
-  $main::opt_p = LDAPS_PORT if (!defined($main::opt_p) &&
-				defined($main::opt_P) &&
-				($main::opt_P ne ""));
-
-  $ld{"host"} = $main::opt_h || "ldap";
-  $ld{"port"} = $main::opt_p || LDAP_PORT;
-  $ld{"base"} = $main::opt_b || $base || $ENV{'LDAP_BASEDN'};
-  $ld{"root"} = $ld{"base"};
-  $ld{"bind"} = $main::opt_D || $bind || "";
-  $ld{"pswd"} = $main::opt_w || "";
-  $ld{"cert"} = $main::opt_P || "";
-  $ld{"certname"} = $main::opt_N || "";
-  $ld{"keypwd"} = $main::opt_W || "";
-  $ld{"starttls"} = (defined($main::opt_Z) ? 1 : 0);
-  $ld{"scope"} = (defined($main::opt_s) ? $main::opt_s : LDAP_SCOPE_SUBTREE);
-  $ld{"vers"} = (defined($main::opt_V) && $main::opt_V eq "2") ?
-    LDAP_VERSION2 : LDAP_VERSION3;
-
-  if (($ld{"bind"} ne "") && ($ld{"pswd"} eq ""))
-    {
-      $ld{pswd} = askPassword(1);
-    }
-
-  if (($ld{"certname"} ne "") && ($ld{"keypwd"} eq ""))
-    {
-      $ld{keypwd} = askPassword(1, "Enter PIN for " . $ld{"certname"} . ": ");
-    }
-
-  return %ld;
-}
-
-
-#############################################################################
-# Try to find a user to bind as, and possibly ask for the password. Pass
-# a pointer to the hash array with LDAP parameters to this function.
-#
-sub userCredentials
-{
-  my ($ld) = @_;
-  my ($conn, $entry, $pswd, $search);
-
-  if ($ld->{"bind"} eq "")
-    {
-      my ($base) = $ld->{"base"} || $ld->{"root"};
-
-      $conn = Mozilla::LDAP::Conn->new($ld);
-      die "Couldn't connect to LDAP server " . $ld->{"host"} unless $conn;
-
-      $search = "(&(objectclass=inetOrgPerson)(uid=$ENV{USER}))";
-      $entry = $conn->search($base, "subtree", $search, 0, ("uid"));
-      return 0 if (!$entry || $conn->nextEntry());
-
-      $conn->close();
-      $ld->{"bind"} = $entry->getDN();
-    }
-
-  if ($ld->{"pswd"} eq "")
-    {
-      $ld->{"pswd"} = Mozilla::LDAP::Utils::askPassword(1);
-    }
-}
-
-
-#############################################################################
-# Ask a Y/N question, return "Y" or "N".
-#
-sub answer
-{
-  die "Default string must be Y or N."
-    unless (($_[0] eq "Y") || ($_[0] eq "N"));
-
-  chop($_ = <STDIN>);
-
-  return $_[0] if /^$/;
-  return "Y" if /^[yY]/;
-  return "N" if /^[nN]/;
-}
-
-
-#############################################################################
-# Mandatory TRUE return value.
-#
-1;
-
-
-#############################################################################
-# POD documentation...
-#
-__END__
-
-=head1 NAME
-
-  Mozilla::LDAP::Utils.pm - Collection of useful little utilities.
-
-=head1 SYNOPSIS
-
-  use Mozilla::LDAP::Utils;
-
-=head1 ABSTRACT
-
-
-=head1 DESCRIPTION
-
-
-=head1 OBJECT CLASS METHODS
-
-=over 13
-
-=item B<normalizeDN>
-
-This function will remove all extraneous white spaces in the DN, and also
-change all upper case characters to lower case. The only argument is the
-DN string to normalize, and the return value is the new, clean DN.
-
-=back
-
-=head1 EXAMPLES
-
-There are plenty of examples to look at, in the examples directory. We are
-adding more examples every day (almost).
-
-=head1 INSTALLATION
-
-Installing this package is part of the Makefile supplied in the
-package. See the installation procedures which are part of this package.
-
-=head1 AVAILABILITY
-
-This package can be retrieved from a number of places, including:
-
-    http://www.mozilla.org/directory/
-    Your local CPAN server
-
-=head1 CREDITS
-
-Most of this code was developed by Leif Hedstrom, Netscape Communications
-Corporation. 
-
-=head1 BUGS
-
-None. :)
-
-=head1 SEE ALSO
-
-L<Mozilla::LDAP::Conn>, L<Mozilla::LDAP::Entry>, L<Mozilla::LDAP::API>, and
-of course L<Perl>.
-
-=cut

mozilla/directory/perldap/examples/ChangeLog

@@ -1,68 +0,0 @@
-2005-01-04  Leif Hedstrom  <leif@ogre.com>
-
-	* All examples: Changed all calls to new to use the class method
-	directly.
-
-2004-10-13  Leif Hedstrom  <leif@ogre.com>
-
-	* modattr.pl: Added a -i option, for case insentive "adds" to an
-	attribute. This means that trying to add "foo" or "Foo" will only
-	generate one value for the server.
-
-	* monitor.pl: Added -V option (for version).
-
-	* psoftsync.pl: Added -V option (for version).
-
-	* changes2ldif.pl: Added -V option (for version).
-
-	* tabdump.pl: Added -V option (for version).
-
-	* rmentry.pl: Added -V option (for version).
-
-	* rename.pl: Added -V option (for version).
-
-	* rand_mods.pl: Added -V option (for version).
-
-	* modattr.pl: Added -V option (for version).
-
-	* lfinger.pl: Added -V option (for version).
-
-	* ldappasswd.pl: Added -V option (for version).
-
-	* qsearch.pl: Added -V option (for version).
-
-1999-06-30  Leif Hedstrom  <leif@netscape.com>
-
-	* rmentry.pl: Added support for "-p".
-
-1999-01-05  Leif Hedstrom  <leif@netscape.com>
-
-	* psoftsync.pl (delAttr): Fixed annoying bug where I missed to
-	"my" $entry.
-
-1999-01-04  Leif Hedstrom  <leif@netscape.com>
-
-	* modattr.pl: Bug fixes for handling bad cases better (like
-	missing attribute, adding empty values etc).
-
-1998-12-11  Leif Hedstrom  <leif@netscape.com>
-
-	* modattr.pl: Modified slightly to enable the rebind proc.
-
-1998-08-03  Leif Hedstrom  <leif@netscape.com>
-
-	* psoftsync.pl: New file, also merged in some modules from
-	LdapUtils.pm, to make sure this works. NOTE: This script currently
-	doesn't work, since all "modify" operations are horked.
-
-1998-07-30  Leif Hedstrom  <leif@netscape.com>
-
-	* tabdump.pl: Actually works!
-
-	* ldappasswd.pl: Cleaned out some code, and moved it over to the
-	::Utils module.
-
-1998-07-29  Leif Hedstrom  <leif@netscape.com>
-
-	* qsearch.pl: First working version.
-

mozilla/directory/perldap/examples/changes2ldif.pl

@@ -1,136 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: changes2ldif.pl,v 1.3.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP. 
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Search the changelog, and produce an LDIF file suitable for ldapmodify
-#    for instance. This should be merged into LDIF.pm eventually.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-use strict;
-no strict "vars";
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "changes2ldif";
-$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert -V ver [min [max]]";
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('nvb:h:D:p:s:w:P:V:'))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-$ld{root} = "cn=changelog" if (!defined($ld{root}) || $ld{root} eq "");
-
-
-#################################################################################
-# Instantiate an LDAP object, which also binds to the LDAP server.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-
-#################################################################################
-# Create the search filter.
-#
-$min = $ARGV[$[];
-$max = $ARGV[$[ + 1];
-
-if ($min ne "")
-{
-  if ($max ne "")
-    {
-      $search = "(&(changenumber>=$min)(changenumber<=$max))";
-    }
-  else
-    {
-      $search = "(changenumber>=$min)";
-    }
-}
-else
-{
-  $search = "(changenumber=*)";
-}
-  
-
-#################################################################################
-# Do the searches, and print the results.
-#
-$entry = $conn->search($ld{root}, "ONE", "$search");
-while ($entry)
-{
-  print "dn: ", $entry->{targetdn}[0], "\n";
-  $type = $entry->{changetype}[0];
-  print "changetype: $type\n";
-  if ($type =~ /modify/i)
-    {
-      # Should we filter out modifiersname and modifytimestamp ? We do chop
-      # off the trailing \0 though.
-      chop($entry->{changes}[0]);
-      print $entry->{changes}[0], "\n";
-    }
-  elsif ($type =~ /add/i)
-    {
-      print $entry->{changes}[0], "\n";
-    }
-  else
-    {
-      print "\n";
-    }
-
-  $entry = $conn->nextEntry;
-}
-
-
-#################################################################################
-# Close the connection.
-#
-$ld{conn}->close if $ld{conn};

mozilla/directory/perldap/examples/ldappasswd.pl

@@ -1,119 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: ldappasswd.pl,v 1.7.2.5 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    This is an LDAP version of the normal passwd/yppasswd command found
-#    on most Unix systems. Note that this will only use the {crypt}
-#    encryption/hash algorithm (at this point).
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-
-#############################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "ldappasswd";
-$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert -V ver search ...";
-
-@ATTRIBUTES = ("uid", "userpassword");
-
-
-#############################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('nvb:s:h:D:w:P:V:')) {
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
-
-
-#############################################################################
-# Ask for the new password, and confirm it's correct.
-#
-do
-{
-  print "New password: ";
-  $new = Mozilla::LDAP::Utils::askPassword();
-  print "New password (again): ";
-  $new2 = Mozilla::LDAP::Utils::askPassword();
-  print "Passwords didn't match, try again!\n\n" if ($new ne $new2);
-} until ($new eq $new2);
-print "\n";
-
-#############################################################################
-# Now do all the searches, one by one. If there are no search criteria, we
-# will change the password for the user running the script.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-foreach $search ($#ARGV >= $[ ? @ARGV : $ld{bind})
-{
-  $entry = $conn->search($search, "subtree", "ALL", 0, @ATTRIBUTES);
-  $entry = $conn->search($ld{root}, "subtree", $search, 0, @ATTRIBUTES)
-    unless $entry;
-  print "No such user: $search\n" unless $entry;
-
-  while ($entry)
-    {
-      $entry->{userpassword} = [$new];
-      print "Changing password for: $entry->{dn}\n" if $opt_v;
-
-      if (!$opt_n)
-	{
-	  $conn->update($entry);
-	  $conn->printError() if $conn->getErrorCode();
-	}
-
-      $entry = $conn->nextEntry();
-    }
-}
-
-
-#############################################################################
-# Close the connection.
-#
-$conn->close if $conn;

mozilla/directory/perldap/examples/lfinger.pl

@@ -1,146 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: lfinger.pl,v 1.11.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    "finger" version using LDAP information (using RFC 2307 objectclass).
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-
-#############################################################################
-# Constants, shouldn't have to edit these... The HIDE mechanism is a very
-# Netscape internal specific feature. We use this objectclass to mark some
-# entries to be "hidden", and some of our applications will honor this. With
-# more recent versions of the Directory Server this can be accomplished more
-# effectively with appropriate ACI/ACLs.
-#
-$APPNAM	= "lfinger";
-$USAGE	= "$APPNAM -m -b base -h host -D bind -w pswd -P cert -V ver user_info";
-
-@ATTRIBUTES = ("uid", "cn", "homedirectory", "loginshell", "pager",
-	       "telephonenumber", "facsimiletelephonenumber", "mobile");
-$HIDE = "(objectclass=nscphidethis)";
-
-
-
-#############################################################################
-# Print a "finger" entry.
-#
-sub printIt
-{
-  my($entry) = @_;
-
-  print "Login name: $entry->{uid}[0]";
-  print " " x (39 - 11 - length($entry->{uid}[0]));
-  print "In real life: $entry->{cn}[0]\n";
-  if ($entry->{homedirectory}[0] || $entry->{loginshell}[0])
-    {
-      print "Directory: $entry->{homedirectory}[0]";
-      print " " x (39 - 10 - length($entry->{homedirectory}[0]));
-      print "Shell: $entry->{loginshell}[0]\n";
-    }
-
-  if ($entry->{telephonenumber}[0] || $entry->{pager}[0])
-    {
-      print "Phone: $entry->{telephonenumber}[0]";
-      print " " x (39 - 6 - length($entry->{telephonenumber}[0]));
-      print "Pager: $entry->{pager}[0]\n";
-    }
-
-  if ($entry->{mobile}[0] || $entry->{facsimiletelephonenumber}[0])
-    {
-      print "Mobile: $entry->{mobile}[0]";
-      print " " x (39 - 7 - length($entry->{mobile}[0]));
-      print "Fax: $entry->{facsimiletelephonenumber}[0]\n";
-    }
-
-  print "\n";
-}
-
-
-#############################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('mb:h:D:p:w:P:V:') || !defined($ARGV[$[]))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-$user=$ARGV[$[];
-
-
-#############################################################################
-# Instantiate an LDAP object, which also binds to the LDAP server.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-
-#############################################################################
-# Ok, lets generate the filter, and do the search!
-#
-if ($opt_m)
-{
-  $search = "(&(uid=$user)(!$HIDE))";
-}
-else
-{
-  $search = "(&(|(cn=*$user*)(uid=*$user*)(telephonenumber=*$user*))(!$HIDE))";
-}
-
-$entry = $conn->search($ld{root}, "subtree", $search, 0, @ATTRIBUTES);
-$conn->printError() if $conn->getErrorCode();
-
-while($entry)
-{
-  printIt($entry);
-  $entry = $conn->nextEntry();
-}
-
-
-#############################################################################
-# Close the connection.
-#
-$conn->close if $conn;

mozilla/directory/perldap/examples/modattr.pl

@@ -1,351 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: modattr.pl,v 1.9.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    This script can be used to do a number of different modification
-#    operations on a script. Like adding/deleting values, or entire
-#    attributes.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-use strict;
-no strict "vars";
-
-
-#############################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "modattr";
-$USAGE	= "$APPNAM [-dnvW] -b base -h host -D bind -w pswd -P cert -V ver attr=value filter";
-
-
-#############################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('adnvWb:h:D:p:s:w:P:V:i:'))
-{
-  print "usage: $APPNAM $USAGE\n";
-  exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
-$nocase = (defined($opt_i) && $opt_i) ? 1 : 0;
-
-
-#############################################################################
-# Let's process the changes requested, and commit them unless the "-n"
-# option was given.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-$conn->setDefaultRebindProc($ld{bind}, $ld{pswd});
-
-($change, $search) = @ARGV;
-if (($change eq "") || ($search eq ""))
-{
-  print "usage: $APPNAM $USAGE\n";
-  exit;
-}
-($attr, $value) = split(/=/, $change, 2);
-
-$entry = $conn->search($ld{root}, $ld{scope}, $search);
-while ($entry)
-{
-  $changed = 0;
-
-  if ($opt_d)
-    {
-      if (defined $entry->{$attr})
-	{
-	  if ($value)
-	    {
-	      $changed = $entry->removeValue($attr, $value);
-	      if ($changed && $opt_v)
-		{
-		  print "Removed value from ", $entry->getDN(), "\n" if $opt_v;
-		}
-	    }
-	  else
-	    {
-	      delete $entry->{$attr};
-	      print "Deleted attribute $attr for ", $entry->getDN(), "\n" if $opt_v;
-	      $changed = 1;
-	    }
-	}
-      else
-	{
-	  print "No attribute values for: $attr\n";
-	}
-    }
-  else
-    {
-      if (!defined($value) || !$value)
-	{
-	  print "No value provided for the attribute $attr\n";
-	}
-      elsif ($opt_a)
-	{
-	  $changed = $entry->addValue($attr, $value, 0, 0, $nocase);
-	  if ($changed && $opt_v)
-	    {
-	      print "Added attribute to ", $entry->getDN(), "\n" if $opt_v;
-	    }
-	}
-      else
-	{
-	  $entry->setValue($attr, $value);
-	  $changed = 1;
-	  print "Set attribute for ", $entry->getDN(), "\n" if $opt_v;
-	}
-    }
-  if ($changed && ! $opt_n)
-    {
-      if (!$conn->update($entry)) {
-        $conn->printError();
-      }
-    }
-
-  $entry = $conn->nextEntry();
-}
-
-
-#############################################################################
-# Close the connection.
-#
-$conn->close if $conn;
-
-
-#############################################################################
-# POD documentation...
-#
-__END__
-
-=head1 NAME
-
-  modattr - Modify an attribute for one or more LDAP entries
-
-=head1 SYNOPSIS
-
-  modattr [-adnvW] -b base -h host -D bind DN -w pwd -P cert attr=value filter
-
-=head1 ABSTRACT
-
-This command line utility can be used to modify one attribute for one or
-more LDAP entries. As simple as this sounds, this turns out to be a very
-common operation. For instance, let's say you want to change "mailHost"
-for all users on a machine named I<dredd>, to be I<judge>. With this
-script all you have to do is
-
-    modattr mailHost=judge '(mailHost=dredd)'
-
-=head1 DESCRIPTION
-
-There are four primary operations that can be made with this utility:
-
-=over 4
-
-=item *
-
-Set an attribute to a (single) specified value.
-
-=item *
-
-Add a value to an attribute (for multi-value attributes).
-
-=item *
-
-Delete a value from an attribute. If it's the last value (or if it's a
-single value), this will remove the entire attribute.
-
-=item *
-
-Delete an entire attribute, even if it has multiple values.
-
-=back
-
-The first three requires an option of the form B<attr=value>, while the
-last one only takes the name of the attribute as the option. The last
-argument is always an LDAP search filter, specifying which entries the
-operation should be applied to.
-
-=head1 OPTIONS
-
-All but the first two command line options for this tool are standard LDAP
-options, to set parameters for the LDAP connection. The two new options
-are I<-a> and I<-d> to add and remove attribute values.
-
-Without either of these two options specified (they are both optional),
-the default action is to set the attribute to the specified value. That
-will effectively remove any existing values for this attribute.
-
-=over 12
-
-=item -a
-
-Specify that the operation is an I<add>, to add a value to the
-attribute. If there is no existing value for this attribute, we'll create
-a new attribute, otherwise we add the new value if it's not already there.
-
-=item -d
-
-Delete the attribute value, or the entire attribute if there's no value
-specified. As you can see this option has two forms, and it's function
-depends on the last arguments. Be careful here, if you forget to specify
-the value to delete, you will remove all of them.
-
-=item -h <host>
-
-Name of the LDAP server to connect to.
-
-=item -p <port>
-
-TCP port for the LDAP connection.
-
-=item -b <DN>
-
-Base DN for the search
-
-=item -D <bind>
-
-User (DN) to bind as. We support a few convenience shortcuts here, like
-I<root>, I<user> and I<repl>.
-
-=item -w <passwd>
-
-This specifies the password to use when connecting to the LDAP
-server. This is strongly discouraged, and without this option the script
-will ask for the password interactively.
-
-=item -s <scope>
-
-Search scope, default is I<sub>, the other possible values are I<base> and
-I<one>. You can also specify the numeric scopes, I<0>, I<1> or I<2>.
-
-=item -P
-
-Use SSL for the LDAP connection, using the specified cert.db file for
-certificate information.
-
-=item -n
-
-Don't do anything, only show the changes that would have been made. This
-is very convenient, and can save you from embarrassing mistakes.
-
-=item -v
-
-Verbose output.
-
-=back
-
-The last two arguments are special for this script. The first
-argument specifies the attribute (and possibly the value) to operate on,
-and the last argument is a properly formed LDAP search filter.
-
-=head1 EXAMPLES
-
-We'll give one example for each of the four operations this script can
-currently handle. Since the script itself is quite flexible, you'll
-probably find you can use this script for a lot of other applications, or
-call it from other scripts. Note that we don't specify any LDAP specific
-options here, we assume you have configured your defaults properly.
-
-To set the I<description> attribute for user "leif", you would do
-
-    modattr 'description=Company Swede' '(uid=leif)'
-
-The examples shows how to use this command without either of the I<-a> or
-the I<-d> argument. To add an e-mail alias (alternate address) to the same
-user, you would do
-
-    modattr -a 'mailAlternateAddress=theSwede@netscape.com' '(uid=leif)'
-
-To remove an object class from all entries which uses it, you could do
-
-    modattr -d 'objectclass=dummyClass' '(objectclass=dummyClass)'
-
-This example is not great, since unless you've assured that no entries
-uses any of the attributes in this class, you'll get schema
-violations. But don't despair, you can use this tool to clean up all
-entries first! To completely remove all usage of an attribute named
-I<dummyAttr>, you'd simply do
-
-    modattr -d dummyAttr '(dummyAttr=*)'
-
-This shows the final format of this command, notice how we don't specify a
-value, to assure that the entire attribute is removed. This is potentially
-dangerous, so again be careful.
-
-=head1 INSTALLATION
-
-In order to use this script, you'll need Perl version 5.004 or later, the
-LDAP SDK, and also the LDAP Perl module (aka PerLDAP). Once you've installed
-these packages, just copy this file to where you keep your admin binaries,
-e.g. /usr/local/bin.
-
-In order to get good performance, you should make sure you have indexes on
-the attributes you typically use with this script. Our experience has been
-that in most cases the standard indexes in the Directory Server are
-sufficient, e.g. I<CN>, I<UID> and I<MAIL>.
-
-=head1 AVAILABILITY
-
-This package can be retrieved from a number of places, including:
-
-    http://www.mozilla.org/directory/
-    Your local CPAN server
-
-=head1 CREDITS
-
-This little tool was developed internally at Netscape, by Leif Hedstrom.
-
-=head1 BUGS
-
-None, of course...
-
-=head1 SEE ALSO
-
-L<Mozilla::LDAP::API> and L<Perl>
-
-=cut

mozilla/directory/perldap/examples/monitor.pl

@@ -1,85 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: monitor.pl,v 1.3.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP. 
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Ask the directory server for it's monitor entry, to see some
-#    performance and usage stats.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "monitor";
-$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert -V ver";
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('b:h:D:p:w:P:V:'))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs("", "cn=monitor");
-
-
-#################################################################################
-# Instantiate an LDAP object, which also binds to the LDAP server, and then
-# do the simple search.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-$entry = $conn->search($ld{root}, "base", "objectclass=*");
-Mozilla::LDAP::Utils::printEntry($entry)
-  if ($entry);
-
-
-#################################################################################
-# Close the connection.
-#
-$conn->close if $conn;

mozilla/directory/perldap/examples/psoftsync.pl

@@ -1,633 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: psoftsync.pl,v 1.6.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP. 
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Synchronise some LDAP info with a PeopleSoft "dump". This "dump" file
-#    is a "tab" separated file, as generated by an SQL utility on the
-#    Oracle server.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-
-#############################################################################
-# Local configurations, check these out . Note that SYNCS and ORDER has to
-# have the same fields, this is because the hash array doesn't preserve
-# the order of it's entries... :-( The "codes" are bit fields, where the
-# three LSB are used as
-#
-#	 1  Force the update, even if attribute is empty (i.e. delete it)
-#	 2  The attribute is the base for a DN (e.g. "manager").
-#	 4  The attribute should be deleted if the user is not in PeopleSoft.
-#	 8  Don't warn if the attribute is missing in the Psoft file (-W option).
-#	16  Always delete this attribute in the PeopleSoft entry.
-#	32  Delete this attribute if the account has "expired".
-#
-%SYNCS = (
-	  "nscpharold" => 1 + 4,
-	  "uid" => 0,
-	  "" => 0,
-	  "" => 0,
-	  "employeenumber" => 1 + 4 + 32,
-	  "departmentnumber" => 1 + 4,
-	  "" => 0,
-	  "" => 0,
-	  "" => 0,
-	  "manager" => 1 + 2,
-	  "title" => 1 + 4 + 16 + 32,
-	  "ou" =>  1 + 4 + 32,
-	  "businesscategory" => 1 + 4 + 32,
-	  "employeetype" => 0,
-	  "nscppersonexpdate" => 1 + 8
-	  );
-
-@ORDER = (
-	  "nscpharold",
-	  "uid",
-	  "",
-	  "",
-	  "employeenumber",
-	  "departmentnumber",
-	  "",
-	  "",
-	  "",
-	  "manager",
-	  "title",
-	  "ou",
-	  "businesscategory",
-	  "employeetype",
-	  "nscppersonexpdate"
-	  );
-
-# This is used for mapping the employeeType attribute into a readable format.
-%EMPCODES = (
-	     "A" => "Applicant",
-	     "C" => "Contractor",
-	     "E" => "Employee",
-	     "O" => "OEM Partner",
-	     "T" => "Interim",
-	     "V" => "Vendor"
-	     );
-
-# Expiration policy for other attributes, the EXPDELAY is a convenience
-# default setting.
-$EXPDELAY = 24 * 7;
-%EXPIRES = (
-	    "carlicense"		=> $EXPDELAY,
-	    "mailautoreplymode"		=> $EXPDELAY,
-	    "mailautoreplytext"		=> $EXPDELAY,
-	    "mailforwardingaddress"	=> $EXPDELAY,
-	    "facsimiletelephonenumber"	=> $EXPDELAY
-	    );
-	    
-
-$NOTYPE = "Unknown";
-$DELIMITER = "%%";
-$SENDMAIL = "/usr/lib/sendmail";
-
-$SEARCH = "(&(uid=*)(!(objectclass=pseudoAccount)))";
-$MAILTO = "leif\@netscape.com";
-
-#$LDAP_DEBUG = 1;
-
-
-#############################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "psoftsync";
-$USAGE	= "$APPNAM [-nvW] -b base -h host -D bind -w passwd -P cert -V ver PS_file";
-
-@ATTRIBUTES = uniq(@ORDER);
-push(@ATTRIBUTES, "objectclass");
-
-$TODAY = `/usr/bin/date '+%Y%m%d'`;
-chop($TODAY);
-
-
-#############################################################################
-# Print an error for the PeopleSoft data. Note that we use the "__XXX__" fields
-# here, to avoid the problem when an attribute is "expired" or modified.
-#
-sub psoftError
-{
-  my ($str, $entry) = @_;
-
-  print "Error: $str: ";
-  print $entry->key(), " (";
-  print $entry->{__employeenumber__}, ", ";
-  print $entry->{__employeetype__}, ", ";
-  print $entry->{__departmentnumber__}, ")\n";
-}
-
-
-#############################################################################
-# Read in a PeopleSoft file, and create all the entries.
-#
-sub readDump
-{
-  my ($file) = @_;
-  my (@info, %entries);
-  my $val;
-
-  if (!open(PSOFT, $file))
-    {
-      print "Error: Can't read file $file\n";
-
-      exit(1);
-    }
-
-  while (<PSOFT>)
-    {
-      next unless /$DELIMITER/;
-
-      @info = split(/\s*%%\s*/);
-      $entry = PsoftEntry->new($info[$[]);
-      foreach $attr (@ORDER)
-	{
-	  $val = shift(@info);
-	  next if ($attr eq "");
-
-	  $entry->add($attr, $val, $SYNCS{$attr});
-	}
-      #
-      # Perhaps we should do some sanity checks here on the PeopleSoft data?
-      #
-
-      # Clean up some data if the user has expired ("best before...")
-      if ($entry->expired($entry->{nscppersonexpdate}))
-	{
-	  foreach $attr (@ORDER)
-	    {
-	      next unless $attr;
-
-	      delete($entry->{$attr}) if ($SYNCS{$attr} & 32);
-	    }
-	}
-
-      if ($entry->{uid})
-	{
-	  $entries{$entry->{uid}} = $entry;
-	}
-      elsif ($opt_W)
-	{
-	  psoftError("No UID", $entry);
-	}
-    }
-  close(PSOFT);
-
-  return %entries;
-}
-
-
-#############################################################################
-# Make a list "uniq", just like the Unix command.
-#
-sub uniq {				# uniq(elements[])
-  my %tmp;
-   
-  grep($tmp{$_}++, @_);
-  return sort(keys(%tmp));
-}
-
-
-#############################################################################
-# Delete an attribute from an entry.
-#
-sub delAttr {				# delAttr(ENTRY, ATTR)
-  my ($entry, $attr) = @_;
-
-  if (defined($entry->{$attr}))
-    {
-      $out->write("Deleted $attr for user: $entry->{uid}[0]") if $opt_v;
-      delete($entry->{$attr});
-
-      return 1;
-    }
-
-  return 0;
-}
-
-
-#############################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('nvMWb:h:D:p:s:w:P:V:'))
-{
-  print "usage: $APPNAM $USAGE\n";
-  exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
-
-$out = Mail->new();
-if ($opt_M)
-{
-  $out->set("to", $MAILTO);
-  $out->set("subject", "Hoth: PeopleSoft synchronization report");
-}
-else
-{
-  $out->echo();
-  $out->nomail();
-}
-
-
-#############################################################################
-# Read in all the PeopleSoft entries, and then instantiate an LDAP object,
-# which also binds to the LDAP server.
-#
-%psoft = readDump(@ARGV[$[]);
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-
-#############################################################################
-# Now process all the users, one by one.
-#
-$entry = $conn->search($ld{root}, "subtree", $SEARCH, 0, @ATTRIBUTES);
-
-while ($entry)
-{
-  $uid = $entry->{"uid"}[0];
-  $changed = 0;
-
-  $psent = $psoft{$uid};
-  if (!$psent)
-    {
-      print "Error: LDAP user $uid: No entry in PeopleSoft\n" if $opt_W;
-      foreach $attr (@ORDER)
-	{
-	  next unless $attr;
-	  $changed += delAttr($entry, $attr) if ($SYNCS{$attr} & 4);
-	}
-      if ($entry->{employeetype}[0] ne "$NOTYPE")
-	{
-	  $entry->{employeetype} = ["$NOTYPE"];
-	  $changed = 1;
-	  $out->write("Set employeeType to $NOTYPE for user: $uid") if $opt_v;
-	}
-	  
-    }
-  else
-    {
-      $psent->handled(1);
-      foreach $attr (@ORDER)
-	{
-	  next unless $attr;
-
-	  if (!defined($psent->{$attr}) || ($psent->{$attr} eq ""))
-	    {
-	      $changed += delAttr($entry, $attr) if ($SYNCS{$attr} & 1);
-	    }
-	  elsif ($entry->{$attr}[0] ne $psent->{$attr})
-	    {
-	      $entry->{$attr} = [$psent->{$attr}];
-	      $changed = 1;
-	      $out->write("Set $attr to $psent->{$attr} for user: $uid") if $opt_v;
-	    }
-	}
-      # Now handle the Expire date special case...
-      if ($psent->expired() ne "")
-	{
-	  if ($entry->addValue("objectclass", "nscphidethis"))
-	    {
-	      $changed = 1;
-	      $out->write("Expiring the user: $uid") if $opt_v;
-	    }
-
-	  # Expire other attributes, IFF the expire is over a certain
-	  # treshhold (e.g. a week).
-	}
-      elsif ($entry->removeValue("objectclass", "nscphidethis"))
-	{
-	  $changed = 1;
-	  $out->write("Enabling the user: $uid") if $opt_v;
-	}
-    }
-
-  $conn->update($entry) if ($changed && ! $opt_n);
-  $entry = $conn->nextEntry();
-}
-
-
-#############################################################################
-# Close the LDAP connection.
-#
-$conn->close if $conn;
-
-
-#############################################################################
-# Post process, figure out which PSoft entries have no entry in LDAP.
-#
-if ($opt_W)
-{
-  foreach (keys(%psoft))
-    {
-      $ent=$psoft{$_};
-      
-      psoftError("No LDAP entry", $ent) unless $ent->handled();
-    }
-}
-
-
-
-#############################################################################
-# Package to an entry from the PeopleSoft database.
-#
-package PsoftEntry;
-
-
-#############################################################################
-# Creator.
-#
-sub new
-{
-  my ($class, $key) = @_;
-  my $self = {};
-  
-  bless $self, ref $class || $class;
-  $self->{__key__} = $key;
-
-  return $self;
-}
-
-
-#############################################################################
-# Add an attribute/field to the entry.
-#
-sub add
-{
-  my ($self, $attr, $val, $lev) = @_;
-
-  return if ($lev & 16);
-
-  $attr = lc $attr;
-  if ($attr eq "employeetype")
-    {
-      if (defined($main::EMPCODES{$val}))
-	{
-	  $self->{$attr} = $main::EMPCODES{$val};
-	}
-      else
-	{
-	  $self->{$attr} = $main::NOTYPE;
-	}
-      $self->{__employeetype__} = $val;
-    }
-  elsif (!defined($val) || ($val eq ""))
-    {
-      main::psoftError("No attribute $attr", $self)
-	if ($main::opt_W && ($lev & 1) && !($lev & 8));
-    }
-  else
-    {
-      $self->{$attr} = ($lev & 2) ? "uid=$val,$main::ld{root}" : $val;
-      $self->{"__${attr}__"} = $val;
-    }
-}
-
-
-#############################################################################
-# Return the value for an attribute/field.
-#
-sub get
-{
-  my ($self, $attr) = @_;
-
-  return $self->{$attr};
-}
-
-
-#############################################################################
-# Mark the entry as "expired". If there is no "date" argument, we'll return
-# the current entries expire status.
-#
-sub expired
-{
-  my ($self, $date) = @_;
-
-  if ($date)
-    {
-      # Only expire entries with reasonable expire dates...
-      if (length($date) != 8)
-	{
-	  main::psoftError("Bad expire date", $self) if $main::opt_W;
-
-	  return 0;
-	}
-
-      if ($date lt $main::TODAY)
-	{
-	  $self->{employeetype} = "$main::NOTYPE";
-	  $self->{__expired__} = 1;
-
-	  return 1;
-	}
-    }
-
-  return $self->{__expired__};
-}
-
-
-#############################################################################
-# Mark the entry as "handled", i.e. it exists in LDAP.
-#
-sub handled
-{
-  my ($self, $flag) = @_;
-
-  $self->{__handled__} = 1 if $flag;
-
-  return $self->{__handled__};
-}
-
-
-#############################################################################
-# Return the "key" of this entry, typically the name field.
-#
-sub key
-{
-  my ($self) = @_;
-
-  return $self->{__key__};
-}
-
-
-#################################################################################
-# This sub-package will send mail to some recipients, IFF there is anything to
-# send, or your force it to send. Note that the Subject doesn't qualify it to
-# send a message (force it to send if you have to).
-#
-package Mail;
-
-
-#################################################################################
-# The constructor, which optionally takes the TO, FROM and SUBJECT.
-#
-sub new
-{
-  my ($class, $to, $from, $subject) = @_;
-  my $self = {};
-
-  bless $self, ref $class || $class;
-
-  $self->{to} = $to || "root";
-  $self->{from} = $from || "ldap";
-  $self->{subject} = $subject || "Output from LDAP script\n";
-  @{$self->{message}} = ();
-  $self->{send} = 0;
-  $self->{nomail} = 0;
-  $self->{echo} = 0;
-
-  return $self;
-}
-
-
-#################################################################################
-# Destructor, which will also send the message, if appropriate.
-#
-sub DESTROY
-{
-  my ($self) = @_;
-
-  if ($self->{send} && !$self->{nomail})
-    {
-      $self->send();
-      $self->{send} = 0;
-    }
-}
-
-
-#################################################################################
-# Set a field for this entry, e.g. From:, To: etc.
-#
-sub set
-{
-  my ($self, $field, $string) = @_;
-
-  if ($field && $string)
-    {
-      $field = lc $field;
-      $self->{$field} = $string;
-    }
-}
-
-
-#################################################################################
-# Add a line to the message, the argument is the string.
-#
-sub write
-{
-  my ($self, $string) = @_;
-
-  if ($string ne "")
-    {
-      push(@{$self->{message}}, $string);
-      print "$string\n" if $self->{echo};
-
-      $self->{send}++;
-    }
-}
-
-
-#################################################################################
-# Force the object to send the message, no matter if there's anything in the
-# body or not.
-#
-sub force
-{
-  my ($self) = @_;
-
-  $self->{send} = 1;
-  $self->{nomail} = 0;
-}
-
-
-#################################################################################
-# Don't send the mail, this is the oppositte to "force...
-#
-sub nomail
-{
-  my ($self) = @_;
-
-  $self->{send} = 0;
-  $self->{nomail} = 1;
-}
-
-
-#################################################################################
-# Enable echo-mode, where we will also print everything to STDOUT.
-#
-sub echo
-{
-  my ($self) = @_;
-
-  $self->{echo} = 1;
-}
-
-
-#################################################################################
-# Actually send the message. This is automatically done by the DESTROY method,
-# but we can force it to do it this way.
-#
-sub send
-{
-  my ($self) = @_;
-
-  if ($self->{send} && !$self->{nomail})
-    {
-      open(MAILER, "|$main::SENDMAIL -t");
-      print MAILER "From: $self->{from}\n";
-      print MAILER "To: $self->{to}\n";
-      print MAILER "Subject: $self->{subject}\n\n";
-
-      foreach (@{$self->{message}})
-	{
-	  print MAILER "$_\n";
-	}
-      print MAILER ".\n";
-
-      close(MAILER);
-      $self->{send} = 0;
-    }
-}

mozilla/directory/perldap/examples/qsearch.pl

@@ -1,115 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: qsearch.pl,v 1.9.2.5 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP. 
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Quick Search, like ldapsearch, but in Perl. Look how simple it is.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-use strict;
-no strict "vars";
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "qsearch";
-$USAGE	= "$APPNAM -b base -h host -D bind -w pswd -P cert -V ver filter [attr...]";
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('b:h:D:p:s:w:P:V:'))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-
-
-#################################################################################
-# Now do all the searches, one by one.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-foreach (@ARGV)
-{
-  if (/\=/)
-    {
-      push(@srch, $_);
-    }
-  else
-    {
-      push(@attr, $_);
-    }
-}
-
-foreach $search (@srch)
-{
-  if ($#attr >= $[)
-    {
-      $entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @attr);
-    }
-  else
-    {
-      $entry = $conn->search($ld{root}, $ld{scope}, "$search");
-    }
-
-  print "Searched for `$search':\n\n";
-  while ($entry)
-    {
-      $entry->printLDIF();
-      $entry = $conn->nextEntry;
-    }
-  $conn->printError() if $conn->getErrorCode();
-  print "\n";
-}
-
-
-#################################################################################
-# Close the connection.
-#
-$conn->close if $conn;

mozilla/directory/perldap/examples/rand_mods.pl

@@ -1,158 +0,0 @@
-#!/usr/bin/perl5
-#################################################################################
-# $Id: rand_mods.pl,v 1.3.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# SYNOPSIS:
-#    Modify an attribute for one or more entries, or possibly delete it.
-#
-# USAGE:
-#    rand_mods [-adnvW] -b base -h host -D bind DN -w pwd -P cert filter loops
-#		attribute ...
-
-#################################################################################
-# Modules we need. Note that we depend heavily on the Ldapp module, 
-# which needs to be built from the C code. It also requires an LDAP SDK.
-#
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-use Carp;
-
-use strict;
-no strict "vars";
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "rand_mods";
-$USAGE	= "$APPNAM [-dnvW] -b base -h host -D bind -w pswd -V ver filter loops attr ...";
-$AUTHOR	= "Leif Hedstrom <leif\@netscape.com>";
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('adnvWb:h:D:p:s:w:P:V:'))
-{
-  print "usage: $APPNAM $USAGE\n";
-  exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-
-
-#################################################################################
-# Instantiate an LDAP object, which also binds to the LDAP server.
-#
-if (!getopts('b:h:D:p:s:w:P:'))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-croak "Could't connect to LDAP server $ld{host}" unless $conn;
-
-
-#################################################################################
-# Parse some extra argumens
-#
-my $srch, $loop;
-my (@attrs) = ("givenName", "sn");
-
-if (! ($srch = shift(@ARGV)))
-{
-  print "Usage: $APPNAME $USAGE\n";
-  exit;
-}
-$srch = "(&(!(objectclass=nscpHideThis))(uid=*))" if ($srch eq "");
-
-if (! ($loops = shift(@ARGV)))
-{
-  print "Usage: $APPNAME $USAGE\n";
-  exit;
-}
-
-@attrs = @ARGV if ($#ARGV > $[);
-$num_attrs = $#attrs;
-
-
-#################################################################################
-# Find all the argument
-#
-my $num = 0;
-$entry = $conn->search($ld{root}, $ld{scope}, $srch, 0, ("0.0"));
-while ($entry)
-{
-  push(@users, $entry->getDN());
-  $num++;
-  $entry = $conn->nextEntry();
-}
-
-print "Found $num users, randomizing changes now...\n";
-
-srand(time ^ $$);
-
-my $tmp, $tmp2, $dn, $loop2;
-while ($loops--)
-{
-  $dn = $users[rand($num)];
-
-  print "$loops loops left...\n" if (($loops % 100) == 0);
-  $entry = $conn->browse($dn, @attrs);
-
-  if ($entry)
-    {
-      $loop2 = $num_attrs + 1;
-      while ($loop2--)
-	{
-	  $tmp = $entry->{$attrs[$loop2]}[0];
-	  $tmp2 = rand($num_attrs);
-
-	  $entry->{$attrs[$loop2]} = [ $entry->{$attrs[$tmp2]}[0] ];
-	  $entry->{$attrs[$tmp2]} = [ $tmp] ;
-
-	  $entry->printLDIF();
-	}
-
-      $conn->update($entry);
-    }
-}

mozilla/directory/perldap/examples/rename.pl

@@ -1,116 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: rename.pl,v 1.5.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP. 
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Rename an LDAP entry, changing it's DN. Note that currently this only
-#    works with RDNs.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-
-#############################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "rename";
-$USAGE	= "$APPNAM [-nvI] -b base -h host -D bind -w pswd -P cert -V ver filter new_rdn";
-
-
-#############################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('nvIb:h:D:w:P:V:'))
-{
-  print "usage: $APPNAM $USAGE\n";
-  exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
-
-($search, $rdn) = @ARGV;
-if (($search eq "") || ($rdn eq ""))
-{
-  print "usage: $APPNAM $USAGE\n";
-  exit;
-}
-
-
-#############################################################################
-# Instantiate an LDAP object, which also binds to the LDAP server.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-$key = "Y" if $opt_I;
-$entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @ATTRIBUTES);
-$conn->printError() if $conn->getErrorCode();
-
-if (! $entry || $conn->nextEntry())
-{
-  print "Error: The search did not return exactly one match, abort!\n";
-  exit;
-}
-
-if (! $opt_I)
-{
-  print "Rename ", $entry->getDN(), " with $rdn [N]? ";
-  $key = Mozilla::LDAP::Utils::answer("N") unless $opt_I;
-}
-
-if ($key eq "Y")
-{
-  # Note: I have to explicitly specify the original DN below, since the call
-  # to nextEntry() above blows the DN away from the ::Conn object.
-  if (! $opt_n)
-    {
-      $conn->modifyRDN($rdn, $entry->getDN());
-      $conn->printError() if $conn->getErrorCode();
-    }
-  print "Renamed $entry->{dn}\n" if $opt_v;
-}
-
-
-#################################################################################
-# Close the connection.
-#
-$conn->close if $conn;

mozilla/directory/perldap/examples/rmentry.pl

@@ -1,113 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: rmentry.pl,v 1.6.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Remove one or several LDAP objects. By default this tool is
-#    interactive, which can be disabled with the "-I" option (but
-#    please be careful...).
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "rmentry";
-$USAGE	= "$APPNAM [-nvI] -b base -h host -p port -D bind -w pswd" .
-          "-P cert -V ver filter ...";
-
-@ATTRIBUTES = ("uid");
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('nvIb:h:p:D:w:P:V:'))
-{
-  print "usage: $APPNAM $USAGE\n";
-  exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
-
-
-#################################################################################
-# Do the search, and process all the entries.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-$key = "Y" if $opt_I;
-foreach $search (@ARGV)
-{
-  $entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @ATTRIBUTES);
-  $conn->printError() if $conn->getErrorCode();
-
-  while ($entry)
-    {
-      if (! $opt_I)
-	{
-	  print "Delete $entry->{dn} [N]? ";
-	  $key = Mozilla::LDAP::Utils::answer("N") unless $opt_I;
-	}
-
-      if ($key eq "Y")
-	{
-	  if (! $opt_n)
-	    {
-	      $conn->delete($entry);
-	      $conn->printError() if $conn->getErrorCode();
-	    }
-	  print "Deleted $entry->{dn}\n" if $opt_v;
-	}
-
-      $entry = $conn->nextEntry();
-    }
-}
-
-
-#################################################################################
-# Close the connection.
-#
-$conn->close if $conn;

mozilla/directory/perldap/examples/tabdump.pl

@@ -1,100 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: tabdump.pl,v 1.4.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Generate a TAB separate "dump" of entries matching the search criteria,
-#    using the list of attributes specified.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "tabdump";
-$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert -V ver -t <sep> attr1,attr2,.. srch";
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('nvb:h:D:p:s:w:P:t:V:'))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs();
-$separator = (defined($opt_t) ? $opt_t : "\t");
-
-$attributes = $ARGV[$[];
-$search = $ARGV[$[ + 1];
-die "Need to specify a list of attributes and the search filter.\n"
-  unless ($attributes && $search);
-
-
-#################################################################################
-# Do the searches, and produce the output.
-#
-$conn = Mozilla::LDAP::Conn->new(\%ld);
-die "Could't connect to LDAP server $ld{host}" unless $conn;
-
-@attr = split(/,/, $attributes);
-$entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @attr);
-$conn->printError() if $conn->getErrorCode();
-
-while ($entry)
-{
-  foreach (@attr)
-    {
-      print $entry->{$_}[0], $separator;
-    }
-  print "\n";
-  $entry = $conn->nextEntry;
-}
-
-
-#################################################################################
-# Close the connection.
-#
-$conn->close if $conn;

mozilla/directory/perldap/perl-Mozilla-LDAP.spec

@@ -1,131 +0,0 @@
-%define nspr_name	nspr
-%define nss_name	nss
-%define mozldap_name	mozldap
-
-Summary: LDAP Perl module that wraps the Mozilla C SDK
-Name: perl-Mozilla-LDAP
-Version: 1.5.3
-Release: 1%{?dist}
-License: GPL/LGPL/MPL
-Group: Development/Libraries
-URL: http://www.mozilla.org/directory/perldap.html
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: perl >= 2:5.8.0
-BuildRequires: perl >= 2:5.8.0
-BuildRequires: %{nspr_name}-devel >= 4.6
-BuildRequires: %{nss_name}-devel >= 3.11
-BuildRequires: %{mozldap_name}-devel >= 6.0
-Source0: ftp://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/1.5/perl-mozldap-%{version}.tar.gz
-Source1: ftp://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/1.5/Makefile.PL.rpm
-
-%description
-%{summary}.
-
-%prep
-%setup -q -n perl-mozldap-%{version}
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(Mozilla::LDAP::Entry)$/d'
-EOF
-
-%define __perl_provides %{_builddir}/perl-mozldap-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(Mozilla::LDAP::Entry)/d'
-EOF
-
-%define __perl_requires %{_builddir}/perl-mozldap-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
-%build
-
-LDAPPKGNAME=%{mozldap_name} CFLAGS="$RPM_OPT_FLAGS" perl %{SOURCE1} PREFIX=$RPM_BUILD_ROOT%{_prefix} INSTALLDIRS=vendor < /dev/null
-make OPTIMIZE="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" 
-make test
-
-%install
-rm -rf $RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-
-%makeinstall
-
-# remove files we don't want to package
-rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
-find $RPM_BUILD_ROOT -name API.bs -a -size 0 -exec rm -f {} \;
-
-# make sure shared lib is correct mode
-find $RPM_BUILD_ROOT -name API.so -exec chmod 755 {} \;
-
-
-# find and run the correct version of brp-compress
-if [ -x /usr/lib/rpm/brp-compress ] ; then
-    /usr/lib/rpm/brp-compress
-elif [ -x %{_libdir}/rpm/brp-compress ] ; then
-    %{_libdir}/rpm/brp-compress
-fi
-
-# make sure files refer to %{_prefix} instead of buildroot/%prefix
-find $RPM_BUILD_ROOT%{_prefix} -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-%{release}-filelist
-if [ "$(cat %{name}-%{version}-%{release}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit 1
-fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}-%{version}-%{release}-filelist
-%defattr(-,root,root,-)
-%doc CREDITS ChangeLog README MPL-1.1.txt
-
-%changelog
-* Tue Aug  3 2010 Nathan Kinder <nkinder@redhat.com> - 1.5.3-1
-- avoid using deprecated functions in the underlying LDAP library.
-
-* Fri Jul 27 2007 Rich Megginson <richm@stanfordalumni.org> - 1.5.2-1
-- Fix bugzilla 389731 - crash when a bad URL is passed
-
-* Wed Jun 20 2007 Rich Megginson <richm@stanfordalumni.org> - 1.5.1-1
-- all files have been GPL/LGPL/MPL tri-licensed
-
-* Wed Jan 10 2007 Rich Megginson <richm@stanfordalumni.org> - 1.5-9
-- remove only perl(Mozilla::LDAP::Entry) from Provides, leave in 
-- perl(Mozilla::LDAP::Entry) = 1.5
-
-* Wed Jan 10 2007 Rich Megginson <richm@stanfordalumni.org> - 1.5-8
-- add perl_requires filter for the Entry module
-- add the MPL-1.1.txt file to the DOCs
-
-* Wed Jan 10 2007 Rich Megginson <richm@stanfordalumni.org> - 1.5-7
-- Incorporate comments from Fedora Extras review - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219869
-- Remove all Requires except perl - use autogenerated ones
-- Remove ExclusiveArch
-- Remove files that don't need to be packaged
-- add full URL to sources
-- set API.so to mode 755
-
-* Tue Oct 17 2006 Rich Megginson <richm@stanfordalumni.org> - 1.5-6
-- look for brp-compress first in /usr/lib then _libdir
-
-* Tue Oct 17 2006 Rich Megginson <richm@stanfordalumni.org> - 1.5-5
-- there is no TODO file; use custom Makefile.PL
-
-* Mon Oct 16 2006 Rich Megginson <richm@stanfordalumni.org> - 1.5-4
-- use pkg-config --variable=xxx instead of --cflags e.g.
-
-* Mon Oct 16 2006 Rich Megginson <richm@stanfordalumni.org> - 1.5-3
-- this is not a noarch package
-
-* Mon Oct 16 2006 Rich Megginson <richm@stanfordalumni.org> - 1.5-2
-- Use new mozldap6, dirsec versions of nspr, nss
-
-* Tue Feb  7 2006 Rich Megginson <richm@stanfordalumni.org> - 1.5-1
-- Based on the perl-LDAP.spec file
-

mozilla/directory/perldap/t/ChangeLog

@@ -1,20 +0,0 @@
-2005-01-04  Leif Hedstrom  <leif@ogre.com>
-
-	* entry.pl: Changed all calls to new to use the class method directly.
-
-	* conn.pl: Changed all calls to new to use the class method directly.
-
-1999-08-06  Leif Hedstrom  <leif@netscape.com>
-
-	* conn.pl: Added support for browse() and compare().
-
-1999-03-19  Leif Hedstrom  <leif@netscape.com>
-
-	* conn.pl: Added test for add() with a hash array.
-
-1999-01-05  Leif Hedstrom  <leif@netscape.com>
-
-	* entry.pl: New script, to test all Entry:: methods.
-
-	* conn.pl: Added test for modifyRDN().
-

mozilla/directory/perldap/t/api.t

@@ -1,4 +0,0 @@
-print "This is not a real test, yet...\n";
-print "1..1\n";
-
-print "ok 1\n";

mozilla/directory/perldap/t/conn.t

@@ -1,4 +0,0 @@
-print "This is not a real test, yet...\n";
-print "1..1\n";
-
-print "ok 1\n";

mozilla/directory/perldap/t/entry.pl

@@ -1,168 +0,0 @@
-#!/usr/bin/perl5
-#############################################################################
-# $Id: entry.pl,v 1.3.2.4 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Test most (all?) of the LDAP::Mozilla::Conn methods.
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-use Mozilla::LDAP::API;
-
-use strict;
-no strict "vars";
-
-
-#################################################################################
-# Configurations, modify these as needed.
-#
-$BIND	= "uid=ldapadmin";
-$BASE	= "o=ogre.com";
-$PEOPLE	= "ou=people";
-$UID	= "leif-test";
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "entry.pl";
-$USAGE	= "$APPNAM -b base -h host -D bind -w pswd -P cert";
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('b:h:D:p:s:w:P:'))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs($BIND, $BASE);
-
-
-#################################################################################
-# Get an LDAP connection
-#
-sub getConn
-{
-  my $conn;
-
-  if ($main::reuseConn)
-    {
-      if (!defined($main::mainConn))
-	{
-	  $main::mainConn = Mozilla::LDAP::Conn->new(\%main::ld);
-	  die "Could't connect to LDAP server $main::ld{host}"
-	    unless $main::mainConn;
-	}
-      return $main::mainConn;
-    }
-  else
-    {
-      $conn = Mozilla::LDAP::Conn->new(\%main::ld);
-      die "Could't connect to LDAP server $main::ld{host}" unless $conn;
-    }
-
-  return $conn;
-}
-
-
-#################################################################################
-# Some small help functions...
-#
-sub dotPrint
-{
-  my $str = shift;
-
-  print $str . '.' x (20 - length($str));
-}
-
-sub attributeEQ
-{
-  my (@a, @b);
-  my $i;
-
-  @a = @{$_[0]};
-  @b = @{$_[1]};
-  return 1 if (($#a < 0) && ($#b < 0));
-  return 0 unless ($#a == $#b);
-
-  @a = sort(@a);
-  @b = sort(@b);
-  for ($i = 0; $i <= $#a; $i++)
-    {
-      return 0 unless ($a[$i] eq $b[$i]);;
-    }
-
-  return 1;             # We passed all the tests, we're ok.
-}
-
-
-#################################################################################
-# Setup the test entries.
-#
-undef $reuseConn;
-
-$filter = "(uid=$UID)";
-$conn = getConn();
-$nentry = $conn->newEntry("uid=$UID, $PEOPLE, $BASE");
-
-$nentry->{objectclass} = [ "top", "person", "inetOrgPerson", "mailRecipient" ];
-$nentry->addValue("uid", $UID);
-$nentry->addValue("sn", "Hedstrom");
-$nentry->addValue("givenName", "Leif");
-$nentry->addValue("cn", "Leif Hedstrom");
-$nentry->addValue("cn", "Leif P. Hedstrom");
-$nentry->addValue("cn", "The Swede");
-$nentry->addValue("description", "Test1");
-$nentry->addValue("description", "Test2");
-$nentry->addValue("description", "Test3");
-$nentry->addValue("description", "Test4");
-$nentry->addValue("description", "Test5");
-$nentry->addValue("mail", "leif\@ogre.com");
-
-$ent = $conn->search($ld{root}, $ld{scope}, $filter);
-$conn->delete($ent->getDN()) if $ent;
-$conn->add($nentry);
-
-$nentry->printLDIF();
-
-$conn->close();

mozilla/directory/perldap/t/entry.t

@@ -1,4 +0,0 @@
-print "This is not a real test, yet...\n";
-print "1..1\n";
-
-print "ok 1\n";

mozilla/directory/perldap/t/ldif.t

@@ -1,65 +0,0 @@
-#!/usr/bin/perl
-#############################################################################
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerlDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Test the LDIF module
-
-use Mozilla::LDAP::Conn;
-use Mozilla::LDAP::Utils qw(normalizeDN);
-use Mozilla::LDAP::API qw(ldap_explode_dn);
-use Mozilla::LDAP::LDIF;
-use strict;
-
-
-my $testldif = "t/test.ldif";
-
-print "1..1\n";
-open( LDIF, "$testldif" ) || die "Can't open $testldif: $!";
-my $in = new Mozilla::LDAP::LDIF(*LDIF) ;
-my $ent;
-while ($ent = readOneEntry $in) {
-    print "The Entry is:\n";
-    Mozilla::LDAP::LDIF::put_LDIF(select(), 78, $ent);
-    my $desc = $ent->getValue('description');
-    # this tests the base64 decoding
-    die "Error: the description is not hello world" if ($desc ne 'hello world');
-}
-close LDIF;
-print "ok 1\n";

mozilla/directory/perldap/t/ssl.pl

@@ -1,85 +0,0 @@
-#!/usr/bin/env perl
-#############################################################################
-# $Id: ssl.pl,v 1.1.2.2 2007-06-14 09:21:17 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Rich Megginson <richm@stanfordalumni.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Test most (all?) of the LDAP::Mozilla::Conn methods. This code
-#    needs to be rewritten to use the standard test harness in Perl...
-
-use Getopt::Std;			# To parse command line arguments.
-use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
-use Mozilla::LDAP::Utils;		# LULU, utilities.
-use Mozilla::LDAP::API;
-
-use strict;
-no strict "vars";
-
-
-# Uncomment for somewhat more verbose messages from core modules
-#$LDAP_DEBUG = 1;
-
-
-#################################################################################
-# Configurations, modify these as needed.
-#
-$BASE	= "dc=example,dc=com";
-$PEOPLE	= "ou=people";
-$UID	= "scarter";
-
-
-#################################################################################
-# Constants, shouldn't have to edit these...
-#
-$APPNAM	= "ssl.pl";
-$USAGE	= "$APPNAM -b base -h host -D bind -w pswd -P cert -N certname -W keypassword -Z";
-
-
-#################################################################################
-# Check arguments, and configure some parameters accordingly..
-#
-if (!getopts('b:h:D:p:s:w:P:N:W:Z'))
-{
-   print "usage: $APPNAM $USAGE\n";
-   exit;
-}
-%ld = Mozilla::LDAP::Utils::ldapArgs(undef, $BASE);
-$BASE = $ld{"base"};
-Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;

mozilla/directory/perldap/t/ssl.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-LD_LIBRARY_PATH=/home/rich/mozilla/dist/lib ; export LD_LIBRARY_PATH
-
-#argsfile=.gdbinit
-#echo "break main" > $argsfile
-#echo "run -I../blib/arch -I../blib/lib ssl.pl -h localhost -p 10202 -P /home/rich/102srv/alias/slapd-localhost-cert8.db -N Server-Cert -W 723d1e6cf342e1d133c69876e938be08e41bad41 -b '' objectclass=*" >> $argsfile
-#gdb -x $argsfile perl
-#rm -f $argsfile
-perl -d -I../blib/arch -I../blib/lib ssl.pl -h localhost -Z -p 10200 -P /home/rich/102srv/alias/slapd-localhost-cert8.db -N "Server-Cert" -W `cat /home/rich/102srv/alias/pwdfile.txt` -b "" "objectclass=*" 
-#perl -d -I../blib/arch -I../blib/lib ssl.pl -h localhost -p 10202 -P /home/rich/102srv/alias/slapd-localhost-cert8.db -N "Server-Cert" -W `cat /home/rich/102srv/alias/pwdfile.txt` -b "" "objectclass=*" 

mozilla/directory/perldap/t/test.ldif

@@ -1,11 +0,0 @@
-dn: uid=user,dc=example,dc=com
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: user
-cn: Jay User
-sn: User
-givenName: Jay
-description:: aGVsbG8gd29ybGQ=
-

mozilla/directory/perldap/t/utils.t

@@ -1,4 +0,0 @@
-print "This is not a real test, yet...\n";
-print "1..1\n";
-
-print "ok 1\n";

mozilla/directory/perldap/test_api/api.pl

@@ -1,297 +0,0 @@
-#!/usr/bin/perl -w
-#############################################################################
-# $Id: api.pl,v 1.8.2.1 2007-06-14 09:21:18 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#   api.pl - Test all LDAPv2 API function
-#   Author:  Clayton Donley <donley@wwa.com>
-#
-#   Performs all API calls directly in order to test for possible issues
-#   on a particular platform.
-
-use Mozilla::LDAP::API qw(:api :constant);
-use strict;
-
-my $BASE = "ou=Test,o=Test,c=US";
-my $DN = "cn=Directory Manager";
-my $PASS = "abcd1234";
-my $HOST = "";
-my $PORT = 389;
-
-if (!$HOST)
-{
-   print "Please edit the variables at the top of this file.\n";
-   exit -1;
-}
-
-print "\nPerLDAP API TestSuite\n";
-print "\nNote: Failures in earlier tests will cause later tests to fail.\n";
-print "\n";
-
-my $howmany = 10;
-
-# Initialize the Connection
-{
-my $ld = ldap_init($HOST,$PORT);
-if ($ld <0)
-{
-   print "init			- Failed!\n";
-   die;
-}
-print "init		- OK\n";
-
-# Set an LDAP Session Option
-if (ldap_set_option($ld,LDAP_OPT_PROTOCOL_VERSION,LDAP_VERSION3)
-      != LDAP_SUCCESS)
-{
-   print "set_option	- Failed!\n";
-} else {
-   print "set_option	- OK\n";
-}
-
-# Get an LDAP Session Option
-my $option;
-ldap_get_option($ld,LDAP_OPT_REFERRALS,$option);
-
-if ($option != 1)
-{
-   print "get_option	- Failed!\n";
-} else {
-   print "get_option	- OK\n";
-}
-
-# Anonymous Bind
-if (ldap_simple_bind_s($ld,"","") != LDAP_SUCCESS)
-{
-   print "anon_bind	- Failed!\n";
-} else {
-   print "anon_bind	- OK\n";
-}
-
-# Authenticated Simple Bind
-if (ldap_simple_bind_s($ld,$DN,$PASS) != LDAP_SUCCESS)
-{
-   print "simple_bind	- Failed!\n";
-} else {
-   print "simple_bind	- OK\n";
-}
-
-# Set Rebind Process
-my $rebindproc = sub { return($DN,$PASS,LDAP_AUTH_SIMPLE); };
-ldap_set_rebind_proc($ld,$rebindproc);
-print "set_rebind	- OK\n";
-
-# Add an OrgUnit Entry
-my $entry = {
-	"objectclass" => ["top","organizationalUnit"],
-	"ou" => "Test",
-};
-
-if (ldap_add_s($ld,$BASE,$entry) != LDAP_SUCCESS)
-{
-   print "add_org		- Failed!\n";
-} else {
-   print "add_org		- OK\n";
-}
-
-
-# Add People
-foreach my $number (1..$howmany)
-{
-   $entry = {
-	"objectclass" => ["top","person"],
-	"cn" => "Mozilla $number",
-	"sn" => ["$number"],
-   };
-   if (ldap_add_s($ld,"cn=Mozilla $number,$BASE",$entry)
-	 != LDAP_SUCCESS)
-   {
-      print "add_user_$number	- Failed!\n";
-   } else {
-      print "add_user_$number	- OK\n";
-   }
-}
-
-# Modify People
-foreach my $number (1..$howmany)
-{
-   $entry = {
-	"sn" => {"ab",["Test"]},
-        "telephoneNumber" => {"ab",[123.456]},
-#	"telephoneNumber" => "800-555-111$number",
-   };
-   if (ldap_modify_s($ld,"cn=Mozilla $number,$BASE",$entry)
-	  != LDAP_SUCCESS)
-   {
-      print "mod_user_$number	- Failed!\n";
-   } else {
-      print "mod_user_$number	- OK\n";
-   }
-}
-
-
-# Search People
-my $filter = "(sn=Test)";
-my $attrs = ["cn","sn"];
-my $res;
-if (ldap_search_s($ld,$BASE,LDAP_SCOPE_SUBTREE,$filter,$attrs,0,$res)
-     != LDAP_SUCCESS)
-{
-   print "search_user	- Failed!\n";
-} else {
-   print "search_user	- OK\n";
-}
-
-# Count Results
-if (ldap_count_entries($ld,$res) != $howmany)
-{
-   print "count_res	- Failed!\n";
-} else {
-   print "count_res	- OK\n";
-}
-
-# Sort Results
-if (ldap_sort_entries($ld,$res,"sn") != LDAP_SUCCESS)
-{
-   print "sort_ent	- Failed!\n";
-} else {
-   print "sort_ent	- OK\n";
-}
-
-# Multisort Results
-if (ldap_multisort_entries($ld,$res,["sn","telephoneNumber"]) != LDAP_SUCCESS)
-{
-   print "multisort	- Failed!\n";
-} else {
-   print "multisort	- OK\n";
-}
-
-# Get First Entry
-my $ent = ldap_first_entry($ld,$res);
-if (!$ent)
-{
-   print "first_entry	- Failed!\n";
-} else {
-   print "first_entry	- OK\n";
-}
-
-# Get Next Entry
-$ent = ldap_next_entry($ld,$ent);
-if (!$ent)
-{
-   print "next_entry	- Failed!\n";
-} else {
-   print "next_entry	- OK\n";
-}
-
-# Get DN
-my $dn = ldap_get_dn($ld,$ent);
-if (!$dn)
-{
-   print "get_dn		- Failed!\n";
-} else {
-   print "get_dn		- OK\n";
-}
-
-# Get First Attribute
-my $ber;
-my $attr = ldap_first_attribute($ld,$ent,$ber);
-if (!$attr)
-{
-   print "first_attr	- Failed!\n";
-} else {
-   print "first_attr	- OK\n";
-}
-
-# Get Next Attribute
-$attr = ldap_next_attribute($ld,$ent,$ber);
-if (!$attr)
-{
-   print "next_attr	- Failed!\n";
-} else {
-   print "next_attr	- OK\n";
-}
-
-# Get Attribute Values
-my @vals = ldap_get_values($ld,$ent,$attr);
-if ($#vals < 0)
-{
-   print "get_values	- Failed!\n";
-} else {
-   print "get_values	- OK\n";
-}
-
-# Free structures pointed to by $ber and $res to prevent memory leak
-ldap_ber_free($ber,1);
-ldap_msgfree($res);
-
-# Compare Attribute Values
-foreach my $number (1..$howmany)
-{
-   if(ldap_compare_s($ld,"cn=Mozilla $number,$BASE","sn",$number)
-	 != LDAP_COMPARE_TRUE)
-   {
-      print "comp_user_$number	- Failed!\n";
-   } else {
-      print "comp_user_$number	- OK\n";
-   }
-}
-
-# Delete Users
-foreach my $number (1..$howmany)
-{
-   if (ldap_delete_s($ld,"cn=Mozilla $number,$BASE") != LDAP_SUCCESS)
-   {
-      print "del_user_$number	- Failed!\n";
-   } else {
-      print "del_user_$number	- OK\n";
-   }
-}
-
-if (ldap_delete_s($ld,"$BASE") != LDAP_SUCCESS)
-{
-   print "del_org		- Failed!\n";
-} else {
-   print "del_org		- OK\n";
-}
-
-# Unbind
-ldap_unbind($ld);
-}

mozilla/directory/perldap/test_api/search.pl

@@ -1,148 +0,0 @@
-#!/usr/bin/perl
-#############################################################################
-# $Id: search.pl,v 1.5.2.1 2007-06-14 09:21:18 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerlDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Test the search capabilities of the API, similar to write.pl.
-
-use Mozilla::LDAP::API qw(:api :constant);
-use strict;
-
-
-my $ldap_host = "";
-my $BASEDN = "o=Org,c=US";
-my $filter = $ARGV[0];
-
-if (!$ldap_host)
-{
-   print "Edit the top portion of this file before continuing.\n";
-   exit -1;
-}
-
-my $attrs = [];
-
-my ($ld,$result,$count);
-
-##
-##  Initialize LDAP Connection
-##
-
-if (($ld = ldap_init($ldap_host,LDAP_PORT)) == -1)
-{
-   die "Can not open LDAP connection to $ldap_host";
-}
-
-##
-##  Bind as DN, PASSWORD (NULL,NULL) on LDAP connection $ld
-##
-
-if (ldap_simple_bind_s($ld,"","") != LDAP_SUCCESS)
-{
-   ldap_perror($ld,"bind_s");
-   die;
-}
-
-##
-## ldap_search_s - Synchronous Search
-##
-
-if (ldap_search_s($ld,$BASEDN,LDAP_SCOPE_SUBTREE,$filter,$attrs,0,$result) != LDAP_SUCCESS)
-{
-   ldap_perror($ld,"search_s");
-   die;
-}
-
-##
-## ldap_count_entries - Count Matched Entries
-##
-
-if (($count = ldap_count_entries($ld,$result)) == -1)
-{
-   ldap_perror($ld,"count_entry");
-   die;
-}
-
-##
-## first_entry - Get First Matched Entry
-## next_entry  - Get Next Matched Entry
-##
-
-for (my $ent = ldap_first_entry($ld,$result); $ent; $ent = ldap_next_entry($ld,$ent))
-{
-      
-##
-## ldap_get_dn  -  Get DN for Matched Entries
-##
-
-   my ($dn,$attr,@vals,$val,$ber);
-   if (($dn = ldap_get_dn($ld,$ent)) ne "")
-   {
-      print "dn: $dn\n";
-   } else {
-      ldap_perror($ld,"get_dn");
-      die;
-   }
-
-   for ($attr = ldap_first_attribute($ld,$ent,$ber); $attr; $attr = ldap_next_attribute($ld,$ent,$ber))
-   {
-
-##
-## ldap_get_values
-##
-
-      @vals = ldap_get_values($ld,$ent,$attr);
-      if ($#vals >= 0)
-      {
-         foreach $val (@vals)
-         {
-            print "$attr: $val\n";
-         }
-      }
-   }
-   ldap_ber_free($ber,0);
-}
-ldap_msgfree($result);
-
-##
-##  Unbind LDAP Connection
-##
-
-ldap_unbind($ld);
-

mozilla/directory/perldap/test_api/write.pl

@@ -1,127 +0,0 @@
-#!/usr/bin/perl -w
-#############################################################################
-# $Id: write.pl,v 1.5.2.1 2007-06-14 09:21:18 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerlDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#   write.pl - Test of LDAP Modify Operations in Perl5
-#   Author:  Clayton Donley <donley@wwa.com>
-#
-#   This utility is mostly to demonstrate all the write operations
-#   that can be done with LDAP through this PERL5 module.
-
-use strict;
-use Mozilla::LDAP::API qw(:constant :api);
-
-
-# This is the entry we will be adding.  Do not use a pre-existing entry.
-my $ENTRYDN = "cn=Test Guy, o=Org, c=US";
-
-# This is the DN and password for an Administrator
-my $ROOTDN = "cn=DSManager,o=Org,c=US";
-my $ROOTPW = "";
-
-my $ldap_server = "";
-
-if (!$ldap_server)
-{
-   print "Edit the top portion of this file before continuing.\n";
-   exit -1;
-}
-
-my $ld = ldap_init($ldap_server,LDAP_PORT);
-
-if ($ld == -1)
-{
-   die "Connection to LDAP Server Failed";
-}
-
-if (ldap_simple_bind_s($ld,$ROOTDN,$ROOTPW) != LDAP_SUCCESS)
-{
-   ldap_perror($ld,"bind_s");
-   die;
-}
-
-my %testwrite = (
-	"cn" => "Test User",
-	"sn" => "User",
-        "givenName" => "Test",
-	"telephoneNumber" => "8475551212",
-	"objectClass" => ["top","person","organizationalPerson",
-           "inetOrgPerson"],
-        "mail" => "tuser\@my.org",
-);
-
-if (ldap_add_s($ld,$ENTRYDN,\%testwrite) != LDAP_SUCCESS)
-{
-   ldap_perror($ld,"add_s");
-   die;
-}
-
-print "Entry Added.\n";
-
-
-%testwrite = (
-	"telephoneNumber" => "7085551212",
-        "mail" => {"a",["Test_User\@my.org"]},
-);
-
-if (ldap_modify_s($ld,$ENTRYDN,\%testwrite) != LDAP_SUCCESS)
-{
-   ldap_perror($ld,"modify_s");
-   die;
-}
-
-print "Entry Modified.\n";
-
-#
-# Delete the entry for $ENTRYDN
-#
-if (ldap_delete_s($ld,$ENTRYDN) != LDAP_SUCCESS)
-{
-   ldap_perror($ld,"delete_s");
-   die;
-}
-
-print "Entry Deleted.\n";
-
-# Unbind to LDAP server
-ldap_unbind($ld);
-
-exit;

mozilla/directory/perldap/typemap

@@ -1,102 +0,0 @@
-#############################################################################
-# $Id: typemap,v 1.5.2.6 2007-06-14 09:21:15 gerv%gerv.net Exp $
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is PerLDAP.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Clayton Donley
-#   Leif Hedstrom <leif@perldap.org>
-#   Kevin McCarthy
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# DESCRIPTION
-#    Typemap to declare XSUB data types.
-
-const int		T_IV
-char *			T_PV
-const char *		T_PV
-char **			T_charptrptr
-void *			T_PTR
-LDAP *			T_PTR
-LDAPMessage *		T_PTR
-LDAPMessage **		T_PTR
-BerElement *		T_PTR
-LDAPControl *		T_PTR
-LDAPVersion *		T_PTR
-struct berval 		T_berval
-struct berval *		T_bervalptr
-struct berval **	T_bervalptrptr
-FriendlyMap *		T_PTR
-LDAPsortkey **		T_PTR
-LDAPVirtualList *	T_PTR
-LDAPURLDesc *		T_PTR
-LDAPControl **		T_PTR
-LDAPFiltDesc *		T_PTR
-LDAPFiltInfo *		T_PTR
-LDAPMemCache *		T_PTR
-LDAPMemCache **		T_PTR
-struct ldap_thread_fns *	T_PTR
-LDAPMod **		T_PTR
-LDAP_CMP_CALLBACK *	T_PTR
-LDAP_REBINDPROC_CALLBACK *	T_PTR
-struct timeval		T_timeval
-my_chgtype_t    T_IV
-my_chgnum_t     T_IV
-my_result_t     T_IV
-my_vlvint_t     T_IV
-
-#########
-INPUT
-T_timeval
-	$var.tv_sec = (long)atof((char *)SvPV($arg,PL_na));
-	$var.tv_usec = 0
-T_berval
-	$var.bv_val = (char *)SvPV($arg,PL_na);
-	$var.bv_len = PL_na
-T_charptrptr
-        $var = (char **)avref2charptrptr($arg)
-T_bervalptr
-    $var = NULL
-T_bervalptrptr
-	$var = (struct berval **)avref2berptrptr($arg)
-OUTPUT
-T_charptrptr
-	$arg = charptrptr2avref($var);
-T_bervalptr
-    if ($var) {
-        sv_setpvn($arg,$var->bv_val,$var->bv_len);
-        ber_bvfree($var);
-    }
-T_bervalptrptr
-	$arg = berptrptr2avref((struct berval **)$var);

mozilla/xpinstall/Makefile.in

@@ -0,0 +1,39 @@
+#!gmake
+#
+# 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:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH = ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+

mozilla/xpinstall/makefile.win

@@ -0,0 +1,30 @@
+#!nmake
+#
+# 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:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH=..
+
+DIRS= public res src 
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/notifier/SoftwareUpdate-Source-1.rdf

@@ -0,0 +1,33 @@
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/NC-rdf#">
+
+  <RDF:Bag ID="NC:SoftwareUpdateRoot">
+    <RDF:li>
+       <RDF:Bag ID="NC:NewSoftwareToday" NC:title="New Software">
+
+    <RDF:li>
+        <RDF:Description ID="AimUpdate344">
+         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
+         <NC:title>AOL AIM</NC:title>
+         <NC:description>An Instant Message Client</NC:description>
+         <NC:version>3.4.1.12</NC:version>
+         <NC:registryKey>/AOL/AIM/</NC:registryKey>
+         <NC:url>http://home.netscape.com/index.html</NC:url>
+       </RDF:Description>
+    </RDF:li>
+    
+    <RDF:li>
+       <RDF:Description ID="PGPPlugin345">
+         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
+         <NC:title>PGP Plugin For Mozilla</NC:title>
+         <NC:description>A high grade encryption plugin</NC:description>
+         <NC:version>1.1.2.0</NC:version>
+         <NC:registryKey>/PGP/ROCKS/</NC:registryKey>
+         <NC:url>http://home.netscape.com/index.html</NC:url>
+       </RDF:Description>
+    </RDF:li>
+
+       </RDF:Bag>
+     </RDF:li>
+  </RDF:Bag>
+</RDF:RDF>

mozilla/xpinstall/notifier/SoftwareUpdate.css

@@ -0,0 +1,57 @@
+window { 
+ display: block; 
+} 
+
+tree { 
+ display: table; 
+ background-color: #FFFFFF; 
+ border: none; 
+ border-spacing: 0px; 
+ width: 100%;
+}
+
+treecol {
+ display: table-column;
+ width: 200px;
+}
+
+treeitem { 
+ display: table-row; 
+} 
+
+treehead { 
+ display: table-header-group; 
+} 
+
+treebody { 
+ display: table-row-group; 
+} 
+
+treecell { 
+ display: table-cell; 
+ font-family: Verdana, Sans-Serif;
+ font-size: 8pt;
+} 
+
+treecell[selectedcell] {
+ background-color: yellow;
+ }
+ 
+
+treehead treeitem treecell { 
+ background-color: #c0c0c0; 
+ border: outset 1px;
+ border-color: white #707070 #707070 white;
+ padding-left: 4px;
+}
+
+treeitem[type="http://home.netscape.com/NC-rdf#SoftwarePackage"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/SoftwareUpdatePackage.gif");
+}
+
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/bookmark-folder-closed.gif");
+
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/bookmark-folder-open.gif");
+}

mozilla/xpinstall/notifier/SoftwareUpdate.js

@@ -0,0 +1,123 @@
+    // the rdf service
+    var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+
+    function getAttr(registry,service,attr_name) 
+    {
+        var attr = registry.GetTarget(service,
+                                      RDF.GetResource('http://home.netscape.com/NC-rdf#' + attr_name),
+                                      true);
+        if (attr)
+            attr = attr.QueryInterface(Components.interfaces.nsIRDFLiteral);
+  
+        if (attr)
+            attr = attr.Value;
+        
+        return attr;
+    }
+
+    function Init()
+    {
+        // this is the main rdf file.
+        
+        var mainRegistry = RDF.GetDataSource('resource://res/rdf/SoftwareUpdates.rdf');
+        
+        var mainContainer = Components.classes['component://netscape/rdf/container'].createInstance();
+        mainContainer = mainContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
+
+        mainContainer.Init(mainRegistry, RDF.GetResource('NC:SoftwareUpdateDataSources'));
+
+        // Now enumerate all of the softwareupdate datasources.
+        var mainEnumerator = mainContainer.GetElements();
+        while (mainEnumerator.HasMoreElements()) 
+        {
+            var aDistributor = mainEnumerator.GetNext();
+            aDistributor = aDistributor.QueryInterface(Components.interfaces.nsIRDFResource);
+
+            var distributorContainer = Components.classes['component://netscape/rdf/container'].createInstance();
+            distributorContainer = distributorContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
+            
+            var distributorRegistry = RDF.GetDataSource(aDistributor.Value);
+            var distributorResource = RDF.GetResource('NC:SoftwareUpdateRoot');
+
+            distributorContainer.Init(distributorRegistry, distributorResource);
+
+            // Now enumerate all of the distributorContainer's packages.
+            
+            var distributorEnumerator = distributorContainer.GetElements();
+            
+            while (distributorEnumerator.HasMoreElements()) 
+            {
+                 var aPackage = distributorEnumerator.GetNext();
+                 aPackage = aPackage.QueryInterface(Components.interfaces.nsIRDFResource);
+                 
+                 // remove any that we do not want.
+            
+                 if (getAttr(distributorRegistry, aPackage, 'title') == "AOL AIM")
+                 {
+                    //distributorContainer.RemoveElement(aPackage, true);
+                 }
+            }
+            var tree = document.getElementById('tree');
+
+            // Add it to the tree control's composite datasource.
+            tree.database.AddDataSource(distributorRegistry);
+
+        }
+        
+        // Install all of the stylesheets in the softwareupdate Registry into the
+        // panel.
+
+        // TODO
+
+        // XXX hack to force the tree to rebuild
+        var treebody = document.getElementById('NC:SoftwareUpdateRoot');
+        treebody.setAttribute('id', 'NC:SoftwareUpdateRoot');
+    }
+
+
+    function OpenURL(event, node)
+    {
+        if (node.getAttribute('type') == "http://home.netscape.com/NC-rdf#SoftwarePackage") 
+        {
+            url = node.getAttribute('url');
+     
+            /*window.open(url,'bookmarks');*/
+  
+            var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
+            if (!toolkitCore) 
+            {
+                toolkitCore = new ToolkitCore();
+                if (toolkitCore) 
+                {
+                    toolkitCore.Init("ToolkitCore");
+                }
+            }
+        
+            if (toolkitCore) 
+            {
+                toolkitCore.ShowWindow(url,window);
+            }
+
+            dump("OpenURL(" + url + ")\n");
+        
+            return true;        
+        }
+        return false;
+    }
+
+
+    // To get around "window.onload" not working in viewer.
+    function Boot()
+    {
+        var tree = document.getElementById('tree');
+        if (tree == null) {
+            setTimeout(Boot, 0);
+        }
+        else {
+            Init();
+        }
+    }
+
+    setTimeout('Boot()', 0);
+

mozilla/xpinstall/notifier/SoftwareUpdate.xul

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="resource:/res/rdf/sidebar.css" type="text/css"?>
+<?xml-stylesheet href="resource:/res/rdf/SoftwareUpdate.css" type="text/css"?>
+<window
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <html:script src="SoftwareUpdate.js"/>
+  
+  <tree id="tree"
+        flex="100%"
+        datasources="rdf:softwareupdates"
+        ondblclick="return OpenURL(event, event.target.parentNode);">
+
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#title" />
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#description" />
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#version" />
+
+    <treehead>
+      <treeitem>
+        <treecell>Title</treecell>
+        <treecell>Description</treecell>
+        <treecell>Version</treecell>
+      </treeitem>
+    </treehead>
+
+    <treebody id="NC:SoftwareUpdateRoot" rdf:containment="http://home.netscape.com/NC-rdf#child" />
+  </tree>
+</window>

mozilla/xpinstall/notifier/SoftwareUpdates.rdf

@@ -0,0 +1,7 @@
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/softwareupdate-schema#">
+
+  <RDF:Bag ID="NC:SoftwareUpdateDataSources">
+    <RDF:li resource="resource:/res/rdf/SoftwareUpdate-Source-1.rdf" />
+  </RDF:Bag>
+</RDF:RDF>

mozilla/xpinstall/public/MANIFEST

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

mozilla/xpinstall/public/Makefile.in

@@ -0,0 +1,47 @@
+#!gmake
+#
+# 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:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+DEPTH = ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = xpinstall
+
+XPIDLSRCS = nsIXPInstallProgress.idl
+
+EXPORTS =		             \
+        nsIDOMInstallTriggerGlobal.h \
+        nsIDOMInstallVersion.h       \
+        nsSoftwareUpdateIIDs.h       \
+        nsISoftwareUpdate.h          \
+        $(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpinstall/public/idl/Install.idl

@@ -0,0 +1,113 @@
+interface Install
+{
+/* IID: { 0x18c2f988, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+
+	const int BAD_PACKAGE_NAME          = -200;
+	const int UNEXPECTED_ERROR          = -201;
+	const int ACCESS_DENIED             = -202;
+	const int TOO_MANY_CERTIFICATES     = -203; /* Installer file must have 1 certificate */
+	const int NO_INSTALLER_CERTIFICATE  = -204; /* Installer file must have a certificate */
+	const int NO_CERTIFICATE            = -205; /* Extracted file is not signed */
+	const int NO_MATCHING_CERTIFICATE   = -206; /* Extracted file does not match installer certificate */
+	const int UNKNOWN_JAR_FILE          = -207; /* JAR file has not been opened */
+	const int INVALID_ARGUMENTS         = -208; /* Bad arguments to a function */
+	const int ILLEGAL_RELATIVE_PATH     = -209; /* Illegal relative path */
+	const int USER_CANCELLED            = -210; /* User cancelled */
+	const int INSTALL_NOT_STARTED       = -211;
+	const int SILENT_MODE_DENIED        = -212;
+	const int NO_SUCH_COMPONENT         = -213; /* no such component in the registry. */
+	const int FILE_DOES_NOT_EXIST       = -214; /* File cannot be deleted as it does not exist */
+	const int FILE_READ_ONLY            = -215; /* File cannot be deleted as it is read only. */
+	const int FILE_IS_DIRECTORY         = -216; /* File cannot be deleted as it is a directory */
+	const int NETWORK_FILE_IS_IN_USE    = -217; /* File on the network is in-use */
+	const int APPLE_SINGLE_ERR          = -218; /* error in AppleSingle unpacking */
+	const int INVALID_PATH_ERR          = -219; /* GetFolder() did not like the folderID */
+	const int PATCH_BAD_DIFF            = -220; /* error in GDIFF patch */
+	const int PATCH_BAD_CHECKSUM_TARGET = -221; /* source file doesn't checksum  */
+	const int PATCH_BAD_CHECKSUM_RESULT = -222; /* final patched file fails checksum  */
+	const int UNINSTALL_FAILED          = -223; /* error while uninstalling a package  */
+	const int GESTALT_UNKNOWN_ERR       = -5550;         
+	const int GESTALT_INVALID_ARGUMENT  = -5551;
+
+	const int SUCCESS					  = 0;
+	const int REBOOT_NEEDED               = 999;
+
+	/* install types */
+	const int LIMITED_INSTALL             = 0;
+	const int FULL_INSTALL                = 1;
+	const int NO_STATUS_DLG				  = 2;
+	const int NO_FINALIZE_DLG			  = 4;
+
+	// these should not be public...
+	/* message IDs*/
+	const int SU_INSTALL_FILE_UNEXPECTED_MSG_ID  = 0;
+	const int SU_DETAILS_REPLACE_FILE_MSG_ID  = 1;
+	const int SU_DETAILS_INSTALL_FILE_MSG_ID  = 2;
+    //////////////////////////
+	
+	readonly attribute wstring UserPackageName;
+	readonly attribute wstring RegPackageName;
+
+	void Install();
+
+	void AbortInstall();
+
+	long AddDirectory(	   in wstring regName, 
+						   in wstring version, 
+						   in wstring jarSource,         
+						   in InstallFolder folder, 
+						   in wstring subdir, 
+						   in boolean forceMode );
+
+
+	long AddSubcomponent(  in wstring regName, 
+						   in wstring version, 
+						   in wstring jarSource,         
+						   in InstallFolder folder, 
+						   in wstring targetName, 
+						   in boolean forceMode );
+
+	long DeleteComponent(  in wstring registryName);
+
+	long DeleteFile(       in InstallFolder folder,
+						   in wstring relativeFileName );
+	
+	long DiskSpaceAvailable( in InstallFolder folder );
+	
+	long Execute(in wstring jarSource, in wstring args);
+	
+	long FinalizeInstall();
+
+	long Gestalt (in wstring selector);
+
+	InstallFolder GetComponentFolder( in wstring regName, 
+						              in wstring subdirectory);
+
+	InstallFolder GetFolder(in wstring targetFolder, 
+				            in wstring subdirectory);
+
+	long GetLastError();
+
+	long GetWinProfile(in InstallFolder folder, in wstring file);
+	
+	long GetWinRegistry();
+
+	long Patch( in wstring regName, 
+				in wstring version, 
+				in wstring jarSource,
+				in InstallFolder folder, 
+				in wstring targetName );
+	
+	void ResetError();
+
+	void SetPackageFolder( in InstallFolder folder );
+	
+	long StartInstall( in wstring userPackageName,
+					   in wstring packageName, 
+					   in wstring version, 
+					   in long flags );
+
+	long Uninstall( in wstring packageName);
+
+};

mozilla/xpinstall/public/idl/InstallTrigger.idl

@@ -0,0 +1,24 @@
+interface InstallTriggerGlobal
+{
+/* IID: { 0x18c2f987, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+	
+	const int MAJOR_DIFF =  4;
+    const int MINOR_DIFF =  3;
+    const int REL_DIFF   =  2;
+    const int BLD_DIFF   =  1;
+    const int EQUAL      =  0;	
+
+	boolean UpdateEnabled ();
+
+	long StartSoftwareUpdate(in wstring URL);
+
+	long ConditionalSoftwareUpdate(	in wstring URL, 
+									in wstring regName,
+									in long diffLevel, 
+									in wstring version, 
+									in long mode);
+
+	long CompareVersion( in wstring regName, in wstring version );
+
+};

mozilla/xpinstall/public/idl/InstallVersion.idl

@@ -0,0 +1,34 @@
+interface InstallVersion
+{
+/* IID: { 0x18c2f986, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+	 
+	const int EQUAL				=  0;
+    const int BLD_DIFF			=  1;
+	const int BLD_DIFF_MINUS		= -1;
+    const int REL_DIFF			=  2;
+	const int REL_DIFF_MINUS		= -2;
+    const int MINOR_DIFF			=  3;
+	const int MINOR_DIFF_MINUS   = -3;
+    const int MAJOR_DIFF			=  4;
+	const int MAJOR_DIFF_MINUS   = -4;
+	
+	attribute int major;
+	attribute int minor;
+	attribute int release;
+	attribute int build;
+
+	void InstallVersion();
+
+	void init(in wstring versionString);	
+/*
+	void init(in int major, in int minor, in int release, in int build);	
+*/
+	wstring toString();
+
+/*	int compareTo(in wstring version);
+	int compareTo(in int major, in int minor, in int release, in int build);
+*/
+	int compareTo(in InstallVersion versionObject);
+
+};

mozilla/xpinstall/public/makefile.win

@@ -0,0 +1,36 @@
+#!nmake
+#
+# 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:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+MODULE=xpinstall 
+DEPTH=..\..
+
+EXPORTS=    nsIDOMInstallTriggerGlobal.h \
+			nsIDOMInstallVersion.h       \
+            nsSoftwareUpdateIIDs.h       \
+			nsISoftwareUpdate.h
+
+XPIDLSRCS = .\nsIXPInstallProgress.idl        
+
+include <$(DEPTH)\config\config.mak>
+include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/public/nsIDOMInstall.h

@@ -0,0 +1 @@
+#error

mozilla/xpinstall/public/nsIDOMInstallTriggerGlobal.h

@@ -0,0 +1,96 @@
+/* -*- 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMInstallTriggerGlobal_h__
+#define nsIDOMInstallTriggerGlobal_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+
+#define NS_IDOMINSTALLTRIGGERGLOBAL_IID \
+ { 0x18c2f987, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
+
+class nsIDOMInstallTriggerGlobal : public nsISupports {
+public:
+  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLTRIGGERGLOBAL_IID; return iid; }
+  enum {
+    MAJOR_DIFF = 4,
+    MINOR_DIFF = 3,
+    REL_DIFF = 2,
+    BLD_DIFF = 1,
+    EQUAL = 0
+  };
+
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn)=0;
+
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn)=0;
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn)=0;
+
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
+
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMINSTALLTRIGGERGLOBAL   \
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn);  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn);  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMINSTALLTRIGGERGLOBAL(_to)  \
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn) { return _to##UpdateEnabled(aReturn); }  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aFlags, aReturn); }  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, nsIDOMInstallVersion* aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aMajor, aMinor, aRelease, aBuild, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
+
+
+extern nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMInstallTriggerGlobal_h__

mozilla/xpinstall/public/nsIDOMInstallVersion.h

@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMInstallVersion_h__
+#define nsIDOMInstallVersion_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+class nsIDOMInstallVersion;
+
+#define NS_IDOMINSTALLVERSION_IID \
+ { 0x18c2f986, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
+
+class nsIDOMInstallVersion : public nsISupports {
+public:
+  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLVERSION_IID; return iid; }
+  enum {
+    EQUAL = 0,
+    BLD_DIFF = 1,
+    BLD_DIFF_MINUS = -1,
+    REL_DIFF = 2,
+    REL_DIFF_MINUS = -2,
+    MINOR_DIFF = 3,
+    MINOR_DIFF_MINUS = -3,
+    MAJOR_DIFF = 4,
+    MAJOR_DIFF_MINUS = -4
+  };
+
+  NS_IMETHOD    GetMajor(PRInt32* aMajor)=0;
+  NS_IMETHOD    SetMajor(PRInt32 aMajor)=0;
+
+  NS_IMETHOD    GetMinor(PRInt32* aMinor)=0;
+  NS_IMETHOD    SetMinor(PRInt32 aMinor)=0;
+
+  NS_IMETHOD    GetRelease(PRInt32* aRelease)=0;
+  NS_IMETHOD    SetRelease(PRInt32 aRelease)=0;
+
+  NS_IMETHOD    GetBuild(PRInt32* aBuild)=0;
+  NS_IMETHOD    SetBuild(PRInt32 aBuild)=0;
+
+  NS_IMETHOD    Init(const nsString& aVersionString)=0;
+
+  NS_IMETHOD    ToString(nsString& aReturn)=0;
+
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMINSTALLVERSION   \
+  NS_IMETHOD    GetMajor(PRInt32* aMajor);  \
+  NS_IMETHOD    SetMajor(PRInt32 aMajor);  \
+  NS_IMETHOD    GetMinor(PRInt32* aMinor);  \
+  NS_IMETHOD    SetMinor(PRInt32 aMinor);  \
+  NS_IMETHOD    GetRelease(PRInt32* aRelease);  \
+  NS_IMETHOD    SetRelease(PRInt32 aRelease);  \
+  NS_IMETHOD    GetBuild(PRInt32* aBuild);  \
+  NS_IMETHOD    SetBuild(PRInt32 aBuild);  \
+  NS_IMETHOD    Init(const nsString& aVersionString);  \
+  NS_IMETHOD    ToString(nsString& aReturn);  \
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMINSTALLVERSION(_to)  \
+  NS_IMETHOD    GetMajor(PRInt32* aMajor) { return _to##GetMajor(aMajor); } \
+  NS_IMETHOD    SetMajor(PRInt32 aMajor) { return _to##SetMajor(aMajor); } \
+  NS_IMETHOD    GetMinor(PRInt32* aMinor) { return _to##GetMinor(aMinor); } \
+  NS_IMETHOD    SetMinor(PRInt32 aMinor) { return _to##SetMinor(aMinor); } \
+  NS_IMETHOD    GetRelease(PRInt32* aRelease) { return _to##GetRelease(aRelease); } \
+  NS_IMETHOD    SetRelease(PRInt32 aRelease) { return _to##SetRelease(aRelease); } \
+  NS_IMETHOD    GetBuild(PRInt32* aBuild) { return _to##GetBuild(aBuild); } \
+  NS_IMETHOD    SetBuild(PRInt32 aBuild) { return _to##SetBuild(aBuild); } \
+  NS_IMETHOD    Init(const nsString& aVersionString) { return _to##Init(aVersionString); }  \
+  NS_IMETHOD    ToString(nsString& aReturn) { return _to##ToString(aReturn); }  \
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn) { return _to##CompareTo(aVersionObject, aReturn); }  \
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn) { return _to##CompareTo(aString, aReturn); }  \
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareTo(aMajor, aMinor, aRelease, aBuild, aReturn); }  \
+
+
+extern nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMInstallVersion_h__

mozilla/xpinstall/public/nsISoftwareUpdate.h

@@ -0,0 +1,85 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#ifndef nsISoftwareUpdate_h__
+#define nsISoftwareUpdate_h__
+
+#include "nsISupports.h"
+#include "nsIFactory.h"
+#include "nsString.h"
+
+#include "nsIXPInstallProgress.h"
+
+#define NS_IXPINSTALLCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/xpinstall"
+#define NS_IXPINSTALLCOMPONENT_CLASSNAME "Mozilla XPInstall Component"
+
+
+#define NS_ISOFTWAREUPDATE_IID                   \
+{ 0x18c2f992, 									 \
+  0xb09f, 										 \
+  0x11d2,						                 \
+ {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}\
+} 
+
+
+class nsISoftwareUpdate : public nsISupports  
+{
+    public:
+        	NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISOFTWAREUPDATE_IID)
+            
+            NS_IMETHOD InstallJar(const nsString& fromURL,
+                                  const nsString& localFile,
+                                  long  flags) = 0; 
+            
+            NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier) = 0;
+            
+            NS_IMETHOD InstallPending(void) = 0;
+
+            /* FIX: these should be in a private interface */
+            NS_IMETHOD InstallJarCallBack()                   = 0; 
+            NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier) = 0;
+};
+
+
+class nsSoftwareUpdateFactory : public nsIFactory 
+{
+    public:
+        
+        nsSoftwareUpdateFactory();
+        virtual ~nsSoftwareUpdateFactory();
+        
+        NS_DECL_ISUPPORTS
+
+              NS_IMETHOD CreateInstance(nsISupports *aOuter,
+                                        REFNSIID aIID,
+                                        void **aResult);
+
+              NS_IMETHOD LockFactory(PRBool aLock);
+
+};
+
+
+#endif // nsISoftwareUpdate_h__
+

mozilla/xpinstall/public/nsIXPInstallProgress.idl

@@ -0,0 +1,30 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+[uuid(eea90d40-b059-11d2-915e-c12b696c9333)]
+interface nsIXPInstallProgress : nsISupports
+{
+        void BeforeJavascriptEvaluation();
+        void AfterJavascriptEvaluation();
+        void InstallStarted([const] in string UIPackageName);
+        void ItemScheduled([const] in string message );
+        void InstallFinalization([const] in string message, in long itemNum, in long totNum );
+        void InstallAborted();
+};

mozilla/xpinstall/public/nsIXPInstallProgressNotifier.h

@@ -0,0 +1,93 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * 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:
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsIXPInstallProgressNotifier_h__
+#define nsIXPInstallProgressNotifier_h__
+
+
+class nsIXPInstallProgressNotifier
+{
+     public:
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: BeforeJavascriptEvaluation
+        // Description	    : This will be called when prior to the install script being evaluate
+        // Return type		: void 
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void BeforeJavascriptEvaluation(void) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: AfterJavascriptEvaluation
+        // Description	    : This will be called after the install script has being evaluated
+        // Return type		: void 
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+         
+        virtual void AfterJavascriptEvaluation(void) = 0;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallStarted
+        // Description	    : This will be called when StartInstall has been called
+        // Return type		: void
+        // Argument         : char* UIPackageName - User Package Name
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallStarted(const char* UIPackageName) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: ItemScheduled
+        // Description	    : This will be called when items are being scheduled 
+        // Return type		: Any value returned other than zero, will be treated as an error and the script will be aborted
+        // Argument         : The message that should be displayed to the user
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual long ItemScheduled( const char* message ) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallFinalization
+        // Description	    : This will be called when the installation is in its Finalize stage 
+        // Return type		: void 
+        // Argument         : char* message - The message that should be displayed to the user
+        // Argument         : long itemNum  - This is the current item number
+        // Argument         : long totNum   - This is the total number of items
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallFinalization( const char* message, long itemNum, long totNum ) = 0;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallAborted
+        // Description	    : This will be called when the install is aborted 
+        // Return type		: void
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallAborted(void) = 0;
+
+};
+
+
+#endif

mozilla/xpinstall/public/nsSoftwareUpdateIIDs.h

@@ -0,0 +1,64 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#ifndef nsSoftwareUpdateIIDs_h___
+#define nsSoftwareUpdateIIDs_h___
+
+#define NS_SoftwareUpdate_CID                        \
+{ /* 18c2f989-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f989,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstall_CID                 \
+{ /* 18c2f98b-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98b,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstallTrigger_CID          \
+{ /* 18c2f98d-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98d,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstallVersion_CID          \
+{ /* 18c2f98f-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98f,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+
+
+#endif /* nsSoftwareUpdateIIDs_h___ */
+

mozilla/xpinstall/res/MANIFEST

@@ -0,0 +1,3 @@
+progress.xul
+progress.css
+progress.html

mozilla/xpinstall/res/Makefile.in

@@ -0,0 +1,34 @@
+#!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
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
+
+EXPORT_RESOURCE_XPINSTALL = \
+	$(srcdir)/progress.xul \
+	$(srcdir)/progress.html \
+	$(srcdir)/progress.css \
+	$(NULL)
+
+install:: 
+	$(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/res/xpinstall

mozilla/xpinstall/res/makefile.win

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

mozilla/xpinstall/res/progress.css

@@ -0,0 +1,3 @@
+TD {
+    font: 10pt sans-serif;
+}

mozilla/xpinstall/res/progress.html

@@ -0,0 +1,16 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<body bgcolor="#C0C0C0"  style="overflow:visible; margin: 0px; color-background: rgb(192,192,192);">
+<center>
+<table BORDER COLS=5 WIDTH="99%" style="color-background:rgb(192,192,192);">
+<tr>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="10%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="81%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+</tr>
+</table>
+</center>
+</body>
+</html>

mozilla/xpinstall/res/progress.xul

@@ -0,0 +1,67 @@
+<?xml version="1.0"?> 
+<?xml-stylesheet href="../samples/xul.css" type="text/css"?> 
+<?xml-stylesheet href="progress.css" type="text/css"?> 
+
+<!DOCTYPE window
+[
+<!ENTITY downloadWindow.title "XPInstall Progress"> 
+<!ENTITY  status "Status:"> 
+<!ENTITY  cancelButtonTitle "Cancel">
+]
+> 
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="XPInstall Progress"
+        width="425"
+        height="225">
+
+    <data>
+        <broadcaster id="data.canceled" type="string" value="false"/>
+    </data>
+
+
+    <html:script>
+ 
+         function cancelInstall() 
+         {
+            var cancelData = document.getElementById("data.canceled");
+            cancelData.setAttribute( "value", "true");
+         }
+
+    </html:script>
+
+<html:center>
+  <html:table style="width:100%;">
+
+    <html:tr>
+      <html:td align="center">
+        <html:input id="dialog.uiPackageName" readonly="" style="background-color:lightgray;width:300px;"/>
+      </html:td>
+    </html:tr>
+
+    <html:tr>
+      <html:td nowrap="" style="border: 1px rgb(192,192,192);" align="center">
+        <html:input id="dialog.currentAction" readonly="" style="background-color:lightgray;width:450px;"/>
+      </html:td>
+    </html:tr>
+
+
+    <html:tr>
+      <html:td align="center" width="15%" nowrap="" style="border: 1px rgb(192,192,192);">
+        <progressmeter id="dialog.progress" mode="undetermined" style="width:300px;height:16px;">
+        </progressmeter>
+	  </html:td>
+    </html:tr>
+
+    <html:tr>
+      <html:td align="center" width="3%"  nowrap="" style="border: 1px rgb(192,192,192);">
+        <html:button onclick="cancelInstall()" height="12">
+          &cancelButtonTitle;
+        </html:button>
+      </html:td>
+    </html:tr>
+  </html:table>
+
+</html:center>
+</window>

mozilla/xpinstall/src/Makefile.in

@@ -0,0 +1,61 @@
+#!gmake
+#
+# 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:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+DEPTH           = ../..
+topsrcdir       = @top_srcdir@
+VPATH           = @srcdir@
+srcdir          = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpinstall
+LIBRARY_NAME	= xpinstall
+IS_COMPONENT	= 1
+REQUIRES        = dom js netlib raptor xpcom
+
+CPPSRCS = \
+    nsSoftwareUpdate.cpp        \
+    nsInstall.cpp               \
+    nsInstallDelete.cpp         \
+    nsInstallExecute.cpp        \
+    nsInstallFile.cpp           \
+    nsInstallFolder.cpp         \
+    nsInstallPatch.cpp          \
+    nsInstallUninstall.cpp      \
+    nsInstallTrigger.cpp        \
+    nsInstallResources.cpp      \
+    nsJSInstall.cpp             \
+    nsJSInstallTriggerGlobal.cpp\
+    nsSoftwareUpdateRun.cpp     \
+    nsSoftwareUpdateStream.cpp  \
+    nsTopProgressNotifier.cpp   \
+    nsLoggingProgressNotifier   \
+    ScheduledTasks.cpp          \
+    nsInstallFileOpItem.cpp     \
+    $(NULL)
+
+INCLUDES += -I$(srcdir)/../public
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -0,0 +1,233 @@
+/* -*- 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:
+
+ *     Douglas Turner <dougt@netscape.com>
+
+ */
+
+ 
+
+#ifndef SU_PAS_H
+
+#define SU_PAS_H
+
+
+
+
+
+#include <Errors.h>
+
+#include <Types.h>
+
+#include <Files.h>
+
+#include <Script.h>
+
+#include <Resources.h>
+
+
+
+typedef struct PASHeader /* header portion of Patchable AppleSingle */
+
+{
+
+       UInt32 magicNum; 	/* internal file type tag = 0x00244200*/
+
+       UInt32 versionNum; 	/* format version: 1 = 0x00010000 */
+
+       UInt8 filler[16]; 	/* filler */
+
+       UInt16 numEntries; 	/* number of entries which follow */
+
+} PASHeader ; 
+
+
+
+
+
+typedef struct PASEntry 	/* one Patchable AppleSingle entry descriptor */
+
+{
+
+        UInt32 entryID; 	/* entry type: see list, 0 invalid 		*/
+
+        UInt32 entryOffset; /* offset, in bytes, from beginning 	*/
+
+                            /* of file to this entry's data 		*/
+
+        UInt32 entryLength; /* length of data in octets 			*/
+
+        
+
+} PASEntry; 
+
+
+
+
+
+typedef struct PASMiscInfo
+
+{
+
+	short	fileHasResFork;
+
+	short	fileResAttrs;
+
+	OSType 	fileType;
+
+	OSType	fileCreator;
+
+	UInt32	fileFlags;
+
+
+
+} PASMiscInfo; 
+
+
+
+
+
+typedef struct PASResFork
+
+{
+
+	short	NumberOfTypes;
+
+	
+
+} PASResFork; 
+
+
+
+
+
+typedef struct PASResource
+
+{
+
+	short			attr;
+
+	short			attrID;
+
+	OSType			attrType;
+
+	Str255			attrName;
+
+	unsigned long	length;
+
+		
+
+} PASResource; 
+
+
+
+
+
+
+
+#if PRAGMA_ALIGN_SUPPORTED
+
+#pragma options align=reset
+
+#endif
+
+
+
+
+
+#define kCreator	'MOSS'
+
+#define kType		'PASf'
+
+#define PAS_BUFFER_SIZE (1024*512)
+
+
+
+#define PAS_MAGIC_NUM	(0x00244200)
+
+#define PAS_VERSION		(0x00010000)
+
+
+
+enum
+
+{
+
+	ePas_Data	=	1,
+
+	ePas_Misc,
+
+	ePas_Resource
+
+};
+
+
+
+#ifdef __cplusplus
+
+extern "C" {
+
+#endif
+
+
+
+/* Prototypes */
+
+OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
+
+OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
+
+
+
+
+
+
+
+#ifdef __cplusplus
+
+}
+
+#endif
+
+
+
+#endif /* SU_PAS_H */

mozilla/xpinstall/src/ScheduledTasks.cpp

@@ -0,0 +1,380 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nscore.h"
+#include "NSReg.h"
+#include "nsFileSpec.h"
+#include "nsFileStream.h"
+#include "nsInstall.h" // for error codes
+#include "prmem.h"
+#include "ScheduledTasks.h"
+
+#ifdef _WINDOWS
+#include <sys/stat.h>
+#include <windows.h>
+
+BOOL WIN32_IsMoveFileExBroken()
+{
+    /* the NT option MOVEFILE_DELAY_UNTIL_REBOOT is broken on 
+     * Windows NT 3.51 Service Pack 4 and NT 4.0 before Service Pack 2
+     */
+    BOOL broken = FALSE;
+    OSVERSIONINFO osinfo;
+
+    // they *all* appear broken--better to have one way that works.
+    return TRUE;
+
+    osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    if (GetVersionEx(&osinfo) && osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
+    {
+        if ( osinfo.dwMajorVersion == 3 && osinfo.dwMinorVersion == 51 )
+        {
+            if ( 0 == stricmp(osinfo.szCSDVersion,"Service Pack 4"))
+            {
+                broken = TRUE;
+            }
+        }
+        else if ( osinfo.dwMajorVersion == 4 )
+        {
+            if (osinfo.szCSDVersion[0] == '\0' || 
+                (0 == stricmp(osinfo.szCSDVersion,"Service Pack 1")))
+            {
+                broken = TRUE;
+            }
+        }
+    }
+
+    return broken;
+}
+
+
+PRInt32 DoWindowsReplaceExistingFileStuff(const char* currentName, const char* finalName)
+{
+    PRInt32 err = 0;
+
+    char* final   = strdup(finalName);
+    char* current = strdup(currentName);
+
+    /* couldn't delete, probably in use. Schedule for later */
+     DWORD	dwVersion, dwWindowsMajorVersion;
+
+    /* Get OS version info */
+    dwVersion = GetVersion();
+    dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
+
+    /* Get build numbers for Windows NT or Win32s */
+
+    if (dwVersion < 0x80000000)                // Windows NT
+    {
+    	/* On Windows NT */
+        if ( WIN32_IsMoveFileExBroken() )
+        {
+            /* the MOVEFILE_DELAY_UNTIL_REBOOT option doesn't work on
+             * NT 3.51 SP4 or on NT 4.0 until SP2
+             */
+            struct stat statbuf;
+            PRBool nameFound = PR_FALSE;
+            char tmpname[_MAX_PATH];
+            
+            strncpy( tmpname, finalName, _MAX_PATH );
+            int len = strlen(tmpname);
+            while (!nameFound && len < _MAX_PATH ) 
+            {
+                    tmpname[len-1] = '~';
+                    tmpname[len] = '\0';
+                    if ( stat(tmpname, &statbuf) != 0 )
+                        nameFound = TRUE;
+                    else
+                        len++;
+            }
+
+            if ( nameFound ) 
+            {
+                if ( MoveFile( finalName, tmpname ) ) 
+                {
+                    if ( MoveFile( currentName, finalName ) ) 
+                    {
+                        DeleteFileNowOrSchedule(nsFileSpec(tmpname));
+                    }
+                    else 
+                    {
+                        /* 2nd move failed, put old file back */
+                        MoveFile( tmpname, finalName );
+                    }
+                }
+                else
+                {
+                    /* non-executable in use; schedule for later */
+                    return -1;  // let the start registry stuff do our work!
+                }
+            }
+        }
+        else if ( MoveFileEx(currentName, finalName, MOVEFILE_DELAY_UNTIL_REBOOT) )
+        {
+		    err = 0;
+        }
+    }
+	else // Windows 95 or Win16
+	{
+        /*
+ 		 * Place an entry in the WININIT.INI file in the Windows directory
+		 * to delete finalName and rename currentName to be finalName at reboot
+ 		 */
+
+        int strlen;
+ 		char	Src[_MAX_PATH];   // 8.3 name
+ 		char	Dest[_MAX_PATH];  // 8.3 name
+
+        strlen = GetShortPathName( (LPCTSTR)currentName, (LPTSTR)Src, (DWORD)sizeof(Src) );
+        if ( strlen > 0 ) 
+        {
+            free(current);
+            current   = strdup(Src);
+        }
+
+		strlen = GetShortPathName( (LPCTSTR) finalName, (LPTSTR) Dest, (DWORD) sizeof(Dest));
+        if ( strlen > 0 ) 
+        {
+            free(final);
+            final   = strdup(Dest);
+        }
+        
+        /* NOTE: use OEM filenames! Even though it looks like a Windows
+         *       .INI file, WININIT.INI is processed under DOS 
+         */
+        
+        AnsiToOem( final, final );
+        AnsiToOem( current, current );
+
+        if ( WritePrivateProfileString( "Rename", final, current, "WININIT.INI" ) )
+		    err = 0;
+    }
+    
+    free(final);
+    free(current);
+
+    return err;
+}
+#endif
+
+
+
+
+
+
+REGERR DeleteFileNowOrSchedule(nsFileSpec& filename)
+{
+
+    REGERR result = 0;
+    
+    filename.Delete(false);
+    
+    if (filename.Exists())
+    {
+        RKEY newkey;
+        HREG reg;
+        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
+        {
+            if (REGERR_OK == NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY, &newkey) )
+            {
+                // FIX should be using nsPersistentFileDescriptor!!!
+
+                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)filename.GetNativePathCString(), REGTYPE_ENTRY_FILE, nsnull, 0);
+                if (result == REGERR_OK)
+                    result = nsInstall::REBOOT_NEEDED;
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+/* tmp file is the bad one that we want to replace with target. */
+
+REGERR ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
+{
+    REGERR result = 0;
+    
+    if(replacementFile == doomedFile)
+    {
+        /* do not have to do anything */
+        return result;
+    }
+
+    doomedFile.Delete(false);
+
+    if (! doomedFile.Exists() )
+    {
+        // Now that we have move the existing file, we can move the mExtracedFile into place.
+        nsFileSpec parentofFinalFile;
+
+        doomedFile.GetParent(parentofFinalFile);
+        result = replacementFile.Move(parentofFinalFile);
+        if ( NS_SUCCEEDED(result) )
+        {
+            char* leafName = doomedFile.GetLeafName();
+            replacementFile.Rename(leafName);
+            nsCRT::free(leafName);
+        }
+    }
+    else
+    {
+#ifdef _WINDOWS
+        if (DoWindowsReplaceExistingFileStuff(replacementFile.GetNativePathCString(), doomedFile.GetNativePathCString()) == 0)
+            return 0;
+#endif
+
+        RKEY newkey;
+        HREG reg;
+
+        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
+        {
+            result = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &newkey);
+            if ( result == REGERR_OK ) 
+            {
+                char* replacementFileName = (char*)(const char*)replacementFile.GetNativePathCString();
+                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)doomedFile.GetNativePathCString(), REGTYPE_ENTRY_FILE, replacementFileName, strlen(replacementFileName));
+                if (result == REGERR_OK)
+                    result = nsInstall::REBOOT_NEEDED;
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+
+void DeleteScheduledFiles(void);
+void ReplaceScheduledFiles(void);
+
+extern "C" void PerformScheduledTasks(void *data)
+{
+    DeleteScheduledFiles();
+    ReplaceScheduledFiles();
+}
+
+
+void DeleteScheduledFiles(void)
+{
+    HREG reg;
+
+    if (REGERR_OK == NR_RegOpen("", &reg))
+    {
+        RKEY    key;
+	    REGENUM state;
+
+        /* perform scheduled file deletions and replacements (PC only) */
+        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY,&key))
+        {
+            char buf[MAXREGNAMELEN];
+
+            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, buf, sizeof(buf), NULL ))
+            {
+                nsFileSpec doomedFile(buf);
+
+                doomedFile.Delete(PR_FALSE);
+                
+                if (! doomedFile.Exists()) 
+                {
+                    NR_RegDeleteEntry( reg, key, buf );
+                }
+            }
+
+            /* delete list node if empty */
+			if (REGERR_NOMORE == NR_RegEnumEntries( reg, key, &state, buf, sizeof(buf), NULL ))
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY);
+            }
+        }
+        
+        NR_RegClose(reg);
+    }
+}
+
+void ReplaceScheduledFiles(void)
+{
+    HREG reg;
+     
+    if (REGERR_OK == NR_RegOpen("", &reg))
+    {
+        RKEY    key;
+	    REGENUM state;
+
+        /* replace files if any listed */
+        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &key))
+        {
+            char tmpfile[MAXREGNAMELEN];
+            char target[MAXREGNAMELEN];
+
+            state = 0;
+            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL ))
+            {
+
+                nsFileSpec replaceFile(tmpfile);
+
+                if (! replaceFile.Exists() )
+                {
+                    NR_RegDeleteEntry( reg, key, tmpfile );
+                }
+                else if ( REGERR_OK != NR_RegGetEntryString( reg, key, tmpfile, target, sizeof(target) ) )
+                {
+                    /* can't read target filename, corruption? */
+                    NR_RegDeleteEntry( reg, key, tmpfile );
+                }
+                else 
+                {
+                    nsFileSpec targetFile(target);
+                
+                    targetFile.Delete(PR_FALSE);
+                
+                    if (!targetFile.Exists())
+                    {
+                        nsFileSpec parentofTarget;
+                        targetFile.GetParent(parentofTarget);                                           
+                    
+                        nsresult result = replaceFile.Move(parentofTarget);
+                        if ( NS_SUCCEEDED(result) )
+                        {
+                            char* leafName = targetFile.GetLeafName();
+                            replaceFile.Rename(leafName);
+                            nsCRT::free(leafName);
+                            
+                            NR_RegDeleteEntry( reg, key, tmpfile );
+                        }
+                    }
+                }
+            }
+            /* delete list node if empty */
+            if (REGERR_NOMORE == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL )) 
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY);
+            }
+        }
+        
+        NR_RegClose(reg);
+    }
+}

mozilla/xpinstall/src/ScheduledTasks.h

@@ -0,0 +1,42 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __SCHEDULEDTASKS_H__
+#define __SCHEDULEDTASKS_H__
+
+
+#include "NSReg.h"
+#include "nsFileSpec.h"
+
+
+REGERR DeleteFileNowOrSchedule(nsFileSpec& filename);
+REGERR ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
+
+
+extern "C" void PerformScheduledTasks(void *data);
+
+
+#endif

mozilla/xpinstall/src/gdiff.h

@@ -0,0 +1,135 @@
+/* -*- 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.
+ */
+/*--------------------------------------------------------------
+ * GDIFF.H
+ *
+ * Constants used in processing the GDIFF format
+ *--------------------------------------------------------------*/
+
+
+#include "prio.h"
+#include "nsFileSpec.h"
+
+#define GDIFF_MAGIC         "\xD1\xFF\xD1\xFF"
+#define GDIFF_MAGIC_LEN     4
+#define GDIFF_VER           5
+#define GDIFF_EOF           "\0"
+
+#define GDIFF_VER_POS       4
+#define GDIFF_CS_POS        5
+#define GDIFF_CSLEN_POS     6
+
+#define GDIFF_HEADERSIZE    7
+#define GDIFF_APPDATALEN    4
+
+#define GDIFF_CS_NONE       0
+#define GDIFF_CS_MD5        1
+#define GDIFF_CS_SHA        2
+#define GDIFF_CS_CRC32      32
+
+#define CRC32_LEN           4
+
+/*--------------------------------------
+ *  GDIFF opcodes
+ *------------------------------------*/
+#define ENDDIFF     0
+#define ADD8MAX     246
+#define ADD16       247
+#define ADD32       248
+#define COPY16BYTE  249
+#define COPY16SHORT 250
+#define COPY16LONG  251
+#define COPY32BYTE  252
+#define COPY32SHORT 253
+#define COPY32LONG  254
+#define COPY64      255
+
+/* instruction sizes */
+#define ADD16SIZE           2
+#define ADD32SIZE           4
+#define COPY16BYTESIZE      3
+#define COPY16SHORTSIZE     4
+#define COPY16LONGSIZE      6
+#define COPY32BYTESIZE      5
+#define COPY32SHORTSIZE     6
+#define COPY32LONGSIZE      8
+#define COPY64SIZE          12
+
+
+/*--------------------------------------
+ *  error codes
+ *------------------------------------*/
+#define GDIFF_OK                0
+#define GDIFF_ERR_UNKNOWN       -1
+#define GDIFF_ERR_ARGS          -2
+#define GDIFF_ERR_ACCESS        -3
+#define GDIFF_ERR_MEM           -4
+#define GDIFF_ERR_HEADER        -5
+#define GDIFF_ERR_BADDIFF       -6
+#define GDIFF_ERR_OPCODE        -7
+#define GDIFF_ERR_OLDFILE       -8
+#define GDIFF_ERR_CHKSUMTYPE    -9
+#define GDIFF_ERR_CHECKSUM      -10
+#define GDIFF_ERR_CHECKSUM_TARGET  -11
+#define GDIFF_ERR_CHECKSUM_RESULT  -12
+
+
+/*--------------------------------------
+ *  types
+ *------------------------------------*/
+#ifndef AIX
+#ifdef OSF1
+#include <sys/types.h>
+#else
+typedef unsigned char uchar;
+#endif
+#endif
+
+typedef struct _diffdata {
+    PRFileDesc*	fSrc;
+    PRFileDesc*	fOut;
+    PRFileDesc*	fDiff;
+    uint8       checksumType;
+    uint8       checksumLength;
+    uchar*      oldChecksum;
+    uchar*      newChecksum;
+    PRBool      bMacAppleSingle;
+    PRBool      bWin32BoundImage;
+    uchar*      databuf;
+    uint32      bufsize;
+} DIFFDATA;
+
+typedef DIFFDATA* pDIFFDATA;
+
+
+/*--------------------------------------
+ *  miscellaneous
+ *------------------------------------*/
+
+#define APPFLAG_W32BOUND        "autoinstall:Win32PE"
+#define APPFLAG_APPLESINGLE     "autoinstall:AppleSingle"
+
+#ifndef TRUE
+  #define TRUE  1
+#endif
+
+#ifndef FALSE
+  #define FALSE 0
+#endif
+
+

mozilla/xpinstall/src/makefile.win

@@ -0,0 +1,111 @@
+#!nmake
+#
+# 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:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH=..\..
+IGNORE_MANIFEST=1
+
+MAKE_OBJ_TYPE = DLL
+MODULE=xpinstall
+
+DLL=.\$(OBJDIR)\$(MODULE).dll
+
+DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
+
+LCFLAGS =          \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+LINCS=                          \
+        -I$(PUBLIC)\xpinstall   \
+        -I$(PUBLIC)\jar         \
+        -I$(PUBLIC)\libreg      \
+        -I$(PUBLIC)\netlib      \
+        -I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\pref        \
+        -I$(PUBLIC)\rdf         \
+        -I$(PUBLIC)\js          \
+        -I$(PUBLIC)\dom         \
+        -I$(PUBLIC)\raptor      \
+        -I$(PUBLIC)\nspr2       \
+		-I$(PUBLIC)\zlib        \
+        -I$(PUBLIC)\xpfe\components \
+        $(NULL)
+
+LLIBS =                                \
+        $(DIST)\lib\jar50.lib          \
+        $(DIST)\lib\libreg32.lib       \
+        $(DIST)\lib\netlib.lib         \
+        $(DIST)\lib\xpcom.lib        \
+        $(DIST)\lib\js3250.lib         \
+        $(DIST)\lib\jsdombase_s.lib    \
+        $(DIST)\lib\jsdomevents_s.lib  \
+		$(DIST)\lib\zlib.lib           \
+		$(DIST)\lib\plc3.lib           \
+        $(LIBNSPR)                     \
+        $(NULL)
+
+
+OBJS =                                          \
+       .\$(OBJDIR)\nsInstall.obj                \
+       .\$(OBJDIR)\nsInstallTrigger.obj         \
+       .\$(OBJDIR)\nsInstallVersion.obj         \
+       .\$(OBJDIR)\nsInstallFolder.obj          \
+       .\$(OBJDIR)\nsJSInstall.obj              \
+       .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
+       .\$(OBJDIR)\nsJSInstallVersion.obj       \
+       .\$(OBJDIR)\nsSoftwareUpdate.obj         \
+       .\$(OBJDIR)\nsSoftwareUpdateRun.obj      \
+       .\$(OBJDIR)\nsSoftwareUpdateStream.obj   \
+       .\$(OBJDIR)\nsInstallFile.obj            \
+       .\$(OBJDIR)\nsInstallDelete.obj          \
+       .\$(OBJDIR)\nsInstallExecute.obj         \
+       .\$(OBJDIR)\nsInstallPatch.obj           \
+       .\$(OBJDIR)\nsInstallUninstall.obj       \
+       .\$(OBJDIR)\nsInstallResources.obj       \
+       .\$(OBJDIR)\nsTopProgressNotifier.obj    \
+       .\$(OBJDIR)\nsLoggingProgressNotifier.obj\
+       .\$(OBJDIR)\ScheduledTasks.obj           \
+       .\$(OBJDIR)\nsWinReg.obj                 \
+       .\$(OBJDIR)\nsJSWinReg.obj               \
+       .\$(OBJDIR)\nsWinRegItem.obj             \
+       .\$(OBJDIR)\nsWinRegValue.obj            \
+       .\$(OBJDIR)\nsWinProfile.obj             \
+       .\$(OBJDIR)\nsJSWinProfile.obj           \
+       .\$(OBJDIR)\nsWinProfileItem.obj         \
+       .\$(OBJDIR)\nsInstallProgressDialog.obj  \
+       .\$(OBJDIR)\nsInstallFileOpItem.obj      \
+       $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin\components
+
+clobber::
+        rm -f $(DIST)\lib\$(MODULE).lib
+        rm -f $(DIST)\bin\components\$(MODULE).dll
+

mozilla/xpinstall/src/nsInstall.h

@@ -0,0 +1,265 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __NS_INSTALL_H__
+#define __NS_INSTALL_H__
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+#include "jsapi.h"
+
+#include "plevent.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsVector.h"
+#include "nsHashtable.h"
+
+#include "nsSoftwareUpdate.h"
+
+#include "nsInstallObject.h"
+#include "nsInstallVersion.h"
+
+#include "nsIXPInstallProgress.h"
+
+
+class nsInstallInfo
+{
+  public:
+    
+    nsInstallInfo(const nsString& fromURL, const nsString& localFile, long flags);
+
+    nsInstallInfo(nsVector* fromURL, nsVector* localFiles, long flags);
+    
+    virtual ~nsInstallInfo();
+
+    nsString& GetFromURL(PRUint32 index = 0);
+    
+    nsString& GetLocalFile(PRUint32 index = 0);
+
+    void GetArguments(nsString& args, PRUint32 index = 0);
+    
+    long GetFlags();
+    
+    PRBool    IsMultipleTrigger();
+
+    static void DeleteVector(nsVector* vector);    
+    
+  private:
+    
+    
+    PRBool    mMultipleTrigger;
+    nsresult  mError;
+
+    long       mFlags;
+    nsVector  *mFromURLs;
+    nsVector  *mLocalFiles;
+};
+
+
+
+class nsInstall
+{
+    friend class nsWinReg;
+    friend class nsWinProfile;
+
+    public:
+       
+        enum 
+        {
+            BAD_PACKAGE_NAME            = -200,
+            UNEXPECTED_ERROR            = -201,
+            ACCESS_DENIED               = -202,
+            TOO_MANY_CERTIFICATES       = -203,
+            NO_INSTALLER_CERTIFICATE    = -204,
+            NO_CERTIFICATE              = -205,
+            NO_MATCHING_CERTIFICATE     = -206,
+            UNKNOWN_JAR_FILE            = -207,
+            INVALID_ARGUMENTS           = -208,
+            ILLEGAL_RELATIVE_PATH       = -209,
+            USER_CANCELLED              = -210,
+            INSTALL_NOT_STARTED         = -211,
+            SILENT_MODE_DENIED          = -212,
+            NO_SUCH_COMPONENT           = -213,
+            FILE_DOES_NOT_EXIST         = -214,
+            FILE_READ_ONLY              = -215,
+            FILE_IS_DIRECTORY           = -216,
+            NETWORK_FILE_IS_IN_USE      = -217,
+            APPLE_SINGLE_ERR            = -218,
+            INVALID_PATH_ERR            = -219,
+            PATCH_BAD_DIFF              = -220,
+            PATCH_BAD_CHECKSUM_TARGET   = -221,
+            PATCH_BAD_CHECKSUM_RESULT   = -222,
+            UNINSTALL_FAILED            = -223,
+            GESTALT_UNKNOWN_ERR         = -5550,
+            GESTALT_INVALID_ARGUMENT    = -5551,
+            
+            SUCCESS                     = 0,
+            REBOOT_NEEDED               = 999,
+            
+            LIMITED_INSTALL             = 0,
+            FULL_INSTALL                = 1,
+            NO_STATUS_DLG               = 2,
+            NO_FINALIZE_DLG             = 4,
+
+            INSTALL_FILE_UNEXPECTED_MSG_ID = 0,
+            DETAILS_REPLACE_FILE_MSG_ID = 1,
+            DETAILS_INSTALL_FILE_MSG_ID = 2
+        };
+
+
+        nsInstall();
+        virtual ~nsInstall();
+        
+        PRInt32    SetScriptObject(void* aScriptObject);
+
+        PRInt32    SaveWinRegPrototype(void* aScriptObject);
+        PRInt32    SaveWinProfilePrototype(void* aScriptObject);
+        
+        JSObject*  RetrieveWinRegPrototype(void);
+        JSObject*  RetrieveWinProfilePrototype(void);
+
+        PRInt32    GetUserPackageName(nsString& aUserPackageName);
+        PRInt32    GetRegPackageName(nsString& aRegPackageName);
+
+        PRInt32    AbortInstall();
+        
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRBool aForceMode, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aJarSource, PRInt32* aReturn);
+        
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRBool aForceMode, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aJarSource, PRInt32* aReturn);
+        
+        PRInt32    DeleteComponent(const nsString& aRegistryName, PRInt32* aReturn);
+        PRInt32    DeleteFile(const nsString& aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
+        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt32* aReturn);
+        PRInt32    Execute(const nsString& aJarSource, const nsString& aArgs, PRInt32* aReturn);
+        PRInt32    Execute(const nsString& aJarSource, PRInt32* aReturn);
+        PRInt32    FinalizeInstall(PRInt32* aReturn);
+        PRInt32    Gestalt(const nsString& aSelector, PRInt32* aReturn);
+        PRInt32    GetComponentFolder(const nsString& aComponentName, const nsString& aSubdirectory, nsString** aFolder);
+        PRInt32    GetComponentFolder(const nsString& aComponentName, nsString** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsString** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, nsString** aFolder);
+        PRInt32    GetLastError(PRInt32* aReturn);
+        PRInt32    GetWinProfile(const nsString& aFolder, const nsString& aFile, JSContext* jscontext, JSClass* WinProfileClass, jsval* aReturn);
+        PRInt32    GetWinRegistry(JSContext* jscontext, JSClass* WinRegClass, jsval* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    ResetError();
+        PRInt32    SetPackageFolder(const nsString& aFolder);
+        PRInt32    StartInstall(const nsString& aUserPackageName, const nsString& aPackageName, const nsString& aVersion, PRInt32* aReturn);
+        PRInt32    Uninstall(const nsString& aPackageName, PRInt32* aReturn);
+        
+        PRInt32    FileOpDirCreate(nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpDirGetParent(nsFileSpec& aTarget, nsFileSpec* aReturn);
+        PRInt32    FileOpDirRemove(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpDirRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileCopy(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileDelete(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileExists(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileExecute(nsFileSpec& aTarget, nsString& aParams, PRInt32* aReturn);
+        PRInt32    FileOpFileGetNativeVersion(nsFileSpec& aTarget, nsString* aReturn);
+        PRInt32    FileOpFileGetDiskSpaceAvailable(nsFileSpec& aTarget, PRUint32* aReturn);
+        PRInt32    FileOpFileGetModDate(nsFileSpec& aTarget, nsFileSpec::TimeStamp* aReturn);
+        PRInt32    FileOpFileGetSize(nsFileSpec& aTarget, PRUint32* aReturn);
+        PRInt32    FileOpFileIsDirectory(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileIsFile(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileModDateChanged(nsFileSpec& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
+        PRInt32    FileOpFileMove(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileWinShortcutCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileMacAliasCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileUnixLinkCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+
+        PRInt32    ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedName, nsFileSpec** aRealName);
+        void       AddPatch(nsHashKey *aKey, nsFileSpec* fileName);
+        void       GetPatch(nsHashKey *aKey, nsFileSpec* fileName);
+        
+        void       GetJarFileLocation(nsString& aFile);
+        void       SetJarFileLocation(const nsString& aFile);
+
+        void       GetInstallArguments(nsString& args);
+        void       SetInstallArguments(const nsString& args);
+
+
+    private:
+        JSObject*           mScriptObject;
+        
+        JSObject*           mWinRegObject;
+        JSObject*           mWinProfileObject;
+        
+        nsString            mJarFileLocation;
+        void*               mJarFileData;
+        
+        nsString            mInstallArguments;
+
+        PRBool              mUserCancelled;
+        
+        PRBool              mUninstallPackage;
+        PRBool              mRegisterPackage;
+
+        nsString            mRegistryPackageName;   /* Name of the package we are installing */
+        nsString            mUIName;                /* User-readable package name */
+
+        nsInstallVersion*   mVersionInfo;           /* Component version info */
+        
+        nsVector*           mInstalledFiles;        
+        nsHashtable*        mPatchList;
+        
+        nsIXPInstallProgress *mNotifier;
+        
+        PRInt32             mLastError;
+
+        void        ParseFlags(int flags);
+        PRInt32     SanityCheck(void);
+        void        GetTime(nsString &aString);
+
+        
+        PRInt32     GetQualifiedRegName(const nsString& name, nsString& qualifiedRegName );
+        PRInt32     GetQualifiedPackageName( const nsString& name, nsString& qualifiedName );
+        
+        void        CurrentUserNode(nsString& userRegNode);
+        PRBool      BadRegName(const nsString& regName);
+        PRInt32     SaveError(PRInt32 errcode);
+
+        void        CleanUp();
+
+        PRInt32     OpenJARFile(void);
+        void        CloseJARFile(void);
+        PRInt32     ExtractDirEntries(const nsString& directory, nsVector *paths);
+
+        PRInt32     ScheduleForInstall(nsInstallObject* ob);
+        
+
+};
+
+#endif

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -0,0 +1,235 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#include "prmem.h"
+
+#include "nsFileSpec.h"
+
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "nsInstallDelete.h"
+#include "nsInstallResources.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  const nsString& folderSpec,
+                                  const nsString& inPartialPath,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if ((folderSpec == "null") || (inInstall == NULL)) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_FILE;
+    mFinalFile      = nsnull;
+    mRegistryName   = "";
+    
+
+    mFinalFile = new nsFileSpec(folderSpec);
+    *mFinalFile += inPartialPath;
+
+    *error = ProcessInstallDelete();
+}
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  const nsString& inComponentName,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if (inInstall == NULL) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_COMPONENT;
+    mFinalFile    = nsnull;
+    mRegistryName = inComponentName;
+
+    *error = ProcessInstallDelete();
+}
+
+
+nsInstallDelete::~nsInstallDelete()
+{
+    if (mFinalFile == nsnull)
+        delete mFinalFile;
+}
+
+
+PRInt32 nsInstallDelete::Prepare()
+{
+    // no set-up necessary
+    return nsInstall::SUCCESS;
+}
+
+PRInt32 nsInstallDelete::Complete()
+{
+    PRInt32 err = nsInstall::SUCCESS;
+
+    if (mInstall == NULL) 
+       return nsInstall::INVALID_ARGUMENTS;
+
+    if (mDeleteStatus == DELETE_COMPONENT) 
+    {
+        char* temp = mRegistryName.ToNewCString();
+        err = VR_Remove(temp);
+        delete [] temp;
+    }
+
+    if ((mDeleteStatus == DELETE_FILE) || (err == REGERR_OK)) 
+    {
+        err = NativeComplete();
+    }	
+    else 
+    {
+        err = nsInstall::UNEXPECTED_ERROR;
+    }
+
+    
+    return err;
+}
+
+void nsInstallDelete::Abort()
+{
+}
+
+char* nsInstallDelete::toString()
+{
+    char* buffer = new char[1024];
+    
+    if (mDeleteStatus == DELETE_COMPONENT)
+    {
+        sprintf( buffer, nsInstallResources::GetDeleteComponentString(), nsAutoCString(mRegistryName));
+    }
+    else
+    {
+        if (mFinalFile)
+            sprintf( buffer, nsInstallResources::GetDeleteFileString(), mFinalFile->GetCString());
+    }
+
+    return buffer;
+}
+
+
+PRBool
+nsInstallDelete::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallDelete::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+
+
+PRInt32 nsInstallDelete::ProcessInstallDelete()
+{
+    PRInt32 err;
+    
+    char* tempCString = nsnull;
+
+    if (mDeleteStatus == DELETE_COMPONENT) 
+    {
+        /* Check if the component is in the registry */
+        tempCString = mRegistryName.ToNewCString();
+
+        err = VR_InRegistry( tempCString );
+                
+        if (err != REGERR_OK) 
+        {
+            return err;
+        } 
+        else 
+        {
+            char* tempRegistryString;
+
+            tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
+            
+            err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
+            
+            if (err == REGERR_OK)
+            {
+                if (mFinalFile)
+                    delete mFinalFile;
+
+                mFinalFile = new nsFileSpec(tempRegistryString);
+            }
+
+            PR_FREEIF(tempRegistryString);
+        }
+    }
+    
+    if(tempCString)
+        delete [] tempCString;
+
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+            err = nsInstall::SUCCESS;
+        }
+        else
+        {
+            err = nsInstall::FILE_IS_DIRECTORY;
+        }
+    }
+    else
+    {
+        err = nsInstall::FILE_DOES_NOT_EXIST;
+    }
+
+    return err;
+}
+
+
+
+PRInt32 nsInstallDelete::NativeComplete()
+{
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+           return DeleteFileNowOrSchedule(*mFinalFile);
+        }
+        else
+        {
+            return nsInstall::FILE_IS_DIRECTORY;
+        }
+    }
+    
+    return nsInstall::FILE_DOES_NOT_EXIST;
+}
+

mozilla/xpinstall/src/nsInstallDelete.h

@@ -0,0 +1,78 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallDelete_h__
+#define nsInstallDelete_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+
+#define DELETE_COMPONENT 1
+#define DELETE_FILE      2
+
+class nsInstallDelete : public nsInstallObject 
+{
+    public:
+
+        nsInstallDelete(  nsInstall* inInstall,
+                          const nsString& folderSpec,
+                          const nsString& inPartialPath,
+                          PRInt32 *error);
+
+        nsInstallDelete(  nsInstall* inInstall,
+                          const nsString& ,
+                          PRInt32 *error);
+
+        virtual ~nsInstallDelete();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void    Abort();
+        char*   toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	    
+  
+    private:
+
+        /* Private Fields */
+
+        nsFileSpec* mFinalFile;
+        
+        nsString    mRegistryName;
+        PRInt32     mDeleteStatus;
+
+        PRInt32 ProcessInstallDelete();
+        PRInt32 NativeComplete();
+        
+};
+
+#endif /* nsInstallDelete_h__ */

mozilla/xpinstall/src/nsInstallExecute.cpp

@@ -0,0 +1,136 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+
+#include "prmem.h"
+
+#include "nsFileSpec.h"
+
+#include "VerReg.h"
+#include "nsInstallExecute.h"
+#include "nsInstallResources.h"
+#include "ScheduledTasks.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
+                                      const nsString& inJarLocation,
+                                      const nsString& inArgs,
+                                      PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if ((inInstall == nsnull) || (inJarLocation == "null"))
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    mJarLocation        = inJarLocation;
+    mArgs               = inArgs;
+    mExecutableFile     = nsnull;
+
+}
+
+
+nsInstallExecute::~nsInstallExecute()
+{
+    if (mExecutableFile)
+        delete mExecutableFile;
+}
+
+
+
+PRInt32 nsInstallExecute::Prepare()
+{
+    if (mInstall == NULL || mJarLocation == "null") 
+        return nsInstall::INVALID_ARGUMENTS;
+
+    return mInstall->ExtractFileFromJar(mJarLocation, nsnull, &mExecutableFile);
+}
+
+PRInt32 nsInstallExecute::Complete()
+{
+    if (mExecutableFile == nsnull)
+        return nsInstall::INVALID_ARGUMENTS;
+
+    nsFileSpec app( *mExecutableFile);
+    
+    if (!app.Exists())
+	{
+		return nsInstall::INVALID_ARGUMENTS;
+	}
+
+    PRInt32 result = app.Execute( mArgs );
+    
+    DeleteFileNowOrSchedule( app );
+    
+    return result;
+}
+
+void nsInstallExecute::Abort()
+{
+    /* Get the names */
+    if (mExecutableFile == nsnull) 
+        return;
+
+    DeleteFileNowOrSchedule(*mExecutableFile);
+}
+
+char* nsInstallExecute::toString()
+{
+    char* buffer = new char[1024];
+    
+    // if the FileSpec is NULL, just us the in jar file name.
+
+    if (mExecutableFile == nsnull)
+    {
+        char *tempString = mJarLocation.ToNewCString();
+        sprintf( buffer, nsInstallResources::GetExecuteString(), tempString);
+        delete [] tempString;
+    }
+    else
+    {
+        sprintf( buffer, nsInstallResources::GetExecuteString(), mExecutableFile->GetCString());
+    }
+    return buffer;
+
+}
+
+
+PRBool
+nsInstallExecute::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallExecute::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+

mozilla/xpinstall/src/nsInstallExecute.h

@@ -0,0 +1,73 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallExecute_h__
+#define nsInstallExecute_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+
+class nsInstallExecute : public nsInstallObject 
+{
+    public:
+          
+        nsInstallExecute( nsInstall* inInstall,
+                          const nsString& inJarLocation,
+                          const nsString& inArgs,
+                          PRInt32 *error);
+
+
+        virtual ~nsInstallExecute();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+          
+        nsString mJarLocation; // Location in the JAR
+        nsString mArgs;        // command line arguments
+        
+        nsFileSpec *mExecutableFile;    // temporary file location
+        
+
+        PRInt32 NativeComplete(void);
+        void NativeAbort(void);
+
+};
+
+#endif /* nsInstallExecute_h__ */

mozilla/xpinstall/src/nsInstallFile.cpp

@@ -0,0 +1,366 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstallFile.h"
+#include "nsFileSpec.h"
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+#include "nsInstallResources.h"
+
+/* Public Methods */
+
+/*	Constructor
+        inInstall    - softUpdate object we belong to
+        inComponentName	- full path of the registry component
+        inVInfo	        - full version info
+        inJarLocation   - location inside the JAR file
+        inFinalFileSpec	- final	location on disk
+*/
+
+
+nsInstallFile::nsInstallFile(nsInstall* inInstall,
+                             const nsString& inComponentName,
+                             const nsString& inVInfo,
+                             const nsString& inJarLocation,
+                             const nsString& folderSpec,
+                             const nsString& inPartialPath,
+                             PRBool forceInstall,
+                             PRInt32 *error) 
+: nsInstallObject(inInstall)
+{
+    mVersionRegistryName = nsnull;
+    mJarLocation         = nsnull;
+    mExtracedFile        = nsnull;
+    mFinalFile           = nsnull;
+    mVersionInfo         = nsnull;
+
+    mUpgradeFile = PR_FALSE;
+    
+    if ((folderSpec == "null") || (inInstall == NULL)) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    /* Check for existence of the newer	version	*/
+    
+    PRBool versionNewer = PR_FALSE;  // Is this a newer version
+    char* qualifiedRegNameString = inComponentName.ToNewCString();
+
+    if ( (forceInstall == PR_FALSE ) && (inVInfo !=  "") && ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
+    {
+        nsInstallVersion *newVersion = new nsInstallVersion();
+        newVersion->Init(inVInfo);
+        
+        VERSION versionStruct;
+        
+        VR_GetVersion( qualifiedRegNameString, &versionStruct );
+        
+        nsInstallVersion* oldVersion = new nsInstallVersion();
+
+        oldVersion->Init(versionStruct.major,
+                         versionStruct.minor,
+                         versionStruct.release,
+                         versionStruct.build);
+
+        PRInt32 areTheyEqual;
+        newVersion->CompareTo(oldVersion, &areTheyEqual);
+        
+        delete oldVersion;
+        delete newVersion;
+
+        if (areTheyEqual == nsIDOMInstallVersion::MAJOR_DIFF_MINUS ||
+            areTheyEqual == nsIDOMInstallVersion::MINOR_DIFF_MINUS ||
+            areTheyEqual == nsIDOMInstallVersion::REL_DIFF_MINUS   ||
+            areTheyEqual == nsIDOMInstallVersion::BLD_DIFF_MINUS   )
+        {
+            // the file to be installed is OLDER than what is on disk.  Return error
+            delete qualifiedRegNameString;
+            *error = areTheyEqual;
+            return;
+        }
+    }
+
+    delete qualifiedRegNameString;
+
+    
+     mFinalFile = new nsFileSpec(folderSpec);
+    *mFinalFile += inPartialPath;
+    
+    mReplaceFile = mFinalFile->Exists();
+    
+    if (mReplaceFile == PR_FALSE)
+    {
+        nsFileSpec parent;
+        mFinalFile->GetParent(parent);
+        nsFileSpec makeDirs(parent.GetCString(), PR_TRUE);
+    }
+
+    mForceInstall           = forceInstall;
+    
+    mVersionRegistryName    = new nsString(inComponentName);
+    mJarLocation            = new nsString(inJarLocation);
+    mVersionInfo	        = new nsString(inVInfo);
+        
+    nsString regPackageName;
+    mInstall->GetRegPackageName(regPackageName);
+    
+    // determine Child status
+    if ( regPackageName == "" ) 
+    {
+        // in the "current communicator package" absolute pathnames (start
+        // with slash) indicate shared files -- all others are children
+        mChildFile = ( mVersionRegistryName->CharAt(0) != '/' );
+    } 
+    else 
+    {
+        
+        // there is no "starts with" api in nsString.  LAME!
+        nsString startsWith;
+        mVersionRegistryName->Left(startsWith, regPackageName.Length());
+
+        if (startsWith.Equals(regPackageName))
+        {
+            mChildFile = true;
+        }
+        else
+        {
+            mChildFile = false;
+        }
+    }
+}
+
+
+nsInstallFile::~nsInstallFile()
+{
+    if (mVersionRegistryName)
+        delete mVersionRegistryName;
+  
+    if (mJarLocation)
+        delete mJarLocation;
+  
+    if (mExtracedFile)
+        delete mExtracedFile;
+
+    if (mFinalFile)
+        delete mFinalFile;
+  
+    if (mVersionInfo)
+      delete mVersionInfo;
+}
+
+/* Prepare
+ * Extracts file out of the JAR archive
+ */
+PRInt32 nsInstallFile::Prepare()
+{
+    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull ) 
+        return nsInstall::INVALID_ARGUMENTS;
+
+    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtracedFile);
+}
+
+/* Complete
+ * Completes the install:
+ * - move the downloaded file to the final location
+ * - updates the registry
+ */
+PRInt32 nsInstallFile::Complete()
+{
+    PRInt32 err;
+
+    if (mInstall == nsnull || mVersionRegistryName == nsnull || mFinalFile == nsnull ) 
+    {
+       return nsInstall::INVALID_ARGUMENTS;
+    }
+
+    err = CompleteFileMove();
+    
+    if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
+    {
+        err = RegisterInVersionRegistry();
+    }
+    
+    return err;
+
+}
+
+void nsInstallFile::Abort()
+{
+    if (mExtracedFile != nsnull)
+        mExtracedFile->Delete(PR_FALSE);
+}
+
+char* nsInstallFile::toString()
+{
+    char* buffer = new char[1024];
+    
+    if (mFinalFile == nsnull)
+    {
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), nsnull);
+    }
+    else if (mReplaceFile)
+    {
+        // we are replacing this file.
+
+        sprintf( buffer, nsInstallResources::GetReplaceFileString(), mFinalFile->GetCString());
+    }
+    else
+    {
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), mFinalFile->GetCString());
+    }
+
+    return buffer;
+}
+
+
+PRInt32 nsInstallFile::CompleteFileMove()
+{
+    int result = 0;
+    
+    if (mExtracedFile == nsnull) 
+    {
+        return -1;
+    }
+   	
+    if ( *mExtracedFile == *mFinalFile ) 
+    {
+        /* No need to rename, they are the same */
+        result = 0;
+    } 
+    else 
+    {
+        result = ReplaceFileNowOrSchedule(*mExtracedFile, *mFinalFile );
+    }
+
+  return result;  
+}
+
+PRInt32
+nsInstallFile::RegisterInVersionRegistry()
+{
+    int refCount;
+    nsString regPackageName;
+    mInstall->GetRegPackageName(regPackageName);
+    
+  
+    // Register file and log for Uninstall
+  
+    if (!mChildFile) 
+    {
+        int found;
+        if (regPackageName != "") 
+        {
+            found = VR_UninstallFileExistsInList( (char*)(const char*)nsAutoCString(regPackageName) , 
+                                                  (char*)(const char*)nsAutoCString(*mVersionRegistryName));
+        } 
+        else 
+        {
+            found = VR_UninstallFileExistsInList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
+        }
+        
+        if (found != REGERR_OK)
+            mUpgradeFile = PR_FALSE;
+        else
+            mUpgradeFile = PR_TRUE;
+    } 
+    else if (REGERR_OK == VR_InRegistry( (char*)(const char*)nsAutoCString(*mVersionRegistryName))) 
+    {
+        mUpgradeFile = PR_TRUE;
+    } 
+    else 
+    {
+        mUpgradeFile = PR_FALSE;
+    }
+
+    if ( REGERR_OK != VR_GetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), &refCount )) 
+    {
+        refCount = 0;
+    }
+
+    VR_Install( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 
+                (char*)(const char*)mFinalFile->GetNativePathCString(),  // DO NOT CHANGE THIS. 
+                (char*)(const char*)nsAutoCString(*mVersionInfo), 
+                PR_FALSE );
+
+    if (mUpgradeFile) 
+    {
+        if (refCount == 0) 
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
+        else 
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount );  //FIX?? what should the ref count be/
+    }
+    else
+    {
+        if (refCount != 0) 
+        {
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount + 1 );
+        } 
+        else 
+        {
+            if (mReplaceFile)
+                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 2 );
+            else
+                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
+        }
+    }
+    
+    if ( !mChildFile && !mUpgradeFile ) 
+    {
+        if (regPackageName != "") 
+        { 
+            VR_UninstallAddFileToList( (char*)(const char*)nsAutoCString(regPackageName), 
+                                       (char*)(const char*)nsAutoCString(*mVersionRegistryName));
+        } 
+        else 
+        {
+            VR_UninstallAddFileToList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
+        }
+    }
+
+    return nsInstall::SUCCESS;
+}
+
+/* CanUninstall
+* InstallFile() installs files which can be uninstalled,
+* hence this function returns true. 
+*/
+PRBool
+nsInstallFile::CanUninstall()
+{
+    return TRUE;
+}
+
+/* RegisterPackageNode
+* InstallFile() installs files which need to be registered,
+* hence this function returns true.
+*/
+PRBool
+nsInstallFile::RegisterPackageNode()
+{
+    return TRUE;
+}

mozilla/xpinstall/src/nsInstallFile.h

@@ -0,0 +1,93 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallFile_h__
+#define nsInstallFile_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsInstallVersion.h"
+
+class nsInstallFile : public nsInstallObject 
+{
+    public:
+
+      /*************************************************************
+       * Public Methods 
+       *
+       *	Constructor
+       *    inSoftUpdate    - softUpdate object we belong to
+       *    inComponentName	- full path of the registry component
+       *    inVInfo	        - full version info
+       *    inJarLocation   - location inside the JAR file
+       *    inFinalFileSpec	- final	location on	disk
+       *************************************************************/
+        nsInstallFile(  nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        const nsString& folderSpec,
+                        const nsString& inPartialPath,
+                        PRBool forceInstall,
+                        PRInt32 *error);
+
+        virtual ~nsInstallFile();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+
+        /* Private Fields */
+        nsString*     mVersionInfo;	  /* Version info for this file*/
+        
+        nsString*     mJarLocation;	      /* Location in the JAR */
+        nsFileSpec*   mExtracedFile;	  /* temporary file location */
+        nsFileSpec*   mFinalFile;	      /* final file destination */
+
+        nsString*   mVersionRegistryName; /* full version path */
+        
+        PRBool      mForceInstall;   /* whether install is forced */
+        PRBool      mReplaceFile;    /* whether file exists */
+        PRBool      mChildFile;      /* whether file is a child */
+        PRBool      mUpgradeFile;    /* whether file is an upgrade */
+
+
+        PRInt32     CompleteFileMove();
+        PRInt32     RegisterInVersionRegistry();
+};
+
+#endif /* nsInstallFile_h__ */

mozilla/xpinstall/src/nsInstallFileOpEnums.h

@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsInstallFileOpEnums_h__
+#define nsInstallFileOpEnums_h__
+
+typedef enum nsInstallFileOpEnums {
+  NS_FOP_DIR_CREATE = 0,
+  NS_FOP_DIR_REMOVE = 1,
+  NS_FOP_DIR_RENAME = 2,
+  NS_FOP_FILE_COPY = 3,
+  NS_FOP_FILE_DELETE = 4,
+  NS_FOP_FILE_EXECUTE = 5,
+  NS_FOP_FILE_MOVE = 6,
+  NS_FOP_FILE_RENAME = 7,
+  NS_FOP_WIN_SHORTCUT_CREATE = 8,
+  NS_FOP_MAC_ALIAS_CREATE = 9,
+  NS_FOP_UNIX_LINK_CREATE = 10,
+  NS_FOP_FILE_SET_STAT = 11
+
+} nsInstallFileOpEnums;
+
+#endif /* nsInstallFileOpEnums_h__ */

mozilla/xpinstall/src/nsInstallFileOpItem.cpp

@@ -0,0 +1,316 @@
+/* -*- 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 "nspr.h"
+#include "nsInstall.h"
+#include "nsInstallFileOpEnums.h"
+#include "nsInstallFileOpItem.h"
+
+/* Public Methods */
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aTarget,
+                                         PRInt32        aFlags,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = aFlags;
+	mSrc     = nsnull;
+  mParams  = nsnull;
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aSrc,
+                                         nsFileSpec&    aTarget,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = 0;
+	mSrc     = new nsFileSpec(aSrc);
+  mParams  = nsnull;
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aTarget,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = 0;
+	mSrc     = nsnull;
+  mParams  = nsnull;
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aTarget,
+                                         nsString&      aParams,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = 0;
+	mSrc     = nsnull;
+  mParams  = new nsString(aParams);
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::~nsInstallFileOpItem()
+{
+  if(mSrc)
+    delete mSrc;
+  if(mTarget)
+    delete mTarget;
+}
+
+PRInt32 nsInstallFileOpItem::Complete()
+{
+  PRInt32 aReturn = NS_OK;
+
+  switch(mCommand)
+  {
+    case NS_FOP_DIR_CREATE:
+      NativeFileOpDirCreate(mTarget);
+      break;
+    case NS_FOP_DIR_REMOVE:
+      NativeFileOpDirRemove(mTarget, mFlags);
+      break;
+    case NS_FOP_DIR_RENAME:
+      NativeFileOpDirRename(mSrc, mTarget);
+      break;
+    case NS_FOP_FILE_COPY:
+      NativeFileOpFileCopy(mSrc, mTarget);
+      break;
+    case NS_FOP_FILE_DELETE:
+      NativeFileOpFileDelete(mTarget, mFlags);
+      break;
+    case NS_FOP_FILE_EXECUTE:
+      NativeFileOpFileExecute(mTarget, mParams);
+      break;
+    case NS_FOP_FILE_MOVE:
+      NativeFileOpFileMove(mSrc, mTarget);
+      break;
+    case NS_FOP_FILE_RENAME:
+      NativeFileOpFileRename(mSrc, mTarget);
+      break;
+    case NS_FOP_WIN_SHORTCUT_CREATE:
+      NativeFileOpWinShortcutCreate();
+      break;
+    case NS_FOP_MAC_ALIAS_CREATE:
+      NativeFileOpMacAliasCreate();
+      break;
+    case NS_FOP_UNIX_LINK_CREATE:
+      NativeFileOpUnixLinkCreate();
+      break;
+  }
+	return aReturn;
+}
+  
+float nsInstallFileOpItem::GetInstallOrder()
+{
+	return 3;
+}
+
+char* nsInstallFileOpItem::toString()
+{
+	nsString result;
+  char*    resultCString;
+
+  switch(mCommand)
+  {
+    case NS_FOP_FILE_COPY:
+      result = "Copy file: ";
+      result.Append(mSrc->GetNativePathCString());
+      result.Append(" to ");
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_FILE_DELETE:
+      result = "Delete file: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_FILE_MOVE:
+      result = "Move file: ";
+      result.Append(mSrc->GetNativePathCString());
+      result.Append(" to ");
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_FILE_RENAME:
+      result = "Rename file: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_DIR_CREATE:
+      result = "Create Folder: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_DIR_REMOVE:
+      result = "Remove Folder: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_WIN_SHORTCUT_CREATE:
+      break;
+    case NS_FOP_MAC_ALIAS_CREATE:
+      break;
+    case NS_FOP_UNIX_LINK_CREATE:
+      break;
+    case NS_FOP_FILE_SET_STAT:
+      result = "Set file stat: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    default:
+      result = "Unkown file operation command!";
+      resultCString = result.ToNewCString();
+      break;
+  }
+  return resultCString;
+}
+
+PRInt32 nsInstallFileOpItem::Prepare()
+{
+	return NULL;
+}
+
+void nsInstallFileOpItem::Abort()
+{
+}
+
+/* Private Methods */
+
+/* CanUninstall
+* InstallFileOpItem() does not install any files which can be uninstalled,
+* hence this function returns false. 
+*/
+PRBool
+nsInstallFileOpItem::CanUninstall()
+{
+    return FALSE;
+}
+
+/* RegisterPackageNode
+* InstallFileOpItem() does notinstall files which need to be registered,
+* hence this function returns false.
+*/
+PRBool
+nsInstallFileOpItem::RegisterPackageNode()
+{
+    return FALSE;
+}
+
+//
+// File operation functions begin here
+//
+PRInt32
+nsInstallFileOpItem::NativeFileOpDirCreate(nsFileSpec* aTarget)
+{
+  aTarget->CreateDirectory();
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpDirRemove(nsFileSpec* aTarget, PRInt32 aFlags)
+{
+  aTarget->Delete(aFlags);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpDirRename(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Rename(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileCopy(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Copy(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileDelete(nsFileSpec* aTarget, PRInt32 aFlags)
+{
+  aTarget->Delete(aFlags);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileExecute(nsFileSpec* aTarget, nsString* aParams)
+{
+  aTarget->Execute(*aParams);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileMove(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Move(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileRename(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Rename(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpWinShortcutCreate()
+{
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpMacAliasCreate()
+{
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpUnixLinkCreate()
+{
+  return NS_OK;
+}
+

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsInstallFileOpItem_h__
+#define nsInstallFileOpItem_h__
+
+#include "prtypes.h"
+
+#include "nsFileSpec.h"
+#include "nsSoftwareUpdate.h"
+#include "nsInstallObject.h"
+#include "nsInstall.h"
+
+class nsInstallFileOpItem : public nsInstallObject
+{
+  public:
+    /* Public Fields */
+
+    /* Public Methods */
+    // used by:
+    //   FileOpFileDelete()
+    nsInstallFileOpItem(nsInstall*    installObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        PRInt32       aFlags,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirRemove()
+    //   FileOpDirRename()
+    //   FileOpFileCopy()
+    //   FileOpFileMove()
+    //   FileOpFileRename()
+    nsInstallFileOpItem(nsInstall*    installObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aSrc,
+                        nsFileSpec&   aTarget,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirCreate()
+    nsInstallFileOpItem(nsInstall*    aInstallObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpFileExecute()
+    nsInstallFileOpItem(nsInstall*    aInstallObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        nsString&     aParams,
+                        PRInt32*      aReturn);
+
+    ~nsInstallFileOpItem();
+
+    PRInt32       Prepare(void);
+    PRInt32       Complete();
+    char*         toString();
+    void          Abort();
+    float         GetInstallOrder();
+    
+  /* should these be protected? */
+    PRBool        CanUninstall();
+    PRBool        RegisterPackageNode();
+      
+  private:
+    
+    /* Private Fields */
+    
+    nsInstall*    mIObj;        // initiating Install object
+    nsFileSpec*   mSrc;
+    nsFileSpec*   mTarget;
+    nsString*     mParams;
+    long          mFStat;
+    PRInt32       mFlags;
+    PRInt32       mCommand;
+    
+    /* Private Methods */
+
+    PRInt32       NativeFileOpDirCreate(nsFileSpec* aTarget);
+    PRInt32       NativeFileOpDirRemove(nsFileSpec* aTarget, PRInt32 aFlags);
+    PRInt32       NativeFileOpDirRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileCopy(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileDelete(nsFileSpec* aTarget, PRInt32 aFlags);
+    PRInt32       NativeFileOpFileExecute(nsFileSpec* aTarget, nsString* aParams);
+    PRInt32       NativeFileOpFileMove(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpWinShortcutCreate();
+    PRInt32       NativeFileOpMacAliasCreate();
+    PRInt32       NativeFileOpUnixLinkCreate();
+
+};
+
+#endif /* nsInstallFileOpItem_h__ */
+

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -0,0 +1,336 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstall.h"
+#include "nsInstallFolder.h"
+
+#include "nscore.h"
+#include "prtypes.h"
+#include "nsRepository.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsSpecialSystemDirectory.h"
+
+#include "nsFileLocations.h"
+#include "nsIFileLocator.h"
+
+struct DirectoryTable
+{
+	char *  directoryName;			/* The formal directory name */
+	PRInt32 folderEnum;		        /* Directory ID */
+};
+
+struct DirectoryTable DirectoryTable[] = 
+{
+    {"Plugins",             100 },
+	{"Program",             101 },
+	{"Communicator",        102 },
+	{"User Pick",           103 },
+	{"Temporary",           104 },
+	{"Installed",           105 },
+	{"Current User",        106 },
+	{"Preferences",         107 },
+	{"OS Drive",            108 },
+	{"file:///",            109 },
+
+    {"Components",          110 },
+    {"Chrome",              111 },
+
+	{"Win System",          200 },
+	{"Windows",             201 },
+
+	{"Mac System",          300 },
+	{"Mac Desktop",         301 },
+	{"Mac Trash",           302 },
+	{"Mac Startup",         303 },
+	{"Mac Shutdown",        304 },
+	{"Mac Apple Menu",      305 },
+	{"Mac Control Panel",   306 },
+	{"Mac Extension",       307 },
+	{"Mac Fonts",           308 },
+	{"Mac Preferences",     309 },
+    {"Mac Documents",       310 },
+
+	{"Unix Local",          400 },
+	{"Unix Lib",            401 },
+
+	{"",                    -1  }
+};
+
+
+
+nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
+{
+    mFileSpec = nsnull;
+    SetDirectoryPath( aFolderID, "");
+}
+
+nsInstallFolder::nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath)
+{
+    mFileSpec = nsnull;
+
+    /*
+        aFolderID can be either a Folder enum in which case we merely pass it to SetDirectoryPath, or
+        it can be a Directory.  If it is the later, it must already exist and of course be a directory
+        not a file.  
+    */
+    
+    nsFileSpec dirCheck(aFolderID);
+    if ( (dirCheck.Error() == NS_OK) && (dirCheck.IsDirectory()) && (dirCheck.Exists()))
+    {
+        nsString tempString = aFolderID;
+        tempString += aRelativePath;
+        mFileSpec = new nsFileSpec(tempString);
+
+        // make sure that the directory is created.
+        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
+    }
+    else
+    {
+        SetDirectoryPath( aFolderID, aRelativePath);
+    }
+}
+
+
+nsInstallFolder::~nsInstallFolder()
+{
+    if (mFileSpec != nsnull)
+        delete mFileSpec;
+}
+        
+void 
+nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
+{
+	aDirectoryPath = "";
+    
+    if (mFileSpec != nsnull)
+    {
+        // We want the a NATIVE path.
+       aDirectoryPath.SetString(mFileSpec->GetCString());
+    }
+}
+
+void
+nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath)
+{
+    if ( aFolderID.EqualsIgnoreCase("User Pick") )
+    {
+        PickDefaultDirectory();
+        return;
+    }
+    else if ( aFolderID.EqualsIgnoreCase("Installed") )
+    {   
+        mFileSpec = new nsFileSpec(aRelativePath, PR_TRUE);  // creates the directories to the relative path.
+        return;
+    }
+    else
+    {
+        PRInt32 folderDirSpecID = MapNameToEnum(aFolderID);
+        
+        switch (folderDirSpecID) 
+		{
+            case 100: ///////////////////////////////////////////////////////////  Plugins
+                SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
+                break; 
+
+            case 101: ///////////////////////////////////////////////////////////  Program
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
+                break;
+            
+            case 102: ///////////////////////////////////////////////////////////  Communicator
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
+                break;
+
+            case 103: ///////////////////////////////////////////////////////////  User Pick
+                // we should never be here.
+                mFileSpec = nsnull;
+                break;
+
+            case 104: ///////////////////////////////////////////////////////////  Temporary
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_TemporaryDirectory ));
+                break;
+
+            case 105: ///////////////////////////////////////////////////////////  Installed
+                // we should never be here.
+                mFileSpec = nsnull;
+                break;
+
+            case 106: ///////////////////////////////////////////////////////////  Current User
+                SetAppShellDirectory(nsSpecialFileSpec::App_UserProfileDirectory50 );
+                break;
+
+            case 107: ///////////////////////////////////////////////////////////  Preferences
+                SetAppShellDirectory(nsSpecialFileSpec::App_PrefsDirectory50 );
+                break;
+
+            case 108: ///////////////////////////////////////////////////////////  OS Drive
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_DriveDirectory ));
+                break;
+
+            case 109: ///////////////////////////////////////////////////////////  File URL
+                {
+                    nsString tempFileURLString = aFolderID;
+                    tempFileURLString += aRelativePath;
+                    mFileSpec = new nsFileSpec( nsFileURL(tempFileURLString) );
+                }
+                break;
+
+            case 110: ///////////////////////////////////////////////////////////  Components
+                SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
+                break;
+            
+            case 111: ///////////////////////////////////////////////////////////  Chrome
+                SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
+                break;
+
+            case 200: ///////////////////////////////////////////////////////////  Win System
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_SystemDirectory ));
+                break;
+
+            case 201: ///////////////////////////////////////////////////////////  Windows
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_WindowsDirectory ));
+                break;
+
+            case 300: ///////////////////////////////////////////////////////////  Mac System
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_SystemDirectory ));
+                break;
+
+            case 301: ///////////////////////////////////////////////////////////  Mac Desktop
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DesktopDirectory ));
+                break;
+
+            case 302: ///////////////////////////////////////////////////////////  Mac Trash
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_TrashDirectory ));
+                break;
+
+            case 303: ///////////////////////////////////////////////////////////  Mac Startup
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
+                break;
+
+            case 304: ///////////////////////////////////////////////////////////  Mac Shutdown
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
+                break;
+
+            case 305: ///////////////////////////////////////////////////////////  Mac Apple Menu
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_AppleMenuDirectory ));
+                break;
+
+            case 306: ///////////////////////////////////////////////////////////  Mac Control Panel
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ControlPanelDirectory ));
+                break;
+
+            case 307: ///////////////////////////////////////////////////////////  Mac Extension
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ExtensionDirectory ));
+                break;
+
+            case 308: ///////////////////////////////////////////////////////////  Mac Fonts
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_FontsDirectory ));
+                break;
+
+            case 309: ///////////////////////////////////////////////////////////  Mac Preferences
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_PreferencesDirectory ));
+                break;
+                    
+            case 310: ///////////////////////////////////////////////////////////  Mac Documents
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DocumentsDirectory ));
+                break;
+                    
+            case 400: ///////////////////////////////////////////////////////////  Unix Local
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LocalDirectory ));
+                break;
+
+            case 401: ///////////////////////////////////////////////////////////  Unix Lib
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LibDirectory ));
+                break;
+
+
+            case -1:
+		    default:
+                mFileSpec = nsnull;
+			   return;
+		}
+#ifndef XP_MAC
+        if (aRelativePath.Length() > 0)
+        {
+            nsString tempPath(aRelativePath);
+
+            if (aRelativePath.Last() != '/' || aRelativePath.Last() != '\\')
+                tempPath += '/';
+
+            *mFileSpec += tempPath;
+        }
+#endif
+            // make sure that the directory is created.
+        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
+    }
+}
+
+void nsInstallFolder::PickDefaultDirectory()
+{
+    //FIX:  Need to put up a dialog here and set mFileSpec
+    return;   
+}
+
+/* MapNameToEnum
+ * maps name from the directory table to its enum */
+PRInt32 
+nsInstallFolder::MapNameToEnum(const nsString& name)
+{
+	int i = 0;
+
+	if ( name == "null")
+        return -1;
+
+	while ( DirectoryTable[i].directoryName[0] != 0 )
+	{
+		if ( name.EqualsIgnoreCase(DirectoryTable[i].directoryName) )
+			return DirectoryTable[i].folderEnum;
+		i++;
+	}
+	return -1;
+}
+
+
+static NS_DEFINE_IID(kFileLocatorIID, NS_IFILELOCATOR_IID);
+static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID);
+
+void
+nsInstallFolder::SetAppShellDirectory(PRUint32 value)
+{
+    nsIFileLocator * appShellLocator;
+    
+    nsresult rv = nsComponentManager::CreateInstance(kFileLocatorCID, 
+                                                     nsnull,
+                                                     kFileLocatorIID,
+                                                     (void**) &appShellLocator);
+
+    if ( NS_SUCCEEDED(rv) )
+    {
+        mFileSpec = new nsFileSpec();
+        appShellLocator->GetFileLocation(value, mFileSpec);
+        NS_RELEASE(appShellLocator);
+    }
+}

mozilla/xpinstall/src/nsInstallFolder.h

@@ -0,0 +1,58 @@
+/* -*- 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:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __NS_INSTALLFOLDER_H__
+#define __NS_INSTALLFOLDER_H__
+
+#include "nscore.h"
+#include "prtypes.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsSpecialSystemDirectory.h"
+
+class nsInstallFolder
+{
+    public:
+        
+       nsInstallFolder(const nsString& aFolderID);
+       nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath);
+       virtual ~nsInstallFolder();
+
+       void GetDirectoryPath(nsString& aDirectoryPath);
+       
+    private:
+        
+        nsFileSpec*  mFileSpec;
+
+		void         SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath);
+        void         PickDefaultDirectory();
+        PRInt32      MapNameToEnum(const nsString&  name);
+        void         SetAppShellDirectory(PRUint32 value);
+};
+
+
+#endif

mozilla/xpinstall/src/nsInstallObject.h

@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer 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 nsInstallObject_h__
+#define nsInstallObject_h__
+
+#include "prtypes.h"
+
+class nsInstall;
+
+class nsInstallObject 
+{
+    public:
+        /* Public Methods */
+        nsInstallObject(nsInstall* inInstall) {mInstall = inInstall; }
+
+        /* Override with your set-up action */
+        virtual PRInt32 Prepare() = 0;
+
+        /* Override with your Completion action */
+        virtual PRInt32 Complete() = 0;
+
+        /* Override with an explanatory string for the progress dialog */
+        virtual char* toString() = 0;
+
+        /* Override with your clean-up function */
+        virtual void Abort() = 0;
+
+        /* should these be protected? */
+        virtual PRBool CanUninstall() = 0;
+        virtual PRBool RegisterPackageNode() = 0;
+
+    protected:
+        nsInstall* mInstall;
+};
+
+#endif /* nsInstallObject_h__ */

mozilla/xpinstall/src/nsInstallPatch.cpp

@@ -0,0 +1,986 @@
+/* -*- 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 "nsFileSpec.h"
+#include "prmem.h"
+#include "nsInstall.h"
+#include "nsInstallPatch.h"
+#include "nsInstallResources.h"
+#include "nsIDOMInstallVersion.h"
+#include "zlib.h"
+
+#include "gdiff.h"
+
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "plstr.h"
+#include "xp_file.h" /* for XP_PlatformFileToURL */
+
+
+#ifdef XP_MAC
+#include "PatchableAppleSingle.h"
+#endif
+
+#define BUFSIZE     32768
+#define OPSIZE      1
+#define MAXCMDSIZE  12
+#define SRCFILE     0
+#define OUTFILE     1
+
+#define getshort(s) (uint16)( ((uchar)*(s) << 8) + ((uchar)*((s)+1)) )
+
+#define getlong(s)  \
+            (uint32)( ((uchar)*(s) << 24) + ((uchar)*((s)+1) << 16 ) + \
+                      ((uchar)*((s)+2) << 8) + ((uchar)*((s)+3)) )
+
+
+
+static int32   gdiff_parseHeader( pDIFFDATA dd );
+static int32   gdiff_validateFile( pDIFFDATA dd, int file );
+static int32   gdiff_valCRC32( pDIFFDATA dd, PRFileDesc* fh, uint32 chksum );
+static int32   gdiff_ApplyPatch( pDIFFDATA dd );
+static int32   gdiff_getdiff( pDIFFDATA dd, uchar *buffer, uint32 length );
+static int32   gdiff_add( pDIFFDATA dd, uint32 count );
+static int32   gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count );
+static int32   gdiff_validateFile( pDIFFDATA dd, int file );
+
+
+nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
+                                const nsString& inVRName,
+                                const nsString& inVInfo,
+                                const nsString& inJarLocation,
+                                PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    char tempTargetFile[MAXREGPATHLEN];
+    char* tempVersionString = inVRName.ToNewCString();
+
+    PRInt32 err = VR_GetPath(tempVersionString, MAXREGPATHLEN, tempTargetFile );
+    
+    delete [] tempVersionString;
+    
+    if (err != REGERR_OK)
+    {
+        *error = nsInstall::NO_SUCH_COMPONENT;
+        return;
+    }
+	nsString folderSpec(tempTargetFile);
+
+    mPatchFile      =   nsnull;
+    mTargetFile     =   nsnull;
+    mPatchedFile    =   nsnull;
+    mRegistryName   =   new nsString(inVRName);
+    mJarLocation    =   new nsString(inJarLocation);
+    mTargetFile     =   new nsFileSpec(folderSpec);
+    
+    mVersionInfo    =   new nsInstallVersion();
+    
+    mVersionInfo->Init(inVInfo);
+    
+}
+
+
+nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
+                                const nsString& inVRName,
+                                const nsString& inVInfo,
+                                const nsString& inJarLocation,
+                                const nsString& folderSpec,
+                                const nsString& inPartialPath,
+                                PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if ((inInstall == nsnull) || (inVRName == "null") || (inJarLocation == "null")) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mPatchFile      =   nsnull;
+    mTargetFile     =   nsnull;
+    mPatchedFile    =   nsnull;
+    mRegistryName   =   new nsString(inVRName);
+    mJarLocation    =   new nsString(inJarLocation);
+    mVersionInfo    =   new nsInstallVersion();
+    
+    mVersionInfo->Init(inVInfo);
+    
+    mTargetFile = new nsFileSpec(folderSpec);
+    if(inPartialPath != "null")
+        *mTargetFile += inPartialPath;
+}
+
+nsInstallPatch::~nsInstallPatch()
+{
+    if (mVersionInfo)
+        delete mVersionInfo;
+
+    if (mTargetFile)
+        delete mTargetFile;
+
+    if (mJarLocation)
+        delete mJarLocation;
+    
+    if (mRegistryName)
+        delete mRegistryName;
+
+    if (mPatchedFile)
+        delete mPatchedFile;
+    
+    if (mPatchFile)
+        delete mPatchFile;
+
+}
+
+
+PRInt32 nsInstallPatch::Prepare()
+{
+    PRInt32 err;
+    PRBool deleteOldSrc;
+    
+    if (mTargetFile == nsnull)
+        return  nsInstall::INVALID_ARGUMENTS;
+
+    if (mTargetFile->Exists())
+    {
+        if (mTargetFile->IsFile())
+        {
+            err = nsInstall::SUCCESS;
+        }
+        else
+        {
+            err = nsInstall::FILE_IS_DIRECTORY;
+        }
+    }
+    else
+    {
+        err = nsInstall::FILE_DOES_NOT_EXIST;
+    }
+
+    if (err != nsInstall::SUCCESS)
+    {   
+        return err;
+    }
+
+    err =  mInstall->ExtractFileFromJar(*mJarLocation, mTargetFile, &mPatchFile);
+   
+    
+    nsFileSpec *fileName = nsnull;
+    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
+    
+    mInstall->GetPatch(&ikey, fileName);
+
+    if (fileName != nsnull) 
+    {
+        deleteOldSrc = PR_TRUE;
+    } 
+    else 
+    {
+        fileName     = mTargetFile;
+        deleteOldSrc = PR_FALSE;
+    }
+
+    err = NativePatch(  *fileName,           // the file to patch
+                        *mPatchFile,         // the patch that was extracted from the jarfile
+                        &mPatchedFile);     // the new patched file
+    
+    if (err != nsInstall::SUCCESS)
+    {   
+        return err;
+    }
+
+    PR_ASSERT(mPatchedFile != nsnull);
+	mInstall->AddPatch(&ikey, mPatchedFile );
+	
+    if ( deleteOldSrc ) 
+    {
+		DeleteFileNowOrSchedule(*fileName );
+    }
+  
+    return err;
+}
+
+PRInt32 nsInstallPatch::Complete()
+{  
+    if ((mInstall == nsnull) || (mVersionInfo == nsnull) || (mPatchedFile == nsnull) || (mTargetFile == nsnull)) 
+    {
+        return nsInstall::INVALID_ARGUMENTS;
+    }
+    
+    PRInt32 err = nsInstall::SUCCESS;
+
+    nsFileSpec *fileName = nsnull;
+    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) )  );
+    
+    mInstall->GetPatch(&ikey, fileName);
+    
+    if (fileName != nsnull && (*fileName == *mPatchedFile) )
+    {
+        // the patch has not been superceded--do final replacement
+		err = ReplaceFileNowOrSchedule( *mTargetFile, *mPatchedFile);
+        if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
+        {
+            nsString tempVersionString;
+            mVersionInfo->ToString(tempVersionString);
+            
+            char* tempRegName = mRegistryName->ToNewCString();
+            char* tempVersion = tempVersionString.ToNewCString();
+
+            err = VR_Install( tempRegName, 
+							  (char*) (const char *) nsNSPRPath(*mTargetFile),
+                              tempVersion, 
+                              PR_FALSE );
+            
+            delete [] tempRegName;
+            delete [] tempVersion;
+
+        }
+        else
+        {
+            err = nsInstall::UNEXPECTED_ERROR;
+        }
+    }
+    else
+    {
+        // nothing -- old intermediate patched file was
+        // deleted by a superceding patch
+    }
+
+    return err;
+}
+
+void nsInstallPatch::Abort()
+{
+    nsFileSpec *fileName = nsnull;
+    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
+
+    mInstall->GetPatch(&ikey, fileName);
+
+    if (fileName != nsnull && (*fileName == *mPatchedFile) )
+    {
+        DeleteFileNowOrSchedule( *mPatchedFile );
+    }
+}
+
+char* nsInstallPatch::toString()
+{
+	char* buffer = new char[1024];
+
+	// FIX!  sprintf( buffer, nsInstallResources::GetPatchFileString(), mPatchedFile->GetCString());
+
+	return buffer;
+}
+
+
+PRBool
+nsInstallPatch::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallPatch::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+
+
+PRInt32
+nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patchFile, nsFileSpec **newFile)
+{
+
+	DIFFDATA	*dd;
+	PRInt32		status		= GDIFF_ERR_MEM;
+	char 		*tmpurl		= NULL;
+	char 		*realfile	= PL_strdup(nsNSPRPath(sourceFile)); // needs to be sourceFile!!!
+	nsFileSpec  outFileSpec = sourceFile;
+
+	dd = (DIFFDATA *)PR_Calloc( 1, sizeof(DIFFDATA));
+	if (dd != NULL)
+	{
+		dd->databuf = (uchar*)PR_Malloc(BUFSIZE);
+		if (dd->databuf == NULL) 
+		{
+			status = GDIFF_ERR_MEM;
+			goto cleanup;
+		}
+
+
+		dd->bufsize = BUFSIZE;
+
+		// validate patch header & check for special instructions
+		dd->fDiff = PR_Open (nsNSPRPath(patchFile), PR_RDONLY, 0666);
+
+
+		if (dd->fDiff != NULL)
+		{
+			status = gdiff_parseHeader(dd);
+		} else {
+			status = GDIFF_ERR_ACCESS;
+		}
+
+#ifdef dono
+#ifdef WIN32
+
+        /* unbind Win32 images */
+        if ( dd->bWin32BoundImage && status == GDIFF_OK ) {
+            tmpurl = WH_TempName( xpURL, NULL );
+            if ( tmpurl != NULL ) {
+                if (su_unbind( srcfile, srctype, tmpurl, xpURL ))  	
+				{
+                    PL_strfree(realfile);
+					realfile = tmpurl;
+                    realtype = xpURL;
+                    
+                }
+            }
+            else
+                status = GDIFF_ERR_MEM;
+        }
+#endif
+#endif
+
+#ifdef XP_MAC
+
+		if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
+		{
+           // create a tmp file, so that we can AppleSingle the src file
+           nsSpecialSystemDirectory tempMacFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+           nsString srcName = sourceFile.GetLeafName();
+           tempMacFile.SetLeafName(srcName);
+           tempMacFile.MakeUnique();
+           
+           // Encode! 
+		   // Encode src file, and put into temp file
+		   FSSpec sourceSpec = sourceFile.GetFSSpec();
+		   FSSpec tempSpec   = tempMacFile.GetFSSpec();
+		    
+			status = PAS_EncodeFile(&sourceSpec, &tempSpec);   
+				
+			if (status == noErr)
+			{
+				// set
+                PL_strfree(realfile);
+				realfile = PL_strdup(nsNSPRPath(tempMacFile));
+			}
+		}
+#endif 
+
+
+
+		if (status != NS_OK)
+			goto cleanup;
+
+		// make a unique file at the same location of our source file  (FILENAME-ptch.EXT)
+        nsString patchFileName = "-ptch";
+		nsString newFileName = sourceFile.GetLeafName();
+
+        PRInt32 index;
+		if ((index = newFileName.RFind(".")) > 0)
+		{
+            nsString extention;
+            nsString fileName;
+            newFileName.Right(extention, (newFileName.Length() - index) );        
+            newFileName.Left(fileName, (newFileName.Length() - (newFileName.Length() - index)));
+            newFileName = fileName + patchFileName + extention;
+
+        } else {
+            newFileName += patchFileName;
+        }
+        
+
+		outFileSpec.SetLeafName(newFileName); //????
+		outFileSpec.MakeUnique();
+
+        char *outFile = PL_strdup(nsNSPRPath(outFileSpec));
+
+		// apply patch to the source file
+		dd->fSrc = PR_Open ( realfile, PR_RDONLY, 0666);
+		dd->fOut = PR_Open ( outFile, PR_RDWR|PR_CREATE_FILE|PR_TRUNCATE, 0666);
+
+		if (dd->fSrc != NULL && dd->fOut != NULL)
+		{
+			status = gdiff_validateFile (dd, SRCFILE);
+
+			// specify why diff failed
+			if (status == GDIFF_ERR_CHECKSUM)
+				status = GDIFF_ERR_CHECKSUM_TARGET;
+
+			if (status == GDIFF_OK)
+				status = gdiff_ApplyPatch(dd);
+
+			if (status == GDIFF_OK)
+				status = gdiff_validateFile (dd, OUTFILE);
+
+			if (status == GDIFF_ERR_CHECKSUM)
+				status = GDIFF_ERR_CHECKSUM_RESULT;
+
+            if (status == GDIFF_OK)
+            {
+                *newFile = &outFileSpec;
+                if ( outFile != nsnull)
+                    PL_strfree( outFile );
+            }
+
+		} else {
+
+			status = GDIFF_ERR_ACCESS;
+		}		
+	}
+
+
+
+#ifdef XP_MAC
+	if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
+	{
+        // create another file, so that we can decode somewhere
+        nsFileSpec anotherName = outFileSpec;
+        anotherName.MakeUnique();
+        
+		// Close the out file so that we can read it 		
+		PR_Close( dd->fOut );
+		dd->fOut = NULL;
+		
+		
+		FSSpec outSpec = outFileSpec.GetFSSpec();
+		FSSpec anotherSpec   = anotherName.GetFSSpec();
+		
+			
+        status =  PAS_DecodeFile(&outSpec, &anotherSpec);
+		if (status != noErr)
+		{
+		   	goto cleanup;
+        }
+		
+        nsFileSpec parent;
+        
+        outFileSpec.GetParent(parent);
+        
+        outFileSpec.Delete(PR_FALSE);
+        anotherName.Copy(parent);
+        
+        *newFile = &anotherName;
+	}
+	
+#endif 
+
+
+cleanup:
+    if ( dd != NULL ) 
+    {
+        if ( dd->fSrc != nsnull )
+            PR_Close( dd->fSrc );
+
+
+        if ( dd->fDiff != nsnull )
+            PR_Close( dd->fDiff );
+		
+		if ( dd->fOut != nsnull )
+        {
+            PR_Close( dd->fOut );
+        }
+        
+        if ( status != GDIFF_OK )
+		   	//XP_FileRemove( outfile, outtype );
+			newFile = NULL;
+		        
+		PR_FREEIF( dd->databuf );
+        PR_FREEIF( dd->oldChecksum );
+        PR_FREEIF( dd->newChecksum );
+        PR_DELETE(dd);
+    }
+
+	if ( tmpurl != NULL ) {
+        //XP_FileRemove( tmpurl, xpURL );
+		tmpurl = NULL;
+        PR_DELETE( tmpurl );
+    }
+    
+	/* lets map any GDIFF error to nice SU errors */
+
+	switch (status)
+	{
+        case GDIFF_OK:
+                break;
+		case GDIFF_ERR_HEADER:
+		case GDIFF_ERR_BADDIFF:
+		case GDIFF_ERR_OPCODE:
+		case GDIFF_ERR_CHKSUMTYPE:
+				status = nsInstall::PATCH_BAD_DIFF;
+				break;
+		case GDIFF_ERR_CHECKSUM_TARGET:
+				status = nsInstall::PATCH_BAD_CHECKSUM_TARGET;
+				break;
+		case GDIFF_ERR_CHECKSUM_RESULT:
+				status = nsInstall::PATCH_BAD_CHECKSUM_RESULT;
+				break;
+		case GDIFF_ERR_OLDFILE:
+		case GDIFF_ERR_ACCESS:
+		case GDIFF_ERR_MEM:
+		case GDIFF_ERR_UNKNOWN:
+		default:
+				status = nsInstall::UNEXPECTED_ERROR;
+				break;
+	}
+
+    return status;
+
+	// return -1;	//old return value
+}
+
+
+void* 
+nsInstallPatch::HashFilePath(const nsFilePath& aPath)
+{
+    PRUint32 rv = 0;
+
+	char* cPath = PL_strdup(nsNSPRPath(aPath));
+    
+    if(cPath != nsnull) 
+    {
+        char  ch;
+        char* filePath = PL_strdup(cPath);
+        PRUint32 cnt=0;
+
+        while ((ch = *filePath++) != 0) 
+        {
+            // FYI: rv = rv*37 + ch
+            rv = ((rv << 5) + (rv << 2) + rv) + ch;
+            cnt++;
+        }
+        
+        for (PRUint32 i=0; i<=cnt; i++)
+            *filePath--;
+		PL_strfree(filePath);
+    }
+
+	PL_strfree(cPath);
+
+    return (void*)rv;
+}
+
+
+
+
+/*---------------------------------------------------------
+ *  gdiff_parseHeader()
+ *
+ *  reads and validates the GDIFF header info
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_parseHeader( pDIFFDATA dd )
+{
+    int32   err = GDIFF_OK;
+    uint8   cslen;
+    uint8   oldcslen;
+    uint8   newcslen;
+    uint32  nRead;
+    uchar   header[GDIFF_HEADERSIZE];
+
+    /* Read the fixed-size part of the header */
+
+	nRead = PR_Read (dd->fDiff, header, GDIFF_HEADERSIZE);
+    if ( nRead != GDIFF_HEADERSIZE ||
+         memcmp( header, GDIFF_MAGIC, GDIFF_MAGIC_LEN ) != 0  ||
+         header[GDIFF_VER_POS] != GDIFF_VER )
+    {
+        err = GDIFF_ERR_HEADER;
+    }
+    else
+    {
+        /* get the checksum information */
+
+        dd->checksumType = header[GDIFF_CS_POS];
+        cslen = header[GDIFF_CSLEN_POS];
+
+        if ( cslen > 0 )
+        {
+            oldcslen = cslen / 2;
+            newcslen = cslen - oldcslen;
+            PR_ASSERT( newcslen == oldcslen );
+
+            dd->checksumLength = oldcslen;
+            dd->oldChecksum = (uchar*)PR_MALLOC(oldcslen);
+            dd->newChecksum = (uchar*)PR_MALLOC(newcslen);
+
+            if ( dd->oldChecksum != NULL && dd->newChecksum != NULL )
+            {
+				nRead = PR_Read (dd->fDiff, dd->oldChecksum, oldcslen);
+                if ( nRead == oldcslen )
+                {
+					nRead = PR_Read (dd->fDiff, dd->newChecksum, newcslen);
+                    if ( nRead != newcslen ) {
+                        err = GDIFF_ERR_HEADER;
+                    }
+                }
+                else {
+                    err = GDIFF_ERR_HEADER;
+                }
+            }
+            else {
+                err = GDIFF_ERR_MEM;
+            }
+        }
+
+
+        /* get application data, if any */
+
+        if ( err == GDIFF_OK )
+        {
+            uint32  appdataSize;
+            uchar   *buf;
+            uchar   lenbuf[GDIFF_APPDATALEN];
+
+			nRead = PR_Read(dd->fDiff, lenbuf, GDIFF_APPDATALEN);
+            if ( nRead == GDIFF_APPDATALEN ) 
+            {
+                appdataSize = getlong(lenbuf);
+
+                if ( appdataSize > 0 ) 
+                {
+                    buf = (uchar *)PR_MALLOC( appdataSize );
+
+                    if ( buf != NULL )
+                    {
+						nRead = PR_Read (dd->fDiff, buf, appdataSize);
+                        if ( nRead == appdataSize ) 
+                        {
+                            if ( 0 == memcmp( buf, APPFLAG_W32BOUND, appdataSize ) )
+                                dd->bWin32BoundImage = TRUE;
+
+                            if ( 0 == memcmp( buf, APPFLAG_APPLESINGLE, appdataSize ) )
+                                dd->bMacAppleSingle = TRUE;
+                        }
+                        else {
+                            err = GDIFF_ERR_HEADER;
+                        }
+
+                        PR_DELETE( buf );
+                    }
+                    else {
+                        err = GDIFF_ERR_MEM;
+                    }
+                }
+            }
+            else {
+                err = GDIFF_ERR_HEADER;
+            }
+        }
+    }
+
+    return (err);
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_validateFile()
+ *
+ *  computes the checksum of the file and compares it to 
+ *  the value stored in the GDIFF header
+ *---------------------------------------------------------
+ */
+static 
+int32 gdiff_validateFile( pDIFFDATA dd, int file )
+{
+    int32		result;
+    PRFileDesc*	fh;
+    uchar*		chksum;
+
+    /* which file are we dealing with? */
+    if ( file == SRCFILE ) {
+        fh = dd->fSrc;
+        chksum = dd->oldChecksum;
+    }
+    else { /* OUTFILE */
+        fh = dd->fOut;
+        chksum = dd->newChecksum;
+    }
+
+    /* make sure file's at beginning */
+    PR_Seek( fh, 0, PR_SEEK_SET );
+
+    /* calculate appropriate checksum */
+    switch (dd->checksumType)
+    {
+        case GDIFF_CS_NONE:
+            result = GDIFF_OK;
+            break;
+
+
+        case GDIFF_CS_CRC32:
+            if ( dd->checksumLength == CRC32_LEN )
+                result = gdiff_valCRC32( dd, fh, getlong(chksum) );
+            else
+                result = GDIFF_ERR_HEADER;
+            break;
+
+
+        case GDIFF_CS_MD5:
+
+
+        case GDIFF_CS_SHA:
+
+
+        default:
+            /* unsupported checksum type */
+            result = GDIFF_ERR_CHKSUMTYPE;
+            break;
+    }
+
+    /* reset file position to beginning and return status */
+    PR_Seek( fh, 0, PR_SEEK_SET );
+    return (result);
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_valCRC32()
+ *
+ *  computes the checksum of the file and compares it to 
+ *  the passed in checksum.  Assumes file is positioned at
+ *  beginning.
+ *---------------------------------------------------------
+ */
+static 
+int32 gdiff_valCRC32( pDIFFDATA dd, PRFileDesc* fh, uint32 chksum )
+{
+    uint32 crc;
+    uint32 nRead;
+
+    crc = crc32(0L, Z_NULL, 0);
+
+	nRead = PR_Read (fh, dd->databuf, dd->bufsize);
+    while ( nRead > 0 ) 
+    {
+        crc = crc32( crc, dd->databuf, nRead );
+		nRead = PR_Read (fh, dd->databuf, dd->bufsize);
+    }
+
+    if ( crc == chksum )
+        return GDIFF_OK;
+    else
+        return GDIFF_ERR_CHECKSUM;
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_ApplyPatch()
+ *
+ *  Combines patch data with source file to produce the
+ *  new target file.  Assumes all three files have been
+ *  opened, GDIFF header read, and all other setup complete
+ *
+ *  The GDIFF patch is processed sequentially which random
+ *  access is neccessary for the source file.
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_ApplyPatch( pDIFFDATA dd )
+{
+    int32   err;
+    XP_Bool done;
+    uint32  position;
+    uint32  count;
+    uchar   opcode;
+    uchar   cmdbuf[MAXCMDSIZE];
+
+    done = FALSE;
+    while ( !done ) {
+        err = gdiff_getdiff( dd, &opcode, OPSIZE );
+        if ( err != GDIFF_OK )
+            break;
+
+        switch (opcode)
+        {
+            case ENDDIFF:
+                done = TRUE;
+                break;
+
+            case ADD16:
+                err = gdiff_getdiff( dd, cmdbuf, ADD16SIZE );
+                if ( err == GDIFF_OK ) {
+                    err = gdiff_add( dd, getshort( cmdbuf ) );
+                }
+                break;
+
+            case ADD32:
+                err = gdiff_getdiff( dd, cmdbuf, ADD32SIZE );
+                if ( err == GDIFF_OK ) {
+                    err = gdiff_add( dd, getlong( cmdbuf ) );
+                }
+                break;
+
+            case COPY16BYTE:
+                err = gdiff_getdiff( dd, cmdbuf, COPY16BYTESIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getshort( cmdbuf );
+                    count = *(cmdbuf + sizeof(short));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY16SHORT:
+                err = gdiff_getdiff( dd, cmdbuf, COPY16SHORTSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getshort( cmdbuf );
+                    count = getshort(cmdbuf + sizeof(short));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY16LONG:
+                err = gdiff_getdiff( dd, cmdbuf, COPY16LONGSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getshort( cmdbuf );
+                    count =  getlong(cmdbuf + sizeof(short));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY32BYTE:
+                err = gdiff_getdiff( dd, cmdbuf, COPY32BYTESIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getlong( cmdbuf );
+                    count = *(cmdbuf + sizeof(long));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY32SHORT:
+                err = gdiff_getdiff( dd, cmdbuf, COPY32SHORTSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getlong( cmdbuf );
+                    count = getshort(cmdbuf + sizeof(long));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY32LONG:
+                err = gdiff_getdiff( dd, cmdbuf, COPY32LONGSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getlong( cmdbuf );
+                    count = getlong(cmdbuf + sizeof(long));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY64:
+                /* we don't support 64-bit file positioning yet */
+                err = GDIFF_ERR_OPCODE;
+                break;
+
+            default:
+                err = gdiff_add( dd, opcode );
+                break;
+        }
+
+        if ( err != GDIFF_OK )
+            done = TRUE;
+    }
+
+    /* return status */
+    return (err);
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_getdiff()
+ *
+ *  reads the next "length" bytes of the diff into "buffer"
+ *
+ *  XXX: need a diff buffer to optimize reads!
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_getdiff( pDIFFDATA dd, uchar *buffer, uint32 length )
+{
+    uint32 bytesRead;
+
+	bytesRead = PR_Read (dd->fDiff, buffer, length);
+    if ( bytesRead != length )
+        return GDIFF_ERR_BADDIFF;
+
+    return GDIFF_OK;
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_add()
+ *
+ *  append "count" bytes from diff file to new file
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_add( pDIFFDATA dd, uint32 count )
+{
+    int32   err = GDIFF_OK;
+    uint32  nRead;
+    uint32  chunksize;
+
+    while ( count > 0 ) {
+        chunksize = ( count > dd->bufsize) ? dd->bufsize : count;
+		nRead = PR_Read (dd->fDiff, dd->databuf, chunksize);
+        if ( nRead != chunksize ) {
+            err = GDIFF_ERR_BADDIFF;
+            break;
+        }
+
+		PR_Write (dd->fOut, dd->databuf, chunksize);
+
+        count -= chunksize;
+    }
+
+    return (err);
+}
+
+
+
+/*---------------------------------------------------------
+ *  gdiff_copy()
+ *
+ *  copy "count" bytes from "position" in source file
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count )
+{
+    int32 err = GDIFF_OK;
+    uint32 nRead;
+    uint32 chunksize;
+
+	PR_Seek (dd->fSrc, position, PR_SEEK_SET);
+
+    while ( count > 0 ) {
+        chunksize = (count > dd->bufsize) ? dd->bufsize : count;
+
+		nRead = PR_Read (dd->fSrc, dd->databuf, chunksize);
+        if ( nRead != chunksize ) {
+            err = GDIFF_ERR_OLDFILE;
+            break;
+        }
+
+		PR_Write (dd->fOut, dd->databuf, chunksize);
+
+        count -= chunksize;
+    }
+
+    return (err);
+}
+

mozilla/xpinstall/src/nsInstallPatch.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsInstallPatch_h__
+#define nsInstallPatch_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsInstallFolder.h"
+#include "nsInstallVersion.h"
+
+
+class nsInstallPatch : public nsInstallObject 
+{
+    public:
+
+        nsInstallPatch( nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        const nsString& folderSpec,
+                        const nsString& inPartialPath,
+                        PRInt32 *error);
+
+        nsInstallPatch( nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        PRInt32 *error);
+
+        virtual ~nsInstallPatch();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+        
+        
+        nsInstallVersion        *mVersionInfo;
+        
+        nsFileSpec              *mTargetFile;
+        nsFileSpec              *mPatchFile;
+        nsFileSpec              *mPatchedFile;
+
+        nsString                *mJarLocation;
+        nsString                *mRegistryName;
+        
+       
+
+        PRInt32  NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patchfile, nsFileSpec **newFile);
+        void*    HashFilePath(const nsFilePath& aPath);
+};
+
+#endif /* nsInstallPatch_h__ */

mozilla/xpinstall/src/nsInstallProgressDialog.cpp

@@ -0,0 +1,343 @@
+/* -*- 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:
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#include "nsIXPInstallProgress.h"
+#include "nsInstallProgressDialog.h"
+
+#include "nsIAppShellComponentImpl.h"
+
+#include "nsIServiceManager.h"
+#include "nsIDocumentViewer.h"
+#include "nsIContent.h"
+#include "nsINameSpaceManager.h"
+#include "nsIContentViewer.h"
+#include "nsIDOMElement.h"
+#include "nsINetService.h"
+
+#include "nsIWebShell.h"
+#include "nsIWebShellWindow.h"
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
+static NS_DEFINE_IID( kNetServiceCID,      NS_NETSERVICE_CID );
+
+// Utility to set element attribute.
+static nsresult setAttribute( nsIDOMXULDocument *doc,
+                              const char *id,
+                              const char *name,
+                              const nsString &value ) {
+    nsresult rv = NS_OK;
+
+    if ( doc ) {
+        // Find specified element.
+        nsCOMPtr<nsIDOMElement> elem;
+        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
+        if ( elem ) {
+            // Set the text attribute.
+            rv = elem->SetAttribute( name, value );
+            if ( NS_SUCCEEDED( rv ) ) {
+            } else {
+                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
+                               __FILE__, (int)__LINE__, (int)rv );
+            }
+        } else {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } else {
+        rv = NS_ERROR_NULL_POINTER;
+    }
+
+    return rv;
+}
+
+
+// Utility to get element attribute.
+static nsresult getAttribute( nsIDOMXULDocument *doc,
+                              const char *id,
+                              const char *name,
+                              nsString &value ) {
+    nsresult rv = NS_OK;
+
+    if ( doc ) {
+        // Find specified element.
+        nsCOMPtr<nsIDOMElement> elem;
+        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
+        if ( elem ) {
+            // Set the text attribute.
+            rv = elem->GetAttribute( name, value );
+            if ( NS_SUCCEEDED( rv ) ) {
+            } else {
+                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
+                               __FILE__, (int)__LINE__, (int)rv );
+            }
+        } else {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } else {
+        rv = NS_ERROR_NULL_POINTER;
+    }
+
+    return rv;
+}
+
+
+nsInstallProgressDialog::nsInstallProgressDialog()
+{
+    NS_INIT_REFCNT();
+    mWindow = nsnull;
+    mDocument = nsnull;
+
+}
+
+nsInstallProgressDialog::~nsInstallProgressDialog()
+{
+}
+
+
+NS_IMPL_ADDREF( nsInstallProgressDialog );
+NS_IMPL_RELEASE( nsInstallProgressDialog );
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::QueryInterface(REFNSIID aIID,void** aInstancePtr)
+{
+  if (aInstancePtr == NULL) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  // Always NULL result, in case of failure
+  *aInstancePtr = NULL;
+
+  if (aIID.Equals(nsIXPInstallProgress::GetIID())) {
+    *aInstancePtr = (void*) ((nsInstallProgressDialog*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(nsIXULWindowCallbacks::GetIID())) {
+    *aInstancePtr = (void*) ((nsIXULWindowCallbacks*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(kISupportsIID)) {
+    *aInstancePtr = (void*) (nsISupports*)((nsIXPInstallProgress*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_ERROR_NO_INTERFACE;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::BeforeJavascriptEvaluation()
+{
+    nsresult rv = NS_OK;
+
+    // Get app shell service.
+    nsIAppShellService *appShell;
+    rv = nsServiceManager::GetService( kAppShellServiceCID,
+                                       nsIAppShellService::GetIID(),
+                                       (nsISupports**)&appShell );
+
+    if ( NS_SUCCEEDED( rv ) ) 
+    {
+        // Open "progress" dialog.
+        nsIURL *url;
+        rv = NS_NewURL( &url, "resource:/res/xpinstall/progress.xul" );
+        
+        if ( NS_SUCCEEDED(rv) ) 
+        {
+        
+            nsIWebShellWindow *newWindow;
+
+            rv = appShell->CreateTopLevelWindow( nsnull,
+                                                 url,
+                                                 PR_TRUE,
+                                                 newWindow,
+                                                 nsnull,
+                                                 this,  // callbacks??
+                                                 0,
+                                                 0 );
+
+            if ( NS_SUCCEEDED( rv ) ) 
+            {
+                mWindow = newWindow;
+                NS_RELEASE( newWindow );
+
+                 if (mWindow != nsnull)
+                    mWindow->Show(PR_TRUE);
+            }
+            else 
+            {
+                DEBUG_PRINTF( PR_STDOUT, "Error creating progress dialog, rv=0x%X\n", (int)rv );
+            }
+            NS_RELEASE( url );
+        }
+        
+        nsServiceManager::ReleaseService( kAppShellServiceCID, appShell );
+    } 
+    else 
+    {
+        DEBUG_PRINTF( PR_STDOUT, "Unable to get app shell service, rv=0x%X\n", (int)rv );
+    }
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::AfterJavascriptEvaluation()
+{
+    if (mWindow)
+    {
+        mWindow->Close();
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallStarted(const char *UIPackageName)
+{
+    setAttribute( mDocument, "dialog.uiPackageName", "value", nsString(UIPackageName) );
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::ItemScheduled(const char *message)
+{
+    PRInt32 maxChars = 40;
+
+    nsString theMessage(message);
+    PRInt32 len = theMessage.Length();
+    if (len > maxChars)
+    {
+        PRInt32 offset = (len/2) - ((len - maxChars)/2);
+        PRInt32 count  = (len - maxChars);
+        theMessage.Cut(offset, count); 
+        theMessage.Insert(nsString("..."), offset);
+    }
+    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
+    
+    nsString aValue;
+    getAttribute( mDocument, "data.canceled", "value", aValue );
+
+    if (aValue.EqualsIgnoreCase("true"))
+        return -1;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum)
+{
+
+    PRInt32 maxChars = 40;
+
+    nsString theMessage(message);
+    PRInt32 len = theMessage.Length();
+    if (len > maxChars)
+    {
+        PRInt32 offset = (len/2) - ((len - maxChars)/2);
+        PRInt32 count  = (len - maxChars);
+        theMessage.Cut(offset, count);  
+        theMessage.Insert(nsString("..."), offset);
+    }
+
+    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
+
+    nsresult rv = NS_OK;
+    char buf[16];
+    
+    PR_snprintf( buf, sizeof buf, "%lu", totNum );
+    setAttribute( mDocument, "dialog.progress", "max", buf );
+   
+    if (totNum != 0)
+    {
+        PR_snprintf( buf, sizeof buf, "%lu", ((totNum-itemNum)/totNum) );
+    }
+    else
+    {
+        PR_snprintf( buf, sizeof buf, "%lu", 0 );
+    }
+    setAttribute( mDocument, "dialog.progress", "value", buf );
+    
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallAborted()
+{
+    return NS_OK;
+}
+
+
+
+
+// Do startup stuff from C++ side.
+NS_IMETHODIMP
+nsInstallProgressDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) 
+{
+    nsresult rv = NS_OK;
+
+    // Get content viewer from the web shell.
+    nsCOMPtr<nsIContentViewer> contentViewer;
+    rv = aWebShell ? aWebShell->GetContentViewer(getter_AddRefs(contentViewer))
+                   : NS_ERROR_NULL_POINTER;
+
+    if ( contentViewer ) {
+        // Up-cast to a document viewer.
+        nsCOMPtr<nsIDocumentViewer> docViewer( do_QueryInterface( contentViewer, &rv ) );
+        if ( docViewer ) {
+            // Get the document from the doc viewer.
+            nsCOMPtr<nsIDocument> document;
+            rv = docViewer->GetDocument(*getter_AddRefs(document));
+            if ( document ) {
+                // Upcast to XUL document.
+                mDocument = do_QueryInterface( document, &rv );
+                if ( ! mDocument ) 
+                {
+                    DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDOMXULDocument failed, rv=0x%X\n",
+                                  __FILE__, (int)__LINE__, (int)rv );
+                }
+            } 
+            else 
+            {
+                DEBUG_PRINTF( PR_STDOUT, "%s %d: GetDocument failed, rv=0x%X\n",
+                              __FILE__, (int)__LINE__, (int)rv );
+            }
+        } 
+        else 
+        {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDocumentViewer failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } 
+    else 
+    {
+        DEBUG_PRINTF( PR_STDOUT, "%s %d: GetContentViewer failed, rv=0x%X\n",
+                      __FILE__, (int)__LINE__, (int)rv );
+    }
+
+    return rv;
+}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * 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:
+ *     Douglas Turner <dougt@netscape.com>
+ */
+#ifndef __nsInstallProgressDialog_h__
+#define __nsInstallProgressDialog_h__
+
+#include "nsIXPInstallProgress.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsIWebShell.h"
+#include "nsIWebShellWindow.h"
+#include "nsIXULWindowCallbacks.h"    
+
+#include "nsIDocument.h"
+#include "nsIDOMXULDocument.h"
+
+
+class nsInstallProgressDialog : public nsIXPInstallProgress, public nsIXULWindowCallbacks
+{
+    public: 
+
+        nsInstallProgressDialog();
+        virtual ~nsInstallProgressDialog();
+        
+        NS_DECL_ISUPPORTS
+
+        
+        NS_IMETHOD BeforeJavascriptEvaluation();
+        NS_IMETHOD AfterJavascriptEvaluation();
+        NS_IMETHOD InstallStarted(const char *UIPackageName);
+        NS_IMETHOD ItemScheduled(const char *message);
+        NS_IMETHOD InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum);
+        NS_IMETHOD InstallAborted();
+
+        // Declare implementations of nsIXULWindowCallbacks interface functions.
+        NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);
+        NS_IMETHOD ConstructAfterJavaScript(nsIWebShell *aWebShell) { return NS_OK; }
+
+    private:
+
+        nsCOMPtr<nsIDOMXULDocument>  mDocument;
+        nsCOMPtr<nsIWebShellWindow>  mWindow;
+};
+#endif