From bd5cec12a8c0bb11a801a4336371fd2d888a1783 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Sat, 4 Feb 2017 18:09:01 -0500 Subject: [PATCH] Remove AIX support Eclipse 4.7 removed AIX support so CDT should also remove it. Change-Id: I9ed50a4c47e7b861eb2adeb86e857d2a78b4834b Signed-off-by: Marc-Andre Laperle --- core/org.eclipse.cdt.core.aix/.classpath | 7 - core/org.eclipse.cdt.core.aix/.project | 28 -- .../META-INF/MANIFEST.MF | 10 - core/org.eclipse.cdt.core.aix/about.html | 24 -- .../org.eclipse.cdt.core.aix/build.properties | 19 -- core/org.eclipse.cdt.core.aix/fragment.xml | 12 - .../org.eclipse.cdt.core.aix/library/Makefile | 29 -- core/org.eclipse.cdt.core.aix/library/PTY.h | 29 -- .../library/PTYInputStream.h | 32 -- .../library/PTYOutputStream.h | 29 -- .../library/Spawner.h | 53 --- .../library/SpawnerInputStream.h | 32 -- .../library/SpawnerOutputStream.h | 29 -- core/org.eclipse.cdt.core.aix/library/exec0.h | 29 -- .../library/exec_pty.c | 184 ----------- .../library/exec_unix.c | 159 --------- core/org.eclipse.cdt.core.aix/library/io.c | 114 ------- .../library/openpty.c | 134 -------- .../library/openpty.h | 19 -- core/org.eclipse.cdt.core.aix/library/pfind.c | 107 ------- core/org.eclipse.cdt.core.aix/library/pty.c | 72 ----- core/org.eclipse.cdt.core.aix/library/ptyio.c | 118 ------- .../library/spawner.c | 303 ------------------ .../os/aix/ppc/libpty.so | Bin 12345 -> 0 bytes .../os/aix/ppc/libspawner.so | Bin 31528 -> 0 bytes .../plugin.properties | 2 - core/org.eclipse.cdt.core.aix/pom.xml | 39 --- .../cdt/internal/core/aix/ProcessInfo.java | 55 ---- .../cdt/internal/core/aix/ProcessList.java | 89 ----- .../plugin.properties | 4 - .../StandaloneTests.launch | 9 +- pom.xml | 11 - .../feature.xml | 9 - 33 files changed, 3 insertions(+), 1787 deletions(-) delete mode 100644 core/org.eclipse.cdt.core.aix/.classpath delete mode 100644 core/org.eclipse.cdt.core.aix/.project delete mode 100644 core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF delete mode 100644 core/org.eclipse.cdt.core.aix/about.html delete mode 100644 core/org.eclipse.cdt.core.aix/build.properties delete mode 100644 core/org.eclipse.cdt.core.aix/fragment.xml delete mode 100644 core/org.eclipse.cdt.core.aix/library/Makefile delete mode 100644 core/org.eclipse.cdt.core.aix/library/PTY.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/PTYInputStream.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/PTYOutputStream.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/Spawner.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/SpawnerInputStream.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/SpawnerOutputStream.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/exec0.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/exec_pty.c delete mode 100644 core/org.eclipse.cdt.core.aix/library/exec_unix.c delete mode 100644 core/org.eclipse.cdt.core.aix/library/io.c delete mode 100644 core/org.eclipse.cdt.core.aix/library/openpty.c delete mode 100644 core/org.eclipse.cdt.core.aix/library/openpty.h delete mode 100644 core/org.eclipse.cdt.core.aix/library/pfind.c delete mode 100644 core/org.eclipse.cdt.core.aix/library/pty.c delete mode 100644 core/org.eclipse.cdt.core.aix/library/ptyio.c delete mode 100644 core/org.eclipse.cdt.core.aix/library/spawner.c delete mode 100644 core/org.eclipse.cdt.core.aix/os/aix/ppc/libpty.so delete mode 100644 core/org.eclipse.cdt.core.aix/os/aix/ppc/libspawner.so delete mode 100644 core/org.eclipse.cdt.core.aix/plugin.properties delete mode 100644 core/org.eclipse.cdt.core.aix/pom.xml delete mode 100644 core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessInfo.java delete mode 100644 core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessList.java diff --git a/core/org.eclipse.cdt.core.aix/.classpath b/core/org.eclipse.cdt.core.aix/.classpath deleted file mode 100644 index 01836c4842f..00000000000 --- a/core/org.eclipse.cdt.core.aix/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/core/org.eclipse.cdt.core.aix/.project b/core/org.eclipse.cdt.core.aix/.project deleted file mode 100644 index b463663a422..00000000000 --- a/core/org.eclipse.cdt.core.aix/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.cdt.core.aix - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF deleted file mode 100644 index d69f0bb0ac6..00000000000 --- a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %fragmentName.aix -Bundle-SymbolicName: org.eclipse.cdt.core.aix; singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Eclipse-PlatformFilter: (osgi.os=aix) diff --git a/core/org.eclipse.cdt.core.aix/about.html b/core/org.eclipse.cdt.core.aix/about.html deleted file mode 100644 index d7c511887d6..00000000000 --- a/core/org.eclipse.cdt.core.aix/about.html +++ /dev/null @@ -1,24 +0,0 @@ - - -About - - -

About This Content

- -

June 22, 2007

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

- - \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.aix/build.properties b/core/org.eclipse.cdt.core.aix/build.properties deleted file mode 100644 index 4cc40daacc3..00000000000 --- a/core/org.eclipse.cdt.core.aix/build.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2009 IBM Corporation 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -source.. = src/ -bin.includes = fragment.xml,\ - .,\ - about.html,\ - META-INF/,\ - os/,\ - plugin.properties -src.includes = library/,\ - about.html diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml deleted file mode 100644 index f0194a4080a..00000000000 --- a/core/org.eclipse.cdt.core.aix/fragment.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/core/org.eclipse.cdt.core.aix/library/Makefile b/core/org.eclipse.cdt.core.aix/library/Makefile deleted file mode 100644 index f607f23c1a8..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# makefile for libspawner.so - -#set JDK_INCLUDES -JDK_INCLUDES=/opt/ibm-jdk1.4.2/include -RM=rm -CC=xlc -CFLAGS = -I. -I$(JDK_INCLUDES) -#CFLAGS +=-fpic -D_REENTRANT - -LIB_NAME_SPAWNER = libspawner.so -LIB_NAME_FULL_SPAWNER = ../os/aix/ppc/libspawner.so -OBJS_SPAWNER=spawner.o io.o exec_unix.o exec_pty.o openpty.o pfind.o - -LIB_NAME_PTY = libpty.so -LIB_NAME_FULL_PTY = ../os/aix/ppc/libpty.so -OBJS_PTY=openpty.o pty.o ptyio.o - -all: $(LIB_NAME_FULL_SPAWNER) $(LIB_NAME_FULL_PTY) - -$(LIB_NAME_FULL_SPAWNER): $(OBJS_SPAWNER) - mkdir -p ../os/aix/ppc - $(CC) -G -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lc - -$(LIB_NAME_FULL_PTY): $(OBJS_PTY) - $(CC) -G -o $(LIB_NAME_FULL_PTY) $(OBJS_PTY) - -clean : - $(RM) $(OBJS_SPAWNER) $(LIB_NAME_FULL_SPAWNER) - $(RM) $(OBJS_PTY) $(LIB_NAME_FULL_PTY) diff --git a/core/org.eclipse.cdt.core.aix/library/PTY.h b/core/org.eclipse.cdt.core.aix/library/PTY.h deleted file mode 100644 index f717942a01d..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/PTY.h +++ /dev/null @@ -1,29 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_eclipse_cdt_utils_pty_PTY */ - -#ifndef _Included_org_eclipse_cdt_utils_pty_PTY -#define _Included_org_eclipse_cdt_utils_pty_PTY -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_eclipse_cdt_utils_pty_PTY - * Method: openMaster - * Signature: (Z)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_eclipse_cdt_utils_pty_PTY_openMaster - (JNIEnv *, jobject, jboolean); - -/* - * Class: org_eclipse_cdt_utils_pty_PTY - * Method: change_window_size - * Signature: (III)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_change_1window_1size - (JNIEnv *, jobject, jint, jint, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/PTYInputStream.h b/core/org.eclipse.cdt.core.aix/library/PTYInputStream.h deleted file mode 100644 index e7349272b56..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/PTYInputStream.h +++ /dev/null @@ -1,32 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_eclipse_cdt_utils_pty_PTYInputStream */ - -#ifndef _Included_org_eclipse_cdt_utils_pty_PTYInputStream -#define _Included_org_eclipse_cdt_utils_pty_PTYInputStream -#ifdef __cplusplus -extern "C" { -#endif -#undef org_eclipse_cdt_utils_pty_PTYInputStream_SKIP_BUFFER_SIZE -#define org_eclipse_cdt_utils_pty_PTYInputStream_SKIP_BUFFER_SIZE 2048L -/* Inaccessible static: skipBuffer */ -/* - * Class: org_eclipse_cdt_utils_pty_PTYInputStream - * Method: read0 - * Signature: (I[BI)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYInputStream_read0 - (JNIEnv *, jobject, jint, jbyteArray, jint); - -/* - * Class: org_eclipse_cdt_utils_pty_PTYInputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYInputStream_close0 - (JNIEnv *, jobject, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/PTYOutputStream.h b/core/org.eclipse.cdt.core.aix/library/PTYOutputStream.h deleted file mode 100644 index fb28491060e..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/PTYOutputStream.h +++ /dev/null @@ -1,29 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_eclipse_cdt_utils_pty_PTYOutputStream */ - -#ifndef _Included_org_eclipse_cdt_utils_pty_PTYOutputStream -#define _Included_org_eclipse_cdt_utils_pty_PTYOutputStream -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_eclipse_cdt_utils_pty_PTYOutputStream - * Method: write0 - * Signature: (I[BI)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYOutputStream_write0 - (JNIEnv *, jobject, jint, jbyteArray, jint); - -/* - * Class: org_eclipse_cdt_utils_pty_PTYOutputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYOutputStream_close0 - (JNIEnv *, jobject, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/Spawner.h b/core/org.eclipse.cdt.core.aix/library/Spawner.h deleted file mode 100644 index e2fea946912..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/Spawner.h +++ /dev/null @@ -1,53 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_eclipse_cdt_utils_spawner_Spawner */ - -#ifndef _Included_org_eclipse_cdt_utils_spawner_Spawner -#define _Included_org_eclipse_cdt_utils_spawner_Spawner -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: exec0 - * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0 - (JNIEnv *, jobject, jobjectArray, jobjectArray, jstring, jintArray); - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: exec1 - * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1 - (JNIEnv *, jobject, jobjectArray, jobjectArray, jstring); - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: exec2 - * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[ILjava/lang/String;I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec2 - (JNIEnv *, jobject, jobjectArray, jobjectArray, jstring, jintArray, jstring, jint, jboolean); - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: raise - * Signature: (II)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_raise - (JNIEnv *, jobject, jint, jint); - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: waitFor - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_waitFor - (JNIEnv *, jobject, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/SpawnerInputStream.h b/core/org.eclipse.cdt.core.aix/library/SpawnerInputStream.h deleted file mode 100644 index ecf8f8c6a78..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/SpawnerInputStream.h +++ /dev/null @@ -1,32 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class com_qnx_tools_utils_spawner_SpawnerInputStream */ - -#ifndef _Included_com_qnx_tools_utils_spawner_SpawnerInputStream -#define _Included_com_qnx_tools_utils_spawner_SpawnerInputStream -#ifdef __cplusplus -extern "C" { -#endif -#undef com_qnx_tools_utils_spawner_SpawnerInputStream_SKIP_BUFFER_SIZE -#define com_qnx_tools_utils_spawner_SpawnerInputStream_SKIP_BUFFER_SIZE 2048L -/* Inaccessible static: skipBuffer */ -/* - * Class: org_elipse_cdt_utils_spawner_SpawnerInputStream - * Method: read0 - * Signature: (I[BI)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_read0 - (JNIEnv *, jobject, jint, jbyteArray, jint); - -/* - * Class: org_eclipse_cdt_utils_spawner_SpawnerInputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_close0 - (JNIEnv *, jobject, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/SpawnerOutputStream.h b/core/org.eclipse.cdt.core.aix/library/SpawnerOutputStream.h deleted file mode 100644 index 444d71c698c..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/SpawnerOutputStream.h +++ /dev/null @@ -1,29 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class com_qnx_tools_utils_spawner_SpawnerOutputStream */ - -#ifndef _Included_com_qnx_tools_utils_spawner_SpawnerOutputStream -#define _Included_com_qnx_tools_utils_spawner_SpawnerOutputStream -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream - * Method: write0 - * Signature: (I[BI)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_write0 - (JNIEnv *, jobject, jint, jbyteArray, jint); - -/* - * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_close0 - (JNIEnv *, jobject, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/exec0.h b/core/org.eclipse.cdt.core.aix/library/exec0.h deleted file mode 100644 index 630e741a582..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/exec0.h +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * IBM Corporation - port of 248071 - *******************************************************************************/ - -#include -#include -#include -#include -#include - -extern pid_t exec0(const char *path, char *const argv[], - char *const envp[], const char *dirpath, - int channels[3]); - - -extern pid_t exec_pty(const char *path, char *const argv[], - char *const envp[], const char *dirpath, - int channels[3], const char *pts_name, int fdm, - int console); - -extern int wait0(pid_t pid); diff --git a/core/org.eclipse.cdt.core.aix/library/exec_pty.c b/core/org.eclipse.cdt.core.aix/library/exec_pty.c deleted file mode 100644 index 2c3a03ee0d4..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/exec_pty.c +++ /dev/null @@ -1,184 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2013 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - initial API and implementation - * IBM Corporation - port of 248071 - *******************************************************************************/ - -#include "exec0.h" -#include -#include -#include -#include -#include -#include -#include -#include - -/* from pfind.c */ -extern char *pfind(const char *name, char * const envp[]); - -pid_t -exec_pty(const char *path, char *const argv[], char *const envp[], - const char *dirpath, int channels[3], const char *pts_name, int fdm, int console) -{ - int pipe2[2]; - pid_t childpid; - char *full_path; - - /* - * We use pfind() to check that the program exists and is an executable. - * If not pass the error up. Also execve() wants a full path. - */ - full_path = pfind(path, envp); - if (full_path == NULL) { - fprintf(stderr, "Unable to find full path for \"%s\"\n", (path) ? path : ""); - return -1; - } - - /* - * Make sure we can create our pipes before forking. - */ - if (channels != NULL && console) { - if (pipe(pipe2) < 0) { - fprintf(stderr, "%s(%d): returning due to error: %s\n", __FUNCTION__, __LINE__, strerror(errno)); - free(full_path); - return -1; - } - } - - childpid = fork(); - - if (childpid < 0) { - fprintf(stderr, "%s(%d): returning due to error: %s\n", __FUNCTION__, __LINE__, strerror(errno)); - free(full_path); - return -1; - } else if (childpid == 0) { /* child */ - - chdir(dirpath); - - if (channels != NULL) { - int fds; - - if (!console && setsid() < 0) { - perror("setsid()"); - return -1; - } - - fds = ptys_open(fdm, pts_name); - if (fds < 0) { - fprintf(stderr, "%s(%d): returning due to error: %s\n", __FUNCTION__, __LINE__, strerror(errno)); - return -1; - } - - /* Close the read end of pipe2 */ - if (console && close(pipe2[0]) == -1) - perror("close(pipe2[0]))"); - - /* close the master, no need in the child */ - close(fdm); - - if (console) { - set_noecho(fds); - if (setpgid(getpid(), getpid()) < 0) { - perror("setpgid()"); - return -1; - } - } - - /* redirections */ - dup2(fds, STDIN_FILENO); /* dup stdin */ - dup2(fds, STDOUT_FILENO); /* dup stdout */ - if (console) { - dup2(pipe2[1], STDERR_FILENO); /* dup stderr */ - } else { - dup2(fds, STDERR_FILENO); /* dup stderr */ - } - close(fds); /* done with fds. */ - } - - /* Close all the fd's in the child */ - { - int fdlimit = sysconf(_SC_OPEN_MAX); - int fd = 3; - - while (fd < fdlimit) - close(fd++); - } - - if (envp[0] == NULL) { - execv(full_path, argv); - } else { - execve(full_path, argv, envp); - } - - _exit(127); - - } else if (childpid != 0) { /* parent */ - - if (console) { - set_noecho(fdm); - } - if (channels != NULL) { - channels[0] = fdm; /* Input Stream. */ - channels[1] = fdm; /* Output Stream. */ - if (console) { - /* close the write end of pipe1 */ - if (close(pipe2[1]) == -1) - perror("close(pipe2[1])"); - channels[2] = pipe2[0]; /* stderr Stream. */ - } else { - channels[2] = fdm; /* Error Stream. */ - } - } - - free(full_path); - return childpid; - } - - free(full_path); - return -1; /*NOT REACHED */ -} -#ifdef __STAND_ALONE__ -int main(int argc, char **argv, char **envp) { - const char *path = "./bufferring_test"; - int channels[3] = { -1, -1, -1}; - int status; - FILE *app_stdin; - FILE *app_stdout; - FILE *app_stderr; - char pts_name[32]; - int fdm; - char buffer[32]; - - fdm = ptym_open(pts_name); - status = exec_pty(path, argv, envp, ".", channels, pts_name, fdm); - if (status >= 0) { - app_stdin = fdopen(channels[0], "w"); - app_stdout = fdopen(channels[1], "r"); - app_stderr = fdopen(channels[2], "r"); - if (app_stdout == NULL || app_stderr == NULL || app_stdin == NULL) { - fprintf(stderr, "PROBLEMS\n"); - } else { - fputs("foo\n", app_stdin); - fputs("bar\n", app_stdin); - while(fgets(buffer, sizeof buffer, app_stdout) != NULL) { - fprintf(stdout, "STDOUT: %s\n", buffer); - } - while(fgets(buffer, sizeof buffer, app_stderr) != NULL) { - fprintf(stdout, "STDERR: %s\n", buffer); - } - } - } - fputs("bye\n", stdout); - close(channels[0]); - close(channels[1]); - close(channels[2]); - return 0; -} -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/exec_unix.c b/core/org.eclipse.cdt.core.aix/library/exec_unix.c deleted file mode 100644 index 8c71787b618..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/exec_unix.c +++ /dev/null @@ -1,159 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * IBM Corporation - port of 248071 - *******************************************************************************/ - -#include "exec0.h" -#include -#include -#include -#include -#include -#include -#include - -/* from pfind.c */ -extern char *pfind(const char *name, char * const envp[]); - -pid_t -exec0(const char *path, char *const argv[], char *const envp[], - const char *dirpath, int channels[3]) -{ - int pipe0[2], pipe1[2], pipe2[2]; - pid_t childpid; - char *full_path; - - /* - * We use pfind() to check that the program exists and is an executable. - * If not pass the error up. Also execve() wants a full path. - */ - full_path = pfind(path, envp); - if (full_path == NULL) { - fprintf(stderr, "Unable to find full path for \"%s\"\n", (path) ? path : ""); - return -1; - } - - /* - * Make sure we can create our pipes before forking. - */ - if (channels != NULL) { - if (pipe(pipe0) < 0 || pipe(pipe1) < 0 || pipe(pipe2) < 0) { - fprintf(stderr, "%s(%d): returning due to error.\n", - __FUNCTION__, __LINE__); - free(full_path); - return -1; - } - } - - childpid = fork(); - - if (childpid < 0) { - fprintf(stderr, "%s(%d): returning due to error: %s\n", - __FUNCTION__, __LINE__, strerror(errno)); - free(full_path); - return -1; - } else if (childpid == 0) { /* child */ - char *ptr; - - chdir(dirpath); - - if (channels != NULL) { - /* Close the write end of pipe0 */ - if (close(pipe0[1]) == -1) - perror("close(pipe0[1])"); - - /* Close the read end of pipe1 */ - if (close(pipe1[0]) == -1) - perror("close(pipe1[0])"); - - /* Close the read end of pipe2 */ - if (close(pipe2[0]) == -1) - perror("close(pipe2[0]))"); - - /* redirections */ - dup2(pipe0[0], STDIN_FILENO); /* dup stdin */ - dup2(pipe1[1], STDOUT_FILENO); /* dup stdout */ - dup2(pipe2[1], STDERR_FILENO); /* dup stderr */ - } - - /* Close all the fd's in the child */ - { - int fdlimit = sysconf(_SC_OPEN_MAX); - int fd = 3; - - while (fd < fdlimit) - close(fd++); - } - - setpgid(getpid(), getpid()); - - if (envp[0] == NULL) { - execv(full_path, argv); - } else { - execve(full_path, argv, envp); - } - - _exit(127); - - } else if (childpid != 0) { /* parent */ - - char b; - - if (channels != NULL) { - /* close the read end of pipe1 */ - if (close(pipe0[0]) == -1) - perror("close(pipe0[0])"); - - /* close the write end of pipe2 */ - if (close(pipe1[1]) == -1) - perror("close(pipe1[1])"); - - /* close the write end of pipe2 */ - if (close(pipe2[1]) == -1) - perror("close(pipe2[1])"); - - channels[0] = pipe0[1]; /* Output Stream. */ - channels[1] = pipe1[0]; /* Input Stream. */ - channels[2] = pipe2[0]; /* Input Stream. */ - } - - free(full_path); - return childpid; - } - - free(full_path); - return -1; /*NOT REACHED */ -} - - -int wait0(pid_t pid) -{ - int status; - int val = -1; - - if (pid < 0) - return -1; - - for (;;) { - if (waitpid(pid, &status, 0) < 0) { - if (errno == EINTR) { - // interrupted system call - retry - continue; - } - } - break; - } - - if (WIFEXITED(status)) { - val = WEXITSTATUS(status); - } - - return val; -} diff --git a/core/org.eclipse.cdt.core.aix/library/io.c b/core/org.eclipse.cdt.core.aix/library/io.c deleted file mode 100644 index b5bb5eef8b8..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/io.c +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2010 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -#include -#include -#include -#include -#include - -/* Header for class _org_eclipse_cdt_utils_spawner_SpawnerInputStream */ -/* Header for class _org_eclipse_cdt_utils_spawner_SpawnerOutputStream */ - -/* - * Class: org_eclipse_cdt_utils_spawner_SpawnerInputStream - * Method: read0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_read0(JNIEnv * env, - jobject jobj, - jint jfd, - jbyteArray buf, - jint buf_len) -{ - int fd; - int status; - jbyte *data; - int data_len; - - data = (*env)->GetByteArrayElements(env, buf, 0); - data_len = buf_len; - fd = jfd; - - status = read( fd, data, data_len ); - (*env)->ReleaseByteArrayElements(env, buf, data, 0); - - if (status == 0) { - /* EOF. */ - status = -1; - } else if (status == -1) { - /* Error, toss an exception */ - jclass exception = (*env)->FindClass(env, "java/io/IOException"); - if (exception == NULL) { - /* Give up. */ - return -1; - } - (*env)->ThrowNew(env, exception, "read error"); - } - - return status; -} - - -/* - * Class: org_eclipse_cdt_utils_spawner_SpawnerInputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_close0(JNIEnv * env, - jobject jobj, - jint fd) -{ - return close(fd); -} - -/* - * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream - * Method: write0 - * Signature: (II)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_write0(JNIEnv * env, - jobject jobj, - jint jfd, - jbyteArray buf, - jint buf_len) -{ - int status; - int fd; - jbyte *data; - int data_len; - - data = (*env)->GetByteArrayElements(env, buf, 0); - data_len = buf_len; - fd = jfd; - - status = write(fd, data, data_len); - (*env)->ReleaseByteArrayElements(env, buf, data, 0); - - return status; -} - - -/* - * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_close0(JNIEnv * env, - jobject jobj, - jint fd) -{ - return close(fd); -} diff --git a/core/org.eclipse.cdt.core.aix/library/openpty.c b/core/org.eclipse.cdt.core.aix/library/openpty.c deleted file mode 100644 index e8af4b8ebed..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/openpty.c +++ /dev/null @@ -1,134 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * QNX Software Systems - *******************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -/** - * This is taken from R. W. Stevens book. - * Alain Magloire. - */ - -int ptym_open (char *pts_name); -int ptys_open (int fdm, const char * pts_name); -void set_noecho(int fd); - -int -openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) -{ - char line[20]; - line[0]=0; - *amaster = ptym_open(line); - if (*amaster < 0) - return -1; - *aslave = ptys_open(*amaster, line); - if (*aslave < 0) { - close(*amaster); - return -1; - } - - if (name) - strcpy(name, line); -#ifndef TCSAFLUSH -#define TCSAFLUSH TCSETAF -#endif - if (termp) - (void) tcsetattr(*aslave, TCSAFLUSH, termp); -#ifdef TIOCSWINSZ - if (winp) - (void) ioctl(*aslave, TIOCSWINSZ, (char *)winp); -#endif - return 0; -} - -void -set_noecho(int fd) -{ - struct termios stermios; - if (tcgetattr(fd, &stermios) < 0) { - return ; - } - - /* turn off echo */ - stermios.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL); - /* Turn off the NL to CR/NL mapping ou output. */ - /*stermios.c_oflag &= ~(ONLCR);*/ - - stermios.c_iflag |= (IGNCR); - - tcsetattr(fd, TCSANOW, &stermios); -} - -int -ptym_open(char * pts_name) -{ - int fdm; - char *ptr; - - strcpy(pts_name, "/dev/ptmx"); - fdm = posix_openpt(O_RDWR); - if (fdm < 0) - return -1; - if (grantpt(fdm) < 0) { /* grant access to slave */ - close(fdm); - return -2; - } - if (unlockpt(fdm) < 0) { /* clear slave's lock flag */ - close(fdm); - return -3; - } - ptr = ptsname(fdm); - if (ptr == NULL) { /* get slave's name */ - close (fdm); - return -4; - } - strcpy(pts_name, ptr); /* return name of slave */ - return fdm; /* return fd of master */ -} - -int -ptys_open(int fdm, char * pts_name) -{ - int fds; - /* following should allocate controlling terminal */ - fds = open(pts_name, O_RDWR); - if (fds < 0) { - close(fdm); - return -5; - } -/* - if (ioctl(fds, I_PUSH, "ptem") < 0) { - printf("pterm:%s\n", strerror(errno)); - close(fdm); - close(fds); - return -6; - } - if (ioctl(fds, I_PUSH, "ldterm") < 0) { - printf("ldterm %s\n", strerror(errno)); - close(fdm); - close(fds); - return -7; - } -*/ - return fds; -} diff --git a/core/org.eclipse.cdt.core.aix/library/openpty.h b/core/org.eclipse.cdt.core.aix/library/openpty.h deleted file mode 100644 index 21c98ac82fd..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/openpty.h +++ /dev/null @@ -1,19 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2003, 2013 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * QNX Software Systems - * IBM Corporation - port of 248071 - *******************************************************************************/ - -#ifndef _OPENPTY_H -#define _OPENPTY_H -int ptym_open (char *pts_name); -int ptys_open (int fdm, const char * pts_name); -void set_noecho(int fd); -#endif diff --git a/core/org.eclipse.cdt.core.aix/library/pfind.c b/core/org.eclipse.cdt.core.aix/library/pfind.c deleted file mode 100644 index b97942e298d..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/pfind.c +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * IBM Corporation - port of 248071 - *******************************************************************************/ - -/* - * pfind.c - Search for a binary in $PATH. - */ - -#include -#include -#include -#include -#include - -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - -#define PATH_DEF "PATH=" -const int path_def_len = 5; /* strlen(PATH_DEF); */ -char * path_val(char * const envp[]) -{ - int i; - if (envp == NULL || envp[0] == NULL) - return getenv("PATH" ); - - for(i = 0; envp[i] != NULL; i++){ - char* p = envp[i]; - if(!strncmp(PATH_DEF, p, path_def_len)){ - return p + path_def_len; - } - } - - return NULL; -} - -char * pfind(const char *name, char * const envp[]) -{ - char *tok; - char *sp; - char *path; - char fullpath[PATH_MAX+1]; - - /* Sanity check. */ - if (name == NULL) { - fprintf(stderr, "pfind(): Null argument.\n"); - return NULL; - } - - /* For absolute name or name with a path, check if it is an executable. */ - if (name[0] == '/' || name[0] == '.') { - if (access(name, X_OK | R_OK) == 0) { - return strdup(name); - } - return NULL; - } - - /* Search in the PATH environment. */ - path = path_val( envp ); - - if (path == NULL || strlen(path) <= 0) { - fprintf(stderr, "Unable to get $PATH.\n"); - return NULL; - } - - /* The value return by getenv() is readonly */ - path = strdup(path); - - tok = strtok_r(path, ":", &sp); - while (tok != NULL) { - snprintf(fullpath, sizeof(fullpath) - 1, "%s/%s", tok, name); - - if (access(fullpath, X_OK | R_OK) == 0) { - free(path); - return strdup(fullpath); - } - - tok = strtok_r( NULL, ":", &sp ); - } - - free(path); - return NULL; -} - -#ifdef BUILD_WITH_MAIN -int main(int argc, char **argv) -{ - int i; - char *fullpath; - - for (i=1; i -#include "PTY.h" -#include "openpty.h" - -/* - * Class: org_eclipse_cdt_utils_pty_PTY - * Method: forkpty - * Signature: ()I - */ -JNIEXPORT jstring JNICALL -Java_org_eclipse_cdt_utils_pty_PTY_openMaster (JNIEnv *env, jobject jobj, jboolean console) { - jfieldID fid; /* Store the field ID */ - jstring jstr = NULL; - int master = -1; - char line[1024]; /* FIXME: Should be enough */ - jclass cls; - - line[0] = '\0'; - - master = ptym_open(line); - if (master >= 0) { - // turn off echo - if (console) { - set_noecho(master); - } - - /* Get a reference to the obj's class */ - cls = (*env)->GetObjectClass(env, jobj); - - /* Set the master fd. */ - fid = (*env)->GetFieldID(env, cls, "master", "I"); - if (fid == NULL) { - return NULL; - } - (*env)->SetIntField(env, jobj, fid, (jint)master); - - /* Create a new String for the slave. */ - jstr = (*env)->NewStringUTF(env, line); - } - return jstr; -} - -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_change_1window_1size - (JNIEnv *env, jobject jobj, jint fdm, jint width, jint height) -{ -#ifdef TIOCGWINSZ - struct winsize win; - - win.ws_col = width; - win.ws_row = height; - win.ws_xpixel = 0; - win.ws_ypixel = 0; - - return ioctl(fdm, TIOCSWINSZ, &win); -#else - return 0; -#endif -} - - diff --git a/core/org.eclipse.cdt.core.aix/library/ptyio.c b/core/org.eclipse.cdt.core.aix/library/ptyio.c deleted file mode 100644 index 88ae70f77cb..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/ptyio.c +++ /dev/null @@ -1,118 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2010 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -#include -#include -#include -#include -#include - -/* Header for class _org_eclipse_cdt_utils_pty_PTYInputStream */ -/* Header for class _org_eclipse_cdt_utils_pty_PTYOutputStream */ - -/* - * Class: org_eclipse_cdt_utils_pty_PTYInputStream - * Method: read0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_pty_PTYInputStream_read0(JNIEnv * env, - jobject jobj, - jint jfd, - jbyteArray buf, - jint buf_len) -{ - int fd; - int status; - jbyte *data; - int data_len; - - data = (*env)->GetByteArrayElements(env, buf, 0); - data_len = buf_len; - fd = jfd; - - status = read( fd, data, data_len ); - (*env)->ReleaseByteArrayElements(env, buf, data, 0); - - if (status == 0) { - /* EOF. */ - status = -1; - } else if (status == -1) { - /* Error, toss an exception */ - /* Ignore the error for now, the debugger will attempt - * to close this multiple time. */ -#if 0 - jclass exception = (*env)->FindClass(env, "java/io/IOException"); - if (exception == NULL) { - /* Give up. */ - return -1; - } - (*env)->ThrowNew(env, exception, "read error"); -#endif - } - - return status; -} - - -/* - * Class: org_eclipse_cdt_utils_pty_PTYInputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_pty_PTYInputStream_close0(JNIEnv * env, - jobject jobj, - jint fd) -{ - return close(fd); -} - -/* - * Class: org_eclipse_cdt_utils_pty_PTYOutputStream - * Method: write0 - * Signature: (II)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_pty_PTYOutputStream_write0(JNIEnv * env, - jobject jobj, - jint jfd, - jbyteArray buf, - jint buf_len) -{ - int status; - int fd; - jbyte *data; - int data_len; - - data = (*env)->GetByteArrayElements(env, buf, 0); - data_len = buf_len; - fd = jfd; - - status = write(fd, data, data_len); - (*env)->ReleaseByteArrayElements(env, buf, data, 0); - - return status; -} - - -/* - * Class: org_eclipse_cdt_utils_pty_PTYOutputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_pty_PTYOutputStream_close0(JNIEnv * env, - jobject jobj, - jint fd) -{ - return close(fd); -} diff --git a/core/org.eclipse.cdt.core.aix/library/spawner.c b/core/org.eclipse.cdt.core.aix/library/spawner.c deleted file mode 100644 index 710ae08e1de..00000000000 --- a/core/org.eclipse.cdt.core.aix/library/spawner.c +++ /dev/null @@ -1,303 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * QNX Software Systems - * IBM Corporation - port of 248071 - *******************************************************************************/ - -#include -#include -#include -#include -#include -#include - -#include "exec0.h" -#include - - -#define DEBUGIT 0 - - -/* - * Header for class org_eclipse_cdt_utils_spawner_Spawner - */ - - -#if DEBUGIT -static void print_array(char **c_array) -{ - if (c_array) { - char **p = c_array; - for (; *p; p++) { - if (*p) { - fprintf(stderr, " %s", *p); - } - } - } else { - fprintf(stderr, "null"); - } - fprintf(stderr, "\n"); -} -#endif - - -static char **alloc_c_array(JNIEnv * env, jobjectArray j_array) -{ - int i; - jint c_array_size = (*env)->GetArrayLength(env, j_array); - char **c_array = calloc(c_array_size + 1, sizeof(*c_array)); - - if (c_array == NULL) - return NULL; - - for (i = 0; i < c_array_size; i++) { - jstring j_str = - (jstring) (*env)->GetObjectArrayElement(env, j_array, i); - const char *c_str = (*env)->GetStringUTFChars(env, j_str, NULL); - c_array[i] = (char *) strdup(c_str); - (*env)->ReleaseStringUTFChars(env, j_str, c_str); - (*env)->DeleteLocalRef(env, j_str); - } - - return c_array; -} - - -static void free_c_array(char **c_array) -{ - if (c_array) { - char **p = c_array; - for (; *p; p++) { - if (*p) { - free(*p); - } - } - free(c_array); - } -} - - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: exec2 - * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[ILorg/eclipse/cdt/utils/pty/PTY;)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec2 - (JNIEnv *env, jobject jobj, jobjectArray jcmd, jobjectArray jenv, jstring jdir, jintArray jchannels, - jstring jslaveName, jint masterFD, jboolean console) -{ - jint *channels = (*env)->GetIntArrayElements(env, jchannels, 0); - const char *dirpath = (*env)->GetStringUTFChars(env, jdir, NULL); - const char *pts_name = (*env)->GetStringUTFChars(env, jslaveName, NULL); - char **cmd = NULL; - char **envp = NULL; - int fd[3]; - pid_t pid = -1; - - if (channels == NULL) - goto bail_out; - - cmd = alloc_c_array(env, jcmd); - if (cmd == NULL) - goto bail_out; - - envp = alloc_c_array(env, jenv); - if (envp == NULL) - goto bail_out; - -#if DEBUGIT - fprintf(stderr, "command:"); - print_array(cmd); - fprintf(stderr, "Envp:"); - print_array(envp); - fprintf(stderr, "dirpath: %s\n", dirpath); - fprintf(stderr, "pts_name: %s\n", pts_name); -#endif - - pid = exec_pty(cmd[0], cmd, envp, dirpath, fd, pts_name, masterFD, console); - if (pid < 0) - goto bail_out; - - channels[0] = fd[0]; - channels[1] = fd[1]; - channels[2] = fd[2]; - - bail_out: - (*env)->ReleaseIntArrayElements(env, jchannels, channels, 0); - (*env)->ReleaseStringUTFChars(env, jdir, dirpath); - (*env)->ReleaseStringUTFChars(env, jslaveName, pts_name); - if (cmd) - free_c_array(cmd); - if (envp) - free_c_array(envp); - return pid; -} - - -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_Spawner_exec1(JNIEnv * env, jobject jobj, - jobjectArray jcmd, - jobjectArray jenv, - jstring jdir) -{ - const char *dirpath = (*env)->GetStringUTFChars(env, jdir, NULL); - char **cmd = NULL; - char **envp = NULL; - pid_t pid = -1; - - cmd = alloc_c_array(env, jcmd); - if (cmd == NULL) - goto bail_out; - - envp = alloc_c_array(env, jenv); - if (envp == NULL) - goto bail_out; - -#if DEBUGIT - fprintf(stderr, "command:"); - print_array(cmd); - fprintf(stderr, "Envp:"); - print_array(envp); - fprintf(stderr, "dirpath: %s\n", dirpath); -#endif - - pid = exec0(cmd[0], cmd, envp, dirpath, NULL); - if (pid < 0) - goto bail_out; - - bail_out: - (*env)->ReleaseStringUTFChars(env, jdir, dirpath); - if (cmd) - free_c_array(cmd); - if (envp) - free_c_array(envp); - return pid; -} - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: exec0 - * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_Spawner_exec0(JNIEnv * env, jobject jobj, - jobjectArray jcmd, - jobjectArray jenv, - jstring jdir, - jintArray jchannels) -{ - jint *channels = (*env)->GetIntArrayElements(env, jchannels, 0); - const char *dirpath = (*env)->GetStringUTFChars(env, jdir, NULL); - char **cmd = NULL; - char **envp = NULL; - int fd[3]; - pid_t pid = -1; - - if (channels == NULL) - goto bail_out; - - cmd = alloc_c_array(env, jcmd); - if (cmd == NULL) - goto bail_out; - - envp = alloc_c_array(env, jenv); - if (envp == NULL) - goto bail_out; - -#if DEBUGIT - fprintf(stderr, "command:"); - print_array(cmd); - fprintf(stderr, "Envp:"); - print_array(envp); - fprintf(stderr, "dirpath: %s\n", dirpath); -#endif - - pid = exec0(cmd[0], cmd, envp, dirpath, fd); - if (pid < 0) - goto bail_out; - - channels[0] = fd[0]; - channels[1] = fd[1]; - channels[2] = fd[2]; - - bail_out: - (*env)->ReleaseIntArrayElements(env, jchannels, channels, 0); - (*env)->ReleaseStringUTFChars(env, jdir, dirpath); - if (cmd) - free_c_array(cmd); - if (envp) - free_c_array(envp); - return pid; -} - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: raise - * Signature: (II)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_Spawner_raise(JNIEnv * env, jobject jobj, - jint pid, jint sig) -{ - int status = -1; - - switch (sig) { - case 0: /* NOOP */ - status = killpg(pid, 0); - if(status == -1) { - status = kill(pid, 0); - } - break; - - case 2: /* INTERRUPT */ - status = killpg(pid, SIGINT); - if(status == -1) { - status = kill(pid, SIGINT); - } - break; - - case 9: /* KILL */ - status = killpg(pid, SIGKILL); - if(status == -1) { - status = kill(pid, SIGKILL); - } - break; - - case 15: /* TERM */ - status = killpg(pid, SIGTERM); - if(status == -1) { - status = kill(pid, SIGTERM); - } - break; - - default: - status = killpg(pid, sig); /* WHAT ?? */ - if(status == -1) { - status = kill(pid, sig); /* WHAT ?? */ - } - break; - } - - return status; -} - - - -/* - * Class: org_eclipse_cdt_utils_spawner_Spawner - * Method: waitFor - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_eclipse_cdt_utils_spawner_Spawner_waitFor(JNIEnv * env, - jobject jobj, jint pid) -{ - return wait0(pid); -} diff --git a/core/org.eclipse.cdt.core.aix/os/aix/ppc/libpty.so b/core/org.eclipse.cdt.core.aix/os/aix/ppc/libpty.so deleted file mode 100644 index 8caa860f81baa005f9f168d3e0f3da7395b24287..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12345 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 - - 4.0.0 - - - org.eclipse.cdt - cdt-parent - 9.3.0-SNAPSHOT - ../../pom.xml - - - 5.4.0-SNAPSHOT - org.eclipse.cdt.core.aix - eclipse-plugin - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - p2 - consider - - - aix - gtk - ppc - - - - - - - - diff --git a/core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessInfo.java b/core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessInfo.java deleted file mode 100644 index 275c363d42f..00000000000 --- a/core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessInfo.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.core.aix; - -import org.eclipse.cdt.core.IProcessInfo; - -/** - * @author alain - * - * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. - * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. - */ -public class ProcessInfo implements IProcessInfo { - - int pid; - String name; - - public ProcessInfo(String pidString, String name) { - try { - pid = Integer.parseInt(pidString); - } catch (NumberFormatException e) { - } - this.name = name; - } - - public ProcessInfo(int pid, String name) { - this.pid = pid; - this.name = name; - } - - /** - * @see org.eclipse.cdt.core.IProcessInfo#getName() - */ - public String getName() { - return name; - } - - /** - * @see org.eclipse.cdt.core.IProcessInfo#getPid() - */ - public int getPid() { - return pid; - } - -} diff --git a/core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessList.java b/core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessList.java deleted file mode 100644 index 7c52fc63b02..00000000000 --- a/core/org.eclipse.cdt.core.aix/src/org/eclipse/cdt/internal/core/aix/ProcessList.java +++ /dev/null @@ -1,89 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2016 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.core.aix; - -import java.io.File; -import java.io.FileReader; -import java.io.FilenameFilter; -import java.io.IOException; - -import org.eclipse.cdt.core.IProcessInfo; -import org.eclipse.cdt.core.IProcessList; - -/** - * Insert the type's description here. - * @see IProcessList - */ -public class ProcessList implements IProcessList { - - ProcessInfo[] empty = new ProcessInfo[0]; - - public ProcessList() { - } - - /** - * Insert the method's description here. - * @see IProcessList#getProcessList - */ - public IProcessInfo [] getProcessList() { - File proc = new File("/proc"); //$NON-NLS-1$ - File[] pidFiles = null; - - // We are only interrested in the pid so filter the rest out. - try { - FilenameFilter filter = new FilenameFilter() { - public boolean accept(File dir, String name) { - boolean isPID = false; - try { - Integer.parseInt(name); - isPID = true; - } catch (NumberFormatException e) { - } - return isPID; - } - }; - pidFiles = proc.listFiles(filter); - } catch (SecurityException e) { - } - - ProcessInfo[] processInfo = empty; - if (pidFiles != null) { - processInfo = new ProcessInfo[pidFiles.length]; - for (int i = 0; i < pidFiles.length; i++) { - File cmdLine = new File(pidFiles[i], "cmdline"); //$NON-NLS-1$ - StringBuilder line = new StringBuilder(); - FileReader reader = null; - try { - reader = new FileReader(cmdLine); - int c; - while ((c = reader.read()) > 0) { - line.append((char)c); - } - } catch (IOException e) { - } finally { - try { - if (reader != null) - reader.close(); - } catch (IOException e) {/* Don't care */} - reader = null; - } - String name = line.toString(); - if (name.length() == 0) { - name = "Unknown"; //$NON-NLS-1$ - } - processInfo[i] = new ProcessInfo(pidFiles[i].getName(), name); - } - } else { - pidFiles = new File[0]; - } - return processInfo; - } -} diff --git a/core/org.eclipse.cdt.core.native/plugin.properties b/core/org.eclipse.cdt.core.native/plugin.properties index 6cf9c1205a8..8719363540a 100755 --- a/core/org.eclipse.cdt.core.native/plugin.properties +++ b/core/org.eclipse.cdt.core.native/plugin.properties @@ -13,16 +13,12 @@ pluginName=C/C++ Development Tools Core Native Utilities providerName=Eclipse CDT -fragmentName.aix = C/C++ Development Tools Core Native Utilities for AIX fragmentName.linux = C/C++ Development Tools Core Native Utilities for Linux -fragmentName.linux.ia64 = C/C++ Development Tools Core Native Utilities for Linux (ia64) fragmentName.linux.ppc = C/C++ Development Tools Core Native Utilities for Linux (ppc) fragmentName.linux.ppc64 = C/C++ Development Tools Core Native Utilities for Linux (ppc64) fragmentName.linux.ppc64le = C/C++ Development Tools Core Native Utilities for Linux (ppc64le) fragmentName.linux.x86 = C/C++ Development Tools Core Native Utilities for Linux (x86) fragmentName.linux.x86_64 = C/C++ Development Tools Core Native Utilities for Linux (x86_64) -fragmentName.qnx = C/C++ Development Tools Core Native Utilities for QNX -fragmentName.solaris = C/C++ Development Tools Core Native Utilities for Solaris fragmentName.win32 = C/C++ Development Tools Core Native Utilities for Windows fragmentName.win32.x86 = C/C++ Development Tools Core Native Utilities for Windows (x86) fragmentName.win32.x86_64 = C/C++ Development Tools Core Native Utilities for Windows (x86_64) diff --git a/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch b/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch index b7fd35dedfd..b56608c8092 100644 --- a/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch +++ b/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch @@ -2,7 +2,7 @@ - + @@ -10,9 +10,8 @@ - - - + + @@ -33,8 +32,6 @@ - - diff --git a/pom.xml b/pom.xml index 294f454dbd9..664ed687b96 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,6 @@ core/org.eclipse.cdt.core.win32.x86 core/org.eclipse.cdt.core.win32.x86_64 core/org.eclipse.cdt.core.macosx - core/org.eclipse.cdt.core.aix native/org.eclipse.cdt.native.serial releng/org.eclipse.cdt.native-feature @@ -401,11 +400,6 @@ cocoa x86_64 - - aix - gtk - ppc - linux gtk @@ -464,11 +458,6 @@ cocoa x86_64 - - aix - gtk - ppc - diff --git a/releng/org.eclipse.cdt.native-feature/feature.xml b/releng/org.eclipse.cdt.native-feature/feature.xml index 7dec8b79555..ee74a9f5be9 100644 --- a/releng/org.eclipse.cdt.native-feature/feature.xml +++ b/releng/org.eclipse.cdt.native-feature/feature.xml @@ -26,15 +26,6 @@ version="0.0.0" unpack="false"/> - -