--- a/.hgtags	Sun Oct 31 01:35:37 2010 +0100
+++ b/.hgtags	Tue Nov 02 21:59:45 2010 +0100
@@ -239,3 +239,4 @@
 1af222c7586991f690ea06d1b8c75fb5a6a0a352 r21-5-28
 5c427ece884b7023a244fba8cad8cf41b37dd5ca r21-5-29
 3742ea8250b5fd339d6d797835faf8761f61d0ae ben-lisp-object-final-ws-year-2005
+d185fa593d5fcf818ca0d27e53374348d936d7e8 last-version-with-netinstall

--- a/ChangeLog	Sun Oct 31 01:35:37 2010 +0100
+++ b/ChangeLog	Tue Nov 02 21:59:45 2010 +0100
@@ -1,3 +1,7 @@
+2010-11-02  Mats Lidell  <matsl@xemacs.org>
+
+	* netinstall: removed 
+
 2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* aclocal.m4: Add standard permission boilerplate.

--- a/netinstall/ChangeLog	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,576 +0,0 @@
-2009-05-18  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.29 "garbanzo" is released.
-
-2007-08-12  Mike Sperber  <mike@xemacs.org>
-
-	* Makefile.in.in (datarootdir): Add.
-
-2007-05-21  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.28 "fuki" is released.
-
-2006-05-16  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.27 "fiddleheads" is released.
-
-2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.26 "endive" is released.
-
-2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.25 "eggplant" is released.
-
-2005-11-25  Mike Sperber  <mike@xemacs.org>
-
-	* reginfo.h (XEMACS_INFO_XEMACS_EARLY_PACKAGES_KEY)
-	(XEMACS_INFO_XEMACS_LATE_PACKAGES_KEY)
-	(XEMACS_INFO_XEMACS_LAST_PACKAGES_KEY): Add.
-
-2005-12-18  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.24 "dandelion" is released.
-
-2005-11-22  Ben Wing  <ben@xemacs.org>
-
-	* Makefile.in.in:
-	Ignore errors from rm during clean.
-
-2005-11-13  Ben Wing  <ben@xemacs.org>
-
-	* Makefile.in.in:
-	Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
-	Do some refactoring for cleanliness.
-
-2005-11-06  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* ChangeLog: Nuke useless CVS keyword.
-
-2005-10-26  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.23 "daikon" is released.
-
-2005-09-14  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.22 "cucumber" is released.
-
-2005-05-28  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.21 "corn" is released.
-
-2005-03-11  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.20 "cilantro" is released.
-
-2005-02-18  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.19 "chives" is released.
-
-2004-11-05  Ben Wing  <ben@xemacs.org>
-
-	* res.rc:
-	Fix ^M brokenness.
-
-2004-10-22  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.18 "chestnut" is released.
-
-2004-03-22  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.17 "chayote" is released.
-
-2003-09-26  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.16 "celeriac" is released.
-
-2003-09-03  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.15 "celery" is released.
-
-2003-06-01  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.14 "cassava" is released.
-
-2003-05-10  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.13 "cauliflower" is released.
-
-2003-04-24  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.12 "carrot" is released.
-
-2003-02-16  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.11 "cabbage" is released.
-
-2003-01-04  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.10 "burdock" is released.
-
-2002-08-30  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.9 "brussels sprouts" is released.
-
-2002-07-27  Steve Youngs  <youngs@xemacs.org>
-
-	* XEmacs 21.5.8 "broccoli" is released.
-
-2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.7 "broccoflower" is released.
-
-2002-02-04  Andy Piper  <andy@xemacs.org>
-
-	* install.cc (install_one): Munge installed filename to fit inside
-	dialog.
-
-2001-12-17  Andy Piper  <andy@xemacs.org>
-
-	* desktop.cc (do_desktop_setup): register the whole gamut of C++
-	file types.
-
-2001-12-12  Andy Piper  <andy@xemacs.org>
-
-	* win32.h (CDECL): reorder to remove warnings.
-
-	* Makefile.in.in: add new dependencies.
-
-	* desktop.h: new file.
-
-	* uninstall.cc: use it.
-
-	* install.cc (uninstall_one): when uninstalling xemacs remove
-	shortcuts also.
-
-	* desktop.cc (remove_xemacs_setup): split out from
-	remove_desktop_setup.
-	(remove_desktop_setup): call it.
-
-2001-12-05  Andy Piper  <andy@xemacs.org>
-
-	* win32.h: re-order declarations for native windows from Fabrice
-	Popineau.
-
-2001-11-22  Andy Piper  <andy@xemacs.org>
-
-	* Makefile.in.in (setup-bin.ini): cope with kit revisions.
-
-	* source.cc (save_dialog): warning removal.
-	(load_dialog): ditto.
-
-	* msg.cc: remove cvs id.
-
-	* desktop.cc (find_xemacs_version): new function. Cope with kit
-	revisions.
-	(find_xemacs_exe_path): use it.
-	(find_xemacs_exe_name): ditto.
-
-2002-04-05  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.6 "bok choi" is released.
-
-2002-03-12  Ben Wing  <ben@xemacs.org>
-
-	* The Great Mule Merge of March 2002:
-	see node by that name in the Internals Manual.
-
-2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.5 "beets" is released.
-
-2002-01-08  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.4 "bamboo" is released.
-
-2001-12-12  Andy Piper  <andy@xemacs.org>
-
-	* win32.h (CDECL): reorder to remove warnings.
-
-	* Makefile.in.in: add new dependencies.
-
-	* desktop.h: new file.
-
-	* uninstall.cc: use it.
-
-	* install.cc (uninstall_one): when uninstalling xemacs remove
-	shortcuts also.
-
-	* desktop.cc (remove_xemacs_setup): split out from
-	remove_desktop_setup.
-	(remove_desktop_setup): call it.
-
-2001-12-05  Andy Piper  <andy@xemacs.org>
-
-	* win32.h: re-order declarations for native windows from Fabrice
-	Popineau.
-
-2001-11-22  Andy Piper  <andy@xemacs.org>
-
-	* Makefile.in.in (setup-bin.ini): cope with kit revisions.
-
-	* source.cc (save_dialog): warning removal.
-	(load_dialog): ditto.
-
-	* msg.cc: remove cvs id.
-
-	* desktop.cc (find_xemacs_version): new function. Cope with kit
-	revisions.
-	(find_xemacs_exe_path): use it.
-	(find_xemacs_exe_name): ditto.
-
-2001-11-21  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.4.6 "Common Lisp" is released.
-
-2001-10-27  Andy Piper  <andy@xemacs.org>
-
-	* localdir.cc (dialog_cmd): allow download directory to be
-	created.
-	* log.cc (exit_setup): cygwin -> XEmacs
-	* net.cc (dialog_cmd):
-	 (dialog_proc):
-	 (do_net): sync with cygwin installer.
-	* res.rc:
-	* resource.h (IDS_CREATE_DIR): new.
-	* source.cc (load_dialog):
-	(save_dialog):
-	(dialog_cmd):
-	(dialog_proc):
-	(do_source): sync with cygwin installer.
-	* uninstall.cc (progress): remove log message.
-	* Makefile.in.in: generated setup-bin.ini correctly.
-	
-2001-10-25  Andy Piper  <andy@xemacs.org>
-
-	* Merge 21.5 codeline.
-	
-2001-10-25  Andy Piper  <andy@xemacs.org>
-
-	* setup.mak (OBJS): minor build fixes.
-	(distclean):
-
-2001-10-25  Andy Piper  <andy@xemacs.org>
-
-	* desktop.cc:
-	* desktop.cc (do_desktop_setup):
-	* desktop.cc (load_dialog):
-	* desktop.cc (save_dialog):
-	* desktop.cc (do_desktop): handle idl file registration.
-	* geturl.cc (dialog): warning removal.
-	* geturl.cc (get_url_to_string):
-	* geturl.cc (get_url_to_file): make sure the nio gets deleted
-	after use, this also closes the inbound socket.
-	* nio-ftp.cc (ftp_line): fix from cygwin installer.
-	* nio-ftp.cc (NetIO_FTP): fix typeo.
-	* res.rc: support idl types.
-	* resource.h (IDC_IDL_TYPE): ditto.
-	* state.h: ditto.
-
-2001-09-24  Andy Piper  <andy@xemacs.org>
-
-	* desktop.cc:
-	* desktop.cc (make_link):
-	* desktop.cc (find_xemacs_exe_name):
-	* desktop.cc (remove_link):
-	* desktop.cc (start_menu):
-	* desktop.cc (desktop_icon):
-	* desktop.cc (remove_desktop_setup):
-	* desktop.cc (FROB):
-	* desktop.cc (do_desktop_setup):
-	* desktop.cc (check_startmenu):
-	* desktop.cc (do_desktop): Be more exacting about removal of
-	desktop things.
-	* regedit.cc (remove1):
-	* regedit.cc (remove_app_path):
-	* regedit.h (remove_app_path): remove more registry pieces.
-	* res.rc:
-	* setup.mak (APPVER):
-	* setup.mak (CCV):
-	* setup.mak (OBJS):
-	* setup.mak (LIBS):
-	* setup.mak (distclean):
-	* uninstall.cc:
-	* uninstall.cc (read_installed_db):
-	* uninstall.cc (uninstall_all): Cleanup.
-
-2001-09-08  Andy Piper  <andy@xemacs.org>
-
-	* Makefile.in.in (OBJS):
-	* Makefile.in.in (all):
-	* Makefile.in.in (extraclean):
-	* choose.cc (base):
-	* desktop.cc:
-	* desktop.cc (remove_link):
-	* desktop.cc (start_menu):
-	* desktop.cc (desktop_icon):
-	* desktop.cc (remove_desktop_setup):
-	* desktop.cc (do_desktop_setup):
-	* desktop.cc (load_dialog):
-	* desktop.cc (save_dialog):
-	* desktop.cc (do_desktop):
-	* dialog.h:
-	* download.cc (download_one):
-	* ini.h (pinfo):
-	* main.cc (WinMain):
-	* nio-ie5.cc:
-	* regedit.cc:
-	* regedit.cc (create_xemacs_root):
-	* regedit.cc (set_app_path):
-	* regedit.cc (set_install_path):
-	* regedit.cc (setup_explorer):
-	* regedit.cc (remove_app_path):
-	* regedit.cc (remove_uninstall_path):
-	* regedit.h (remove_app_path):
-	* reginfo.h:
-	* reginfo.h (XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME):
-	* reginfo.h (XEMACS_NATIVE_ARCH_NAME):
-	* res.rc:
-	* resource.h (IDD_UNINSTALL):
-	* resource.h (IDC_TXT_TYPE):
-	* root.cc:
-	* root.cc (browse_cb):
-	* root.cc (set_default_root):
-	* splash.cc (do_splash):
-	* state.h:
-	* state.h (MIRROR_SITE):
-	* uninstall.cc:
-	* uninstall.cc (dialog_proc):
-	* uninstall.cc (progress):
-	* uninstall.cc (uninstall_one):
-	* uninstall.cc (do_uninstall):
-	* uninstall.cc (read_installed_db):
-	* uninstall.cc (uninstall_all):
-	* win32.h:
-	* win32.h (NOCOMATTRIBUTE): Update netinstaller to support
-	uninstallation and register standard file-types.
-
-2001-09-07  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.3 "asparagus" is released.
-
-2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* XEmacs 21.5.2 "artichoke" is released.
-
-2001-05-09  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.5.1 "anise" is released.
-
-2001-04-18  Martin Buchholz  <martin@xemacs.org>
-
-	* XEmacs 21.5.0 "alfalfa" is released.
-
-2001-03-21  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.46 "Urania" is released.
-
-2001-03-01  Andy Piper  <andy@xemacs.org>
-
-	* desktop.cc (find_xemacs_exe_name): support 21.1 and 21.2 series.
-
-	* iniparse.c: remove.
-
-	* inilex.c: remove
-
-2001-02-23  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.45 "Thelxepeia" is released.
-
-2001-02-08  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.44 "Thalia" is released.
-
-2001-02-02  Andy Piper  <andy@xemacs.org>
-
-	* res.rc: update mirrors.lst location.
-
-2001-01-26  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.43 "Terspichore" is released.
-
-2001-01-21  Andy Piper  <andy@xemacs.org>
-
-	* Makefile.in.in (%.o): use CXX to compile
-
-	* res.rc: beautify download status and install status.
-
-	* nio-ftp.cc: use xemacs-setup user for identity.
-
-2001-01-20  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.42 "Poseidon" is released.
-
-2001-01-17  Andy Piper  <andy@xemacs.org>
-
-	* ini.h: move extern "C" to aid win32 compilation. From Fabrice
-	Popineau.
-
-2001-01-17  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.41 "Polyhymnia" is released.
-
-2001-01-12  Andy Piper  <andy@xemacs.org>
-
-	* postinstall.cc (do_postinstall): don't pick up shells if cygwin
-	isn't installed.
-
-2001-01-10  Andy Piper  <andy@xemacs.org>
-
-	* README.xemacs: deleted.
-
-	* README: updated.
-
-	* tar.cc (tar_gzctell): new function picked up from some internal
-	cygnus version of zlib.
-
-	* Makefile.in.in (LOCALCFLAGS): use -O2
-	(OBJS): reinstate autoload.
-
-2001-01-09  Andy Piper  <andy@xemacs.org>
-
-	* root.cc (dialog_cmd): backslash root dir.
-
-	* desktop.cc (do_desktop): runemacs.exe is the exe to run.
-
-	* package-net.el (package-net-batch-convert-index-to-ini): new
-	batch command.
-
-	* Makefile.in.in (setup.ini): new target. Automatically create.
-	(LOCALCFLAGS): use extra_includes.
-	(setup.ini): new target.
-	
-	* regedit.cc (create_xemacs_root): write out the package path.
-
-	* reginfo.h (XEMACS_NATIVE_ARCH_NAME): arch dir is i386 not i586
-
-2001-01-08  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.40 is released.
-
-2000-12-31  Martin Buchholz <martin@xemacs.org>
-
-	* XEmacs 21.2.39 is released.
-
-2000-12-28  Andy Piper  <andy@xemacs.org>
-
-	* desktop.cc (FROB): add more app paths.
-
-2000-12-24  Fabrice Popineau  <Fabrice.Popineau@supelec.fr>
-
-	* choose.cc (create_listview): CreateWindowEx() does not take this kind of
-	parameter.
-
-	* choose.cc (package_sort):
-	* hash.cc (rev_len):
-	* site.cc (site_sort): must be __cdecl to be called by qsort().
-
-	* download.cc:
-	* install.cc:
-	* nio-file.cc:
-	* tar.cc: because of the redefinition of stat to _stat, the
-	inclusion of win32 headers has to be delayed.
-	
-	* win32.h: added some declarations, such as CDECL if
-	not defined, #define for functions that are not standard in msvc
-	libc (strdup, stat ...)
-
-	* concat.h, concat.cc (concat): must be declared CDECL
-
-	* desktop.cc: <io.h> is needed.
-
-	* dialog.h (NEXT): cast needed, the first parameter of EndDialog() must
-	be a HWND.
-
-	* diskfull.cc: syntax when declaring GDFS.
-
-	* ini.cc: Various `extern "C"' declarations: yylineno, yyerror()
-	and fprintf(). Various CDECL declarations: yyerror(), fprintf().
-	
-	* inilex.l: <stdlib.h> required.
-	
-	* iniparse.y: use strdup(), require "win32.h" and <string.h>
-	
-	* install.cc (dialog): syntax when declaring. CreateDialog()
-	returns a HWND.
-	
-	* postinstall.cc: <io.h> and <stdio.h> are needed.
-	
-	* regedit.cc (find_cygwin_mount): WIN32_NATIVE does not know
-	anything about Cygwin stuff.
-	
-	* setup.mak: new makefile for WIN32_NATIVE.
-	
-	* splash.cc (load_dialog): GetDlgItem() returns a HWND.
-	
-	* tar.cc: msvc knows about __int64, but not `long long'.
-
-	* win32.h: <winreg.h> is missing for regedit.cc. Also, I ended up
-	in including <windows.h> because the files listed there are not
-	enough for <wininet.h>.
-	
-	* desktop.cc:
-	* fromcwd.cc:
-	* install.cc: 
-	* postinstall.cc: <unistd.h> does not exist for WIN32_NATIVE
-
-	* choose.cc (do_choose):
-	* ini.cc (do_ini):
-	* nio-ftp.cc (ftp_line): the construct (x ?: y) is not standard.
-
-2000-12-24  Andy Piper  <andy@xemacs.org>
-
-	* choose.cc (read_installed_db): grok package versions correctly.
-
-	* Makefile.in.in: add MINGW define.
-
-2000-12-18  Andy Piper  <andy@xemacs.org>
-
-	* res.rc: better look and feel.
-
-2000-12-18  Andy Piper  <andy@xemacs.org>
-
-	* desktop.cc (do_desktop_setup): more app path fiddling.
-
-2000-12-13  Andy Piper  <andy@xemacs.org>
-
-	* root.cc (dialog_cmd): create the root in the registry if we are successful.
-
-	* desktop.cc (find_xemacs_exe_path): new function. Split out from
-	find_xemacs_exe ().
-	(find_xemacs_exe_name): ditto.
-	(do_desktop_setup): setup app paths if we are installing xemacs
-	itself.
-	(do_desktop): use new functions.
-
-	* regedit.cc (create_xemacs_root): fix key name.
-	(find_xemacs_root): set isnative whatever the key value.
-	(set_app_path): new function. Set path for an app.
-
-2000-12-12  Andy Piper  <andy@xemacs.org>
-
-	* package-net.el (package-net-convert-index-to-ini): use sensible defaults.
-
-2000-12-12  Andy Piper  <andy@xemacs.org>
-
-	* reginfo.h: new macros.
-
-	* iniparse.y: define xemacs_package.
-
-	* ini.h: declare xemacs_package.
-
-	* fromcwd.cc (found_file): guess core type from name.
-
-	* concat.cc: kill warnings.
-	* net.cc: ditto.
-
-	* choose.cc (do_choose): pick up core package type chosen.
-
-	* Makefile.in.in: make sure we can pick up a mingw zlib.
-
-	* desktop.cc: fix desktop icon creation.
-
-2000-11-12  Andy Piper  <andy@xemacs.org>
-
-	* all: port from cygwin setup.
-

--- a/netinstall/Makefile.in.in	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,285 +0,0 @@
-## Copyright (c) 2000, Red Hat, Inc.
-## Copyright (C) 2005 Ben Wing.
-##
-##     This program is free software; you can redistribute it and/or modify
-##     it under the terms of the GNU General Public License as published by
-##     the Free Software Foundation; either version 2 of the License, or
-##     (at your option) any later version.
-##
-##     A copy of the GNU General Public License can be found at
-##     http://www.gnu.org/
-##
-## Written by Christopher Faylor <cgf@redhat.com>
-## Adapted for XEmacs by Andy Piper <andy@xemacs.org>
-##
-## Makefile for Cygwin installer
-
-## For performance and consistency, no built-in rules
-.SUFFIXES:
-.SUFFIXES: .c .cc .h .o
-## ==================== Things "configure" will edit ====================
-
-@SET_MAKE@
-SHELL = /bin/sh
-RM = rm -f
-pwd = /bin/pwd
-
-CC=@CC@
-CPP=@CPP@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-ALLOCA=@ALLOCA@
-LN_S=@LN_S@
-version=@version@
-
-## This will be the name of the generated binary and is set automatically
-## by configure.
-PROGNAME=@PROGNAME@
-INSTALLABLES=setup
-#ifdef USE_GNU_MAKE
-vpath %.c @srcdir@
-vpath %.cc @srcdir@
-vpath %.h @srcdir@
-vpath %.l @srcdir@
-vpath %.y @srcdir@
-vpath %.rc @srcdir@
-#else
-VPATH=@srcdir@
-#endif
-
-## ==================== Where To Install Things ====================
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-srcdir=@srcdir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-instvardir=@instvardir@
-top_srcdir=@top_srcdir@
-archlibdir=@archlibdir@
-configuration=@configuration@
-moduledir=@moduledir@
-sitemoduledir=@sitemoduledir@
-extra_includes=@extra_includes@
-blddir=@blddir@
-
-## ==================== Utility Programs for the Build =================
-
-INSTALL = @install_pp@ @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-SHELL = @SHELL@
-## ========================== Lists of Files ===========================
-
-#define NO_SHORTNAMES
-#define NOT_C_CODE
-#include "../src/config.h"
-
-program_transform_name = @program_transform_name@
-
-CC		= @CC@
-CC_FOR_TARGET	= $(CC)
-
-## -O3 has problems so fix this locally
-LOCALCFLAGS = $(CFLAGS) -O2 -DMINGW $(extra_includes)
-CXXFLAGS	= $(LOCALCFLAGS) -fno-exceptions -nostdinc++ -fno-rtti
-
-WINDRES		= windres
-MINGW_INCLUDES	= -I. -I$(srcdir) 
-MINGW_CXXFLAGS	= $(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
-MINGW_CFLAGS	= $(LOCALCFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
-MINGW_ZLIB_DIR	= /usr/local/lib
-
-PROGS	= setup.exe
-XEMACS=${blddir}/src/${PROGNAME}
-
-CYGWIN_SIZE=0
-WIN32_SIZE=0
-KIT_VERSION=""
-
-CONFIG_H = ../src/config.h
-
-OBJS = \
-	autoload.o \
-	choose.o \
-	concat.o \
-	desktop.o \
-	dialog.o \
-	diskfull.o \
-	download.o \
-	find.o \
-	fromcwd.o \
-	geturl.o \
-	hash.o \
-	ini.o \
-	inilex.o \
-	iniparse.o \
-	init.o \
-	install.o \
-	localdir.o \
-	log.o \
-	main.o \
-	mkdir.o \
-	mklink2.o \
-	regedit.o \
-	msg.o \
-	net.o \
-	netio.o \
-	nio-ie5.o \
-	nio-file.o \
-	nio-ftp.o \
-	nio-http.o \
-	other.o \
-	postinstall.o \
-	res.o \
-	root.o \
-	simpsock.o \
-	site.o \
-	source.o \
-	splash.o \
-	state.o \
-	tar.o \
-	uninstall.o \
-	version.o
-
-.SUFFIXES:
-.NOEXPORT:
-
-.PHONY: all install
-
-all: Makefile $(PROGS)
-
-setup.exe: $(OBJS)
-	$(CXX) $(MINGW_CXXFLAGS) -o $@ $(OBJS) \
-		-lole32 -lwsock32 -lnetapi32 -ladvapi32 \
-		-luuid -lkernel32 -luser32 \
-		-L$(MINGW_ZLIB_DIR) -lz -lmingw32
-	@chmod a-x $@
-
-setup-bin.ini:
-	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
-	| sed -e 's/\$$Revision:* *//' -e 's/ *$$.*//'` ;\
-	$(XEMACS) -batch -vanilla \
-		-eval '(setq package-net-cygwin32-binary-size $(CYGWIN_SIZE) \
-			package-net-win32-binary-size $(WIN32_SIZE) \
-			package-net-kit-version "$(KIT_VERSION)" \
-			package-net-setup-version "'$$V'")' \
-		-l ${srcdir}/../lisp/package-net.el \
-		-f package-net-batch-generate-bin-ini
-
-install:
-	@echo; echo "Installing net setup."
-	for file in ${INSTALLABLES} ; do \
-	  (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \
-	done
-
-version.c : $(srcdir)/ChangeLog Makefile
-	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
-	| sed -e 's/\$$Revision:* *//' \
-	  -e 's/ *$$.*//'` ;\
-	echo "char *version = \"$$V\";" > version.tmp ;\
-	echo "static char *id = \"\\n%%% setup-version $$V\\n\";" >> version.tmp
-	mv version.tmp version.c
-
-%.o: %.rc
-	$(WINDRES) --include-dir $(srcdir) -o $@ $<
-
-%.o: %.c
-	$(CC) $(MINGW_CFLAGS) -c -o $@ $<
-
-%.o: %.cc
-	$(CC) $(MINGW_CXXFLAGS) -c -o $@ $<
-
-iniparse.c iniparse.h : iniparse.y
-	bison -d -o iniparse.c $(srcdir)/iniparse.y
-
-inilex.c : inilex.l iniparse.h
-	flex -8 $(srcdir)/inilex.l
-	mv lex.yy.c inilex.c
-
-.PHONY: mostlyclean clean distclean realclean extraclean
-.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
-mostlyclean:
-	-$(RM) *.o *.i *.ini core
-clean: mostlyclean
-	-$(RM) $(PROGS)
-distclean-noconfig: clean
-	-$(RM) TAGS
-## This is used in making a distribution.
-## Do not use it on development directories!
-distclean: distclean-noconfig
-	-$(RM) GNUmakefile Makefile Makefile.in
-realclean-noconfig: distclean-noconfig
-realclean: distclean
-extraclean-noconfig: realclean-noconfig
-	-$(RM) *~ \#*
-extraclean: realclean
-	-$(RM) *~ \#*
-
-choose.o: choose.cc win32.h dialog.h resource.h state.h ini.h concat.h \
- msg.h log.h find.h reginfo.h
-concat.o: concat.cc
-desktop.o: desktop.cc win32.h resource.h ini.h msg.h state.h concat.h \
- mkdir.h dialog.h version.h port.h reginfo.h desktop.h
-dialog.o: dialog.cc win32.h dialog.h msg.h log.h
-diskfull.o: diskfull.cc win32.h diskfull.h
-download.o: download.cc win32.h resource.h msg.h ini.h dialog.h \
- concat.h geturl.h state.h mkdir.h log.h
-find.o: find.cc win32.h port.h
-fromcwd.o: fromcwd.cc win32.h ini.h resource.h concat.h state.h \
- dialog.h msg.h find.h version.h port.h
-geturl.o: geturl.cc win32.h dialog.h \
- geturl.h resource.h netio.h msg.h log.h
-hash.o: hash.cc hash.h
-ini.o: ini.cc win32.h ini.h resource.h concat.h state.h geturl.h \
- dialog.h msg.h mkdir.h log.h reginfo.h version.h
-inilex.o: inilex.c win32.h \
- ini.h \
- iniparse.h
-iniparse.o: iniparse.c ini.h \
- iniparse.h \
- port.h
-install.o: install.cc win32.h \
- resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
- diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h desktop.h
-init.o: init.cc win32.h resource.h dialog.h state.h msg.h log.h 
-uninstall.o: uninstall.cc win32.h \
- resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
- diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h desktop.h
-localdir.o: localdir.cc win32.h dialog.h resource.h state.h msg.h \
- concat.h log.h
-log.o: log.cc win32.h resource.h msg.h log.h dialog.h state.h concat.h \
- mkdir.h
-main.o: main.cc win32.h resource.h dialog.h state.h msg.h netio.h \
- find.h log.h port.h
-mkdir.o: mkdir.cc win32.h mkdir.h
-mklink2.o: mklink2.c win32.h /usr/include/w32api/shlobj.h
-msg.o: msg.cc win32.h dialog.h log.h
-net.o: net.cc win32.h dialog.h resource.h state.h msg.h log.h
-netio.o: netio.cc win32.h resource.h state.h msg.h netio.h nio-file.h \
- nio-ie5.h nio-http.h nio-ftp.h dialog.h log.h port.h
-nio-file.o: nio-file.cc win32.h netio.h nio-file.h resource.h msg.h
-nio-ftp.o: nio-ftp.cc win32.h resource.h state.h simpsock.h log.h \
- netio.h nio-ftp.h
-nio-http.o: nio-http.cc win32.h resource.h state.h simpsock.h msg.h \
- netio.h nio-http.h
-nio-ie5.o: nio-ie5.cc win32.h resource.h state.h dialog.h msg.h \
- netio.h nio-ie5.h
-other.o: other.cc win32.h dialog.h resource.h state.h msg.h log.h
-postinstall.o: postinstall.cc win32.h state.h dialog.h find.h concat.h \
- port.h
-regedit.o: regedit.cc win32.h reginfo.h regedit.h msg.h resource.h \
- dialog.h
-root.o: root.cc win32.h dialog.h resource.h state.h msg.h regedit.h \
- reginfo.h concat.h log.h
-simpsock.o: simpsock.cc win32.h simpsock.h msg.h
-site.o: site.cc win32.h dialog.h resource.h state.h geturl.h msg.h \
- concat.h regedit.h reginfo.h log.h port.h
-source.o: source.cc win32.h dialog.h resource.h state.h msg.h log.h
-splash.o: splash.cc win32.h dialog.h resource.h msg.h version.h
-state.o: state.cc state.h
-tar.o: tar.cc win32.h tar.h mkdir.h log.h port.h
-version.o: version.c

--- a/netinstall/README	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-This directory contains the source for the setup program for the XEmacs
-net releases.
-
-For commentary on how to do a release please see `package-net.el'
-
-This code has been adapted from the cygwin net release installer. In
-particular note that the cygwin net release installer is actively
-maintained and therefore we will want to incorporate improvements from
-that. I have therefore tried to use the cygwin way wherever
-possible. I have however cleaned up the code somewhat so that there
-are not billions of warnings.
-
-This program should get built as part of the standard XEmacs
-make. Note however that if you use trhe cygwin build you will need a
-NON CYGWIN VERSION OF ZLIB.
-	

--- a/netinstall/autoload.c	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-#include "win32.h"
-
-typedef struct {
-  char *name;
-  HINSTANCE handle;
-} DllInfo;
-
-#define DLL(n) static DllInfo n ## _info __asm__ (#n "_info") = { #n, 0}
-
-#define Auto(dll, func, size) \
-	__asm__ ("\t.data"); \
-	__asm__ ("\t.global\t_" #func "@" #size); \
-	__asm__ ("_" #func "@" #size ":"); \
-	__asm__ ("\tcall\tautoload_common"); \
-	__asm__ ("\t.long\t" #dll "_info"); \
-	__asm__ ("\t.ascii\t\"" #func "\\0\"")
-
-DLL (wininet);
-
-Auto (wininet, InternetAttemptConnect, 4);
-Auto (wininet, InternetCloseHandle, 4);
-Auto (wininet, InternetGetLastResponseInfoA, 12);
-Auto (wininet, InternetOpenA, 20);
-Auto (wininet, InternetOpenUrlA, 24);
-Auto (wininet, InternetReadFile, 16);
-Auto (wininet, InternetSetOptionA, 16);
-Auto (wininet, InternetQueryOptionA, 16);
-Auto (wininet, HttpQueryInfoA, 20);
-Auto (wininet, HttpSendRequestA, 20);
-
-typedef struct {
-  DllInfo *dll;
-  char name[100];
-} AutoEntry;
-
-static void autoload_common () __asm__ ("autoload_common");
-
-static void
-autoload_common (int x)
-{
-  int fp, rel;
-  unsigned char *proc;
-  HINSTANCE h;
-  AutoEntry *a;
-  
-  a = *(AutoEntry **)(&x - 1);
-  if (a->dll->handle == 0)
-    {
-      h = LoadLibrary (a->dll->name);
-      a->dll->handle = h;
-    }
-  fp = (int) GetProcAddress (a->dll->handle, a->name);
-  proc = ((unsigned char *)a) - 5;
-  rel = fp - (int)(a); /* now it's a relative call */
-  *proc++ = 0xe9; /* jump near 32-bit relative */
-  *proc++ = rel;
-  *proc++ = rel>>8;
-  *proc++ = rel>>16;
-  *proc++ = rel>>24;
-
-  *(int *)(&x-1) = (int)proc-5;
-}

Binary file netinstall/check-na.bmp has changed

Binary file netinstall/check-no.bmp has changed

Binary file netinstall/check-yes.bmp has changed

Binary file netinstall/choose-rtarrow.bmp has changed

Binary file netinstall/choose-spin.bmp has changed

--- a/netinstall/choose.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,831 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to let the user choose which packages
-   to install, and which versions of the package when more than one
-   version is provided.  The "trust" level serves as an indication as
-   to which version should be the default choice.  At the moment, all
-   we do is compare with previously installed packages to skip any
-   that are already installed (by setting the action to ACTION_SAME).
-   While the "trust" stuff is supported, it's not really implemented
-   yet.  We always prefer the "current" option.  In the future, this
-   file might have a user dialog added to let the user choose to not
-   install packages, or to install packages that aren't installed by
-   default. */
-
-#include "win32.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "dialog.h"
-#include "resource.h"
-#include "state.h"
-#include "ini.h"
-#include "concat.h"
-#include "msg.h"
-#include "log.h"
-#include "find.h"
-#include "reginfo.h"
-
-#define HMARGIN		10
-#define ROW_MARGIN	5
-#define ICON_MARGIN	4
-
-#define CHECK_SIZE	11
-
-#define TRUST_KEEP	101
-#define TRUST_UNINSTALL	102
-#define TRUST_NONE	103
-
-static int initialized = 0;
-
-static int full_list = 0;
-
-static int scroll_ulc_x, scroll_ulc_y;
-
-static HWND lv, nextbutton;
-static TEXTMETRIC tm;
-static int header_height;
-static HANDLE sysfont;
-static int row_height;
-static HANDLE bm_spin, bm_rtarrow, bm_checkyes, bm_checkno, bm_checkna;
-static HDC bitmap_dc;
-
-static struct {
-  char *text;
-  int slen;
-  int width;
-  int x;
-} headers[] = {
-  { "Current", 7, 0, 0 },
-#define CURRENT_COL 0
-  { "New", 3, 0, 0 },
-#define NEW_COL 1
-  { "Src?", 4, 0, 0 },
-#define SRC_COL 2
-  { "Package", 7, 0, 0 },
-#define PACKAGE_COL 3
-  { 0, 0, 0, 0 }
-};
-#define NUM_COLUMNS (sizeof(headers)/(sizeof(headers[0]))-1)
-
-int *package_indexes, nindexes;
-
-struct ExtraPackageInfo {
-  char *installed_file;	/* filename of previous "install" file */
-  char *installed_ver;	/* version part */
-  int   installed_size; /* ditto, size. */
-
-  int in_partial_list;
-  int pick;
-  int npick;
-  int which_is_installed; /* == TRUST* or -1 */
-
-  struct {
-    int src_avail;
-    int trust;		/* may be keep or uninstall */
-    char *caption;	/* ==0 at EOL */
-  } chooser[NTRUST+3];	/* one extra for NULL above */
-};
-
-static ExtraPackageInfo *extra;
-
-static void
-paint (HWND hwnd)
-{
-  HDC hdc;
-  PAINTSTRUCT ps;
-  int x, y, i, ii;
-
-  hdc = BeginPaint (hwnd, &ps);
-
-  SelectObject (hdc, sysfont);
-
-  RECT cr;
-  GetClientRect (hwnd, &cr);
-
-  POINT p;
-
-  x = cr.left - scroll_ulc_x;
-  y = cr.top - scroll_ulc_y + header_height;
-
-
-  for (i=0; headers[i].text; i++)
-    {
-      TextOut (hdc, x+headers[i].x, 3, headers[i].text, headers[i].slen);
-      MoveToEx (hdc, x+headers[i].x, header_height-3, &p);
-      LineTo (hdc, x+headers[i].x+headers[i].width, header_height-3);
-    }
-
-  IntersectClipRect (hdc, cr.left, cr.top+header_height, cr.right, cr.bottom);
-
-  for (ii=0; ii<nindexes; ii++)
-    {
-      i = package_indexes[ii];
-      int r = y + ii * row_height;
-      int by = r + tm.tmHeight - 11;
-      if (extra[i].installed_ver && extra[i].installed_ver[0])
-	{
-	  TextOut (hdc, x+headers[CURRENT_COL].x, r,
-		   extra[i].installed_ver, strlen (extra[i].installed_ver));
-	  SelectObject (bitmap_dc, bm_rtarrow);
-	  BitBlt (hdc, x+headers[CURRENT_COL].x+headers[0].width+ICON_MARGIN/2+HMARGIN/2, by,
-		  11, 11, bitmap_dc, 0, 0, SRCCOPY);
-	}
-
-      char *s = extra[i].chooser[extra[i].pick].caption;
-      if (s)
-	{
-	  TextOut (hdc, x+headers[NEW_COL].x + 11 + ICON_MARGIN, r,
-		   s, strlen (s));
-	  if (extra[i].npick > 1)
-	    {
-	      SelectObject (bitmap_dc, bm_spin);
-	      BitBlt (hdc, x+headers[NEW_COL].x, by, 11, 11,
-		      bitmap_dc, 0, 0, SRCCOPY);
-	    }
-	}
-
-      HANDLE check_bm = bm_checkna;
-      if (extra[i].chooser[extra[i].pick].src_avail)
-	{
-	  if (package[i].srcaction == SRCACTION_NO)
-	    check_bm = bm_checkno;
-	  else if (package[i].srcaction == SRCACTION_YES)
-	    check_bm = bm_checkyes;
-	}
-      SelectObject (bitmap_dc, check_bm);
-      BitBlt (hdc, x+headers[SRC_COL].x, by, 11, 11,
-	      bitmap_dc, 0, 0, SRCCOPY);
-
-      if (package[i].name)
-	TextOut (hdc, x+headers[PACKAGE_COL].x, r, package[i].name, strlen(package[i].name));
-    }
-
-  if (nindexes == 0)
-    {
-      static char *m = "Nothing to Install/Update";
-      TextOut (hdc, HMARGIN, header_height, m, strlen (m));
-    }
-  
-  EndPaint (hwnd, &ps);
-}
-
-static void
-scroll_common (HWND hwnd, int which, int *var, int code)
-{
-  SCROLLINFO si;
-  si.cbSize = sizeof (si);
-  si.fMask = SIF_ALL;
-  GetScrollInfo (hwnd, which, &si);
-
-  switch (code)
-    {
-    case SB_THUMBTRACK:
-      si.nPos = si.nTrackPos;
-      break;
-    case SB_THUMBPOSITION:
-      break;
-    case SB_BOTTOM:
-      si.nPos = si.nMax;
-      break;
-    case SB_TOP:
-      si.nPos = 0;
-      break;
-    case SB_LINEDOWN:
-      si.nPos += row_height;
-      break;
-    case SB_LINEUP:
-      si.nPos -= row_height;
-      break;
-    case SB_PAGEDOWN:
-      si.nPos += si.nPage * 9/10;
-      break;
-    case SB_PAGEUP:
-      si.nPos -= si.nPage * 9/10;
-      break;
-    }
-
-  if ((int)si.nPos < 0)
-    si.nPos = 0;
-  if ((int)(si.nPos + si.nPage) > si.nMax)
-    si.nPos = si.nMax - si.nPage;
-
-  si.fMask = SIF_POS;
-  SetScrollInfo (hwnd, which, &si, TRUE);
-
-  int ox = scroll_ulc_x;
-  int oy = scroll_ulc_y;
-  *var = si.nPos;
-
-  RECT cr, sr;
-  GetClientRect (hwnd, &cr);
-  sr = cr;
-  sr.top += header_height;
-  ScrollWindow (hwnd, ox - scroll_ulc_x, oy - scroll_ulc_y, &sr, &sr);
-  sr.bottom = sr.top;
-  sr.top = cr.top;
-  ScrollWindow (hwnd, ox - scroll_ulc_x, 0, &sr, &sr);
-}
-
-static LRESULT CALLBACK
-list_vscroll (HWND hwnd, HWND hctl, UINT code, int pos)
-{
-  scroll_common (hwnd, SB_VERT, &scroll_ulc_y, code);
-  return FALSE;
-}
-
-static LRESULT CALLBACK
-list_hscroll (HWND hwnd, HWND hctl, UINT code, int pos)
-{
-  scroll_common (hwnd, SB_HORZ, &scroll_ulc_x, code);
-  return FALSE;
-}
-
-static LRESULT CALLBACK
-list_click (HWND hwnd, BOOL dblclk, int x, int y, UINT hitCode)
-{
-  int r;
-
-  if (nindexes == 0)
-    return 0;
-
-  if (y < header_height)
-    return 0;
-  x += scroll_ulc_x;
-  y += scroll_ulc_y - header_height;
-
-  r = (y + ROW_MARGIN/2) / row_height;
-
-  if (r < 0 || r >= npackages)
-    return 0;
-
-  int p = package_indexes[r];
-
-  if (x >= headers[NEW_COL].x - HMARGIN/2 && x <= headers[NEW_COL+1].x - HMARGIN/2)
-    {
-      extra[p].pick ++;
-      if (extra[p].chooser[extra[p].pick].caption == 0)
-	extra[p].pick = 0;
-    }
-
-  if (x >= headers[SRC_COL].x - HMARGIN/2 && x <= headers[SRC_COL+1].x - HMARGIN/2)
-    {
-      if (extra[p].chooser[extra[p].pick].src_avail)
-	package[p].srcaction ^= (SRCACTION_NO^SRCACTION_YES);
-    }
-
-  RECT rect;
-  rect.left = headers[NEW_COL].x - scroll_ulc_x;
-  rect.right = headers[SRC_COL+1].x - scroll_ulc_x;
-  rect.top = header_height + r * row_height - scroll_ulc_y;
-  rect.bottom = rect.top + row_height;
-  InvalidateRect (hwnd, &rect, TRUE);
-  return FALSE;
-}
-
-static LRESULT CALLBACK
-listview_proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  switch (message) {
-  case WM_HSCROLL:
-    return HANDLE_WM_HSCROLL (hwnd, wParam, lParam, list_hscroll);
-  case WM_VSCROLL:
-    return HANDLE_WM_VSCROLL (hwnd, wParam, lParam, list_vscroll);
-  case WM_LBUTTONDOWN:
-    return HANDLE_WM_LBUTTONDOWN (hwnd, wParam, lParam, list_click);
-  case WM_PAINT:
-    paint (hwnd);
-    return 0;
-  default:
-    return DefWindowProc (hwnd, message, wParam, lParam);
-  }
-}
-
-static void
-register_windows (HINSTANCE hinst)
-{
-  WNDCLASSEX wcex;
-  static int done = 0;
-
-  if (done)
-    return;
-  done = 1;
-
-  memset (&wcex, 0, sizeof (wcex));
-  wcex.cbSize = sizeof (WNDCLASSEX);
-  wcex.style = CS_HREDRAW | CS_VREDRAW;
-  wcex.lpfnWndProc = listview_proc;
-  wcex.hInstance = hinst;
-  wcex.hIcon = LoadIcon (0, IDI_APPLICATION);
-  wcex.hCursor = LoadCursor (0, IDC_ARROW);
-  wcex.hbrBackground = (HBRUSH) (COLOR_WINDOW+1);
-  wcex.lpszClassName = "listview";
-
-  RegisterClassEx (&wcex);
-}
-
-static void
-note_width (HDC dc, char *string, int addend, int column)
-{
-  if (!string)
-    return;
-  SIZE s;
-  GetTextExtentPoint32 (dc, string, strlen (string), &s);
-  if (headers[column].width < s.cx + addend)
-    headers[column].width = s.cx + addend;
-}
-
-static int
-best_trust (int p, int trust)
-{
-  int t;
-  for (t=trust; t>=0; t--)
-    if (package[p].info[t].install)
-      return t;
-  for (t=trust+1; t<=NTRUST; t++)
-    if (package[p].info[t].install)
-      return t;
-  if (extra[p].installed_file)
-    return TRUST_KEEP;
-  return TRUST_NONE;
-}
-
-static void
-default_trust (HWND h, int trust)
-{
-  int i, t, c;
-
-  for (i=0; i<npackages; i++)
-    {
-      t = best_trust (i, trust);
-      extra[i].pick = 1;
-      for (c=0; c<extra[i].npick; c++)
-	if (t == extra[i].chooser[c].trust)
-	  extra[i].pick = c;
-      if (install_type == IDC_INSTALL_NATIVE 
-	  && package[i].type == TY_CYGWIN
-	  ||
-	  install_type == IDC_INSTALL_CYGWIN 
-	  && package[i].type == TY_NATIVE)
-	extra[i].pick = extra[i].npick -1;
-    }
-  RECT r;
-  GetClientRect (h, &r);
-  InvalidateRect (h, &r, TRUE);
-  if (nextbutton)
-    SetFocus (nextbutton);
-}
-
-static void
-set_full_list (HWND h, int isfull)
-{
-  int i, j;
-  full_list = isfull;
-  if (package_indexes == 0)
-    package_indexes = (int *) malloc (npackages * sizeof (int));
-  for (i=j=0; i<npackages; i++)
-    {
-      if (isfull || extra[i].in_partial_list)
-	package_indexes[j++] = i;
-    }
-  nindexes = j;
-
-  RECT r;
-  GetClientRect (h, &r);
-  SCROLLINFO si;
-  memset (&si, 0, sizeof (si));
-  si.cbSize = sizeof (si);
-  si.fMask = SIF_ALL;
-  si.nMin = 0;
-  si.nMax = headers[2].x + headers[2].width + HMARGIN;
-  si.nPage = r.right;
-  SetScrollInfo (h, SB_HORZ, &si, TRUE);
-
-  si.nMax = nindexes * row_height;
-  si.nPage = r.bottom - header_height;
-  SetScrollInfo (h, SB_VERT, &si, TRUE);
-
-  scroll_ulc_x = scroll_ulc_y = 0;
-
-  InvalidateRect (h, &r, TRUE);
-
-  if (nextbutton)
-    SetFocus (nextbutton);
-}
-
-static void
-build_labels ()
-{
-  int i;
-  for (i=0; i<npackages; i++)
-    {
-      int c = 0, t;
-
-#define C extra[i].chooser[c]
-      if (extra[i].installed_ver)
-	{
-	  C.caption = "Uninstall";
-	  C.trust = TRUST_UNINSTALL;
-	  c++;
-	  C.caption = "Keep";
-	  C.trust = TRUST_KEEP;
-	  c++;
-	}
-
-      for (t=TRUST_PREV; t<NTRUST; t++)
-	if (package[i].info[t].install)
-	  if (t != extra[i].which_is_installed)
-	    {
-	      C.caption = package[i].info[t].version;
-	      if (C.caption == 0 || C.caption[0] == 0)
-		C.caption = "0.0";
-	      C.trust = t;
-	      if (package[i].info[t].source)
-		C.src_avail = 1;
-	      c++;
-	      /* we intentionally skip TRUST_PREV */
-	      if (t != TRUST_PREV || !extra[i].installed_ver)
-		extra[i].in_partial_list = 1;
-
-	    }
-
-      if (c == 0)
-	{
-	  C.caption = "N/A";
-	  C.trust = TRUST_NONE;
-	  c++;
-	}
-
-      if (! extra[i].installed_file)
-	{
-	  C.caption = "Skip";
-	  C.trust = TRUST_NONE;
-	  c++;
-	}
-
-      C.caption = 0;
-      extra[i].npick = c;
-#undef C
-    }
-}
-
-static void
-create_listview (HWND dlg, RECT *r)
-{
-  int i, t;
-  lv = CreateWindowEx (WS_EX_CLIENTEDGE,
-		       "listview",
-		       "listviewwindow",
-		       WS_CHILD | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE,
-		       r->left, r->top,
-		       r->right-r->left+1, r->bottom-r->top+1,
-		       dlg,
-		       NULL, // ??? MAKEINTRESOURCE(IDC_CHOOSE_LIST),
-		       hinstance,
-		       0);
-  ShowWindow (lv, SW_SHOW);
-
-  for (i=0; headers[i].text; i++)
-    headers[i].width = 0;
-
-  HDC dc = GetDC (lv);
-  sysfont = GetStockObject (DEFAULT_GUI_FONT);
-  SelectObject (dc, sysfont);
-  GetTextMetrics (dc, &tm);
-  header_height = tm.tmHeight + 5 + 3;
-
-  bitmap_dc = CreateCompatibleDC (dc);
-
-  row_height = (tm.tmHeight + tm.tmExternalLeading + ROW_MARGIN);
-  int irh = tm.tmExternalLeading + tm.tmDescent + 11 + ROW_MARGIN;
-  if (row_height < irh)
-    row_height = irh;
-
-  for (i=0; headers[i].text; i++)
-    note_width (dc, headers[i].text, 0, i);
-  for (i=0; i<npackages; i++)
-    {
-      note_width (dc, extra[i].installed_ver, 0, CURRENT_COL);
-      note_width (dc, extra[i].installed_ver, 11+ICON_MARGIN, NEW_COL);
-      for (t=0; t<NTRUST; t++)
-	note_width (dc, package[i].info[t].version, 11+ICON_MARGIN, NEW_COL);
-      note_width (dc, package[i].name, 0, PACKAGE_COL);
-      note_width (dc, package[i].sdesc, 0, PACKAGE_COL);
-    }
-  note_width (dc, "keep", 11+ICON_MARGIN, NEW_COL);
-  note_width (dc, "uninstall", 11+ICON_MARGIN, NEW_COL);
-
-  headers[CURRENT_COL].x = HMARGIN/2;
-  headers[NEW_COL].x = (headers[CURRENT_COL].x + headers[CURRENT_COL].width
-			+ HMARGIN + 11 + ICON_MARGIN);
-  headers[SRC_COL].x = headers[NEW_COL].x + headers[NEW_COL].width + HMARGIN;
-  headers[PACKAGE_COL].x = headers[SRC_COL].x + headers[SRC_COL].width + HMARGIN;
-
-  set_full_list (lv, full_list);
-  default_trust (lv, TRUST_CURR);
-
-  ReleaseDC (lv, dc);
-}
-
-static BOOL
-dialog_cmd (HWND h, int id, HWND hwndctl, UINT code)
-{
-  switch (id)
-    {
-
-    case IDC_CHOOSE_PREV:
-      default_trust (lv, TRUST_PREV);
-      break;
-    case IDC_CHOOSE_CURR:
-      default_trust (lv, TRUST_CURR);
-      break;
-    case IDC_CHOOSE_EXP:
-      default_trust (lv, TRUST_TEST);
-      break;
-    case IDC_CHOOSE_FULLPART:
-      set_full_list (lv, !full_list);
-      break;
-
-    case IDOK:
-      if (source == IDC_SOURCE_CWD)
-	NEXT (IDD_S_INSTALL);
-      else
-	NEXT (IDD_S_DOWNLOAD);
-      break;
-
-    case IDC_BACK:
-      initialized = 0;
-      if (source == IDC_SOURCE_CWD)
-	NEXT (IDD_ROOT);
-      else
-	NEXT (IDD_SITE);
-      break;
-
-    case IDCANCEL:
-      NEXT (0);
-      break;
-    }
-  return FALSE;
-}
-
-static void
-GetParentRect (HWND parent, HWND child, RECT *r)
-{
-  POINT p;
-  GetWindowRect (child, r);
-  p.x = r->left;
-  p.y = r->top;
-  ScreenToClient (parent, &p);
-  r->left = p.x;
-  r->top = p.y;
-  p.x = r->right;
-  p.y = r->bottom;
-  ScreenToClient (parent, &p);
-  r->right = p.x;
-  r->bottom = p.y;
-}
-
-static BOOL CALLBACK
-dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  HWND frame;
-  RECT r;
-  switch (message)
-    {
-    case WM_INITDIALOG:
-      nextbutton = GetDlgItem (h, IDOK);
-      frame = GetDlgItem (h, IDC_LISTVIEW_POS);
-      GetParentRect (h, frame, &r);
-      r.top += 2;
-      r.bottom -= 2;
-      create_listview (h, &r);
-#if 0
-      load_dialog (h);
-#endif
-      return FALSE;
-    case WM_COMMAND:
-      return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
-    }
-  return FALSE;
-}
-
-char *
-base (char *s)
-{
-  if (!s)
-    return 0;
-  char *rv = s;
-  while (*s)
-    {
-      if ((*s == '/' || *s == ':' || *s == '\\') && s[1])
-	rv = s+1;
-      s++;
-    }
-  return rv;
-}
-
-static void
-scan2 (char *path, unsigned int size)
-{
-  int i, t;
-  for (i=0; i<npackages; i++)
-    for (t=0; t<NTRUST; t++)
-      if (package[i].info[t].install
-	  && strcmp (base (package[i].info[t].install), base (path)) == 0
-	  && package[i].info[t].install_size == (int)size)
-	{
-	  extra[i].installed_file = package[i].info[t].install;
-	  extra[i].installed_size = size;
-	  extra[i].which_is_installed = t;
-	  extra[i].installed_ver = package[i].info[t].version;
-	  if (!extra[i].installed_ver)
-	    extra[i].installed_ver = "0";
-	}
-}
-
-static void
-scan_downloaded_files ()
-{
-  find (".", scan2);
-}
-
-static void
-read_installed_db ()
-{
-  int i;
-  if (!root_dir)
-    return;
-
-  char line[1000], pkg[1000], inst[1000], src[1000];
-  int instsz, srcsz;
-
-  FILE *db = fopen (concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0), "rt");
-  if (!db)
-    return;
-
-  while (fgets (line, 1000, db))
-    {
-      src[0] = 0;
-      srcsz = 0;
-      sscanf (line, "%s %s %d %s %d", pkg, inst, &instsz, src, &srcsz);
-
-      for (i=0; i<npackages; i++)
-	if (strcmp (package[i].name, pkg) == 0)
-	  {
-	    int t;
-	    extra[i].installed_file = inst;
-	    extra[i].installed_size = instsz;
-
-	    for (t=0; t<NTRUST; t++)
-	      if (package[i].info[t].install
-		  && strcmp (base (package[i].info[t].install), base (inst)) == 0)
-		{
-		  extra[i].which_is_installed = t;
-		  extra[i].installed_ver = package[i].info[t].version;
-		  break;
-		}
-
-	    if (extra[i].installed_ver == 0) /* still */
-	      {
-		char *v, *d;
-		for (v=base (inst); *v; v++)
-		  if (*v == '-' && isdigit(v[1]))
-		    {
-		      v++;
-		      break;
-		    }
-		if (!v)
-		  v = inst;
-		for (d=v; *d; d++)
-		  if (strncmp (d, ".tar", 4) == 0
-		      || strncmp (d, "-pkg", 4) == 0)
-		    {
-		      *d = 0;
-		      break;
-		    }
-		if (v[0])
-		  extra[i].installed_ver = strdup (v);
-		else
-		  extra[i].installed_ver = "0";
-	      }
-	    break;
-	  }
-    }
-  fclose (db);
-}
-
-int CDECL
-package_sort (const void *va, const void *vb)
-{
-  Package *a = (Package *)va;
-  Package *b = (Package *)vb;
-  return strcmp (a->name, b->name);
-}
-
-void
-do_choose (HINSTANCE h)
-{
-  int rv, i;
-
-  qsort (package, npackages, sizeof (package[0]), package_sort);
-
-  nextbutton = 0;
-  bm_spin = LoadImage (h, MAKEINTRESOURCE (IDB_SPIN), IMAGE_BITMAP, 0, 0, 0);
-  bm_rtarrow = LoadImage (h, MAKEINTRESOURCE (IDB_RTARROW), IMAGE_BITMAP, 0, 0, 0);
-
-  bm_checkyes = LoadImage (h, MAKEINTRESOURCE (IDB_CHECK_YES), IMAGE_BITMAP, 0, 0, 0);
-  bm_checkno = LoadImage (h, MAKEINTRESOURCE (IDB_CHECK_NO), IMAGE_BITMAP, 0, 0, 0);
-  bm_checkna = LoadImage (h, MAKEINTRESOURCE (IDB_CHECK_NA), IMAGE_BITMAP, 0, 0, 0);
-
-  extra = (ExtraPackageInfo *) malloc (npackages * sizeof (ExtraPackageInfo));
-  memset (extra, 0, npackages * sizeof (ExtraPackageInfo));
-  for (i=0; i<npackages; i++)
-    extra[i].which_is_installed = -1;
-
-  register_windows (h);
-
-  if (source == IDC_SOURCE_DOWNLOAD)
-    scan_downloaded_files ();
-  else
-    read_installed_db ();
-  build_labels ();
-
-  rv = DialogBox (h, MAKEINTRESOURCE (IDD_CHOOSE), 0, dialog_proc);
-  if (rv == -1)
-    fatal (IDS_DIALOG_FAILED);
-
-  for (i=0; i<npackages; i++)
-    {
-      switch (extra[i].chooser[extra[i].pick].trust)
-	{
-	case TRUST_PREV:
-	case TRUST_CURR:
-	case TRUST_TEST:
-	  if (extra[i].installed_file)
-	    package[i].action = ACTION_UPGRADE;
-	  else
-	    package[i].action = ACTION_NEW;
-	  package[i].trust = extra[i].chooser[extra[i].pick].trust;
-	  // pick up the actual core package to install
-	  if (package[i].type == TY_CYGWIN || package[i].type == TY_NATIVE
-	      && xemacs_package == 0)
-	    xemacs_package = &package[i];
-	  break;
-
-	case TRUST_UNINSTALL:
-	  package[i].action = ACTION_UNINSTALL;
-	  break;
-
-	case TRUST_KEEP:
-	case TRUST_NONE:
-	default:
-	  package[i].action = ACTION_SAME;
-	  break;
-	}
-    }
-
-  log (LOG_BABBLE, "Chooser results...");
-  for (i=0; i<npackages; i++)
-    {
-      static char *infos[] = {"prev", "curr", "test"};
-      const char *trust = ((package[i].trust == TRUST_PREV) ? "prev"
-			   : (package[i].trust == TRUST_CURR) ? "curr"
-			   : (package[i].trust == TRUST_TEST) ? "test"
-			   : "unknown");
-      const char *action = ((package[i].action == ACTION_UNKNOWN) ? "unknown"
-			    : (package[i].action == ACTION_SAME) ? "same"
-			    : (package[i].action == ACTION_NEW) ? "new"
-			    : (package[i].action == ACTION_UPGRADE) ? "upgrade"
-			    : (package[i].action == ACTION_UNINSTALL) ? "uninstall"
-			    : (package[i].action == ACTION_ERROR) ? "error"
-			    : "unknown");
-
-      log (LOG_BABBLE, "[%s] action=%s trust=%s src? %s", package[i].name, action, trust,
-	   package[i].srcaction == SRCACTION_NO ? "no" : "yes");
-      for (int t=0; t<NTRUST; t++)
-	{
-	  if (package[i].info[t].install)
-	    log (LOG_BABBLE, "[%s] ver %s inst %s %d src %s %d",
-		 infos[t],
-		 package[i].info[t].version ? package[i].info[t].version : "(none)",
-		 package[i].info[t].install ? package[i].info[t].install : "(none)",
-		 package[i].info[t].install_size,
-		 package[i].info[t].source ? package[i].info[t].source : "(none)",
-		 package[i].info[t].source_size);
-	}
-    }
-}

--- a/netinstall/concat.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* See concat.h.  Note that we canonicalize the result, this avoids
-   multiple slashes being interpreted as UNCs. */
-
-#include "win32.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-
-char * CDECL
-concat (char *s, ...)
-{
-  int len;
-  char *rv, *arg;
-  va_list v;
-
-  if (!s)
-    return 0;
-
-  len = strlen (s);
-
-  va_start (v, s);
-  while (1)
-    {
-      arg = va_arg (v, char *);
-      if (arg == 0)
-	break;
-      len += strlen (arg);
-    }
-  va_end (v);
-
-  rv = (char *) malloc (len+1);
-  strcpy (rv, s);
-  va_start (v, s);
-  while (1)
-  {
-    arg = va_arg (v, char *);
-    if (arg == 0)
-      break;
-    strcat (rv, arg);
-  }
-  va_end (v);
-
-  /* concat is only used for urls and files, so we can safely
-     canonicalize the results */
-  char *d;
-  for (s=rv; *s; s++)
-    if (*s == '\\')
-      *s = '/';
-  for (s=d=rv; *s; s++)
-    {
-      *d++ = *s;
-      /* special case for URLs */
-      if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1)
-	{
-	  *d++ = *++s;
-	  *d++ = *++s;
-	}
-      else if (*s == '/')
-	while (s[1] == '/')
-	  s++;
-    }
-  *d = 0;
-
-  return rv;
-}
-
-char *
-backslash (char *s)
-{
-  for (char *t = s; *t; t++)
-    if (*t == '/')
-      *t = '\\';
-  return s;
-}

--- a/netinstall/concat.h	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* Pass a null-terminated list of strings, and it concatenates them
-   into a single string.  Warning - it assumes the result is a file
-   name or URL, and will canonicalize the result accordingly
-   (i.e. replace \ with /, collapse multiple /// to a single /, etc.)  */
-
-char * CDECL concat (char *s, ...);
-
-/* convert slashes to backslashes */
-
-char * backslash (char *s);

--- a/netinstall/desktop.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,537 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to manage all the desktop setup, such
-   as start menu, batch files, desktop icons, and shortcuts.  Note
-   that unlike other do_* functions, this one is called directly from
-   install.cc */
-
-
-#include "win32.h"
-#include <shlobj.h>
-
-#include <io.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef WIN32_NATIVE
-#include <unistd.h>
-#endif
-
-#include "resource.h"
-#include "ini.h"
-#include "msg.h"
-#include "state.h"
-#include "concat.h"
-#include "mkdir.h"
-#include "dialog.h"
-#include "version.h"
-#include "reginfo.h"
-#include "regedit.h"
-#include "port.h"
-#include "log.h"
-#include "desktop.h"
-
-extern "C" {
-  void make_link_2 (char *exepath, char *args, char *icon, char *lname);
-};
-
-static OSVERSIONINFO verinfo;
-
-/* Lines starting with '@' are conditionals - include 'N' for NT,
-   '5' for Win95, '8' for Win98, '*' for all, like this:
-	echo foo
-	@N8
-	echo NT or 98
-	@*
-   */
-
-#define COMMAND9XARGS "/E:4096 /c"
-#define COMMAND9XEXE  "\\command.com"
-
-static char *iconname;
-static char *batname;
-static char *uninstname;
-
-static void
-make_link (char *linkpath, char *title, char *target, char* args)
-{
-#if 0
-  char argbuf[_MAX_PATH];
-#endif
-  char *fname = concat (linkpath, "/", title, ".lnk", 0);
-
-  if (_access (fname, 0) == 0)
-    return; /* already exists */
-
-  msg ("make_link %s, %s, %s, %s\n", fname, title, target, args);
-
-  mkdir_p (0, fname);
-
-  char *exepath;
-#if 0
-  /* If we are running Win9x, build a command line. */
-  if (verinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
-    {
-#endif
-      exepath = target;
-#if 0
-    }
-  else
-    {
-      char windir[MAX_PATH];
-
-      GetWindowsDirectory (windir, sizeof (windir));
-      exepath = concat (windir, COMMAND9XEXE, 0);
-      sprintf (argbuf, "%s %s", COMMAND9XARGS, target);
-      args = argbuf;
-    }
-#endif
-  msg ("make_link_2 (%s, %s, %s, %s)", exepath, args, iconname, fname);
-  make_link_2 (backslash (exepath), args, iconname, fname);
-}
-
-static char* 
-find_xemacs_version ()
-{
-  char* v = strdup (xemacs_package->info[xemacs_package->trust].version);
-  char* dash = strrchr (v, '-');
-  if (dash)
-    *dash = 0;
-  return v;
-}
-
-static char* 
-find_xemacs_exe_path ()
-{
-  if (xemacs_package->type == TY_CYGWIN)
-    return backslash (concat (root_dir, "/bin/", XEMACS_CYGWIN_ARCH_NAME, 0));
-  else
-    return backslash (concat (root_dir, "\\XEmacs-",
-			      find_xemacs_version (), 
-			      "\\", XEMACS_NATIVE_ARCH_NAME, 0));
-}
-
-char* 
-find_xemacs_exe_name ()
-{
-  /* Hack to support older versions. */
-  if (strncmp (xemacs_package->info[xemacs_package->trust].version,
-	       "21.1", 4) == 0)
-    return strdup ("runemacs.exe");
-  else if (xemacs_package->type == TY_CYGWIN)
-    return backslash (concat ("xemacs-",
-			      find_xemacs_version (), 
-			      ".exe", 0));
-  else
-    return strdup ("xemacs.exe");
-}
-
-static void
-remove_link (char *linkpath, char* title)
-{
-  if (title)
-    {
-      char *fname = backslash (concat (linkpath, "/", title, ".lnk", 0));
-      msg ("remove_link %s, %s\n", fname, title);
-      if (_access (fname, 0) != 0)
-	return; /* doesn't exist */
-      _unlink (fname);
-    }
-  else 
-    {
-      msg ("remove_link %s\n", linkpath);
-      if (_access (linkpath, 0) != 0)
-	return; /* doesn't exist */
-      _rmdir (linkpath);
-    }
-}
-
-static void
-start_menu (char *title, char *target, int rem, char* args)
-{
-  char path[_MAX_PATH];
-  LPITEMIDLIST id;
-  int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0;
-  SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, &id);
-  SHGetPathFromIDList (id, path);
-// following lines added because it appears Win95 does not use common programs
-// unless it comes into play when multiple users for Win95 is enabled
-  msg("Program directory for program link: %s",path);
-  if ( strlen(path) == 0) {
-     SHGetSpecialFolderLocation (NULL, CSIDL_PROGRAMS, &id);
-     SHGetPathFromIDList (id, path);
-     msg("Program directory for program link changed to: %s",path);
-  }
-// end of Win95 addition
-  strcat (path, "\\");
-  strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
-  if (rem == 0)
-    make_link (path, title, target, args);
-  else
-    remove_link (path, title);
-}
-
-static void
-desktop_icon (char *title, char *target, int rem)
-{
-  char path[_MAX_PATH];
-  LPITEMIDLIST id;
-  int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0;
-  //SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_DESKTOP : CSIDL_COMMON_DESKTOPDIRECTORY, &id);
-  SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, &id);
-  SHGetPathFromIDList (id, path);
-// following lines added because it appears Win95 does not use common programs
-// unless it comes into play when multiple users for Win95 is enabled
-  msg("Desktop directory for desktop link: %s",path);
-  if ( strlen(path) == 0) {
-     SHGetSpecialFolderLocation (NULL, CSIDL_DESKTOPDIRECTORY, &id);
-     SHGetPathFromIDList (id, path);
-     msg("Desktop directory for deskop link changed to: %s",path);
-  }
-// end of Win95 addition
-  if (rem == 0)
-    make_link (path, title, target, "");
-  else
-    remove_link (path, title);
-}
-
-static void
-save_icon ()
-{
-  iconname = backslash (concat (root_dir, XEMACS_RESOURCE_DIR, 
-				"xemacs.ico", 0));
-
-  HRSRC rsrc = FindResource (NULL, "XEMACS.ICON", "FILE");
-  if (rsrc == NULL)
-    {
-      fatal ("FindResource failed");
-    }
-  HGLOBAL res = LoadResource (NULL, rsrc);
-  char *data = (char *) LockResource (res);
-  int len = SizeofResource (NULL, rsrc);
-
-  FILE *f = fopen (iconname, "wb");
-  if (f)
-    {
-      fwrite (data, 1, len, f);
-      fclose (f);
-    }
-}
-
-void
-remove_xemacs_setup()
-{
-  if (xemacs_package == 0)
-    return;
-
-  start_menu ("XEmacs", 0, 1, 0);
-  desktop_icon ("XEmacs", 0, 1);
-
-#define FROB(exe)	  remove_app_path (exe)
-  FROB (find_xemacs_exe_name ());
-  FROB ("runemacs.exe");
-  FROB ("xemacs.exe");
-#undef FROB
-}
-
-void
-remove_desktop_setup()
-{
-  remove_xemacs_setup();
-  start_menu ("Uninstall XEmacs", 0, 1, 0);
-  start_menu (0, 0, 1, 0);
-}
-
-static void
-do_desktop_setup()
-{
-  save_icon ();
-
-  if (root_menu && batname) {
-    start_menu ("XEmacs", batname, 0, "");
-    start_menu ("Uninstall XEmacs", uninstname, 0, "-u");
-  }
-
-  if (root_desktop && batname) {
-    desktop_icon ("XEmacs", batname, 0);
-  }
-
-  // set regkeys for the application
-  if (xemacs_package != 0)
-    {
-      int issystem = (root_scope == IDC_ROOT_SYSTEM ? 1 : 0);
-      if (xemacs_package->type == TY_NATIVE
-	  || xemacs_package->type == TY_CYGWIN)
-	{
-	  if (xemacs_package->type == TY_NATIVE)
-	    {
-#define FROB(exe)	  set_app_path ((exe), \
-			find_xemacs_exe_path (), \
-			issystem)
-	      FROB (find_xemacs_exe_name ());
-	      FROB ("runemacs.exe");
-	      FROB ("xemacs.exe");
-#undef FROB
-	    }
-	  else if (xemacs_package->type == TY_CYGWIN)
-	    {
-	      int junk;
-	      char* root = find_cygwin_root (&junk);
-#define FROB(exe)	set_app_path ((exe), \
-			concat (find_xemacs_exe_path (), ";", \
-				root, "\\bin;", \
-				root, "\\usr\\bin", 0), \
-			issystem)
-	      FROB (find_xemacs_exe_name ());
-	      FROB ("runemacs.exe");
-	      FROB ("xemacs.exe");
-#undef FROB
-	    }
-	  set_install_path (find_xemacs_exe_path(), issystem);
-	}
-      // Register file types
-      if (batname)
-	{
-	  if (reg_java)
-	    {
-	      log (0, "Registering .java files");
-	      setup_explorer ("java", "Java Source file", batname);
-	      setup_explorer ("jav", "Java Source file", batname);
-	    }
-	  if (reg_cpp)
-	    {
-	      log (0, "Registering .cpp files");
-	      setup_explorer ("cpp", "C++ Source file", batname);
-	      setup_explorer ("cc", "C++ Source file", batname);
-	      setup_explorer ("cxx", "C++ Source file", batname);
-	      setup_explorer ("hh", "C++ Header file", batname);
-	      setup_explorer ("hpp", "C++ Header file", batname);
-	      setup_explorer ("hxx", "C++ Header file", batname);
-	    }
-	  if (reg_c)
-	    {
-	      log (0, "Registering .c files");
-	      setup_explorer ("c", "C Source file", batname);
-	      setup_explorer ("h", "C Header file", batname);
-	    }
-	  if (reg_elisp)
-	    {
-	      log (0, "Registering .el files");
-	      setup_explorer ("el", "E-Lisp Source file", batname);
-	    }
-	  if (reg_txt)
-	    {
-	      log (0, "Registering .txt files");
-	      setup_explorer ("txt", "Text file", batname);
-	    }
-	  if (reg_idl)
-	    {
-	      log (0, "Registering .idl files");
-	      setup_explorer ("idl", "OMG IDL file", batname);
-	    }
-	}
-    }
-}
-
-static int da[] = { IDC_ROOT_DESKTOP, 0 };
-static int ma[] = { IDC_ROOT_MENU, 0 };
-
-static int ct[] = { IDC_C_TYPE, 0 };
-static int javat[] = { IDC_JAVA_TYPE, 0 };
-static int cppt[] = { IDC_CPP_TYPE, 0 };
-static int elispt[] = { IDC_ELISP_TYPE, 0 };
-static int txtt[] = { IDC_TXT_TYPE, 0 };
-static int idlt[] = { IDC_IDL_TYPE, 0 };
-
-static void
-check_if_enable_next (HWND h)
-{
-  EnableWindow (GetDlgItem (h, IDOK), 1);
-}
-
-static void
-load_dialog (HWND h)
-{
-  rbset (h, da, root_desktop);
-  rbset (h, ma, root_menu);
-  rbset (h, ct, reg_c);
-  rbset (h, javat, reg_java);
-  rbset (h, cppt, reg_cpp);
-  rbset (h, elispt, reg_elisp);
-  rbset (h, txtt, reg_txt);
-  rbset (h, idlt, reg_idl);
-  check_if_enable_next (h);
-}
-
-static int check_desktop (char *title, char *target)
-{
-  char path[_MAX_PATH];
-  LPITEMIDLIST id;
-  int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0;
-  SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, &id);
-  SHGetPathFromIDList (id, path);
-  // following lines added because it appears Win95 does not use common programs
-  // unless it comes into play when multiple users for Win95 is enabled
-  msg ("Desktop directory for desktop link: %s",path);
-  if (strlen (path) == 0) {
-     SHGetSpecialFolderLocation (NULL, CSIDL_DESKTOPDIRECTORY, &id);
-     SHGetPathFromIDList (id, path);
-     msg ("Desktop directory for deskop link changed to: %s",path);
-  }
-  // end of Win95 addition
-  char *fname = concat (path, "/", title, ".lnk", 0);
-
-  if (_access (fname, 0) == 0)
-    return 0; /* already exists */
-  
-  fname = concat (path, "/", title, ".pif", 0); /* check for a pif as well */
-  
-  if (_access (fname, 0) == 0)
-    return 0; /* already exists */
-
-  return IDC_ROOT_DESKTOP;
-}
-
-static int check_startmenu (char *title, char *target)
-{
-  char path[_MAX_PATH];
-  LPITEMIDLIST id;
-  int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0;
-  SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, &id);
-  SHGetPathFromIDList (id, path);
-  // following lines added because it appears Win95 does not use common programs
-  // unless it comes into play when multiple users for Win95 is enabled
-  msg ("Program directory for program link: %s",path);
-  if (strlen (path) == 0) {
-     SHGetSpecialFolderLocation (NULL, CSIDL_PROGRAMS, &id);
-     SHGetPathFromIDList (id, path);
-     msg ("Program directory for program link changed to: %s",path);
-  }
-  // end of Win95 addition
-  strcat (path, "\\");
-  strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
-  char *fname = concat (path, "\\", title, ".lnk", 0);
-
-  if (_access (fname, 0) == 0)
-    return 0; /* already exists */
-  
-  fname = concat (path, "\\", title, ".pif", 0); /* check for a pif as well */
-  
-  if (_access (fname, 0) == 0)
-    return 0; /* already exists */
-  
-  return IDC_ROOT_MENU;
-}
-
-static void
-save_dialog (HWND h)
-{
-  root_desktop= rbget (h, da);
-  root_menu = rbget (h, ma);
-  reg_c = rbget (h, ct);
-  reg_java = rbget (h, javat);
-  reg_cpp = rbget (h, cppt);
-  reg_elisp = rbget (h, elispt);
-  reg_txt = rbget (h, txtt);
-  reg_idl = rbget (h, idlt);
-}
-
-static BOOL
-dialog_cmd (HWND h, int id, HWND hwndctl, UINT code)
-{
-  switch (id)
-    {
-
-    case IDC_ROOT_DESKTOP:
-    case IDC_ROOT_MENU:
-      save_dialog (h);
-      check_if_enable_next (h);
-      break;
-
-    case IDOK:
-      save_dialog (h);
-      do_desktop_setup();
-      NEXT (IDD_S_POSTINSTALL);
-      break;
-
-    case IDC_BACK:
-      save_dialog (h);
-      NEXT (IDD_CHOOSE);
-      break;
-
-    case IDCANCEL:
-      NEXT (0);
-      break;
-    }
-  return FALSE;
-}
-
-static BOOL CALLBACK
-dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  switch (message)
-    {
-    case WM_INITDIALOG:
-      load_dialog (h);
-      return FALSE;
-    case WM_COMMAND:
-      return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
-    }
-  return FALSE;
-}
-
-void
-do_desktop (HINSTANCE h)
-{
-  CoInitialize (NULL);
-
-  verinfo.dwOSVersionInfoSize = sizeof (verinfo);
-  GetVersionEx (&verinfo);
-  batname = 0;
-  uninstname = 0;
-
-  if (xemacs_package != 0 && xemacs_package->type != TY_GENERIC)
-    {
-      batname = concat (find_xemacs_exe_path (), "\\",
-			find_xemacs_exe_name (), 
-			0);
-      uninstname = concat (find_xemacs_exe_path (), "\\", "setup.exe", 0);
-      root_desktop = check_desktop ("XEmacs", batname);
-      root_menu = check_startmenu ("XEmacs", batname);
-      reg_c = IDC_C_TYPE;
-      reg_cpp = IDC_CPP_TYPE;
-      reg_java = IDC_JAVA_TYPE;
-      reg_elisp = IDC_ELISP_TYPE;
-      reg_txt = IDC_TXT_TYPE;
-      reg_idl = IDC_IDL_TYPE;
-    }
-  else
-    {
-      root_desktop = 0;
-      root_menu = 0;
-      reg_c = 0;
-      reg_cpp = 0;
-      reg_java = 0;
-      reg_elisp = 0;
-      reg_txt = 0;
-      reg_idl = 0;
-    }
-  
-  int rv = 0;
-
-  rv = DialogBox (h, MAKEINTRESOURCE (IDD_DESKTOP), 0, dialog_proc);
-  if (rv == -1)
-    fatal (IDS_DIALOG_FAILED);
-}

--- a/netinstall/desktop.h	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/* 
-   Copyright (C) 2001 Andy Piper.
-
-This file is part of XEmacs.
-
-XEmacs is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation, either version 3 of the License, or (at your
-option) any later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs.  If not, see <http://www.gnu.org/licenses/>. */
-
-extern void remove_desktop_setup ();
-extern void remove_xemacs_setup ();
-extern char* find_xemacs_exe_name();

--- a/netinstall/dialog.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to provide common functionality for
-   all the dialogs in the program. */
-
-#include "win32.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "dialog.h"
-#include "msg.h"
-#include "log.h"
-
-char *
-eget (HWND h, int id, char *var)
-{
-  char tmp[4000];
-  if (var)
-    {
-      free (var);
-      var = 0;
-    }
-  if (GetDlgItemText (h, id, tmp, sizeof (tmp)) > 0) 
-    {
-      var = (char *) malloc (strlen (tmp)+1);
-      strcpy (var, tmp);
-    }
-  return var;
-}
-
-int
-eget (HWND h, int id)
-{
-  BOOL s;
-  int r = GetDlgItemInt (h, id, &s, TRUE);
-  return r;
-}
-
-void
-eset (HWND h, int id, char *val)
-{
-  SetDlgItemText (h, id, val);
-}
-
-void
-eset (HWND h, int id, int val)
-{
-  SetDlgItemInt (h, id, (UINT)val, TRUE);
-}
-
-int
-rbget (HWND h, int *ids)
-{
-  int i;
-  for (i=0; ids[i]; i++)
-    if (IsDlgButtonChecked (h, ids[i]) == BST_CHECKED)
-      return ids[i];
-  return 0;
-}
-
-void
-rbset (HWND h, int *ids, int id)
-{
-  int i;
-  for (i=0; ids[i]; i++)
-    CheckDlgButton (h, ids[i], id==ids[i] ? BST_CHECKED : BST_UNCHECKED);
-}
-
-void
-fatal (char *m)
-{
-  DWORD e = GetLastError ();
-  char *buf;
-  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-		 0,
-		 e,
-		 0,
-		 (CHAR *)&buf,
-		 0,
-		 0);
-  MessageBox (0, buf, m, 0);
-  exit_setup (1);
-}

--- a/netinstall/dialog.h	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* global instance for the application; set in main.cc */
-extern HINSTANCE hinstance;
-
-/* used by main.cc to select the next do_* function */
-extern int next_dialog;
-
-/* either "nothing to do" or "setup complete" or something like that */
-extern int exit_msg;
-
-#define D(x) void x(HINSTANCE _h)
-
-/* prototypes for all the do_* functions (most called by main.cc) */
-
-D(do_choose);
-D(do_desktop);
-D(do_download);
-D(do_fromcwd);
-D(do_ini);
-D(do_init);
-D(do_install);
-D(do_local_dir);
-D(do_net);
-D(do_other);
-D(do_postinstall);
-D(do_uninstall);
-D(do_root);
-D(do_site);
-D(do_source);
-D(do_splash);
-
-#undef D
-
-/* end this dialog and select the next.  Pass 0 to exit the program */
-#define NEXT(id) EndDialog((HWND)h, 0), next_dialog = id
-
-/* Get the value of an EditText control.  Pass the previously stored
-   value and it will free the memory if needed. */
- 
-char *eget (HWND h, int id, char *var);
-
-/* Same, but convert the value to an integer */
-
-int   eget (HWND h, int id);
-
-/* Set the EditText control to the given string or integer */
-
-void  eset (HWND h, int id, char *var);
-void  eset (HWND h, int id, int var);
-
-/* RadioButtons.  ids is a null-terminated list of IDs.  Get
-   returns the selected ID (or zero), pass an ID to set */
-
-int   rbget (HWND h, int *ids);
-void  rbset (HWND h, int *ids, int id);
-
-/* *This* version of fatal (compare with msg.h) uses GetLastError() to
-   format a suitable error message.  Similar to perror() */
-
-void fatal (char *msg);

--- a/netinstall/diskfull.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to hide the mess needed just to figure
-   out how full a given disk is.  There is an old API that can't
-   handle disks bigger than 2G, and a new API that isn't always
-   available. */
-
-#include "win32.h"
-#include "diskfull.h"
-
-typedef   BOOL (WINAPI * GDFS)(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER,
-			      PULARGE_INTEGER);
-
-int
-diskfull (char *path)
-{
-  GDFS gdfs = 0;
-
-  HINSTANCE k = LoadLibrary ("KERNEL32.DLL");
-  if (k)
-    {
-      gdfs = (GDFS) GetProcAddress (k, "GetDiskFreeSpaceExA");
-
-      if (gdfs)
-	{
-	  ULARGE_INTEGER avail, total, free;
-	  if (gdfs (path, &avail, &total, &free))
-	    {
-	      int perc = avail.QuadPart * 100 / total.QuadPart;
-	      return 100-perc;
-	    }
-	}
-    }
-
-  char root[4];
-  if (path[1] != ':')
-    return 0;
-
-  root[0] = path[0];
-  root[1] = ':';
-  root[2] = '\\';
-  root[3] = 0;
-
-  DWORD junk, free_clusters, total_clusters;
-
-  if (GetDiskFreeSpace (root, &junk, &junk, &free_clusters, &total_clusters))
-    {
-      int perc = free_clusters * 100 / total_clusters;
-      return 100-perc;
-    }
-
-  return 0;
-}

--- a/netinstall/diskfull.h	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* returns 0..100 (percent) */
-int diskfull (char *path);

--- a/netinstall/download.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to download all the files we need to
-   do the installation. */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "win32.h"
-
-#include "resource.h"
-#include "msg.h"
-#include "ini.h"
-#include "dialog.h"
-#include "concat.h"
-#include "geturl.h"
-#include "state.h"
-#include "mkdir.h"
-#include "log.h"
-
-static int
-download_one (char *name, int expected_size)
-{
-  char *local = name;
-
-  struct stat s;
-  if (stat (local, &s) >= 0)
-    if (s.st_size == expected_size)
-      return 0;
-
-  mkdir_p (0, local);
-
-  if (get_url_to_file (concat (MIRROR_SITE, "/", name, 0),
-		       concat (local, ".tmp", 0),
-		       expected_size))
-    {
-      note (IDS_DOWNLOAD_FAILED, name);
-      return 1;
-    }
-  else
-    {
-      stat (concat (local, ".tmp", 0), &s);
-      if (s.st_size == expected_size)
-	{
-	  log (0, "Downloaded %s", local);
-	  rename (concat (local, ".tmp", 0), local);
-	}
-      else
-	{
-	  log (0, "Download %s wrong size (%d actual vs %d expected)",
-	       local, s.st_size, expected_size);
-	  note (IDS_DOWNLOAD_SHORT, local, s.st_size, expected_size);
-	  return 1;
-	}
-    }
-
-  return 0;
-}
-
-void
-do_download (HINSTANCE h)
-{
-  int i;
-  int errors = 0;
-
-  for (i=0; i<npackages; i++)
-    if (package[i].action == ACTION_NEW || package[i].action == ACTION_UPGRADE)
-      {
-	int e = download_one (pi.install, pi.install_size);
-	if (package[i].srcaction == SRCACTION_YES && pi.source)
-	  e += download_one (pi.source, pi.source_size);
-	errors += e;
-	if (e)
-	  package[i].action = ACTION_ERROR;
-      }
-
-  dismiss_url_status_dialog ();
-
-  if (errors)
-    {
-      if (yesno (IDS_DOWNLOAD_INCOMPLETE) == IDYES)
-	{
-	  next_dialog = IDD_SITE;
-	  return;
-	}
-    }
-
-  if (source == IDC_SOURCE_DOWNLOAD)
-    {
-      if (errors)
-	exit_msg = IDS_DOWNLOAD_INCOMPLETE;
-      else
-	exit_msg = IDS_DOWNLOAD_COMPLETE;
-      next_dialog = 0;
-    }
-  else
-    next_dialog = IDD_S_INSTALL;
-}

--- a/netinstall/find.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to doa recursive find on a given
-   directory, calling a given function for each file found. */
-
-#include "win32.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "port.h"
-
-static void (*for_each)(char *, unsigned int);
-static char dir[_MAX_PATH], *found_part;
-
-static int
-find_sub ()
-{
-  WIN32_FIND_DATA wfd;
-  HANDLE h;
-  char *end = dir + strlen (dir);
-  int rv = 0;
-
-  *end++ = '/';
-  strcpy (end, "*");
-
-  h = FindFirstFile (dir, &wfd);
-
-  if (h == INVALID_HANDLE_VALUE)
-    return 0;
-
-  do {
-    if (strcmp (wfd.cFileName, ".") == 0
-	|| strcmp (wfd.cFileName, "..") == 0)
-      continue;
-
-    strcpy (end, wfd.cFileName);
-
-    if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-      find_sub ();
-    else
-      {
-	for_each (found_part, wfd.nFileSizeLow);
-	rv ++;
-      }
-
-  } while (FindNextFile (h, &wfd));
-
-  FindClose (h);
-  return rv;
-}
-
-int
-find (char *starting_dir, void (*_for_each)(char *, unsigned int))
-{
-  strcpy (dir, starting_dir);
-  for_each = _for_each;
-  found_part = dir + strlen (dir) + 1;
-
-  return find_sub ();
-}

--- a/netinstall/find.h	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The for_each function is called once for each file found in the
-   starting_dir or any subdir (recursively), passing the relative path
-   (i.e. it doesn't include "starting_dir") and the size of the file
-   (bytes).  find() returns the number of files found.  Directories
-   are scanned but not included in the "found" files. */
-
-extern int find (char *starting_dir, void (*for_each)(char *, unsigned int));

--- a/netinstall/fromcwd.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to handle the case where we're
-   installing from files that already exist in the current directory.
-   If a setup.ini file is present, we set the mirror site to "." and
-   pretend we're installing from the `internet' ;-) else we have to
-   find all the .tar.gz files, deduce their versions, and try to
-   compare versions in the case where the current directory contains
-   multiple versions of any given package.  We do *not* try to compare
-   versions with already installed packages; we always choose a
-   package in the current directory over one that's already installed
-   (otherwise, why would you have asked to install it?).  Note
-   that we search recursively. */
-
-#include "win32.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <io.h>
-#include <ctype.h>
-#ifndef WIN32_NATIVE
-#include <unistd.h>
-#endif
-
-#include "ini.h"
-#include "resource.h"
-#include "concat.h"
-#include "state.h"
-#include "dialog.h"
-#include "msg.h"
-#include "find.h"
-#include "version.h"
-
-#include "port.h"
-
-static int
-is_test_version (char *v)
-{
-  int i;
-  for (i=0; v[i] && isdigit (v[i]); i++) ;
-  return (i >= 6) ? 1 : 0;
-}
-
-char *
-canonicalize_version (char *v)
-{
-  static char nv[3][100];
-  static int idx = 0;
-  char *np, *dp;
-  int i;
-
-  idx = (idx+1) % 3;
-  np = nv[idx];
-
-  while (*v)
-    {
-      if (isdigit (*v))
-	{
-	  for (dp=v; *dp && isdigit (*dp); dp++) ;
-	  for (i=dp-v; i<12; i++)
-	    *np++ = '0';
-	  while (v < dp)
-	    *np++ = *v++;
-	}
-      else
-	*np++ = *v++;
-    }
-  *np++ = 0;
-  return nv[idx];
-}
-
-static void
-found_file (char *path, unsigned int fsize)
-{
-  char base[_MAX_PATH], *ver;
-
-  int l = strlen (path);
-
-  if (strcmp (path + l - 7, ".tar.gz") != 0)
-    return;
-  if (strstr (path, "-src."))
-    return;
-  if (strstr (path, "-patch."))
-    return;
-
-  char *sl = strrchr (path, '/');
-  if (sl)
-    sl ++;
-  else
-    sl = path;
-  strcpy (base, sl);
-  base[strlen (base) - 7] = 0; /* remove .tar.gz */
-  for (ver=base; *ver; ver++)
-    if ((*ver == '-' || *ver == '_') && isdigit (ver[1]))
-      {
-	*ver++ = 0;
-	break;
-      }
-
-  Package *p = 0;
-  int i;
-
-  for (i=0; i<npackages; i++)
-    if (strcmp (package[i].name, base) == 0)
-      {
-	p = package + i;
-	break;
-      }
-  if (p == 0)
-      p = new_package (strdup (base));
-
-  int trust = is_test_version (ver) ? TRUST_TEST : TRUST_CURR;
-  if (!*ver)
-    trust = TRUST_PREV;
-
-  /* See if this version is older than what we have */
-  if (p->info[trust].version)
-    {
-      char *ov = canonicalize_version (p->info[trust].version);
-      char *nv = canonicalize_version (ver);
-      if (strcmp (ov, nv) > 0)
-	return;
-    }
-
-  l = strlen (base);
-  if (l >= 5 && strcmp (base + l - 5, "win32") == 0)
-    p->type = TY_NATIVE;
-  if (l >= 8 && strcmp (base + l - 8, "cygwin32") == 0)
-    p->type = TY_CYGWIN;
-
-  p->info[trust].version = strdup (ver);
-  p->info[trust].install = strdup (path);
-  p->info[trust].install_size = fsize;
-}
-
-void
-do_fromcwd (HINSTANCE h)
-{
-  if (_access ("./setup.ini", 0) == 0)
-    {
-      mirror_site = ".";
-      next_dialog = IDD_S_LOAD_INI;
-      return;
-    }
-
-  next_dialog = IDD_CHOOSE;
-
-  find (".", found_file);
-
-  // Now see about source tarballs
-  int i, t;
-  Package *p;
-  char srcpath[_MAX_PATH];
-  for (i=0; i<npackages; i++)
-    {
-      p = package+i;
-      for (t=TRUST_PREV; t<=TRUST_TEST; t++)
-	if (p->info[t].install)
-	  {
-	    strcpy (srcpath, p->info[t].install);
-	    strcpy (srcpath + strlen (srcpath) - 7, "-src.tar.gz");
-	    msg ("looking for %s", srcpath);
-
-	    WIN32_FIND_DATA wfd;
-	    HANDLE h = FindFirstFile (srcpath, &wfd);
-	    if (h != INVALID_HANDLE_VALUE)
-	      {
-		msg("-- got it");
-		FindClose (h);
-		p->info[t].source = strdup (srcpath);
-		p->info[t].source_size = wfd.nFileSizeLow;
-	      }
-	  }
-    }
-
-  return;
-}

--- a/netinstall/geturl.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to act as a pretty interface to
-   netio.cc.  We add a progress dialog and some convenience functions
-   (like collect to string or file */
-
-#include "win32.h"
-#include "commctrl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "dialog.h"
-#include "geturl.h"
-#include "resource.h"
-#include "netio.h"
-#include "msg.h"
-#include "log.h"
-
-static int is_showing = 0;
-static HWND gw_dialog = 0;
-static HWND gw_url = 0;
-static HWND gw_rate = 0;
-static HWND gw_progress = 0;
-static HANDLE init_event;
-static int max_bytes = 0;
-
-static BOOL
-dialog_cmd (HWND h, int id, HWND hwndctl, UINT code)
-{
-  switch (id)
-    {
-    case IDCANCEL:
-      exit_setup (0);
-    }
-  return FALSE;
-}
-
-static BOOL CALLBACK
-dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  switch (message)
-    {
-    case WM_INITDIALOG:
-      gw_dialog = h;
-      gw_url = GetDlgItem (h, IDC_DLS_URL);
-      gw_rate = GetDlgItem (h, IDC_DLS_RATE);
-      gw_progress = GetDlgItem (h, IDC_DLS_PROGRESS);
-      SetEvent (init_event);
-      return FALSE;
-    case WM_COMMAND:
-      return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
-    }
-  return FALSE;
-}
-
-static DWORD WINAPI
-dialog (void *)
-{
-  MSG m;
-  HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS),
-				   0, dialog_proc);
-  ShowWindow (lgw_dialog, SW_SHOWNORMAL);
-  UpdateWindow (lgw_dialog);
-  while (GetMessage (&m, 0, 0, 0) > 0) {
-    TranslateMessage (&m);
-    DispatchMessage (&m);
-  }
-  return FALSE;
-}
-
-static DWORD start_tics;
-
-static void
-init_dialog (char *url, int length)
-{
-  if (gw_dialog == 0)
-    {
-      DWORD tid;
-      HANDLE thread;
-      init_event = CreateEvent (0, 0, 0, 0);
-      thread = CreateThread (0, 0, dialog, 0, 0, &tid);
-      WaitForSingleObject (init_event, 1000);
-      CloseHandle (init_event);
-      SendMessage (gw_progress, PBM_SETRANGE, 0, MAKELPARAM (0, 100));
-      is_showing = 0;
-    }
-  char *sl=url, *cp;
-  for (cp=url; *cp; cp++)
-    if (*cp == '/' || *cp == '\\' || *cp == ':')
-      sl = cp+1;
-  max_bytes = length;
-  SetWindowText (gw_url, sl);
-  SetWindowText (gw_rate, "Connecting...");
-  SendMessage (gw_progress, PBM_SETPOS, (WPARAM) 0, 0);
-  ShowWindow (gw_progress, (length > 0) ? SW_SHOW : SW_HIDE);
-  ShowWindow (gw_dialog, SW_SHOWNORMAL);
-  if (!is_showing)
-    {
-      SetForegroundWindow (gw_dialog);
-      is_showing = 1;
-    }
-  start_tics = GetTickCount ();
-}
-
-
-static void
-progress (int bytes)
-{
-  static char buf[100];
-  int kbps;
-  static DWORD last_tics = 0;
-  DWORD tics = GetTickCount ();
-  if (tics == start_tics) // to prevent division by zero
-    return;
-  if (tics < last_tics + 200) // to prevent flickering updates
-    return;
-  last_tics = tics;
-
-  kbps = bytes / (tics - start_tics);
-  ShowWindow (gw_progress, (max_bytes > 0) ? SW_SHOW : SW_HIDE);
-  if (max_bytes > 100)
-    {
-      int perc = bytes / (max_bytes / 100);
-      SendMessage (gw_progress, PBM_SETPOS, (WPARAM) perc, 0);
-      sprintf (buf, "%3d %%  (%dk/%dk)  %d kb/s\n",
-	       perc, bytes/1000, max_bytes/1000, kbps);
-    }
-  else
-    sprintf (buf, "%d  %d kb/s\n", bytes, kbps);
-
-  SetWindowText (gw_rate, buf);
-}
-
-struct GUBuf {
-  GUBuf *next;
-  int count;
-  char buf[2000];
-};
-
-char *
-get_url_to_string (char *_url)
-{
-  log (LOG_BABBLE, "get_url_to_string %s", _url);
-  init_dialog (_url, 0);
-  NetIO *n = NetIO::open (_url);
-  if (!n || !n->ok ())
-    {
-      delete n;
-      log (LOG_BABBLE, "get_url_to_string failed!");
-      return 0;
-    }
-
-  if (n->file_size)
-    max_bytes = n->file_size;
-
-  GUBuf *bufs = 0;
-  GUBuf **nextp = &bufs;
-  int total_bytes = 1; /* for the NUL */
-  progress (0);
-  while (1)
-    {
-      GUBuf *b = new GUBuf;
-      *nextp = b;
-      b->next = 0;
-      nextp = &(b->next);
-
-      b->count = n->read (b->buf, sizeof (b->buf));
-      if (b->count <= 0)
-	break;
-      total_bytes += b->count;
-      progress (total_bytes);
-    }
-
-  char *rv = (char *) malloc (total_bytes);
-  char *rvp = rv;
-  while (bufs && bufs->count > 0)
-    {
-      GUBuf *tmp = bufs->next;
-      memcpy (rvp, bufs->buf, bufs->count);
-      rvp += bufs->count;
-      delete bufs;
-      bufs = tmp;
-    }
-  *rvp = 0;
-
-  if (n)
-    delete n;
-
-  return rv;
-}
-
-int
-get_url_to_file (char *_url, char *_filename, int expected_length)
-{
-  log (LOG_BABBLE, "get_url_to_file %s %s", _url, _filename);
-  init_dialog (_url, expected_length);
-
-  remove (_filename); /* but ignore errors */
-
-  NetIO *n = NetIO::open (_url);
-  if (!n || !n->ok ())
-    {
-      delete n;
-      log (LOG_BABBLE, "get_url_to_file failed!");
-      return 1;
-    }
-
-  FILE *f = fopen (_filename, "wb");
-  if (!f)
-    {
-      char *err = strerror (errno);
-      if (!err)
-	err = "(unknown error)";
-      fatal (IDS_ERR_OPEN_WRITE, _filename, err);
-    }
-
-  if (n->file_size)
-    max_bytes = n->file_size;
-
-  int total_bytes = 0;
-  progress (0);
-  while (1)
-    {
-      char buf[8192];
-      int count;
-      count = n->read (buf, sizeof (buf));
-      if (count <= 0)
-	break;
-      fwrite (buf, 1, count, f);
-      total_bytes += count;
-      progress (total_bytes);
-    }
-
-  fclose (f);
-
-  if (n)
-    delete n;
-
-  return 0;
-}
-
-void
-dismiss_url_status_dialog ()
-{
-  ShowWindow (gw_dialog, SW_HIDE);
-  is_showing = 0;
-}

--- a/netinstall/geturl.h	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* Download files from the Internet.  These pop up a progress dialog;
-   don't forget to dismiss it when you're done downloading for a while */
-
-char  *get_url_to_string (char *_url);
-int    get_url_to_file (char *_url, char *_filename, int expected_size);
-void   dismiss_url_status_dialog ();

Binary file netinstall/gnu.bmp has changed

--- a/netinstall/hash.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* Simple hash class for install.cc */
-
-#include "win32.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include "hash.h"
-
-class hash_internals {
-public:
-  char **keys;
-  int numkeys;
-  int maxkeys;
-  int prev_index;
-};
-
-hash::hash ()
-{
-  h = new hash_internals;
-  h->numkeys = 0;
-  h->maxkeys = 10;
-  h->keys = (char **) malloc (h->maxkeys * sizeof (char *));
-  h->prev_index = 0;
-}
-
-hash::~hash ()
-{
-  free (h->keys);
-  free (h);
-}
-
-
-void
-hash::add (char *string)
-{
-  int i;
-  for (i=0; i<h->numkeys; i++)
-    if (strcmp (h->keys[i], string) == 0)
-      return;
-  if (h->numkeys >= h->maxkeys)
-    {
-      h->maxkeys += 10;
-      h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *));
-    }
-
-  h->keys[h->numkeys] = _strdup (string);
-  h->numkeys ++;
-}
-
-
-int
-hash::has (char *string)
-{
-  int i;
-  for (i=0; i<h->numkeys; i++)
-    if (strcmp (h->keys[i], string) == 0)
-      return 1;
-  return 0;
-}
-
-char *
-hash::enumerate (char *prev)
-{
-  if (prev == 0)
-    h->prev_index = -1;
-  h->prev_index ++;
-  if (h->prev_index >= h->numkeys)
-    return 0;
-  return h->keys[h->prev_index];
-}
-
-static int CDECL
-rev_len (const void *va, const void *vb)
-{
-  char *a = *(char **)va;
-  char *b = *(char **)vb;
-  return strcmp (b, a);
-}
-
-void
-hash::reverse_sort ()
-{
-  qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len);
-}

--- a/netinstall/hash.h	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* Simple hash class for install.cc */
-
-class hash_internals;
-
-class hash {
-  hash_internals *h;
- public:
-  hash ();
-  ~hash ();
-
-  void add (char *string);
-  int has (char *string);
-
-  /* specialty for install.cc */
-  void add_subdirs (char *path);
-  void reverse_sort ();
-
-  char *enumerate (char *prev=0);
-};

--- a/netinstall/ini.cc	Sun Oct 31 01:35:37 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2000, Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@cygnus.com>
- *
- */
-
-/* The purpose of this file is to get and parse the setup.ini file
-   from the mirror site.  A few support routines for the bison and
-   flex parsers are provided also.  We check to see if this setup.ini
-   is older than the one we used last time, and if so, warn the user. */
-
-#include "win32.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "ini.h"
-#include "resource.h"
-#include "concat.h"
-#include "state.h"
-#include "geturl.h"
-#include "dialog.h"
-#include "msg.h"
-#include "mkdir.h"
-#include "log.h"
-#include "reginfo.h"
-#include "version.h"
-
-unsigned int setup_timestamp = 0;
-char *setup_version = 0;
-
-extern "C" int yyparse ();
-/*extern int yydebug;*/
-
-static char *error_buf = 0;
-static int error_count = 0;
-
-void
-do_ini (HINSTANCE h)
-{
-  char *ini_file = get_url_to_string (concat (MIRROR_SITE, "/setup.ini", 0));
-  dismiss_url_status_dialog ();
-
-  if (!ini_file)
-    {
-      note (IDS_SETUPINI_MISSING, MIRROR_SITE);
-      next_dialog = IDD_SITE;
-      return;
-    }
-
-  package = 0;
-  npackages = 0;
-  setup_timestamp = 0;
-  setup_version = 0;
-
-  ini_init (ini_file);
-
-  setup_timestamp = 0;
-  /*yydebug = 1;*/
-
-  if (yyparse () || error_count > 0)
-    {
-      if (error_count == 1)
-	MessageBox (0, error_buf, "Parse Error", 0);
-      else
-	MessageBox (0, error_buf, "Parse Errors", 0);
-    }
-  else
-    {
-      /* save known-good setup.ini locally */
-      FILE *inif = fopen ("setup.ini", "wb");
-      if (inif)
-	{
-	  fwrite (ini_file, 1, strlen (ini_file), inif);
-	  fclose (inif);
-	}
-    }
-
-  if (root_dir)
-    {
-      mkdir_p (1, concat (root_dir, XEMACS_SETUP_DIR, 0));
-
-      unsigned int old_timestamp = 0;
-      FILE *ots = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "rt");
-      if (ots)
-	{
-	  fscanf (ots, "%u", &old_timestamp);
-	  fclose (ots);
-	  if (old_timestamp && setup_timestamp
-	      && (old_timestamp > setup_timestamp))
-	    {
-	      int yn = yesno (IDS_OLD_SETUPINI);
-	      if (yn == IDNO)
-		exit_setup (1);
-	    }
-	}
-      if (setup_timestamp)
-	{
-	  FILE *nts = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "wt");
-	  if (nts)
-	    {
-	      fprintf (nts, "%u", setup_timestamp);
-	      fclose (nts);
-	    }
-	}
-    }
-
-  msg ("setup_version is %s, our_version is %s", setup_version? setup_version : "(null)", version);
-  if (setup_version)
-    {
-      char *ini_version = canonicalize_version (setup_version);
-      char *our_version = canonicalize_version (version);
-      if (strcmp (our_version, ini_version) < 0)
-	note (IDS_OLD_SETUP_VERSION, version, setup_version);
-    }
-
-  next_dialog = IDD_CHOOSE;
-}
-
-extern "C" int yylineno;
-
-extern "C" int CDECL yyerror (char *s, ...)
-{
-  char buf[1000];
-  int len;
-  sprintf (buf, "setup.ini line %d: ", yylineno);
-  va_list args;
-  va_start (args, s);
-  vsprintf (buf + strlen (buf), s, args);
-  OutputDebugString (buf);
-  if (error_buf)
-    {
-      strcat (error_buf, "\n");
-      len = strlen (error_buf) + strlen (buf) + 5;
-      error_buf = (char *) realloc (error_buf, len);
-      strcat (error_buf, buf);
-    }
-  else
-    {
-      len = strlen (buf) + 5;
-      error_buf = (char *) malloc (len);
-      strcpy (error_buf, buf);
-    }
-  error_count++;
-  return 0;
-}
-
-extern "C" int CDECL fprintf (FILE *f, const char *s, ...);
-
-static char stderrbuf[1000];
-
-int CDECL
-fprintf (FILE *f, const char *fmt, ...)
-{
-  char buf[1000];
-  int rv;
-  va_list args;
-  va_start (args, fmt);
-  if (f == stderr)
-    {
-      rv = vsprintf (buf, fmt, args);
-      strcat (stderrbuf, buf);
-      if (char *nl = strchr (stderrbuf, '\n'))
-	{
-	  *nl = 0;
-	  /*OutputDebugString (stderrbuf);*/
-	  MessageBox (0, buf, "XEmacs Setup", 0);
-	  stderrbuf[0] = 0;
-	}
-      
-    }
-  else
-    {
-      rv = vfprintf (f, fmt, args);
-    }
-  return rv;
-}