From: Jarod <um...@us...> - 2007-06-13 16:17:45
|
Update of /cvsroot/radmind/radmind-pc/reg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28567/reg Modified Files: chksum.c connect.c llist.c pathcmp.c regapply.c regapply.vcproj regcreate.c regcreate.vcproj regdiff.c regdiff.vcproj 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/reg/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: regapply.vcproj =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/regapply.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** regapply.vcproj 14 Dec 2005 20:25:09 -0000 1.2 --- regapply.vcproj 13 Jun 2007 16:17:41 -0000 1.3 *************** *** 2,14 **** <VisualStudioProject ProjectType="Visual C++" ! Version="7.10" Name="regapply" ! 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="regapply" ! ProjectGUID="{0ECF944E-2594-4554-A0F9-8BFD724DD9F7}" ! RootNamespace="regapply" ! > <Platforms> <Platform ! Name="Win32" ! /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration *************** *** 17,72 **** IntermediateDirectory="..\temp\reg" ConfigurationType="1" UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/D "_RADMIND_TLS_CA=\"\"" /D "_RADMIND_TLS_CERT=\"\"" /D "_RADMIND_PATH=\"c:/radmind\"" /D "_RADMIND_COMMANDFILE=\"C:/radmind/client/command.K\"" /D "_RADMIND_HOST=\"\"" /D "_RADMIND_AUTHLEVEL=0"" 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\regapply.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\reg" 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 "_RADMIND_TLS_CA=\"\"" /D "_RADMIND_TLS_CERT=\"\"" /D "_RADMIND_PATH=\"c:/radmind\"" /D "_RADMIND_COMMANDFILE=\"C:/radmind/client/command.K\"" /D "_RADMIND_HOST=\"\"" /D "_RADMIND_AUTHLEVEL=0" /D"_CRT_SECURE_NO_WARNINGS"" 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\regapply.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\reg" ConfigurationType="1" UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> <Tool Name="VCCLCompilerTool" --- 109,134 ---- IntermediateDirectory="..\temp\reg" 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,269 **** <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" ! ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File ! RelativePath="..\common\base64.c"> </File> <File ! RelativePath=".\chksum.c"> </File> <File ! RelativePath=".\code.c"> </File> <File ! RelativePath=".\connect.c"> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ! ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File ! RelativePath="..\common\getopt.c"> </File> <File ! RelativePath=".\heapcheck.c"> </File> <File ! RelativePath="..\common\list.c"> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg"/> </FileConfiguration> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg"/> </FileConfiguration> </File> <File ! RelativePath=".\llist.c"> </File> <File ! RelativePath="..\common\mkdirs.c"> </File> <File ! RelativePath=".\pathcmp.c"> </File> <File ! RelativePath=".\regapply.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=".\heapcheck.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,382 ---- <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" ! ObjectFile="$(IntDir)/$(InputName)1.obj" ! /> </FileConfiguration> </File> <File ! RelativePath="..\common\base64.c" ! > </File> <File ! RelativePath=".\chksum.c" ! > </File> <File ! RelativePath=".\code.c" ! > </File> <File ! RelativePath=".\connect.c" ! > <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" ! ObjectFile="$(IntDir)/$(InputName)1.obj" ! /> </FileConfiguration> </File> <File ! RelativePath="..\common\getopt.c" ! > </File> <File ! RelativePath=".\heapcheck.c" ! > </File> <File ! RelativePath="..\common\list.c" ! > <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg" ! /> </FileConfiguration> <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg" ! /> </FileConfiguration> </File> <File ! RelativePath=".\llist.c" ! > </File> <File ! RelativePath="..\common\mkdirs.c" ! > </File> <File ! RelativePath=".\pathcmp.c" ! > </File> <File ! RelativePath=".\regapply.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=".\heapcheck.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: regcreate.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/regcreate.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** regcreate.c 17 May 2006 17:41:54 -0000 1.5 --- regcreate.c 13 Jun 2007 16:17:41 -0000 1.6 *************** *** 32,36 **** #include <openssl/evp.h> ! #include <snet.h> //#include "applefile.h" --- 32,36 ---- #include <openssl/evp.h> ! #include <libsnet/snet.h> //#include "applefile.h" *************** *** 69,74 **** extern off_t lsize; //extern int showprogress; ! /*extern char *version; ! extern char *checksumlist;*/ extern struct timeval timeout; const EVP_MD *md; --- 69,74 ---- extern off_t lsize; //extern int showprogress; ! extern char *version; ! //extern char *checksumlist; extern struct timeval timeout; const EVP_MD *md; *************** *** 76,80 **** int showprogress = 0; - char version[] = "0.7.0"; char checksumlist[] = ""; char child_test_root[] = ""; --- 76,79 ---- *************** *** 617,622 **** //sprintf( pinfo->pi_name, "%s\\%s", name, valname ); strcpy( pinfo->pi_name, name ); ! pinfo->pi_keyname = strdup( name ); ! pinfo->pi_valname = strdup( valname ); free( name ); free( file_name ); --- 616,621 ---- //sprintf( pinfo->pi_name, "%s\\%s", name, valname ); strcpy( pinfo->pi_name, name ); ! pinfo->pi_keyname = _strdup( name ); ! pinfo->pi_valname = _strdup( valname ); free( name ); free( file_name ); Index: transcript.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/transcript.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** transcript.c 14 Dec 2005 20:25:09 -0000 1.12 --- transcript.c 13 Jun 2007 16:17:41 -0000 1.13 *************** *** 418,422 **** } ! 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 ) ] == '\\' ) ) ) { --- 418,422 ---- } ! 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 ) ] == '\\' ) ) ) { *************** *** 1034,1038 **** next = loop_head->ll_next; ! esc_temp = strdup( loop_head->ll_pinfo->pi_name ); esc_buf = escape_quotes( esc_temp ); if ( *loop_head->ll_pinfo->pi_name == '\0' ) --- 1034,1038 ---- next = loop_head->ll_next; ! esc_temp = _strdup( loop_head->ll_pinfo->pi_name ); esc_buf = escape_quotes( esc_temp ); if ( *loop_head->ll_pinfo->pi_name == '\0' ) *************** *** 1087,1091 **** else { ! esc_temp = strdup( loop_head->ll_pinfo->pi_value ); esc_buf = escape_quotes( esc_temp ); strcat( chksum_pt, "\"" ); --- 1087,1091 ---- else { ! esc_temp = _strdup( loop_head->ll_pinfo->pi_value ); esc_buf = escape_quotes( esc_temp ); strcat( chksum_pt, "\"" ); *************** *** 1204,1209 **** } ! cur->pi_reg_str = strdup( chksum_buf ); ! cur->pi_regdel_str = strdup( del_buf ); free( chksum_buf ); free( del_buf ); --- 1204,1209 ---- } ! cur->pi_reg_str = _strdup( chksum_buf ); ! cur->pi_regdel_str = _strdup( del_buf ); free( chksum_buf ); free( del_buf ); *************** *** 1251,1255 **** chksum_pt = chksum_buf + strlen( chksum_buf ); ! esc_temp = strdup( cur->pi_valname ); esc_buf = escape_quotes( esc_temp ); if ( *cur->pi_valname == '\0' ) --- 1251,1255 ---- chksum_pt = chksum_buf + strlen( chksum_buf ); ! esc_temp = _strdup( cur->pi_valname ); esc_buf = escape_quotes( esc_temp ); if ( *cur->pi_valname == '\0' ) *************** *** 1278,1282 **** else { ! esc_temp = strdup( cur->pi_value ); esc_buf = escape_quotes( esc_temp ); strcat( chksum_pt, "\"" ); --- 1278,1282 ---- else { ! esc_temp = _strdup( cur->pi_value ); esc_buf = escape_quotes( esc_temp ); strcat( chksum_pt, "\"" ); *************** *** 1393,1397 **** break; } ! cur->pi_reg_str = strdup( chksum_buf ); free( chksum_buf ); do_chksuma( cur->pi_reg_str, cur->pi_chksum_b64 ); --- 1393,1397 ---- break; } ! cur->pi_reg_str = _strdup( chksum_buf ); free( chksum_buf ); do_chksuma( cur->pi_reg_str, cur->pi_chksum_b64 ); Index: regcreate.vcproj =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/regcreate.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** regcreate.vcproj 14 Dec 2005 20:25:09 -0000 1.2 --- regcreate.vcproj 13 Jun 2007 16:17:41 -0000 1.3 *************** *** 2,14 **** <VisualStudioProject ProjectType="Visual C++" ! Version="7.10" Name="regcreate" ! 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="regcreate" ! ProjectGUID="{0FAADB12-2D93-4465-9DDC-8180E1C98BD1}" ! > <Platforms> <Platform ! Name="Win32" ! /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration *************** *** 17,72 **** IntermediateDirectory="..\temp\reg" ConfigurationType="1" UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/D "_RADMIND_TLS_CA=\"\"" /D "_RADMIND_TLS_CERT=\"\"" /D "_RADMIND_PATH=\"c:/radmind\"" /D "_RADMIND_COMMANDFILE=\"C:/radmind/client/command.K\"" /D "_RADMIND_HOST=\"\"" /D "_RADMIND_AUTHLEVEL=0"" 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\regcreate.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 --- 19,105 ---- IntermediateDirectory="..\temp\reg" 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 "_RADMIND_TLS_CA=\"\"" /D "_RADMIND_TLS_CERT=\"\"" /D "_RADMIND_PATH=\"c:/radmind\"" /D "_RADMIND_COMMANDFILE=\"C:/radmind/client/command.K\"" /D "_RADMIND_HOST=\"\"" /D "_RADMIND_AUTHLEVEL=0" /D"_CRT_SECURE_NO_WARNINGS"" 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\regcreate.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\reg" ConfigurationType="1" UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> <Tool Name="VCCLCompilerTool" --- 108,133 ---- IntermediateDirectory="..\temp\reg" 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> --- 137,190 ---- 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,254 **** <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=".\heapcheck.c"> </File> <File ! RelativePath="..\common\list.c"> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg"/> </FileConfiguration> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg"/> </FileConfiguration> </File> <File ! RelativePath=".\llist.c"> </File> <File ! RelativePath="..\common\mkdirs.c"> </File> <File ! RelativePath=".\pathcmp.c"> </File> <File ! RelativePath=".\regcreate.c"> </File> <File ! RelativePath=".\retr.c"> </File> <File ! RelativePath=".\stor.c"> </File> <File ! RelativePath="..\common\tls.c"> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories=""/> </FileConfiguration> </File> <File ! RelativePath=".\transcript.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=".\heapcheck.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\tailor.h"> </File> <File ! RelativePath="..\common\tls.h"> </File> <File ! RelativePath=".\transcript.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> --- 194,361 ---- <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=".\heapcheck.c" ! > </File> <File ! RelativePath="..\common\list.c" ! > <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg" ! /> </FileConfiguration> <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\reg" ! /> </FileConfiguration> </File> <File ! RelativePath=".\llist.c" ! > </File> <File ! RelativePath="..\common\mkdirs.c" ! > </File> <File ! RelativePath=".\pathcmp.c" ! > </File> <File ! RelativePath=".\regcreate.c" ! > </File> <File ! RelativePath=".\retr.c" ! > </File> <File ! RelativePath=".\stor.c" ! > </File> <File ! RelativePath="..\common\tls.c" ! > <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="" ! /> </FileConfiguration> </File> <File ! RelativePath=".\transcript.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=".\heapcheck.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\tailor.h" ! > </File> <File ! RelativePath="..\common\tls.h" ! > </File> <File ! RelativePath=".\transcript.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: llist.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/llist.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** llist.c 2 Aug 2005 03:52:04 -0000 1.2 --- llist.c 13 Jun 2007 16:17:40 -0000 1.3 *************** *** 52,56 **** /* find where in the list to put the new entry */ for ( current = headp; *current != NULL; current = &(*current)->ll_next) { ! ret = stricmp( new->ll_pinfo->pi_name, (*current)->ll_pinfo->pi_name ); if ( ret <= 0 ) { break; --- 52,56 ---- /* find where in the list to put the new entry */ for ( current = headp; *current != NULL; current = &(*current)->ll_next) { ! ret = _stricmp( new->ll_pinfo->pi_name, (*current)->ll_pinfo->pi_name ); if ( ret <= 0 ) { break; Index: stor.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/stor.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stor.c 14 Dec 2005 20:25:09 -0000 1.2 --- stor.c 13 Jun 2007 16:17:41 -0000 1.3 *************** *** 32,36 **** #include <openssl/evp.h> ! #include <snet.h> //#include "applefile.h" --- 32,36 ---- #include <openssl/evp.h> ! #include <libsnet/snet.h> //#include "applefile.h" *************** *** 158,168 **** /* Open and stat file */ if (( fd = _open( path, _O_BINARY | _O_RDONLY, 0 )) < 0 ) { ! perror( path ); ! exit( 2 ); } if ( _fstat( fd, &st ) < 0 ) { ! perror( path ); ! close( fd ); ! exit( 2 ); } --- 158,168 ---- /* Open and stat file */ if (( fd = _open( path, _O_BINARY | _O_RDONLY, 0 )) < 0 ) { ! perror( path ); ! exit( 2 ); } if ( _fstat( fd, &st ) < 0 ) { ! perror( path ); ! _close( fd ); ! exit( 2 ); } *************** *** 235,247 **** /* End transaction with server */ if ( snet_writeftv( sn, NULL, ".\r\n" ) < 0 ) { ! fprintf( stderr, "stor_file %s failed: %s\n", pathdesc, ! strerror( errno )); ! return( -1 ); } if ( verbose ) fputs( "\n>>> .\n", stdout ); ! if ( close( fd ) < 0 ) { ! perror( path ); ! exit( 2 ); } --- 235,247 ---- /* End transaction with server */ if ( snet_writeftv( sn, NULL, ".\r\n" ) < 0 ) { ! fprintf( stderr, "stor_file %s failed: %s\n", pathdesc, ! strerror( errno )); ! return( -1 ); } if ( verbose ) fputs( "\n>>> .\n", stdout ); ! if ( _close( fd ) < 0 ) { ! perror( path ); ! exit( 2 ); } Index: retr.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/retr.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** retr.c 14 Dec 2005 20:25:09 -0000 1.2 --- retr.c 13 Jun 2007 16:17:41 -0000 1.3 *************** *** 32,36 **** #include <openssl/evp.h> ! #include <snet.h> //#include "applefile.h" --- 32,36 ---- #include <openssl/evp.h> ! #include <libsnet/snet.h> //#include "applefile.h" *************** *** 175,182 **** }*/ } ! if ( close( fd ) != 0 ) { ! perror( path ); ! returnval = -1; ! goto error1; } if ( verbose ) printf( "\n" ); --- 175,182 ---- }*/ } ! if ( _close( fd ) != 0 ) { ! perror( path ); ! returnval = -1; ! goto error1; } if ( verbose ) printf( "\n" ); *************** *** 213,219 **** error2: ! close( fd ); error1: ! unlink( temppath ); return( returnval ); } --- 213,219 ---- error2: ! _close( fd ); error1: ! _unlink( temppath ); return( returnval ); } Index: regdiff.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/regdiff.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** regdiff.c 17 May 2006 17:41:54 -0000 1.12 --- regdiff.c 13 Jun 2007 16:17:41 -0000 1.13 *************** *** 59,66 **** #endif - #define VERSION "0.7.0" #define APPNAME "regdiff" ! char *version = VERSION; char *appname = APPNAME; char chksumlist[] = "sha1, sha, md5, md4, md2, dss1, mdc2, ripemd160"; --- 59,65 ---- #endif #define APPNAME "regdiff" ! extern char *version; char *appname = APPNAME; char chksumlist[] = "sha1, sha, md5, md4, md2, dss1, mdc2, ripemd160"; *************** *** 123,127 **** return; } ! if ( strnicmp( path->ll_pinfo->pi_name, tran->t_pinfo->pi_name, strlen( path->ll_pinfo->pi_name ) ) == 0 && tran->t_pinfo->pi_name[ strlen( path->ll_pinfo->pi_name ) ] == '\\' ) { neg = ll_allocate( tran->t_pinfo->pi_name ); --- 122,126 ---- return; } ! if ( _strnicmp( path->ll_pinfo->pi_name, tran->t_pinfo->pi_name, strlen( path->ll_pinfo->pi_name ) ) == 0 && tran->t_pinfo->pi_name[ strlen( path->ll_pinfo->pi_name ) ] == '\\' ) { neg = ll_allocate( tran->t_pinfo->pi_name ); *************** *** 201,206 **** memset( valueData, 0, sizeValue + 1 ); } ! llNew->ll_pinfo->pi_valname = strdup( lpName ); ! llNew->ll_pinfo->pi_keyname = strdup( path->ll_pinfo->pi_name ); llNew->ll_pinfo->pi_type = 'v'; llNew->ll_pinfo->pi_maxValueLen = sizeValue; --- 200,205 ---- memset( valueData, 0, sizeValue + 1 ); } ! llNew->ll_pinfo->pi_valname = _strdup( lpName ); ! llNew->ll_pinfo->pi_keyname = _strdup( path->ll_pinfo->pi_name ); llNew->ll_pinfo->pi_type = 'v'; llNew->ll_pinfo->pi_maxValueLen = sizeValue; *************** *** 399,403 **** root->ll_pinfo->pi_type = 'k'; ! child_test_root = strdup( root->ll_pinfo->pi_name ); reg_walk( root ); --- 398,402 ---- root->ll_pinfo->pi_type = 'k'; ! child_test_root = _strdup( root->ll_pinfo->pi_name ); reg_walk( root ); Index: regdiff.vcproj =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/regdiff.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** regdiff.vcproj 14 Dec 2005 20:25:09 -0000 1.5 --- regdiff.vcproj 13 Jun 2007 16:17:41 -0000 1.6 *************** *** 2,14 **** <VisualStudioProject ProjectType="Visual C++" ! Version="7.10" Name="regdiff" ProjectGUID="{F1D26D4C-2BD3-43BC-8BB2-2503E77FD1AB}" ! SccProjectName="" ! SccLocalPath=""> <Platforms> <Platform ! Name="Win32"/> </Platforms> <Configurations> <Configuration --- 2,17 ---- <VisualStudioProject ProjectType="Visual C++" ! Version="8.00" Name="regdiff" ProjectGUID="{F1D26D4C-2BD3-43BC-8BB2-2503E77FD1AB}" ! RootNamespace="regdiff" ! > <Platforms> <Platform ! Name="Win32" ! /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration *************** *** 17,23 **** IntermediateDirectory="..\temp\reg" ConfigurationType="1" UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> <Tool Name="VCCLCompilerTool" --- 20,45 ---- IntermediateDirectory="..\temp\reg" 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/regdiff.tlb" ! HeaderFileName="" ! /> <Tool Name="VCCLCompilerTool" *************** *** 26,68 **** 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/regdiff.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> <Configuration --- 48,101 ---- 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> <Configuration *************** *** 71,90 **** IntermediateDirectory="..\temp\reg" 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" --- 104,154 ---- IntermediateDirectory="..\temp\reg" 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/regdiff.tlb" ! HeaderFileName="" ! /> <Tool Name="VCCLCompilerTool" + AdditionalOptions="/D"_CRT_SECURE_NO_WARNINGS"" 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" *************** *** 92,124 **** OutputFile="..\bin\regdiff.exe" LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/regdiff.pdb" SubSystem="1" ! TargetMachine="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Debug/regdiff.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> </Configurations> --- 156,189 ---- OutputFile="..\bin\regdiff.exe" LinkIncremental="1" ! SuppressStartupBanner="true" ! GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/regdiff.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> </Configurations> *************** *** 128,253 **** <Filter Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File ! RelativePath="argcargv.c"> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions=""/> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3"/> </FileConfiguration> </File> <File ! RelativePath="..\common\base64.c"> </File> <File ! RelativePath=".\chksum.c"> </File> <File ! RelativePath="code.c"> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions=""/> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3"/> </FileConfiguration> </File> <File ! RelativePath="..\common\getopt.c"> </File> <File ! RelativePath="heapcheck.c"> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions=""/> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3"/> </FileConfiguration> </File> <File ! RelativePath="llist.c"> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions=""/> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3"/> </FileConfiguration> </File> <File ! RelativePath=".\pathcmp.c"> </File> <File ! RelativePath=".\regdiff.c"> </File> <File ! RelativePath="transcript.c"> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions=""/> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3"/> </FileConfiguration> </File> <File ! RelativePath="winwrap.c"> <FileConfiguration ! Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions=""/> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3"/> </FileConfiguration> </File> --- 193,358 ---- <Filter Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! > <File ! RelativePath="argcargv.c" ! > <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions="" ! /> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3" ! /> </FileConfiguration> </File> <File ! RelativePath="..\common\base64.c" ! > </File> <File ! RelativePath=".\chksum.c" ! > </File> <File ! RelativePath="code.c" ! > <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions="" ! /> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3" ! /> </FileConfiguration> </File> <File ! RelativePath="..\common\getopt.c" ! > </File> <File ! RelativePath="heapcheck.c" ! > <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions="" ! /> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3" ! /> </FileConfiguration> </File> <File ! RelativePath="llist.c" ! > <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions="" ! /> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3" ! /> </FileConfiguration> </File> <File ! RelativePath=".\pathcmp.c" ! > </File> <File ! RelativePath=".\regdiff.c" ! > </File> <File ! RelativePath="transcript.c" ! > <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions="" ! /> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3" ! /> </FileConfiguration> </File> <File ! RelativePath="..\common\version.c" ! > ! </File> ! <File ! RelativePath="winwrap.c" ! > <FileConfiguration ! Name="Release|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="2" ! PreprocessorDefinitions="" ! /> </FileConfiguration> <FileConfiguration ! Name="Debug|Win32" ! > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" ! BasicRuntimeChecks="3" ! /> </FileConfiguration> </File> *************** *** 255,293 **** <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="..\common\getopt.h"> </File> <File ! RelativePath="heapcheck.h"> </File> <File ! RelativePath="llist.h"> </File> <File ! RelativePath=".\pathcmp.h"> </File> <File ! RelativePath="..\common\tailor.h"> </File> <File ! RelativePath="transcript.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> --- 360,410 ---- <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="..\common\getopt.h" ! > </File> <File ! RelativePath="heapcheck.h" ! > </File> <File ! RelativePath="llist.h" ! > </File> <File ! RelativePath=".\pathcmp.h" ! > </File> <File ! RelativePath="..\common\tailor.h" ! > </File> <File ! RelativePath="transcript.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: chksum.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/chksum.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** chksum.c 14 Dec 2005 20:25:09 -0000 1.4 --- chksum.c 13 Jun 2007 16:17:40 -0000 1.5 *************** *** 82,92 **** //Read chunks of data from file and update digest. ! while (( rr = read( fd, buf, sizeof( buf ))) > 0 ) { EVP_DigestUpdate( &mdctx, buf, (unsigned int)rr ); } if ( rr < 0 ) { ! if ( close( fd ) != 0 ) { ! perror( path ); ! exit( 1 );; } EVP_MD_CTX_cleanup(&mdctx); --- 82,92 ---- //Read chunks of data from file and update digest. ! while (( rr = _read( fd, buf, sizeof( buf ))) > 0 ) { EVP_DigestUpdate( &mdctx, buf, (unsigned int)rr ); } if ( rr < 0 ) { ! if ( _close( fd ) != 0 ) { ! perror( path ); ! exit( 1 );; } EVP_MD_CTX_cleanup(&mdctx); *************** *** 96,102 **** //Close file. ! if ( close( fd ) != 0 ) { ! perror( path ); ! exit( 1 );; } --- 96,102 ---- //Close file. ! if ( _close( fd ) != 0 ) { ! perror( path ); ! exit( 1 );; } Index: regapply.c =================================================================== RCS file: /cvsroot/radmind/radmind-pc/reg/regapply.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** regapply.c 17 May 2006 17:41:54 -0000 1.6 --- regapply.c 13 Jun 2007 16:17:40 -0000 1.7 *************** *** 32,36 **** #include <openssl/evp.h> ! #include <snet.h> //#include "applefile.h" --- 32,36 ---- #include <openssl/evp.h> ! #include <libsnet/snet.h> //#include "applefile.h" *************** *** 70,75 **** SSL_CTX *ctx; ! char *version = "0.7.0", *checksumlist = "", *child_test_root = ""; ! extern char *ca, *cert, *privatekey; struct node { --- 70,75 ---- SSL_CTX *ctx; ! char *checksumlist = "", *child_test_root = ""; ! extern char *version, *ca, *cert, *privatekey; struct node { *************** *** 91,100 **** new_node = (struct node *) malloc( sizeof( struct node )); ! new_node->path = strdup( path ); if ( tline != NULL ) { ! sprintf( new_node->tline, "%s", tline ); ! new_node->doline = 1; } else { ! new_node->doline = 0; } new_node->next = NULL; --- 91,100 ---- new_node = (struct node *) malloc( sizeof( struct node )); ! new_node->path = _strdup( path ); if ( tline != NULL ) { ! sprintf( new_node->tline, "%s", tline ); ! new_node->doline = 1; } else { ! new_node->doline = 0; } new_node->next = NULL; *************** *** 251,255 **** } ! close( fd ); } if ( hKey != NULL && pinfo->pi_regdel_str != NULL ) --- 251,255 ---- } ! _close( fd ); } if ( hKey != NULL && pinfo->pi_regdel_str != NULL ) *************** *** 268,276 **** } ! close( fd ); system( "regedit /s c:\\radmind\\client\\-.reg" ); ! unlink( "c:\\radmind\\client\\-.reg" ); } if ( *targv[ 5 ] == '"' && strcmp( cksum_b64, "+" ) != 0 ) --- 268,276 ---- } ! _close( fd ); system( "regedit /s c:\\radmind\\client\\-.reg" ); ! _unlink( "c:\\radmind\\client... [truncated message content] |