Bug 269223 - Spawner broken pipe problem

core/org.eclipse.cdt.core.win32/library/Makefile

@@ -12,6 +12,7 @@ JDK_INCLUDES= "$(JAVA_HOME)/include"
 JDK_OS_INCLUDES= "$(JAVA_HOME)/include/$(OS)"
 
 CC=g++
+DEBUG_FLAGS =  -D_UNICODE -DDEBUG_MONITOR -DREAD_REPORT
 CFLAGS = -DUNICODE -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
 CXX=g++
 CXXFLAGS=$(CFLAGS)

core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c

@@ -868,7 +868,7 @@ void _cdecl waitProcTermination(void* pv)
 			cleanUpProcBlock(pInfo + i);
 #ifdef DEBUG_MONITOR
 				swprintf(buffer, _T("waitProcTermination: set PID %i to 0\n"), 
-					pid, 
+					pInfo[i].pid, 
 					GetLastError());
 				OutputDebugStringW(buffer);
 #endif

core/org.eclipse.cdt.core.win32/library/iostream.c

@@ -125,6 +125,17 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_rea
 					nBuffOffset = 0;
 					break;
 					}
+				else
+					{
+					// buffer overflow?
+					// according to msdn this happens in message read mode only
+#ifdef DEBUG_MONITOR
+					_stprintf(buffer, _T("Buffer full - %i, bytes read: %i\n"), fd, nNumberOfBytesRead);
+					OutputDebugStringW(buffer);
+#endif
+					// nNumberOfBytesRead can be 0 here for unknown reason (bug 269223)
+					nNumberOfBytesRead = nNumberOfBytesToRead;
+					}
 				}
 			}
 		if(nNumberOfBytesRead > 0)
@@ -138,7 +149,7 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_rea
 	CloseHandle(overlapped.hEvent);
 #ifdef DEBUG_MONITOR
 #ifdef READ_REPORT
-	_stprintf(buffer, _T("End read %i\n"), fd);
+	_stprintf(buffer, _T("End read %i - bytes read: %d\n"), fd, nBuffOffset);
 	OutputDebugStringW(buffer);
 #endif
 #endif