Fixed assorted updater bugs (bug 3697, r=pred, a121=blocking).

This commit is contained in:
David Anderson 2009-03-06 17:41:35 -05:00
parent 2c7555366f
commit c0ee2ce345
3 changed files with 4 additions and 4 deletions

View File

@ -136,7 +136,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".,..\include" AdditionalIncludeDirectories=".,..\include"
PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB" PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;CURL_DISABLE_LDAP"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"

View File

@ -64,7 +64,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="..\curl-src\lib\LIB-Release\libcurl.lib ws2_32.lib" AdditionalDependencies="..\curl-src\lib\LIB-Debug\libcurld.lib ws2_32.lib"
OutputFile="$(OutDir)\webternet.ext.dll" OutputFile="$(OutDir)\webternet.ext.dll"
LinkIncremental="2" LinkIncremental="2"
IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT" IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"

View File

@ -139,7 +139,7 @@ static void PumpUpdate(void *data)
smutils->BuildPath(Path_SM, path, sizeof(path), "gamedata/%s", part->file); smutils->BuildPath(Path_SM, path, sizeof(path), "gamedata/%s", part->file);
if (libsys->IsPathDirectory(path)) if (libsys->IsPathDirectory(path))
{ {
continue; goto skip_create;
} }
if (!libsys->CreateFolder(path)) if (!libsys->CreateFolder(path))
{ {
@ -157,7 +157,7 @@ static void PumpUpdate(void *data)
if (fp == NULL) if (fp == NULL)
{ {
AddUpdateError("Could not open %s for writing", path); AddUpdateError("Could not open %s for writing", path);
return; goto skip_create;
} }
if (fwrite(part->data, 1, part->length, fp) != part->length) if (fwrite(part->data, 1, part->length, fp) != part->length)
{ {