radmind-commit

[Jarod <um...@us...>]

Update of /cvsroot/radmind/radmind-pc/fs
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28567/fs

Modified Files:
	chksum.c connect.c ktcheck.c ktcheck.vcproj lapply.c 
	lapply.vcproj lcreate.c lcreate.vcproj ntfsdiff.c 
	ntfsdiff.vcproj pathcmp.c retr.c stor.c transcript.c 
Log Message:
Recompiled with new version of Openssl and libsnet.  Fixed uploading transcript of size 0 bytes error.

Index: connect.c
===================================================================
RCS file: /cvsroot/radmind/radmind-pc/fs/connect.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** connect.c	14 Dec 2005 20:25:09 -0000	1.3
--- connect.c	13 Jun 2007 16:17:40 -0000	1.4
***************
*** 26,30 ****
  #include <openssl/sha.h>
  
! #include <snet.h>
  
  #include "transcript.h"
--- 26,30 ----
  #include <openssl/sha.h>
  
! #include <libsnet/snet.h>
  
  #include "transcript.h"

Index: transcript.c
===================================================================
RCS file: /cvsroot/radmind/radmind-pc/fs/transcript.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** transcript.c	14 Dec 2005 20:25:09 -0000	1.16
--- transcript.c	13 Jun 2007 16:17:40 -0000	1.17
***************
*** 281,286 ****
  		if ( tran->t_type == T_NEGATIVE ) {
  			strcpy( cur->pi_chksum_b64, "-" );
! 			if ( stricmp( tran->t_pinfo.pi_first_line, cur->pi_first_line ) != 0 ||
! 				stricmp( tran->t_pinfo.pi_sec_string, cur->pi_sec_string ) != 0 ) {
  				t_print( cur, tran, PR_STATUS );
  				break;
--- 281,286 ----
  		if ( tran->t_type == T_NEGATIVE ) {
  			strcpy( cur->pi_chksum_b64, "-" );
! 			if ( _stricmp( tran->t_pinfo.pi_first_line, cur->pi_first_line ) != 0 ||
! 				_stricmp( tran->t_pinfo.pi_sec_string, cur->pi_sec_string ) != 0 ) {
  				t_print( cur, tran, PR_STATUS );
  				break;
***************
*** 298,307 ****
  				strcpy( cur->pi_chksum_b64, "-" );
  			}
! 			if ( stricmp( tran->t_pinfo.pi_time_size_string, cur->pi_time_size_string ) != 0 ){
  				t_print( cur, tran, PR_DOWNLOAD );
  				break;
  			}
! 			if ( stricmp( tran->t_pinfo.pi_first_line, cur->pi_first_line ) != 0 ||
! 				stricmp( tran->t_pinfo.pi_sec_string, cur->pi_sec_string ) != 0 ){
  				t_print( cur, tran, PR_STATUS );
  				break;
--- 298,307 ----
  				strcpy( cur->pi_chksum_b64, "-" );
  			}
! 			if ( _stricmp( tran->t_pinfo.pi_time_size_string, cur->pi_time_size_string ) != 0 ){
  				t_print( cur, tran, PR_DOWNLOAD );
  				break;
  			}
! 			if ( _stricmp( tran->t_pinfo.pi_first_line, cur->pi_first_line ) != 0 ||
! 				_stricmp( tran->t_pinfo.pi_sec_string, cur->pi_sec_string ) != 0 ){
  				t_print( cur, tran, PR_STATUS );
  				break;
***************
*** 311,316 ****
   
      case 'd':			/* dir */
! 		if ( stricmp( tran->t_pinfo.pi_sec_string, cur->pi_sec_string ) != 0 ||
! 				stricmp( tran->t_pinfo.pi_first_line, cur->pi_first_line ) != 0 ){
  				t_print( cur, tran, PR_STATUS );
  				break;
--- 311,316 ----
   
      case 'd':			/* dir */
! 		if ( _stricmp( tran->t_pinfo.pi_sec_string, cur->pi_sec_string ) != 0 ||
! 				_stricmp( tran->t_pinfo.pi_first_line, cur->pi_first_line ) != 0 ){
  				t_print( cur, tran, PR_STATUS );
  				break;
***************
*** 368,372 ****
  			}
  
! 			if ( ! ( strnicmp( child_test_root, begin_tran->t_pinfo.pi_name, strlen( child_test_root ) ) == 0 &&
  				( strlen( child_test_root ) == strlen( begin_tran->t_pinfo.pi_name ) ||
  				begin_tran->t_pinfo.pi_name[ strlen( child_test_root ) ] == '/' ) ) ) {
--- 368,372 ----
  			}
  
! 			if ( ! ( _strnicmp( child_test_root, begin_tran->t_pinfo.pi_name, strlen( child_test_root ) ) == 0 &&
  				( strlen( child_test_root ) == strlen( begin_tran->t_pinfo.pi_name ) ||
  				begin_tran->t_pinfo.pi_name[ strlen( child_test_root ) ] == '/' ) ) ) {

Index: lapply.vcproj
===================================================================
RCS file: /cvsroot/radmind/radmind-pc/fs/lapply.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lapply.vcproj	14 Dec 2005 20:25:09 -0000	1.2
--- lapply.vcproj	13 Jun 2007 16:17:40 -0000	1.3
***************
*** 2,14 ****
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.10"
  	Name="lapply"
! 	ProjectGUID="{937DD88A-B559-4E4B-8613-A1AF099D11E2}"
! 	SccProjectName=""
! 	SccLocalPath="">
  	<Platforms>
  		<Platform
! 			Name="Win32"/>
  	</Platforms>
  	<Configurations>
  		<Configuration
--- 2,17 ----
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="8.00"
  	Name="lapply"
! 	ProjectGUID="{4E6E7896-C849-4917-B930-BC2352F2DADB}"
! 	RootNamespace="lapply"
! 	>
  	<Platforms>
  		<Platform
! 			Name="Win32"
! 		/>
  	</Platforms>
+ 	<ToolFiles>
+ 	</ToolFiles>
  	<Configurations>
  		<Configuration
***************
*** 17,72 ****
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
! 			CharacterSet="2">
  			<Tool
  				Name="VCCLCompilerTool"
! 				AdditionalOptions="/D &quot;_RADMIND_TLS_CA=\&quot;\&quot;&quot; /D &quot;_RADMIND_TLS_CERT=\&quot;\&quot;&quot; /D &quot;_RADMIND_PATH=\&quot;c:/radmind\&quot;&quot; /D &quot;_RADMIND_COMMANDFILE=\&quot;C:/radmind/client/command.K\&quot;&quot; /D &quot;_RADMIND_HOST=\&quot;\&quot;&quot; /D &quot;_RADMIND_AUTHLEVEL=0&quot;"
  				Optimization="0"
! 				AdditionalIncludeDirectories=""
  				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
  				BasicRuntimeChecks="3"
! 				RuntimeLibrary="5"
! 				UsePrecompiledHeader="2"
  				WarningLevel="3"
! 				SuppressStartupBanner="TRUE"
! 				DebugInformationFormat="3"/>
  			<Tool
! 				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="ssleay32.lib libeay32.lib odbc32.lib odbccp32.lib libsnet.lib"
  				OutputFile="..\bin\lapply.exe"
  				LinkIncremental="1"
! 				SuppressStartupBanner="TRUE"
  				AddModuleNamesToAssembly=""
! 				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\Debug/ntfsdiff.pdb"
  				SubSystem="1"
! 				TargetMachine="1"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Debug/ntfsdiff.tlb"
! 				HeaderFileName=""/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
  			<Tool
! 				Name="VCPreBuildEventTool"/>
  			<Tool
! 				Name="VCPreLinkEventTool"/>
  			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="_DEBUG"
! 				Culture="1033"/>
  			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
  			<Tool
! 				Name="VCWebDeploymentTool"/>
  			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
  			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  		<Configuration
--- 20,106 ----
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
+ 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="false"
! 			CharacterSet="2"
! 			>
! 			<Tool
! 				Name="VCPreBuildEventTool"
! 			/>
! 			<Tool
! 				Name="VCCustomBuildTool"
! 			/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Debug/ntfsdiff.tlb"
! 				HeaderFileName=""
! 			/>
  			<Tool
  				Name="VCCLCompilerTool"
! 				AdditionalOptions="/D &quot;_RADMIND_TLS_CA=\&quot;\&quot;&quot; /D &quot;_RADMIND_TLS_CERT=\&quot;\&quot;&quot; /D &quot;_RADMIND_PATH=\&quot;c:/radmind\&quot;&quot; /D &quot;_RADMIND_COMMANDFILE=\&quot;C:/radmind/client/command.K\&quot;&quot; /D &quot;_RADMIND_HOST=\&quot;\&quot;&quot; /D &quot;_RADMIND_AUTHLEVEL=0&quot; /D &quot;_CRT_SECURE_NO_WARNINGS&quot;"
  				Optimization="0"
! 				AdditionalIncludeDirectories="..\common"
  				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
  				BasicRuntimeChecks="3"
! 				RuntimeLibrary="1"
! 				UsePrecompiledHeader="0"
  				WarningLevel="3"
! 				SuppressStartupBanner="true"
! 				DebugInformationFormat="3"
! 				CompileAs="1"
! 			/>
  			<Tool
! 				Name="VCManagedResourceCompilerTool"
! 			/>
! 			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="_DEBUG"
! 				Culture="1033"
! 			/>
! 			<Tool
! 				Name="VCPreLinkEventTool"
! 			/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="ssleay32.lib libeay32.lib odbc32.lib odbccp32.lib libsnetdbg.lib ws2_32.lib"
  				OutputFile="..\bin\lapply.exe"
  				LinkIncremental="1"
! 				SuppressStartupBanner="true"
  				AddModuleNamesToAssembly=""
! 				GenerateDebugInformation="true"
  				ProgramDatabaseFile=".\Debug/ntfsdiff.pdb"
  				SubSystem="1"
! 				TargetMachine="1"
! 			/>
  			<Tool
! 				Name="VCALinkTool"
! 			/>
  			<Tool
! 				Name="VCManifestTool"
! 			/>
  			<Tool
! 				Name="VCXDCMakeTool"
! 			/>
  			<Tool
! 				Name="VCBscMakeTool"
! 			/>
  			<Tool
! 				Name="VCFxCopTool"
! 			/>
  			<Tool
! 				Name="VCAppVerifierTool"
! 			/>
  			<Tool
! 				Name="VCWebDeploymentTool"
! 			/>
  			<Tool
! 				Name="VCPostBuildEventTool"
! 			/>
  		</Configuration>
  		<Configuration
***************
*** 75,81 ****
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
! 			CharacterSet="2">
  			<Tool
  				Name="VCCLCompilerTool"
--- 109,134 ----
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
+ 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="false"
! 			CharacterSet="2"
! 			>
! 			<Tool
! 				Name="VCPreBuildEventTool"
! 			/>
! 			<Tool
! 				Name="VCCustomBuildTool"
! 			/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Release/ntfsdiff.tlb"
! 				HeaderFileName=""
! 			/>
  			<Tool
  				Name="VCCLCompilerTool"
***************
*** 85,127 ****
  				AdditionalIncludeDirectories="..\common"
  				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
! 				StringPooling="TRUE"
! 				RuntimeLibrary="4"
! 				EnableFunctionLevelLinking="TRUE"
! 				UsePrecompiledHeader="2"
  				WarningLevel="3"
! 				SuppressStartupBanner="TRUE"/>
  			<Tool
! 				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
  				AdditionalDependencies="ssleay32.lib libeay32.lib odbc32.lib odbccp32.lib libsnet.lib"
  				LinkIncremental="1"
! 				SuppressStartupBanner="TRUE"
  				SubSystem="1"
! 				TargetMachine="1"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Release/ntfsdiff.tlb"
! 				HeaderFileName=""/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
  			<Tool
! 				Name="VCPreBuildEventTool"/>
  			<Tool
! 				Name="VCPreLinkEventTool"/>
  			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				Culture="1033"/>
  			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
  			<Tool
! 				Name="VCWebDeploymentTool"/>
  			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
  			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  	</Configurations>
--- 138,191 ----
  				AdditionalIncludeDirectories="..\common"
  				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
! 				StringPooling="true"
! 				RuntimeLibrary="0"
! 				EnableFunctionLevelLinking="true"
! 				UsePrecompiledHeader="0"
  				WarningLevel="3"
! 				SuppressStartupBanner="true"
! 			/>
  			<Tool
! 				Name="VCManagedResourceCompilerTool"
! 			/>
! 			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				Culture="1033"
! 			/>
! 			<Tool
! 				Name="VCPreLinkEventTool"
! 			/>
  			<Tool
  				Name="VCLinkerTool"
  				AdditionalDependencies="ssleay32.lib libeay32.lib odbc32.lib odbccp32.lib libsnet.lib"
  				LinkIncremental="1"
! 				SuppressStartupBanner="true"
  				SubSystem="1"
! 				TargetMachine="1"
! 			/>
  			<Tool
! 				Name="VCALinkTool"
! 			/>
  			<Tool
! 				Name="VCManifestTool"
! 			/>
  			<Tool
! 				Name="VCXDCMakeTool"
! 			/>
  			<Tool
! 				Name="VCBscMakeTool"
! 			/>
  			<Tool
! 				Name="VCFxCopTool"
! 			/>
  			<Tool
! 				Name="VCAppVerifierTool"
! 			/>
  			<Tool
! 				Name="VCWebDeploymentTool"
! 			/>
  			<Tool
! 				Name="VCPostBuildEventTool"
! 			/>
  		</Configuration>
  	</Configurations>
***************
*** 131,251 ****
  		<Filter
  			Name="Source Files"
! 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
  			<File
! 				RelativePath=".\argcargv.c">
  			</File>
  			<File
! 				RelativePath="..\common\base64.c">
  			</File>
  			<File
! 				RelativePath=".\chksum.c">
  			</File>
  			<File
! 				RelativePath=".\code.c">
  			</File>
  			<File
! 				RelativePath=".\connect.c">
  			</File>
  			<File
! 				RelativePath="..\common\getopt.c">
  			</File>
  			<File
! 				RelativePath=".\lapply.c">
  			</File>
  			<File
! 				RelativePath="..\common\list.c">
  				<FileConfiguration
! 					Name="Debug|Win32">
  					<Tool
  						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories="..\fs"/>
  				</FileConfiguration>
  				<FileConfiguration
! 					Name="Release|Win32">
  					<Tool
  						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories="..\fs"/>
  				</FileConfiguration>
  			</File>
  			<File
! 				RelativePath=".\llist.c">
  			</File>
  			<File
! 				RelativePath="..\common\mkdirs.c">
  			</File>
  			<File
! 				RelativePath=".\pathcmp.c">
  			</File>
  			<File
! 				RelativePath=".\retr.c">
  			</File>
  			<File
! 				RelativePath="..\common\rmdirs.c">
  			</File>
  			<File
! 				RelativePath="..\common\tls.c">
  			</File>
  			<File
! 				RelativePath=".\transcript.c">
  			</File>
  			<File
! 				RelativePath=".\update.c">
  			</File>
  			<File
! 				RelativePath=".\winwrap.c">
  			</File>
  		</Filter>
  		<Filter
  			Name="Header Files"
! 			Filter="h;hpp;hxx;hm;inl">
  			<File
! 				RelativePath=".\argcargv.h">
  			</File>
  			<File
! 				RelativePath="..\common\base64.h">
  			</File>
  			<File
! 				RelativePath=".\code.h">
  			</File>
  			<File
! 				RelativePath=".\connect.h">
  			</File>
  			<File
! 				RelativePath="..\common\getopt.h">
  			</File>
  			<File
! 				RelativePath="..\common\list.h">
  			</File>
  			<File
! 				RelativePath=".\llist.h">
  			</File>
  			<File
! 				RelativePath="..\common\mkdirs.h">
  			</File>
  			<File
! 				RelativePath=".\pathcmp.h">
  			</File>
  			<File
! 				RelativePath="..\common\rmdirs.h">
  			</File>
  			<File
! 				RelativePath="..\common\tailor.h">
  			</File>
  			<File
! 				RelativePath="..\common\tls.h">
  			</File>
  			<File
! 				RelativePath=".\transcript.h">
  			</File>
  			<File
! 				RelativePath=".\update.h">
  			</File>
  			<File
! 				RelativePath=".\winwrap.h">
  			</File>
  		</Filter>
  		<Filter
  			Name="Resource Files"
! 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
  		</Filter>
  	</Files>
--- 195,358 ----
  		<Filter
  			Name="Source Files"
! 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
! 			>
  			<File
! 				RelativePath=".\argcargv.c"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\base64.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\chksum.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\code.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\connect.c"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\getopt.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\lapply.c"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\list.c"
! 				>
  				<FileConfiguration
! 					Name="Debug|Win32"
! 					>
  					<Tool
  						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories="..\fs"
! 					/>
  				</FileConfiguration>
  				<FileConfiguration
! 					Name="Release|Win32"
! 					>
  					<Tool
  						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories="..\fs"
! 					/>
  				</FileConfiguration>
  			</File>
  			<File
! 				RelativePath=".\llist.c"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\mkdirs.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\pathcmp.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\retr.c"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\rmdirs.c"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\tls.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\transcript.c"
! 				>
  			</File>
  			<File
! 				RelativePath=".\update.c"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\version.c"
! 				>
! 			</File>
! 			<File
! 				RelativePath=".\winwrap.c"
! 				>
  			</File>
  		</Filter>
  		<Filter
  			Name="Header Files"
! 			Filter="h;hpp;hxx;hm;inl"
! 			>
  			<File
! 				RelativePath=".\argcargv.h"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\base64.h"
! 				>
  			</File>
  			<File
! 				RelativePath=".\code.h"
! 				>
  			</File>
  			<File
! 				RelativePath=".\connect.h"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\getopt.h"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\list.h"
! 				>
  			</File>
  			<File
! 				RelativePath=".\llist.h"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\mkdirs.h"
! 				>
  			</File>
  			<File
! 				RelativePath=".\pathcmp.h"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\rmdirs.h"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\tailor.h"
! 				>
  			</File>
  			<File
! 				RelativePath="..\common\tls.h"
! 				>
  			</File>
  			<File
! 				RelativePath=".\transcript.h"
! 				>
  			</File>
  			<File
! 				RelativePath=".\update.h"
! 				>
  			</File>
  			<File
! 				RelativePath=".\winwrap.h"
! 				>
  			</File>
  		</Filter>
  		<Filter
  			Name="Resource Files"
! 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
! 			>
  		</Filter>
  	</Files>

Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind-pc/fs/ktcheck.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ktcheck.c	17 May 2006 17:41:54 -0000	1.6
--- ktcheck.c	13 Jun 2007 16:17:40 -0000	1.7
***************
*** 34,38 ****
  
  #include <openssl/evp.h>
! #include <snet.h>
  
  #include "transcript.h"
--- 34,38 ----
  
  #include <openssl/evp.h>
! #include <libsnet/snet.h>
  
  #include "transcript.h"
***************
*** 78,83 ****
  
  extern struct timeval	timeout;
! char		*version = "0.7.0", *checksumlist = "", *child_test_root = "";
! extern char             *ca, *cert, *privatekey; 
  
      void
--- 78,83 ----
  
  extern struct timeval	timeout;
! char		*checksumlist = "", *child_test_root = "";
! extern char             *version, *ca, *cert, *privatekey; 
  
      void
***************
*** 110,114 ****
  	/* skip dotfiles and the special transcript */
  	if ( de.cFileName[ 0 ] == '.' ||
! 		stricmp( de.cFileName, "special.T" ) == 0 ) {
  	    continue;
  	}
--- 110,114 ----
  	/* skip dotfiles and the special transcript */
  	if ( de.cFileName[ 0 ] == '.' ||
! 		_stricmp( de.cFileName, "special.T" ) == 0 ) {
  	    continue;
  	}
***************
*** 121,125 ****
  
  	/* also skip the base command file */
! 	if ( stricmp( fsitem, base_kfile ) == 0 ) {
  	    continue;
  	}
--- 121,125 ----
  
  	/* also skip the base command file */
! 	if ( _stricmp( fsitem, base_kfile ) == 0 ) {
  	    continue;
  	}
***************
*** 143,147 ****
  	    }
  
! 	    if ( stricmp( fsitem, kitem ) == 0
  			|| ischild( kitem, fsitem )) {
  		match = 1;
--- 143,147 ----
  	    }
  
! 	    if ( _stricmp( fsitem, kitem ) == 0
  			|| ischild( kitem, fsitem )) {
  		match = 1;
***************
*** 159,163 ****
  		rmdirs( fsitem );
  	    } else {
! 		if ( unlink( fsitem ) != 0 ) {
  		    perror( fsitem );
  		    exit( 2 );
--- 159,163 ----
  		rmdirs( fsitem );
  	    } else {
! 		if ( _unlink( fsitem ) != 0 ) {
  		    perror( fsitem );
  		    exit( 2 );
***************
*** 367,371 ****
  		/* Make sure it is a directory */
  		if ( !( st.st_mode & _S_IFDIR )) {
! 		    if ( unlink( tempfile ) != 0 ) {
  			perror( tempfile );
  			return( 2 );
--- 367,371 ----
  		/* Make sure it is a directory */
  		if ( !( st.st_mode & _S_IFDIR )) {
! 		    if ( _unlink( tempfile ) != 0 ) {
  			perror( tempfile );
  			return( 2 );
***************
*** 471,475 ****
  	if ( update ) {
  	    if ( !quiet ) { printf( "%s:", path ); fflush( stdout ); }
! 	    if ( unlink( path ) != 0 ) {
  		perror( path );
  		return( 2 );
--- 471,475 ----
  	if ( update ) {
  	    if ( !quiet ) { printf( "%s:", path ); fflush( stdout ); }
! 	    if ( _unlink( path ) != 0 ) {
  		perror( path );
  		return( 2 );
***************
*** 680,684 ****
  	exit( 2 );
      }
!     if (( kdir = strdup( base_kfile )) == NULL ) {
          perror( "strdup failed" );
          exit( 2 );
--- 680,684 ----
  	exit( 2 );
      }
!     if (( kdir = _strdup( base_kfile )) == NULL ) {
          perror( "strdup failed" );
          exit( 2 );
***************
*** 771,775 ****
  		} else {
  		    /* special.T not updated */
! 		    if ( unlink( tempfile ) !=0 ) {
  			perror( tempfile );
  			exit( 2 );
--- 771,775 ----
  		} else {
  		    /* special.T not updated */
! 		    if ( _unlink( tempfile ) !=0 ) {
  			perror( tempfile );
  			exit( 2 );
***************
*** 810,814 ****
  		if ( !quiet ) printf( "%s: updated\n", path ); 
  	    } else {
! 		if ( unlink( tempfile ) !=0 ) {
  		    perror( tempfile );
  		    exit( 2 );
--- 810,814 ----
  		if ( !quiet ) printf( "%s: updated\n", path ); 
  	    } else {
! 		if ( _unlink( tempfile ) !=0 ) {
  		    perror( tempfile );
  		    exit( 2 );
***************
*** 817,821 ****
  	} else {
  	    /* special.T not updated */
! 	    if ( unlink( tempfile ) !=0 ) {
  		perror( tempfile );
  		exit( 2 );
--- 817,821 ----
  	} else {
  	    /* special.T not updated */
! 	    if ( _unlink( tempfile ) !=0 ) {
  		perror( tempfile );
  		exit( 2 );

Index: ntfsdiff.vcproj
===================================================================
RCS file: /cvsroot/radmind/radmind-pc/fs/ntfsdiff.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntfsdiff.vcproj	14 Dec 2005 20:25:09 -0000	1.2
--- ntfsdiff.vcproj	13 Jun 2007 16:17:40 -0000	1.3
***************
*** 2,14 ****
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.10"
  	Name="ntfsdiff"
! 	ProjectGUID="{937DD88A-B559-4E4B-8613-A1AF099D11E2}"
! 	SccProjectName=""
! 	SccLocalPath="">
  	<Platforms>
  		<Platform
! 			Name="Win32"/>
  	</Platforms>
  	<Configurations>
  		<Configuration
--- 2,16 ----
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="8.00"
  	Name="ntfsdiff"
! 	ProjectGUID="{08996B7A-3475-47F6-B85A-4B76C267EB6C}"
! 	>
  	<Platforms>
  		<Platform
! 			Name="Win32"
! 		/>
  	</Platforms>
+ 	<ToolFiles>
+ 	</ToolFiles>
  	<Configurations>
  		<Configuration
***************
*** 17,36 ****
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
! 			CharacterSet="2">
  			<Tool
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories=""
  				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
  				BasicRuntimeChecks="3"
! 				RuntimeLibrary="5"
! 				UsePrecompiledHeader="2"
  				WarningLevel="3"
! 				SuppressStartupBanner="TRUE"
! 				DebugInformationFormat="3"/>
  			<Tool
! 				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
--- 19,69 ----
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
+ 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="false"
! 			CharacterSet="2"
! 			>
! 			<Tool
! 				Name="VCPreBuildEventTool"
! 			/>
! 			<Tool
! 				Name="VCCustomBuildTool"
! 			/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Debug/ntfsdiff.tlb"
! 				HeaderFileName=""
! 			/>
  			<Tool
  				Name="VCCLCompilerTool"
+ 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_WARNINGS&quot;"
  				Optimization="0"
! 				AdditionalIncludeDirectories="..\common"
  				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
  				BasicRuntimeChecks="3"
! 				RuntimeLibrary="1"
! 				UsePrecompiledHeader="0"
  				WarningLevel="3"
! 				SuppressStartupBanner="true"
! 				DebugInformationFormat="3"
! 				CompileAs="1"
! 			/>
  			<Tool
! 				Name="VCManagedResourceCompilerTool"
! 			/>
! 			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="_DEBUG"
! 				Culture="1033"
! 			/>
! 			<Tool
! 				Name="VCPreLinkEventTool"
! 			/>
  			<Tool
  				Name="VCLinkerTool"
***************
*** 38,71 ****
  				OutputFile="..\bin\ntfsdiff.exe"
  				LinkIncremental="1"
! 				SuppressStartupBanner="TRUE"
  				AddModuleNamesToAssembly=""
! 				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\Debug/ntfsdiff.pdb"
  				SubSystem="1"
! 				TargetMachine="1"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Debug/ntfsdiff.tlb"
! 				HeaderFileName=""/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
  			<Tool
! 				Name="VCPreBuildEventTool"/>
  			<Tool
! 				Name="VCPreLinkEventTool"/>
  			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="_DEBUG"
! 				Culture="1033"/>
  			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
  			<Tool
! 				Name="VCWebDeploymentTool"/>
  			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
  			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  		<Configuration
--- 71,105 ----
  				OutputFile="..\bin\ntfsdiff.exe"
  				LinkIncremental="1"
! 				SuppressStartupBanner="true"
  				AddModuleNamesToAssembly=""
! 				GenerateDebugInformation="true"
  				ProgramDatabaseFile=".\Debug/ntfsdiff.pdb"
  				SubSystem="1"
! 				TargetMachine="1"
! 			/>
  			<Tool
! 				Name="VCALinkTool"
! 			/>
  			<Tool
! 				Name="VCManifestTool"
! 			/>
  			<Tool
! 				Name="VCXDCMakeTool"
! 			/>
  			<Tool
! 				Name="VCBscMakeTool"
! 			/>
  			<Tool
! 				Name="VCFxCopTool"
! 			/>
  			<Tool
! 				Name="VCAppVerifierTool"
! 			/>
  			<Tool
! 				Name="VCWebDeploymentTool"
! 			/>
  			<Tool
! 				Name="VCPostBuildEventTool"
! 			/>
  		</Configuration>
  		<Configuration
***************
*** 74,80 ****
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
! 			CharacterSet="2">
  			<Tool
  				Name="VCCLCompilerTool"
--- 108,133 ----
  			IntermediateDirectory="..\temp\fs"
  			ConfigurationType="1"
+ 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
  			UseOfMFC="0"
! 			ATLMinimizesCRunTimeLibraryUsage="false"
! 			CharacterSet="2"
! 			>
! 			<Tool
! 				Name="VCPreBuildEventTool"
! 			/>
! 			<Tool
! 				Name="VCCustomBuildTool"
! 			/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"
! 			/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Release/ntfsdiff.tlb"
! 				HeaderFileName=""
! 			/>
  			<Tool
  				Name="VCCLCompilerTool"
***************
*** 83,125 ****
  				AdditionalIncludeDirectories="..\common"
  				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
! 				StringPooling="TRUE"
! 				RuntimeLibrary="4"
! 				EnableFunctionLevelLinking="TRUE"
! 				UsePrecompiledHeader="2"
  				WarningLevel="3"
! 				SuppressStartupBanner="TRUE"/>
  			<Tool
! 				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
  				AdditionalDependencies="ssleay32.lib libeay32.lib odbc32.lib odbccp32.lib"
  				LinkIncremental="1"
! 				SuppressStartupBanner="TRUE"
  				SubSystem="1"
! 				TargetMachine="1"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				TypeLibraryName=".\Release/ntfsdiff.tlb"
! 				HeaderFileName=""/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
  			<Tool
! 				Name="VCPreBuildEventTool"/>
  			<Tool
! 				Name="VCPreLinkEventTool"/>
  			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				Culture="1033"/>
  			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
  			<Tool
! 				Name="VCWebDeploymentTool"/>
  			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
  			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  	</Configurations>
--- 136,189 ----
  				AdditionalIncludeDirectories="..\common"
  				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
! 				StringPooling="true"
! 				RuntimeLibrary="0"
! 				EnableFunctionLevelLinking="true"
! 				UsePrecompiledHeader="0"
  				WarningLevel="3"
! 				SuppressStartupBanner="true"
! 			/>
  			<Tool
! 				Name="VCManagedResourceCompilerTool"
! 			/>
! 			<Tool
! 				Name="VCResourceCompilerTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				Culture="1033"
! 			/>
! 			<Tool
! 				Name="VCPreLinkEventTool"
! 			/>
  			<Tool
  				Name="VCLinkerTool"
  				AdditionalDependencies="ssleay32.lib libeay32.lib odbc32.lib odbccp32.lib"
  				LinkIncremental="1"
! 				SuppressStartupBanner="true"
  				SubSystem="1"
! 				TargetMachine="1"
! 			/>
  			<Tool
! 				Name="VCALinkTool"
! 			/>
  			<Tool
! 				Name="VCManifestTool"
! 			/>
  			<Tool
! 				Name="VCXDCMakeTool"
! 			/>
  			<Tool
! 				Name="VCBscMakeTool"
! 			/>
  			<Tool
! 				Name="VCFxCopTool"
! 			/>
  			<Tool
! 				Name="VCAppVerifierTool"
! 			/>
  			<Tool
! 				Name="VCWebDeploymentTool"
! 			/>
  			<Tool
! 				Name="VCPostBuildEventTool"
! 			/>
  		</Configuration>
  	</Configurations>
***************
*** 129,257 ****
  		<Filter
  			Name="Source Files"
! 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
  			<File
! 				RelativePath="argcargv.c">
  				<FileConfiguration
! 					Name="Debug|Win32">
  					<Tool
  						Name="VCCLCompilerTool"
  						Optimization="0"
  						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"/>
  				</FileConfiguration>
  				<Fi...
 
[truncated message content]