moved everything to VS Express 2005

2026-08-03 22:29:06 +00:00 · 2006-05-31 23:01:19 +00:00 · 2006-05-31 23:01:19 +00:00 · bb10b6a8f3
commit bb10b6a8f3
parent 0a392843a3
17 changed files with 758 additions and 402 deletions
--- a/11
+++ b/11
@ -89,6 +89,15 @@ o Modified the WinPcap installer file to explicitly uninstall an
  than just overwriting the old version.  Thanks to Doug Hoyte for
  making this change.

+o Added some P2P application ports to the nmap-services file.  Thanks
+  to Martin Macok for the patch.
+
+o The write buffer length increased in 4.03 was increased even further
+  when the debugging or verbosity levels are more than 2 (e.g. -d3).
+  Thanks to Brandon Enright (bmenrigh(a)ucsd.edu) for the patch.  The
+  goal is to prevent you from ever seeing the fatal error:
+  "log_vwrite: write buffer not large enough -- need to increase"
+
 Nmap 4.03

 o Updated the LibPCRE build system to add the -fno-thread-jumps option
@ -132,7 +141,7 @@ o Fixed (I hope) a problem where aggressive --min-parallelization
 o Fixed a rare crash bug thanks to a report and patch from Ganga
  Bhavani (GBhavani(a)everdreamcorp.com)

-o Increased a write buffer length to avoid Nmap from quitting with the
+o Increased a write buffer length to keep Nmap from quitting with the
  message "log_vwrite: write buffer not large enough -- need to
  increase".  Thanks to Dave (dmarcher(a)pobox.com) for reporting the
  issue.
--- a/Makefile.in
+++ b/Makefile.in
@ -1,4 +1,4 @@
-export NMAP_VERSION = 4.03
+export NMAP_VERSION = 4.04
 NMAP_NAME= Nmap
 NMAP_URL= http://www.insecure.org/nmap/
 NMAP_PLATFORM=@host@
--- a/docs/leet-nmap-ascii-art.txt
+++ b/docs/leet-nmap-ascii-art.txt
@ -12,3 +12,5 @@
    /  /  _/ /    +                                      /              \/
   '  (__/                                             /                  \
             NMAP IS A POWERFUL TOOL -- USE CAREFULLY AND REPONSIBLY
+                   [ Sick of the Nmap dragon? Submit your    ]
+                   [ art and tag lines for the next release! ]
--- a/docs/nmap.1
+++ b/docs/nmap.1
@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "NMAP" "1" "05/27/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "05/31/2006" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@ -1,4 +1,4 @@
-Nmap 4.03 ( http://www.insecure.org/nmap/ )
+Nmap 4.04 ( http://www.insecure.org/nmap/ )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
  Can pass hostnames, IP addresses, networks, etc.
--- a/libdnet-stripped/libdnet-stripped.vcproj
+++ b/libdnet-stripped/libdnet-stripped.vcproj
@ -1,95 +1,145 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="dnet"
 	ProjectGUID="{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="."
 			IntermediateDirectory="Debug"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="include;&quot;..\mswin32\pcap-include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libdnet-stripped.lib"/>
+				OutputFile="$(OutDir)/libdnet-stripped.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="."
 			IntermediateDirectory="Release"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="include;&quot;..\mswin32\pcap-include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="4"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libdnet-stripped.lib"/>
+				OutputFile="$(OutDir)/libdnet-stripped.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@ -98,104 +148,136 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\src\addr-util.c">
+				RelativePath=".\src\addr-util.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\addr.c">
+				RelativePath=".\src\addr.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\arp-win32.c">
+				RelativePath=".\src\arp-win32.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\err.c">
+				RelativePath=".\src\err.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\eth-win32.c">
+				RelativePath=".\src\eth-win32.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\intf-win32.c">
+				RelativePath=".\src\intf-win32.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\ip-util.c">
+				RelativePath=".\src\ip-util.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\ip-win32.c">
+				RelativePath=".\src\ip-win32.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\ip6.c">
+				RelativePath=".\src\ip6.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\route-win32.c">
+				RelativePath=".\src\route-win32.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\strlcat.c">
+				RelativePath=".\src\strlcat.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\strlcpy.c">
+				RelativePath=".\src\strlcpy.c"
+				>
 			</File>
 			<File
-				RelativePath=".\src\strsep.c">
+				RelativePath=".\src\strsep.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\include\dnet\addr.h">
+				RelativePath=".\include\dnet\addr.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\arp.h">
+				RelativePath=".\include\dnet\arp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\config.h">
+				RelativePath=".\include\config.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet.h">
+				RelativePath=".\include\dnet.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\err.h">
+				RelativePath=".\include\err.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\eth.h">
+				RelativePath=".\include\dnet\eth.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\icmp.h">
+				RelativePath=".\include\dnet\icmp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\intf.h">
+				RelativePath=".\include\dnet\intf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\ip.h">
+				RelativePath=".\include\dnet\ip.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\ip6.h">
+				RelativePath=".\include\dnet\ip6.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\os.h">
+				RelativePath=".\include\dnet\os.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\queue.h">
+				RelativePath=".\include\queue.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\route.h">
+				RelativePath=".\include\dnet\route.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\tcp.h">
+				RelativePath=".\include\dnet\tcp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\dnet\udp.h">
+				RelativePath=".\include\dnet\udp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 		</Filter>
 		<File
-			RelativePath=".\ReadMe.txt">
+			RelativePath=".\ReadMe.txt"
+			>
 		</File>
 	</Files>
 	<Globals>
--- a/libpcre/libpcre.vcproj
+++ b/libpcre/libpcre.vcproj
@ -1,95 +1,145 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="libpcre"
 	ProjectGUID="{5DE86C7A-DE72-4265-8807-4CA38F94F22A}"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="."
 			IntermediateDirectory="Debug"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
-				CompileAs="1"/>
+				CompileAs="1"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libpcre.lib"/>
+				OutputFile="$(OutDir)/libpcre.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="."
 			IntermediateDirectory="Release"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="4"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
-				CompileAs="1"/>
+				CompileAs="1"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libpcre.lib"/>
+				OutputFile="$(OutDir)/libpcre.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@ -98,86 +148,112 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\pcre_chartables.c">
+				RelativePath=".\pcre_chartables.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_compile.c">
+				RelativePath=".\pcre_compile.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_config.c">
+				RelativePath=".\pcre_config.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_dfa_exec.c">
+				RelativePath=".\pcre_dfa_exec.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_exec.c">
+				RelativePath=".\pcre_exec.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_fullinfo.c">
+				RelativePath=".\pcre_fullinfo.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_get.c">
+				RelativePath=".\pcre_get.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_globals.c">
+				RelativePath=".\pcre_globals.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_info.c">
+				RelativePath=".\pcre_info.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_maketables.c">
+				RelativePath=".\pcre_maketables.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_refcount.c">
+				RelativePath=".\pcre_refcount.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_study.c">
+				RelativePath=".\pcre_study.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_tables.c">
+				RelativePath=".\pcre_tables.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_try_flipped.c">
+				RelativePath=".\pcre_try_flipped.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_version.c">
+				RelativePath=".\pcre_version.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_xclass.c">
+				RelativePath=".\pcre_xclass.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pcreposix.c">
+				RelativePath=".\pcreposix.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\pcre.h">
+				RelativePath=".\pcre.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_internal.h">
+				RelativePath=".\pcre_internal.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_win.h">
+				RelativePath=".\pcre_win.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pcre_winconfig.h">
+				RelativePath=".\pcre_winconfig.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pcreposix.h">
+				RelativePath=".\pcreposix.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucp.h">
+				RelativePath=".\ucp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 		</Filter>
 	</Files>
 	<Globals>
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@ -1,7 +1,9 @@
 MAKENSIS=/c/apps/NSIS/makensis.exe
+VCEXPRESS="/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/VCExpress.exe"
 NMAP_VERSION:=$(shell grep "export NMAP_VERSION " ../Makefile.in | cut "-d " -f4)

 winbuild:
+	$(VCEXPRESS) nmap.sln /build release /log nmapbuild.log	
 	$(MAKENSIS) winpcap/winpcap-nmap.nsi
 	rm -rf nmap-$(NMAP_VERSION)
 	mkdir nmap-$(NMAP_VERSION)
@ -11,3 +13,7 @@ winbuild:
 	cp nsis/AddToPath.nsh nsis/Nmap.nsi nmap-$(NMAP_VERSION)
 	$(MAKENSIS) nmap-$(NMAP_VERSION)/Nmap.nsi
 	mv nmap-$(NMAP_VERSION)/NmapInstaller.exe nmap-$(NMAP_VERSION)-setup.exe
+
+clean:
+	$(VCEXPRESS) nmap.sln /clean
+	rm -rf Debug Release nmapbuild.log
--- a/mswin32/nmap.rc
+++ b/mswin32/nmap.rc
@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "mfc/winres.h"

 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@ -34,7 +34,7 @@ END

 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""mfc/winres.h""\r\n"
    "\0"
 END

--- a/mswin32/nmap.sln
+++ b/mswin32/nmap.sln
@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5DE86C7A-DE72-4265-8807-4CA38F94F22A} = {5DE86C7A-DE72-4265-8807-4CA38F94F22A}
@ -13,46 +14,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcp
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\libpcre\libpcre.vcproj", "{5DE86C7A-DE72-4265-8807-4CA38F94F22A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbase", "..\nbase\nbase.vcproj", "{B630C8F7-3138-43E8-89ED-78742FA2AC5F}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnet", "..\libdnet-stripped\libdnet-stripped.vcproj", "{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug.ActiveCfg = Debug|Win32
-		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug.Build.0 = Debug|Win32
-		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Release.ActiveCfg = Release|Win32
-		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Release.Build.0 = Release|Win32
-		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug.ActiveCfg = Debug|Win32
-		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug.Build.0 = Debug|Win32
-		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release.ActiveCfg = Release|Win32
-		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release.Build.0 = Release|Win32
-		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug.ActiveCfg = Debug|Win32
-		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug.Build.0 = Debug|Win32
-		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release.ActiveCfg = Release|Win32
-		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release.Build.0 = Release|Win32
-		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug.ActiveCfg = Debug|Win32
-		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug.Build.0 = Debug|Win32
-		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release.ActiveCfg = Release|Win32
-		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release.Build.0 = Release|Win32
-		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug.ActiveCfg = Debug|Win32
-		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug.Build.0 = Debug|Win32
-		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release.ActiveCfg = Release|Win32
-		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.ActiveCfg = Debug|Win32
+		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.Build.0 = Debug|Win32
+		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.ActiveCfg = Release|Win32
+		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.Build.0 = Release|Win32
+		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.Build.0 = Debug|Win32
+		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.ActiveCfg = Release|Win32
+		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.Build.0 = Release|Win32
+		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.Build.0 = Debug|Win32
+		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.ActiveCfg = Release|Win32
+		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.Build.0 = Release|Win32
+		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.Build.0 = Debug|Win32
+		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.ActiveCfg = Release|Win32
+		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.Build.0 = Release|Win32
+		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.Build.0 = Debug|Win32
+		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.ActiveCfg = Release|Win32
+		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
--- a/mswin32/nmap.vcproj
+++ b/mswin32/nmap.vcproj
@ -1,144 +1,207 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="nmap"
+	ProjectGUID="{361719F0-AB42-4C93-9DE8-7D2144B96625}"
 	RootNamespace="nmap"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/nmap.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..;../nbase;../libpcre;winip;..\nsock\include;&quot;pcap-include&quot;;&quot;..\libdnet-stripped\include&quot;"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/nmap.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="2"/>
+				CompileAs="2"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="nsock.lib libpcre.lib nbase.lib libdnet-stripped.lib ws2_32.lib IPHlpAPI.Lib wpcap.lib packet.lib advapi32.lib $(NOINHERIT)"
 				OutputFile=".\Debug/nmap.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="lib;..\libpcre;..\nsock;..\nbase;&quot;..\libdnet-stripped&quot;"
 				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="packet.dll,wpcap.dll,iphlpapi.dll"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/nmap.pdb"
 				SubSystem="1"
 				OptimizeForWindows98="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/nmap.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/nmap.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=".;..;../nbase;../libpcre;winip;..\nsock\include;&quot;pcap-include&quot;;&quot;..\libdnet-stripped\include&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/nmap.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
-				SuppressStartupBanner="TRUE"
-				CompileAs="2"/>
+				SuppressStartupBanner="true"
+				CompileAs="2"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="nsock.lib libpcre.lib nbase.lib libdnet-stripped.lib ws2_32.lib IPHlpAPI.Lib wpcap.lib packet.lib advapi32.lib $(NOINHERIT)"
 				OutputFile=".\Release/nmap.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="lib;..\libpcre;..\nsock;..\nbase;&quot;..\libdnet-stripped&quot;"
 				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="packet.dll,wpcap.dll,iphlpapi.dll"
 				ProgramDatabaseFile=".\Release/nmap.pdb"
 				SubSystem="1"
 				OptimizeForWindows98="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/nmap.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@ -146,434 +209,544 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath="..\charpool.cc">
+				RelativePath="..\charpool.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\FingerPrintResults.cc">
+				RelativePath="..\FingerPrintResults.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\idle_scan.cc">
+				RelativePath="..\idle_scan.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\MACLookup.cc">
+				RelativePath="..\MACLookup.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\main.cc">
+				RelativePath="..\main.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap.cc">
+				RelativePath="..\nmap.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_dns.cc">
+				RelativePath="..\nmap_dns.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_error.cc">
+				RelativePath="..\nmap_error.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_rpc.cc">
+				RelativePath="..\nmap_rpc.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_tty.cc">
+				RelativePath="..\nmap_tty.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\NmapOps.cc">
+				RelativePath="..\NmapOps.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\NmapOutputTable.cc">
+				RelativePath="..\NmapOutputTable.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\osscan.cc">
+				RelativePath="..\osscan.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\output.cc">
+				RelativePath="..\output.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\portlist.cc">
+				RelativePath="..\portlist.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\protocols.cc">
+				RelativePath="..\protocols.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\scan_engine.cc">
+				RelativePath="..\scan_engine.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\service_scan.cc">
+				RelativePath="..\service_scan.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\services.cc">
+				RelativePath="..\services.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\Target.cc">
+				RelativePath="..\Target.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\TargetGroup.cc">
+				RelativePath="..\TargetGroup.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\targets.cc">
+				RelativePath="..\targets.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\tcpip.cc">
+				RelativePath="..\tcpip.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\timing.cc">
+				RelativePath="..\timing.cc"
+				>
 			</File>
 			<File
-				RelativePath="..\utils.cc">
+				RelativePath="..\utils.cc"
+				>
 			</File>
 			<Filter
 				Name="Windows"
-				Filter="">
+				>
 				<File
-					RelativePath="nmap.rc">
+					RelativePath="nmap.rc"
+					>
 				</File>
 				<File
-					RelativePath="winfix.cc">
+					RelativePath="winfix.cc"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ExceptionHandling="TRUE"/>
+							ExceptionHandling="1"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ExceptionHandling="TRUE"/>
+							ExceptionHandling="1"
+						/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath="..\charpool.h">
+				RelativePath="..\charpool.h"
+				>
 			</File>
 			<File
-				RelativePath="..\FingerPrintResults.h">
+				RelativePath="..\FingerPrintResults.h"
+				>
 			</File>
 			<File
-				RelativePath="..\global_structures.h">
+				RelativePath="..\global_structures.h"
+				>
 			</File>
 			<File
-				RelativePath="..\idle_scan.h">
+				RelativePath="..\idle_scan.h"
+				>
 			</File>
 			<File
-				RelativePath="NETINET\IP.H">
+				RelativePath="NETINET\IP.H"
+				>
 			</File>
 			<File
-				RelativePath="..\MACLookup.h">
+				RelativePath="..\MACLookup.h"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap.h">
+				RelativePath="..\nmap.h"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_dns.h">
+				RelativePath="..\nmap_dns.h"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_error.h">
+				RelativePath="..\nmap_error.h"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_rpc.h">
+				RelativePath="..\nmap_rpc.h"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_tty.h">
+				RelativePath="..\nmap_tty.h"
+				>
 			</File>
 			<File
-				RelativePath="..\nmap_winconfig.h">
+				RelativePath="..\nmap_winconfig.h"
+				>
 			</File>
 			<File
-				RelativePath="..\NmapOps.h">
+				RelativePath="..\NmapOps.h"
+				>
 			</File>
 			<File
-				RelativePath="..\NmapOutputTable.h">
+				RelativePath="..\NmapOutputTable.h"
+				>
 			</File>
 			<File
-				RelativePath="..\osscan.h">
+				RelativePath="..\osscan.h"
+				>
 			</File>
 			<File
-				RelativePath="..\output.h">
+				RelativePath="..\output.h"
+				>
 			</File>
 			<File
-				RelativePath="..\portlist.h">
+				RelativePath="..\portlist.h"
+				>
 			</File>
 			<File
-				RelativePath="..\protocols.h">
+				RelativePath="..\protocols.h"
+				>
 			</File>
 			<File
-				RelativePath="..\scan_engine.h">
+				RelativePath="..\scan_engine.h"
+				>
 			</File>
 			<File
-				RelativePath="..\service_scan.h">
+				RelativePath="..\service_scan.h"
+				>
 			</File>
 			<File
-				RelativePath="..\services.h">
+				RelativePath="..\services.h"
+				>
 			</File>
 			<File
-				RelativePath="strings.h">
+				RelativePath="strings.h"
+				>
 			</File>
 			<File
-				RelativePath="..\targets.h">
+				RelativePath="..\targets.h"
+				>
 			</File>
 			<File
-				RelativePath="NETINET\TCP.H">
+				RelativePath="NETINET\TCP.H"
+				>
 			</File>
 			<File
-				RelativePath="..\tcpip.h">
+				RelativePath="..\tcpip.h"
+				>
 			</File>
 			<File
-				RelativePath="..\timing.h">
+				RelativePath="..\timing.h"
+				>
 			</File>
 			<File
-				RelativePath="..\utils.h">
+				RelativePath="..\utils.h"
+				>
 			</File>
 			<Filter
 				Name="Win Headers"
-				Filter="">
+				>
 				<File
-					RelativePath="NET\Bpf.h">
+					RelativePath="NET\Bpf.h"
+					>
 				</File>
 				<File
-					RelativePath="winip\iphlpapi.h">
+					RelativePath="winip\iphlpapi.h"
+					>
 				</File>
 				<File
-					RelativePath=".\winclude.h">
+					RelativePath=".\winclude.h"
+					>
 				</File>
 				<File
-					RelativePath=".\winfix.h">
+					RelativePath=".\winfix.h"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="WinPcap Headers"
-				Filter="">
+				>
 				<File
-					RelativePath=".\pcap-include\bittypes.h">
+					RelativePath=".\pcap-include\bittypes.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\bucket_lookup.h">
+					RelativePath=".\pcap-include\bucket_lookup.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\count_packets.h">
+					RelativePath=".\pcap-include\count_packets.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\Devioctl.h">
+					RelativePath=".\pcap-include\Devioctl.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\Gnuc.h">
+					RelativePath=".\pcap-include\Gnuc.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\ip6_misc.h">
+					RelativePath=".\pcap-include\ip6_misc.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\memory_t.h">
+					RelativePath=".\pcap-include\memory_t.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\normal_lookup.h">
+					RelativePath=".\pcap-include\normal_lookup.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\Ntddndis.h">
+					RelativePath=".\pcap-include\Ntddndis.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\Ntddpack.h">
+					RelativePath=".\pcap-include\Ntddpack.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\Packet32.h">
+					RelativePath=".\pcap-include\Packet32.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\pcap-bpf.h">
+					RelativePath=".\pcap-include\pcap-bpf.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\pcap-int.h">
+					RelativePath=".\pcap-include\pcap-int.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\pcap-stdinc.h">
+					RelativePath=".\pcap-include\pcap-stdinc.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\pcap.h">
+					RelativePath=".\pcap-include\pcap.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\pthread.h">
+					RelativePath=".\pcap-include\pthread.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\remote-ext.h">
+					RelativePath=".\pcap-include\remote-ext.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\sched.h">
+					RelativePath=".\pcap-include\sched.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\semaphore.h">
+					RelativePath=".\pcap-include\semaphore.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\tcp_session.h">
+					RelativePath=".\pcap-include\tcp_session.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\time_calls.h">
+					RelativePath=".\pcap-include\time_calls.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\tme.h">
+					RelativePath=".\pcap-include\tme.h"
+					>
 				</File>
 				<File
-					RelativePath=".\pcap-include\Win32-Extensions.h">
+					RelativePath=".\pcap-include\Win32-Extensions.h"
+					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 			<File
-				RelativePath="icon1.ico">
+				RelativePath="icon1.ico"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Files to copy"
-			Filter="">
+			>
 			<File
-				RelativePath="..\nmap-mac-prefixes">
+				RelativePath="..\nmap-mac-prefixes"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\nmap-os-fingerprints">
+				RelativePath="..\nmap-os-fingerprints"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\nmap-protocols">
+				RelativePath="..\nmap-protocols"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\nmap-rpc">
+				RelativePath="..\nmap-rpc"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\nmap-service-probes">
+				RelativePath="..\nmap-service-probes"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\nmap-services">
+				RelativePath="..\nmap-services"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\docs\nmap.xsl">
+				RelativePath="..\docs\nmap.xsl"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName).xsl to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul
-"
-						Outputs="$(TargetDir)$(InputName)"/>
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@ -79,9 +79,9 @@ SectionEnd


 Section "WinPcap 3.1" SecWinPcap
-  File winpcap-nmap-3.1.A.exe
-  Exec '"$INSTDIR\winpcap-nmap-3.1.A.exe"'
-  Delete "$INSTDIR\winpcap-nmap-3.1.A.exe"
+  File winpcap-nmap-3.1.B.exe
+  Exec '"$INSTDIR\winpcap-nmap-3.1.B.exe"'
+  Delete "$INSTDIR\winpcap-nmap-3.1.B.exe"
 SectionEnd


--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@ -7,7 +7,7 @@
 Name "winpcap-nmap-3.1"

 ; The file to write
-OutFile "winpcap-nmap-3.1.A.exe"
+OutFile "winpcap-nmap-3.1.B.exe"

 ; The default installation directory
 InstallDir $PROGRAMFILES\WinPcap
--- a/2
+++ b/2
@ -18119,7 +18119,7 @@ PU(DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=F%RIPCK=F%UCK=E%ULEN=134%DAT=E)
 # OpenBSD 3.6-stable on SPARC
 # OpenBSD 3.6 GENERIC#304 sparc64
 # OpenBSD 3.7 GENERIC#50 i386
-Fingerprint OpenBSD 3.5 - 3.7
+Fingerprint OpenBSD 3.5 - 3.9
 Class OpenBSD | OpenBSD | 3.X | general purpose
 TSeq(Class=TR%gcd=<6%IPID=RD%TS=2HZ)
 T1(DF=Y%W=4000%ACK=S++%Flags=AS%Ops=MNWNNT)
--- a/10
+++ b/10
@ -1852,6 +1852,7 @@ squid-http        3128/tcp   #
 squid-ipc         3130/udp   #
 vmodem            3141/tcp   # 
 vmodem            3141/udp   # 
+kademlia          3246/udp   # Kademlia P2P (mlnet)
 ccmail            3264/tcp   # cc:mail/lotus
 ccmail            3264/udp   # cc:mail/lotus
 globalcatLDAP     3268/tcp   # Global Catalog LDAP
@ -1890,6 +1891,7 @@ remoteanything    3998/udp   # neoworx remote-anything reserved
 remoteanything    3999/tcp   # neoworx remote-anything slave file browser
 remoteanything    4000/tcp   # neoworx remote-anything slave remote control
 icq               4000/udp   # AOL ICQ instant messaging clent-server communication
+mlchat-proxy      4002/tcp   # mlnet - MLChat P2P chat proxy
 netcheque         4008/tcp   # NetCheque accounting
 netcheque         4008/udp   # NetCheque accounting
 lockd             4045/tcp   # 
@ -1914,6 +1916,8 @@ sae-urn           4500/udp   #
 fax               4557/tcp   # FlexFax FAX transmission service
 hylafax           4559/tcp   # HylaFAX client-server protocol
 mosmig            4660/tcp   # OpenMOSix MIGrates local processes
+edonkey           4662/tcp   # eDonkey file sharing (Donkey)
+edonkey           4666/udp   # eDonkey file sharing (Donkey)
 rfa               4672/tcp   # remote file access server
 rfa               4672/udp   # remote file access server
 squid-htcp        4827/udp   # Squid proxy HTCP port
@ -2048,6 +2052,9 @@ montage-lm        6147/udp   # Montage License Manager
 ricardo-lm        6148/tcp   # Ricardo North America License Manager
 ricardo-lm        6148/udp   # Ricardo North America License Manager
 gnutella          6346/tcp   # Gnutella file sharing protocol
+gnutella          6346/udp   # Gnutella file sharing protocol
+gnutella2         6347/tcp   # Gnutella2 file sharing protocol
+gnutella2         6347/udp   # Gnutella2 file sharing protocol
 crystalreports    6400/tcp   # Seagate Crystal Reports
 crystalenterprise 6401/tcp   # Seagate Crystal Enterprise
 mythtv            6543/tcp
@ -2063,6 +2070,7 @@ analogx           6588/tcp   # AnalogX HTTP proxy port
 irc-serv          6666/tcp   # internet relay chat server
 irc               6667/tcp   # Internet Relay Chat
 irc               6668/tcp   # Internet Relay Chat
+bittorent-tracker 6881/tcp   # BitTorrent tracker
 acmsoda           6969/tcp   #
 acmsoda           6969/udp   #
 napster           6699/tcp   # Napster File (MP3) sharing  software
@ -2156,6 +2164,8 @@ VeritasNetbackup  13722/tcp  # bpjava-msvc   client
 VeritasNetbackup  13782/tcp  # bpcd          client
 VeritasNetbackup  13783/tcp  # vopied        client
 swgps             15126/tcp  # Nortel Java S/WGPS Global Payment Solutions for US credit card authorizations
+overnet           16444/tcp  # Overnet file sharing
+overnet           16444/udp  # Overnet file sharing
 subseven          16959/tcp  # Subseven trojan
 isode-dua         17007/tcp  # 
 isode-dua         17007/udp  # 
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@ -106,7 +106,7 @@
 /* Without this, Windows will give us all sorts of crap about using functions
   like strcpy() even if they are done safely */
 #define _CRT_SECURE_NO_DEPRECATE 1
-#define NMAP_VERSION "4.03"
+#define NMAP_VERSION "4.04"
 #define NMAP_NAME "Nmap"
 #define NMAP_URL "http://www.insecure.org/nmap"
 #define NMAP_PLATFORM "i686-pc-windows-windows"
--- a/output.cc
+++ b/output.cc
@ -674,7 +674,7 @@ char* xml_convert (const char* str) {
   In addition, YOU MUST SANDWHICH EACH EXECUTION IF THIS CALL BETWEEN
   va_start() AND va_end() calls. */
 void log_vwrite(int logt, const char *fmt, va_list ap) {
-  static char *writebuf = NULL;;
+  static char *writebuf = NULL;
  int writebuflen = 65536;
  bool skid_noxlate = false;
  int rc = 0;
@ -682,6 +682,10 @@ void log_vwrite(int logt, const char *fmt, va_list ap) {
  int fileidx = 0;
  int l;

+  /* Account for extended output under high debugging/verbosity */
+  if (o.debugging > 2 || o.verbose > 2)
+    writebuflen *= 8;
+
  if (!writebuf)
    writebuf = (char *) safe_malloc(writebuflen);