Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2006-06-23 17:27:03 +0000
committerDoug Schaefer2006-06-23 17:27:03 +0000
commit17464c08f4d94cc47098c0d0ca9a1f7ddc481fe8 (patch)
treea45ba62950fe69a81c73b96ae5c8f217c6157ed9 /core/org.eclipse.cdt.core.win32
parent9e1827d28b29e27443cfe97f05fe848e296e25e9 (diff)
downloadorg.eclipse.cdt-17464c08f4d94cc47098c0d0ca9a1f7ddc481fe8.tar.gz
org.eclipse.cdt-17464c08f4d94cc47098c0d0ca9a1f7ddc481fe8.tar.xz
org.eclipse.cdt-17464c08f4d94cc47098c0d0ca9a1f7ddc481fe8.zip
Update Copyright dates and fix those that had no copyrights.
Diffstat (limited to 'core/org.eclipse.cdt.core.win32')
-rw-r--r--core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c52
-rw-r--r--core/org.eclipse.cdt.core.win32/library/iostream.c4
-rw-r--r--core/org.eclipse.cdt.core.win32/library/nmake.mak10
-rw-r--r--core/org.eclipse.cdt.core.win32/library/starter/starter.cpp4
-rw-r--r--core/org.eclipse.cdt.core.win32/library/winreg.cpp10
-rw-r--r--core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java2
-rw-r--r--core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java2
7 files changed, 52 insertions, 32 deletions
diff --git a/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c b/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
index 5add853cbb8..50351fafbca 100644
--- a/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
+++ b/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002 - 2005 QNX Software Systems and others.
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,20 +12,20 @@
* Win32ProcessEx.c
*
* This is a JNI implementation of spawner
-***********************************************************************/
+ *******************************************************************************/
#include "stdafx.h"
#include <string.h>
#include <stdlib.h>
#include <process.h>
#include "Spawner.h"
-
-#include "jni.h"
-#include "io.h"
-
+#include "jni.h"
+#include "io.h"
+
+
#define PIPE_SIZE 512 // Size of pipe buffer
-#define MAX_CMD_SIZE 2049 // Initial size of command line
+#define MAX_CMD_SIZE 2049 // Initial size of command line
#define MAX_ENV_SIZE 4096 // Initial size of environment block
#define PIPE_NAME_LENGTH 100 // Size of pipe name buffer
#define PIPE_TIMEOUT 10000 // Default time-out value, in milliseconds.
@@ -95,13 +95,13 @@ static int nCounter = 0; // We use it to build unique synchronisation object nam
// [in] envp - array of environment variables
// [in] dir - working directory
// [out] channels - streams handlers
-/////////////////////////////////////////////////////////////////////////////////////
-
+/////////////////////////////////////////////////////////////////////////////////////
+
JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec2
(JNIEnv * env, jobject process, jobjectArray cmdarray, jobjectArray envp, jstring dir, jintArray channels, jstring slaveName, jint fdm)
-{
- return -1;
-}
+{
+ return -1;
+}
void ensureSize(_TCHAR** ptr, int* psize, int requiredLength)
{
@@ -120,7 +120,7 @@ void ensureSize(_TCHAR** ptr, int* psize, int requiredLength)
}
}
}
-
+
JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
(JNIEnv * env, jobject process, jobjectArray cmdarray, jobjectArray envp, jstring dir, jintArray channels)
{
@@ -690,8 +690,8 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_raise
}
-
-
+
+
/////////////////////////////////////////////////////////////////////////////////////
// Wait for process termination
// Arguments: (see Spawner.java)
@@ -699,9 +699,9 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_raise
/////////////////////////////////////////////////////////////////////////////////////
JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_waitFor
(JNIEnv * env, jobject process, jint uid)
-{
- long exit_code;
- int what=0;
+{
+ long exit_code;
+ int what=0;
HANDLE hProc;
pProcInfo_t pCurProcInfo = findProcInfo(uid);
@@ -715,21 +715,21 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_waitFor
what = WaitForSingleObject(hProc, INFINITE);
-
+
if (what == WAIT_OBJECT_0)
- {
- GetExitCodeProcess(hProc, &exit_code);
+ {
+ GetExitCodeProcess(hProc, &exit_code);
}
if(hProc)
CloseHandle(hProc);
- return exit_code;
-}
-
-
-
+ return exit_code;
+}
+
+
+
// Utilities
diff --git a/core/org.eclipse.cdt.core.win32/library/iostream.c b/core/org.eclipse.cdt.core.win32/library/iostream.c
index 7beda1cdbc2..3ba37058ded 100644
--- a/core/org.eclipse.cdt.core.win32/library/iostream.c
+++ b/core/org.eclipse.cdt.core.win32/library/iostream.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002 - 2005 QNX Software Systems and others.
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
*
* This is a part of JNI implementation of spawner
* Includes implementation of JNI methods (see Spawner.java)
-***********************************************************************/
+ *******************************************************************************/
#include "stdafx.h"
#include <string.h>
#include <stdlib.h>
diff --git a/core/org.eclipse.cdt.core.win32/library/nmake.mak b/core/org.eclipse.cdt.core.win32/library/nmake.mak
index a3ce6c74cc8..16a16f92538 100644
--- a/core/org.eclipse.cdt.core.win32/library/nmake.mak
+++ b/core/org.eclipse.cdt.core.win32/library/nmake.mak
@@ -1,3 +1,13 @@
+#*******************************************************************************
+# Copyright (c) 2005, 2006 QNX Software Systems
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# QNX Software Systems - initial API and implementation
+#*******************************************************************************
TARGET = ..\os\win32\x86\winreg.dll
OBJS = winreg.obj
diff --git a/core/org.eclipse.cdt.core.win32/library/starter/starter.cpp b/core/org.eclipse.cdt.core.win32/library/starter/starter.cpp
index af6bf868d0f..3a0fa472bfe 100644
--- a/core/org.eclipse.cdt.core.win32/library/starter/starter.cpp
+++ b/core/org.eclipse.cdt.core.win32/library/starter/starter.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002 - 2005 QNX Software Systems and others.
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
* starter.cpp
*
* This is a small utility for windows spawner
-***********************************************************************/
+ *******************************************************************************/
diff --git a/core/org.eclipse.cdt.core.win32/library/winreg.cpp b/core/org.eclipse.cdt.core.win32/library/winreg.cpp
index 2feeeb9ad48..2b06ad12966 100644
--- a/core/org.eclipse.cdt.core.win32/library/winreg.cpp
+++ b/core/org.eclipse.cdt.core.win32/library/winreg.cpp
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 QNX Software Systems
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - initial API and implementation
+ *******************************************************************************/
#include <windows.h>
#include <jni.h>
#include <string.h>
diff --git a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java
index 447bb5376b4..33a34952f60 100644
--- a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java
+++ b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * Copyright (c) 2000, 2005 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
index 899904bee3b..b575c2ec587 100644
--- a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
+++ b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * Copyright (c) 2000, 2005 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at

Back to the top