test patch; please ignore
buildbot at kegel.com
buildbot at kegel.com
Thu Sep 8 23:19:47 CDT 2011
This is an experimental automated build and test service.
Please feel free to ignore this email while we work the kinks out.
The Buildbot has detected a failed build on builder runtests-gcc295 while building Wine.
Full details are available at: http://buildbot.kegel.com/builders/runtests-gcc295/builds/1 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting)
BUILD FAILED: failed shell_2
For more info about this message, see http://wiki.winehq.org/BuildBot
-------------- next part --------------
From: Dan Kegel <dank at kegel.com>
Subject: cmd: terminate list of files to delete
Message-Id: <CAPF-yOaG6KBZm5ayOT60BLK6SddFc8dKzMtT88aqU0qV9WeuVA at mail.gmail.com>
Date: Thu, 18 Aug 2011 06:04:34 -0700
SHFileOperations takes a list of filenames, not a single filename.
Without this, "rd /s foo" will try to delete undefined gibberish files,
and output random error messages such as "Path not found"
or "Sharing violation".
Found while testing an unrelated patch to cmd.
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 09c166f..0e192ad 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1705,6 +1705,7 @@ void WCMD_remove_dir (WCHAR *command) {
} else {
SHFILEOPSTRUCTW lpDir;
+ WCHAR filesToDelete[MAX_PATH];
/* Ask first */
if (strstrW (quals, parmQ) == NULL) {
@@ -1720,10 +1721,13 @@ void WCMD_remove_dir (WCHAR *command) {
if (!ok) return;
}
+ strcpyW(filesToDelete, thisArg);
+ filesToDelete[strlenW(thisArg)+1] = 0; /* terminate the list of strings */
+
/* Do the delete */
lpDir.hwnd = NULL;
lpDir.pTo = NULL;
- lpDir.pFrom = thisArg;
+ lpDir.pFrom = filesToDelete;
lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI;
lpDir.wFunc = FO_DELETE;
if (SHFileOperationW(&lpDir)) WCMD_print_error ();
More information about the wine-tests-results
mailing list