Bug 574183 - Fix bustage.

This commit is contained in:
Mitchell Field 2011-03-03 03:10:48 +11:00
parent 76adb57895
commit b3613bee53
3 changed files with 6 additions and 2 deletions

View File

@ -51,7 +51,7 @@ VISIBILITY_FLAGS =
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
ifeq (WINNT,$(HOST_OS_ARCH))
HOST_CSRCS = nsinstall_win.c
HOST_CSRCS = nsinstall_win.c
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
else
HOST_CSRCS = nsinstall.c pathsub.c

View File

@ -51,7 +51,8 @@ VISIBILITY_FLAGS =
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
ifeq (WINNT,$(HOST_OS_ARCH))
HOST_CSRCS = nsinstall_win.c
HOST_CSRCS = nsinstall_win.c
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
else
HOST_CSRCS = nsinstall.c pathsub.c
endif

View File

@ -11,6 +11,7 @@
#include <string.h>
#include <assert.h>
#include <windows.h>
#include <shlwapi.h>
#pragma hdrstop
/*
@ -332,6 +333,8 @@ sh_DoCopy(wchar_t *srcFileName,
}
if (!CopyFile(longSrc, longDst, FALSE)) {
if (!wcscmp(PathFindExtension(longSrc), L".chk"))
return TRUE; // Incredibly ugly hack to work around Bug 539689
fprintf(stderr, "nsinstall: cannot copy %ls to %ls: %s\n",
srcFileName, dstFileName, sh_GetLastErrorMessage());
return FALSE;