Attachment #97566 for bug #226462

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 12-18 Link Here

(-)fragments/org.eclipse.core.net.linux.x86/build.properties (-1 / +1 lines)
12	.,\	12	.,\
13	META-INF/,\	13	META-INF/,\
14	about.html,\	14	about.html,\
15	libproxysupport.so,\	15	libproxyenv.so,\
16	bin/	16	bin/
17	src.includes = about.html	17	src.includes = about.html
18	generateSourceBundle=false	18	generateSourceBundle=false

Lines 42-50 Link Here

(-)src/org/eclipse/core/internal/net/AbstractProxyProvider.java (-2 / +2 lines)
42	return getProxyData(uri);	42	return getProxyData(uri);
43	}	43	}
44		44
45	protected abstract IProxyData[] getProxyData(URI uri);	45	public abstract IProxyData[] getProxyData(URI uri);
46		46
47	protected String[] getNonProxiedHosts() {	47	public String[] getNonProxiedHosts() {
48	return new String[] {};	48	return new String[] {};
49	}	49	}
50	}	50	}

Lines 7-12 Link Here

(-)src/org/eclipse/core/internal/net/ProxyData.java (+14 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Oakland Software Incorporated (Francis Upton) francisu@ieee.org
		11	* Bug 228739 - add UI support to show actual system config
10	*******************************************************************************/	12	*******************************************************************************/
11	package org.eclipse.core.internal.net;	13	package org.eclipse.core.internal.net;
12		14
Lines 15-20 Link Here
15	public class ProxyData implements IProxyData {	17	public class ProxyData implements IProxyData {
16		18
17	private String type;	19	private String type;
		20	private String source;
18	private String host;	21	private String host;
19	private int port;	22	private int port;
20	private String user;	23	private String user;
Lines 48-53 Link Here
48	return type;	51	return type;
49	}	52	}
50		53
		54	public String getSource() {
		55	return source;
		56	}
		57
51	public String getUserId() {	58	public String getUserId() {
52	return user;	59	return user;
53	}	60	}
Lines 71-81 Link Here
71	requiresAuthentication = userid != null;	78	requiresAuthentication = userid != null;
72	}	79	}
73		80
		81	public void setSource(String source) {
		82	this.source = source;
		83	}
		84
74	public boolean isRequiresAuthentication() {	85	public boolean isRequiresAuthentication() {
75	return requiresAuthentication;	86	return requiresAuthentication;
76	}	87	}
77		88
78	public void disable() {	89	public void disable() {
		90	source = null;
79	host = null;	91	host = null;
80	port = -1;	92	port = -1;
81	user = null;	93	user = null;
Lines 85-90 Link Here
85		97
86	public String toString() {	98	public String toString() {
87	StringBuffer stringBuffer = new StringBuffer();	99	StringBuffer stringBuffer = new StringBuffer();
		100	stringBuffer.append("source: "); //$NON-NLS-1$
		101	stringBuffer.append(type);
88	stringBuffer.append("type: "); //$NON-NLS-1$	102	stringBuffer.append("type: "); //$NON-NLS-1$
89	stringBuffer.append(type);	103	stringBuffer.append(type);
90	stringBuffer.append(" host: "); //$NON-NLS-1$	104	stringBuffer.append(" host: "); //$NON-NLS-1$

Lines 11-16 Link Here

(-)src/org/eclipse/core/internal/net/Activator.java (+5 lines)
11	* -------- -------- -----------------------------------------------------------	11	* -------- -------- -----------------------------------------------------------
12	* 20070119 161112 makandre@ca.ibm.com - Andrew Mak, WSE: can't find business thru a proxy server that needs basic auth	12	* 20070119 161112 makandre@ca.ibm.com - Andrew Mak, WSE: can't find business thru a proxy server that needs basic auth
13	* 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base.	13	* 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base.
		14	* 20080424 226462 francisu@ieee.org - Francis Upton (Oakland Software Incorporated)
14	*******************************************************************************/	15	*******************************************************************************/
15		16
16	package org.eclipse.core.internal.net;	17	package org.eclipse.core.internal.net;
Lines 85-90 Link Here
85	getInstance().log(new Status(IStatus.INFO, ID, 0, message, exc));	86	getInstance().log(new Status(IStatus.INFO, ID, 0, message, exc));
86	}	87	}
87		88
		89	public static void logWarning(String message, Throwable exc) {
		90	getInstance().log(new Status(IStatus.WARNING, ID, 0, message, exc));
		91	}
		92
88	/*	93	/*
89	* Log the given status to the log file. If the log is not available, log	94	* Log the given status to the log file. If the log is not available, log
90	* the status to the console.	95	* the status to the console.

Lines 27-34 Link Here

(-)src/org/eclipse/core/internal/net/WindowsProxyProvider.java (-2 / +6 lines)
27	winHttpProxyProvider = new WinHttpProxyProvider();	27	winHttpProxyProvider = new WinHttpProxyProvider();
28	}	28	}
29		29
30	protected IProxyData[] getProxyData(URI uri) {	30	public IProxyData[] getProxyData(URI uri) {
31	return winHttpProxyProvider.getProxyData(uri);	31	IProxyData[] pd = winHttpProxyProvider.getProxyData(uri);
		32	// TODO - the provider might want to set a better source
		33	for (int i = 0; i < pd.length; i++)
		34	((ProxyData) pd[i]).setSource("Windows"); //$NON-NLS-1$
		35	return pd;
32	}	36	}
33		37
34	}	38	}




/*
 * Copyright 2008 Oakland Software Incorporated 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:
 *     Oakland Software Incorporated - initial API and implementation
 */

#include <jni.h>

#include <glib.h>
#include <glib/gslist.h>
#include <gconf/gconf-value.h>
#include <gconf/gconf-client.h>

#ifdef __linux__
#include <string.h>
#else
#include <strings.h>
#endif

static GConfClient *client= NULL;

static jclass proxyInfoClass;
static jclass stringClass;
static jmethodID proxyInfoConstructor;
static jmethodID toString;

static jmethodID hostMethod;
static jmethodID portMethod;
static jmethodID requiresAuthenticationMethod;
static jmethodID userMethod;
static jmethodID passwordMethod;

#define CHECK_NULL(X) { if ((X) == NULL) fprintf (stderr,"JNI error at line %d\n", __LINE__); } 

static void gconfInit(JNIEnv *env) {
	client = gconf_client_get_default();
	jclass cls= NULL;
	CHECK_NULL(cls = (*env)->FindClass(env, "org/eclipse/core/internal/net/ProxyData"));
	proxyInfoClass = (*env)->NewGlobalRef(env, cls);

	CHECK_NULL(cls = (*env)->FindClass(env, "java/lang/String"));
	stringClass = (*env)->NewGlobalRef(env, cls);

	CHECK_NULL(proxyInfoConstructor = (*env)->GetMethodID(env, proxyInfoClass, "<init>", "(Ljava/lang/String;)V"));

	CHECK_NULL(toString = (*env)->GetMethodID(env, proxyInfoClass, "toString", "()Ljava/lang/String;"));

	CHECK_NULL(hostMethod = (*env)->GetMethodID(env, proxyInfoClass, "setHost",
					"(Ljava/lang/String;)V"));
	CHECK_NULL(portMethod = (*env)->GetMethodID(env, proxyInfoClass, "setPort",
					"(I)V"));
	CHECK_NULL(requiresAuthenticationMethod= (*env)->GetMethodID(env, proxyInfoClass, "setRequiresAuthentication",
					"(Z)V"));
	CHECK_NULL(userMethod = (*env)->GetMethodID(env, proxyInfoClass, "setUserid",
					"(Ljava/lang/String;)V"));
	CHECK_NULL(passwordMethod = (*env)->GetMethodID(env, proxyInfoClass, "setPassword",
					"(Ljava/lang/String;)V"));
}

/*
 * Class:     org_eclipse_core_internal_net_UnixProxyProvider
 * Method:    getGConfProxyInfo
 * Signature: ([Ljava/lang/String);
 */
JNIEXPORT jobject JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getGConfProxyInfo(
		JNIEnv *env, jclass clazz, jstring protocol) {

	jboolean isCopy;
	const char *cprotocol;

	jobject proxyInfo= NULL;

	if (client == NULL) {
		gconfInit(env);
	}

	CHECK_NULL(proxyInfo = (*env)->NewObject(env, proxyInfoClass, proxyInfoConstructor, protocol));

	cprotocol = (*env)->GetStringUTFChars(env, protocol, &isCopy);
	if (cprotocol == NULL)
		return NULL;

	//printf("cprotocol: %s\n", cprotocol);

	if (strcasecmp(cprotocol, "http") == 0) {
		gboolean useProxy = gconf_client_get_bool(client,
				"/system/http_proxy/use_http_proxy", NULL);
		if (!useProxy) {
			proxyInfo = NULL;
			goto exit;
		}

		gchar *host = gconf_client_get_string(client,
				"/system/http_proxy/host", NULL);
		jobject jhost = (*env)->NewStringUTF(env, host);
		(*env)->CallVoidMethod(env, proxyInfo, hostMethod, jhost);

		gint port = gconf_client_get_int(client, "/system/http_proxy/port",
				NULL);
		(*env)->CallVoidMethod(env, proxyInfo, portMethod, port);

		gboolean reqAuth = gconf_client_get_bool(client,
				"/system/http_proxy/use_authentication", NULL);
		(*env)->CallVoidMethod(env, proxyInfo,
				requiresAuthenticationMethod, reqAuth);
		if (reqAuth) {

			gchar *user = gconf_client_get_string(client,
					"/system/http_proxy/authentication_user", NULL);
			jobject juser = (*env)->NewStringUTF(env, user);
			(*env)->CallVoidMethod(env, proxyInfo, userMethod, juser);

			gchar *password = gconf_client_get_string(client,
					"/system/http_proxy/authentication_password", NULL);
			jobject jpassword = (*env)->NewStringUTF(env, password);
			(*env)->CallVoidMethod(env, proxyInfo, passwordMethod,
					jpassword);
		}
		goto exit;
	}

	// Everything else applies only if the system proxy mode is manual
	gchar *mode = gconf_client_get_string(client, "/system/proxy/mode", NULL);
	if (strcasecmp(mode, "manual") != 0) {
		proxyInfo = NULL;
		goto exit;
	}

	char selector[100];

	if (strcasecmp(cprotocol, "https") == 0) {
		strcpy(selector, "/system/proxy/secure_");
	} else if (strcasecmp(cprotocol, "socks") == 0) {
		strcpy(selector, "/system/proxy/socks_");
	} else if (strcasecmp(cprotocol, "ftp") == 0) {
		strcpy(selector, "/system/proxy/ftp_");
	} else {
		proxyInfo = NULL;
		goto exit;
	}

	char useSelector[100];
	strcpy(useSelector, selector);

	gchar *host = gconf_client_get_string(client, strcat(useSelector, "host"),
			NULL);
	jobject jhost = (*env)->NewStringUTF(env, host);
	(*env)->CallVoidMethod(env, proxyInfo, hostMethod, jhost);

	strcpy(useSelector, selector);
	gint port = gconf_client_get_int(client, strcat(useSelector, "port"), NULL);
	(*env)->CallVoidMethod(env, proxyInfo, portMethod, port);

	exit: if (isCopy == JNI_TRUE)
		(*env)->ReleaseStringUTFChars(env, protocol, cprotocol);
	return proxyInfo;
}

typedef struct {
	jobjectArray npHostArray;
	JNIEnv *env;
	int index;
} ListProcContext;

// user_data is the ListProcContext
void listProc(gpointer data, gpointer user_data) {
	ListProcContext *lpc = user_data;
	jobject jnpHost = (*lpc->env)->NewStringUTF(lpc->env, (char *)data);
	(*lpc->env)->SetObjectArrayElement(lpc->env, lpc->npHostArray,
			lpc->index++, jnpHost);
}

/*
 * Class:     org_eclipse_core_internal_net_UnixProxyProvider
 * Method:    getGConfNonProxyHosts
 * Signature: ()[Ljava/lang/String;
 */
JNIEXPORT jobjectArray JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getGConfNonProxyHosts(
		JNIEnv *env, jclass clazz) {

	if (client == NULL) {
		gconfInit(env);
	}

	GSList *npHosts;
	int size;

	npHosts = gconf_client_get_list(client, "/system/http_proxy/ignore_hosts",
			GCONF_VALUE_STRING, NULL);
	size = g_slist_length(npHosts);

	// TODO - I'm not sure this is really valid, it's from the JVM implementation
	// of ProxySelector
	if (size == 0) {
		npHosts = gconf_client_get_list(client, "/system/proxy/no_proxy_for",
				GCONF_VALUE_STRING, NULL);
	}
	size = g_slist_length(npHosts);

	jobjectArray ret = (*env)->NewObjectArray(env, size, stringClass, NULL);

	ListProcContext lpc;
	lpc.env = env;
	lpc.npHostArray = ret;
	lpc.index = 0;

	g_slist_foreach(npHosts, listProc, &lpc);
	return ret;
}

/*
 * Class:     org_eclipse_core_internal_net_UnixProxyProvider
 * Method:    getKdeProxyInfo
 * Signature: ([Ljava/lang/String);
 */
JNIEXPORT jobject JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getKdeProxyInfo(
		JNIEnv *env, jclass clazz, jstring protocol) {
	//printf("getKdeProxyInfo - not implemented\n");
	return NULL;
}

/*
 * Class:     org_eclipse_core_internal_net_UnixProxyProvider
 * Method:    getKdeNonProxyHosts
 * Signature: ()Ljava/lang/String;
 */
JNIEXPORT jobject JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getKdeNonProxyHosts(
		JNIEnv *env, jclass clazz) {
	//printf("getKdeNonProxyHosts - not implemented\n");
	return NULL;
}


Removed Link Here

(-)natives/unix/Debug/sources.mk (-17 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	O_SRCS :=
6	C_SRCS :=
7	S_SRCS :=
8	OBJ_SRCS :=
9	ASM_SRCS :=
10	OBJS :=
11	C_DEPS :=
12	LIBRARIES :=
13
14	# Every subdirectory with source files must be described here
15	SUBDIRS := \
16	. \
17

Removed Link Here

(-)natives/unix/Debug/objects.mk (-7 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	USER_OBJS :=
6
7	LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0




################################################################################
# Automatically-generated file. Do not edit!
################################################################################

# Add inputs and outputs from these tool invocations to the build variables 
C_SRCS += \
../getsystemproxy.c 

OBJS += \
./getsystemproxy.o 

C_DEPS += \
./getsystemproxy.d 


# Each subdirectory must supply rules for building sources it contributes
%.o: ../%.c
	@echo 'Building file: $<'
	@echo 'Invoking: GCC C Compiler'
	gcc -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/ -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
	@echo 'Finished building: $<'
	@echo ' '






################################################################################
# Automatically-generated file. Do not edit!
################################################################################

-include ../makefile.init

RM := rm -rf

# All of the sources participating in the build are defined here
-include sources.mk
-include subdir.mk
-include objects.mk

ifneq ($(MAKECMDGOALS),clean)
ifneq ($(strip $(C_DEPS)),)
-include $(C_DEPS)
endif
endif

-include ../makefile.defs

# Add inputs and outputs from these tool invocations to the build variables 

# All Target
all: libproxysupport.so

# Tool invocations
libproxysupport.so: $(OBJS) $(USER_OBJS)
	@echo 'Building target: $@'
	@echo 'Invoking: GCC C Linker'
	gcc -m32 -shared -o"libproxysupport.so" $(OBJS) $(USER_OBJS) $(LIBS)
	@echo 'Finished building target: $@'
	@echo ' '

# Other Targets
clean:
	-$(RM) $(OBJS)$(C_DEPS)$(LIBRARIES) libproxysupport.so
	-@echo ' '

.PHONY: all clean dependents
.SECONDARY:

-include ../makefile.targets




getsystemproxy.d getsystemproxy.o: ../getsystemproxy.c \
  /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
  /usr/include/glib-2.0/glib/gtypes.h \
  /usr/lib/glib-2.0/include/glibconfig.h \
  /usr/include/glib-2.0/glib/gmacros.h \
  /usr/include/glib-2.0/glib/garray.h \
  /usr/include/glib-2.0/glib/gasyncqueue.h \
  /usr/include/glib-2.0/glib/gthread.h \
  /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
  /usr/include/glib-2.0/glib/gutils.h \
  /usr/include/glib-2.0/glib/gatomic.h \
  /usr/include/glib-2.0/glib/gbacktrace.h \
  /usr/include/glib-2.0/glib/gbase64.h \
  /usr/include/glib-2.0/glib/gbookmarkfile.h \
  /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
  /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
  /usr/include/glib-2.0/glib/gcompletion.h \
  /usr/include/glib-2.0/glib/gconvert.h \
  /usr/include/glib-2.0/glib/gdataset.h \
  /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
  /usr/include/glib-2.0/glib/gfileutils.h \
  /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
  /usr/include/glib-2.0/glib/giochannel.h \
  /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gslist.h \
  /usr/include/glib-2.0/glib/gstring.h \
  /usr/include/glib-2.0/glib/gunicode.h \
  /usr/include/glib-2.0/glib/gkeyfile.h \
  /usr/include/glib-2.0/glib/gmappedfile.h \
  /usr/include/glib-2.0/glib/gmarkup.h \
  /usr/include/glib-2.0/glib/gmessages.h \
  /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
  /usr/include/glib-2.0/glib/gpattern.h \
  /usr/include/glib-2.0/glib/gprimes.h \
  /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
  /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
  /usr/include/glib-2.0/glib/gregex.h \
  /usr/include/glib-2.0/glib/gscanner.h \
  /usr/include/glib-2.0/glib/gsequence.h \
  /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
  /usr/include/glib-2.0/glib/gstrfuncs.h \
  /usr/include/glib-2.0/glib/gthreadpool.h \
  /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
  /usr/include/gconf/2/gconf/gconf-value.h \
  /usr/include/gconf/2/gconf/gconf-error.h \
  /usr/include/gconf/2/gconf/gconf-client.h \
  /usr/include/glib-2.0/glib-object.h \
  /usr/include/glib-2.0/gobject/gboxed.h \
  /usr/include/glib-2.0/gobject/gtype.h \
  /usr/include/glib-2.0/gobject/genums.h \
  /usr/include/glib-2.0/gobject/gobject.h \
  /usr/include/glib-2.0/gobject/gvalue.h \
  /usr/include/glib-2.0/gobject/gparam.h \
  /usr/include/glib-2.0/gobject/gclosure.h \
  /usr/include/glib-2.0/gobject/gsignal.h \
  /usr/include/glib-2.0/gobject/gmarshal.h \
  /usr/include/glib-2.0/gobject/gparamspecs.h \
  /usr/include/glib-2.0/gobject/gsourceclosure.h \
  /usr/include/glib-2.0/gobject/gtypemodule.h \
  /usr/include/glib-2.0/gobject/gtypeplugin.h \
  /usr/include/glib-2.0/gobject/gvaluearray.h \
  /usr/include/glib-2.0/gobject/gvaluetypes.h \
  /usr/include/gconf/2/gconf/gconf.h \
  /usr/include/gconf/2/gconf/gconf-schema.h \
  /usr/include/gconf/2/gconf/gconf-engine.h \
  /usr/include/gconf/2/gconf/gconf-error.h \
  /usr/include/gconf/2/gconf/gconf-enum-types.h \
  /usr/include/gconf/2/gconf/gconf-listeners.h \
  /usr/include/gconf/2/gconf/gconf-changeset.h

/usr/include/glib-2.0/glib.h:

/usr/include/glib-2.0/glib/galloca.h:

/usr/include/glib-2.0/glib/gtypes.h:

/usr/lib/glib-2.0/include/glibconfig.h:

/usr/include/glib-2.0/glib/gmacros.h:

/usr/include/glib-2.0/glib/garray.h:

/usr/include/glib-2.0/glib/gasyncqueue.h:

/usr/include/glib-2.0/glib/gthread.h:

/usr/include/glib-2.0/glib/gerror.h:

/usr/include/glib-2.0/glib/gquark.h:

/usr/include/glib-2.0/glib/gutils.h:

/usr/include/glib-2.0/glib/gatomic.h:

/usr/include/glib-2.0/glib/gbacktrace.h:

/usr/include/glib-2.0/glib/gbase64.h:

/usr/include/glib-2.0/glib/gbookmarkfile.h:

/usr/include/glib-2.0/glib/gcache.h:

/usr/include/glib-2.0/glib/glist.h:

/usr/include/glib-2.0/glib/gmem.h:

/usr/include/glib-2.0/glib/gslice.h:

/usr/include/glib-2.0/glib/gcompletion.h:

/usr/include/glib-2.0/glib/gconvert.h:

/usr/include/glib-2.0/glib/gdataset.h:

/usr/include/glib-2.0/glib/gdate.h:

/usr/include/glib-2.0/glib/gdir.h:

/usr/include/glib-2.0/glib/gfileutils.h:

/usr/include/glib-2.0/glib/ghash.h:

/usr/include/glib-2.0/glib/ghook.h:

/usr/include/glib-2.0/glib/giochannel.h:

/usr/include/glib-2.0/glib/gmain.h:

/usr/include/glib-2.0/glib/gslist.h:

/usr/include/glib-2.0/glib/gstring.h:

/usr/include/glib-2.0/glib/gunicode.h:

/usr/include/glib-2.0/glib/gkeyfile.h:

/usr/include/glib-2.0/glib/gmappedfile.h:

/usr/include/glib-2.0/glib/gmarkup.h:

/usr/include/glib-2.0/glib/gmessages.h:

/usr/include/glib-2.0/glib/gnode.h:

/usr/include/glib-2.0/glib/goption.h:

/usr/include/glib-2.0/glib/gpattern.h:

/usr/include/glib-2.0/glib/gprimes.h:

/usr/include/glib-2.0/glib/gqsort.h:

/usr/include/glib-2.0/glib/gqueue.h:

/usr/include/glib-2.0/glib/grand.h:

/usr/include/glib-2.0/glib/grel.h:

/usr/include/glib-2.0/glib/gregex.h:

/usr/include/glib-2.0/glib/gscanner.h:

/usr/include/glib-2.0/glib/gsequence.h:

/usr/include/glib-2.0/glib/gshell.h:

/usr/include/glib-2.0/glib/gspawn.h:

/usr/include/glib-2.0/glib/gstrfuncs.h:

/usr/include/glib-2.0/glib/gthreadpool.h:

/usr/include/glib-2.0/glib/gtimer.h:

/usr/include/glib-2.0/glib/gtree.h:

/usr/include/gconf/2/gconf/gconf-value.h:

/usr/include/gconf/2/gconf/gconf-error.h:

/usr/include/gconf/2/gconf/gconf-client.h:

/usr/include/glib-2.0/glib-object.h:

/usr/include/glib-2.0/gobject/gboxed.h:

/usr/include/glib-2.0/gobject/gtype.h:

/usr/include/glib-2.0/gobject/genums.h:

/usr/include/glib-2.0/gobject/gobject.h:

/usr/include/glib-2.0/gobject/gvalue.h:

/usr/include/glib-2.0/gobject/gparam.h:

/usr/include/glib-2.0/gobject/gclosure.h:

/usr/include/glib-2.0/gobject/gsignal.h:

/usr/include/glib-2.0/gobject/gmarshal.h:

/usr/include/glib-2.0/gobject/gparamspecs.h:

/usr/include/glib-2.0/gobject/gsourceclosure.h:

/usr/include/glib-2.0/gobject/gtypemodule.h:

/usr/include/glib-2.0/gobject/gtypeplugin.h:

/usr/include/glib-2.0/gobject/gvaluearray.h:

/usr/include/glib-2.0/gobject/gvaluetypes.h:

/usr/include/gconf/2/gconf/gconf.h:

/usr/include/gconf/2/gconf/gconf-schema.h:

/usr/include/gconf/2/gconf/gconf-engine.h:

/usr/include/gconf/2/gconf/gconf-error.h:

/usr/include/gconf/2/gconf/gconf-enum-types.h:

/usr/include/gconf/2/gconf/gconf-listeners.h:

/usr/include/gconf/2/gconf/gconf-changeset.h:

Lines 12-18 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
12	org.eclipse.osgi;bundle-version="3.4.0",	12	org.eclipse.osgi;bundle-version="3.4.0",
13	org.eclipse.equinox.registry;bundle-version="3.4.0"	13	org.eclipse.equinox.registry;bundle-version="3.4.0"
14	Bundle-ActivationPolicy: lazy	14	Bundle-ActivationPolicy: lazy
15	Export-Package: org.eclipse.core.internal.net;x-internal:=true,	15	Export-Package: org.eclipse.core.internal.net;x-friends:="org.eclipse.ui.net",
		16	org.eclipse.core.internal.net.proxy.unix,
16	org.eclipse.core.net.proxy	17	org.eclipse.core.net.proxy
17	Bundle-RequiredExecutionEnvironment: J2SE-1.4,	18	Bundle-RequiredExecutionEnvironment: J2SE-1.4,
18	CDC-1.0/Foundation-1.0,	19	CDC-1.0/Foundation-1.0,




package org.eclipse.core.internal.net.proxy.unix;

import java.net.URI;
import java.util.Locale;

import org.eclipse.core.internal.net.AbstractProxyProvider;
import org.eclipse.core.internal.net.Activator;
import org.eclipse.core.internal.net.ProxyData;
import org.eclipse.core.net.proxy.IProxyData;

public class UnixProxyProvider extends AbstractProxyProvider {

	public static boolean _debug = false;

	static {

		// Load each of the libraries separately so that we get
		// whichever ones work
		try {
			System.loadLibrary("proxyenv"); //$NON-NLS-1$
			if (_debug)
				System.out.println("Loaded proxyenv"); //$NON-NLS-1$
		} catch (UnsatisfiedLinkError ex) {
			// This should never happen
			Activator.logError("Missing native code for getenv()", ex); //$NON-NLS-1$
		}

		try {
			System.loadLibrary("proxygnome"); //$NON-NLS-1$
			// Start it up on the main thread, it seems to hand sometimes
			// otherwise
			gconfInit();
			if (_debug)
				System.out.println("Loaded proxygnome"); //$NON-NLS-1$
		} catch (UnsatisfiedLinkError ex) {
			// Expected on systems that are missing Gnome libraries
			Activator.logInfo("Missing gconf (Gnome) libraries", ex); //$NON-NLS-1$
		}
	}


	public IProxyData[] getProxyData(URI uri) {
		String protocol = uri.getScheme();

		synchronized (getClass()) {

			ProxyData pd = getSystemProxyInfo(protocol);

			if (pd != null) {
				IProxyData[] pds = new IProxyData[1];
				pds[0] = pd;
				return pds;
			}

			return new IProxyData[0];
		}
	}

	protected String[] debugPrint(String[] strs) {
		if (_debug) {
			System.out.println("npHosts: "); //$NON-NLS-1$
			for (int i = 0; i < strs.length; i++)
				System.out.println(i + ": " + strs[i]); //$NON-NLS-1$
		}
		return strs;
	}

	public String[] getNonProxiedHosts() {
		String[] npHosts;

		synchronized (getClass()) {

			try {
				// First try the environment variable which is a URL
				String npEnv = null;
				npEnv = getEnv("no_proxy"); //$NON-NLS-1$
				if (npEnv != null) {
					if (_debug)
						System.out.println("got env no_proxy: " + npEnv); //$NON-NLS-1$
					npHosts = npEnv.split(","); //$NON-NLS-1$
					for (int i = 0; i < npHosts.length; i++)
						npHosts[i] = npHosts[i].trim();
					return debugPrint(npHosts);
				}
			} catch (UnsatisfiedLinkError ex) {
				// This has already been reported when the native code did not
				// load
			}

			try {
				npHosts = getGConfNonProxyHosts();
				if (npHosts != null && npHosts.length > 0) {
					if (_debug)
						System.out.println("got gnome no proxy"); //$NON-NLS-1$
					return debugPrint(npHosts);
				}
			} catch (UnsatisfiedLinkError ex) {
				// This has already been reported (the native code did not load)
			}

			return new String[] {};
		}
		return new String[] {};
	}

	// Returns null if something wrong or there is no proxy for the protocol
	protected ProxyData getSystemProxyInfo(String protocol) {
		ProxyData pd = null;

		String envName = null;
		String proxyEnv = null;
		URI uri = null;
		String sysHttp = null;
		// System.getenv(protocol.toLowerCase() + "_proxy"); //$NON-NLS-1$
		if (sysHttp != null) {
			URI uri = null;
			try {
				uri = new URI(sysHttp);
			} catch (URISyntaxException e) {
				return null;
			}

		try {
			if (_debug)
				System.out.println("getting ProxyData for: " + protocol); //$NON-NLS-1$

			// protocol schemes are ISO 8859 (ASCII)
			protocol = protocol.toLowerCase(Locale.ENGLISH);

			// First try the environment variable which is a URL
			proxyEnv = null;
			envName = protocol + "_proxy"; //$NON-NLS-1$
			proxyEnv = getEnv(envName);
			if (_debug)
				System.out.println("got proxyEnv: " + proxyEnv); //$NON-NLS-1$
			if (proxyEnv != null) {
				uri = new URI(proxyEnv);
				pd = new ProxyData(protocol);
				pd.setSource("Environment Variable (getenv)- " + envName); //$NON-NLS-1$
				pd.setHost(uri.getHost());
				pd.setPort(uri.getPort());
				String userInfo = uri.getUserInfo();
				if (userInfo != null) {
					String user = null;
					String password = null;
					int pwInd = userInfo.indexOf(':');
					if (pwInd >= 0) {
						user = userInfo.substring(0, pwInd);
						password = userInfo.substring(pwInd + 1);
					} else {
						user = userInfo;
					}
					pd.setUserid(user);
					pd.setPassword(password);
				}

				if (_debug)
					System.out.println("env proxy data: " + pd); //$NON-NLS-1$
				return pd;
			}
		} catch (UnsatisfiedLinkError ex) {
			// This has already been reported when the native code did not
			// load
		} catch (Exception ex) {
			Activator
					.logWarning(
							"Problem getting proxy from environment: " + envName + " value: " + proxyEnv + " URI: " + uri, ex); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
			// This has already been reported when the native code did not
			// load
		}

		try {
			// Then ask Gnome
			pd = getGConfProxyInfo(protocol);
			if (_debug)
				System.out.println("Gnome proxy data: " + pd); //$NON-NLS-1$
			if (pd != null) {
				pd.setSource("Gnome"); //$NON-NLS-1$
				return pd;
			}

			// Then ask KDE
			pd = getKdeProxyInfo(protocol);
			if (pd != null)
				return pd;
		} catch (UnsatisfiedLinkError ex) {
			// This has already been reported when the native code did not
			// load
		}

		return null;
	}

	protected static native String getEnv(String protocol);

	protected static native void gconfInit();
	
	protected static native ProxyData getGConfProxyInfo(String protocol);

	protected static native String[] getGConfNonProxyHosts();

	protected static native ProxyData getKdeProxyInfo(String protocol);

	protected static native String[] getKdeNonProxyHosts();

}




################################################################################
# Automatically-generated file. Do not edit!
################################################################################

-include ../makefile.init

RM := rm -rf

# All of the sources participating in the build are defined here
-include sources.mk
-include subdir.mk
-include objects.mk

ifneq ($(MAKECMDGOALS),clean)
ifneq ($(strip $(C_DEPS)),)
-include $(C_DEPS)
endif
endif

-include ../makefile.defs

# Add inputs and outputs from these tool invocations to the build variables 

# All Target
all: libproxyenv.so

# Tool invocations
libproxyenv.so: $(OBJS) $(USER_OBJS)
	@echo 'Building target: $@'
	@echo 'Invoking: GCC C Linker'
	gcc -m32 -shared -o"libproxyenv.so" $(OBJS) $(USER_OBJS) $(LIBS)
	@echo 'Finished building target: $@'
	@echo ' '

# Other Targets
clean:
	-$(RM) $(OBJS)$(C_DEPS)$(LIBRARIES) libproxyenv.so
	-@echo ' '

.PHONY: all clean dependents
.SECONDARY:

-include ../makefile.targets




The source for getting the native proxy info is in the top level unix directory.  If
there are more specific compile options, makefiles, etc, then they should be moved
to subdirectories, like in org.eclipse.core.filesystem.

The GetProxy* directories actually have the make files; this is the makefile as generated by the CDT.

To build this, go into GetProxy* directory and type "make clean", then "make", 
the library will be built in that same directory.  Then you will need to copy the library to the correct org.eclipse.core.net.*
fragment.

There is no automatic build process for building the native code, instead the binary
shared libraries are checked in for each fragment, just like in org.eclipse.code.filesystem.

Added Link Here

(-)natives/unix/GetProxyEnv/getproxyenv.d (+1 lines)
1	getproxyenv.d getproxyenv.o: ../getproxyenv.c




/*
 * Copyright 2008 Oakland Software Incorporated 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:
 *     Oakland Software Incorporated - initial API and implementation
 */

#include <jni.h>

#include <stdlib.h>
#ifdef __linux__
#include <string.h>
#else
#include <strings.h>
#endif

static int debug = 0;

/*
 * Class:     org_eclipse_core_internal_net_proxy_unix_UnixProxyProvider
 * Method:    getEnvProxyString
 * Signature: ([Ljava/lang/String);
 */
JNIEXPORT jstring JNICALL Java_org_eclipse_core_internal_net_proxy_unix_UnixProxyProvider_getEnv(
		JNIEnv *env, jclass clazz, jstring variable) {

	jboolean isCopy;
	const char *cvariable;

	cvariable = (*env)->GetStringUTFChars(env, variable, &isCopy);
	if (cvariable == NULL)
		return NULL;

	if (debug)
		printf("envName: %s\n", cvariable);
	char *envValue = getenv(cvariable);
	if (envValue == NULL)
		return NULL;
	
	if (debug)
		printf("envValue: %s\n", envValue);

	jstring jenvValue = (*env)->NewStringUTF(env, envValue);
	return jenvValue;
}




Added Link Here

(-)fragments/org.eclipse.core.net.linux.x86/BUILD_INFO.txt (+10 lines)
1	Native Build Info:
2	------------------
3
4	platform: linux.gtk.x86
5	built by: Francis Upton, francisu@ieee.org
6	build date: 24-Apr-2008
7	OS Name: Fedora 8
8	OS Version: Linux 2.6.24.4-64.fc8
9	Compiler version: gcc (GCC) 4.1.2 20070925 (Red Hat 4.1.2-33)
10	Java version: Standard Edition 1.6.0_04

Added Link Here

(-)natives/unix/GetProxyEnv/objects.mk (+7 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	USER_OBJS :=
6
7	LIBS := -lrt

Added Link Here

(-)natives/unix/GetProxyEnv/sources.mk (+17 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	O_SRCS :=
6	C_SRCS :=
7	S_SRCS :=
8	OBJ_SRCS :=
9	ASM_SRCS :=
10	OBJS :=
11	C_DEPS :=
12	LIBRARIES :=
13
14	# Every subdirectory with source files must be described here
15	SUBDIRS := \
16	. \
17




################################################################################
# Automatically-generated file. Do not edit!
################################################################################

# Add inputs and outputs from these tool invocations to the build variables 
C_SRCS += \
../getproxyenv.c 

OBJS += \
./getproxyenv.o 

C_DEPS += \
./getproxyenv.d 


# Each subdirectory must supply rules for building sources it contributes
%.o: ../%.c
	@echo 'Building file: $<'
	@echo 'Invoking: GCC C Compiler'
	gcc -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
	@echo 'Finished building: $<'
	@echo ' '



Return to bug 226462

Removed Link Here

(-)natives/unix/getsystemproxy.c (-237 lines)
1	/*
2	* Copyright 2008 Oakland Software Incorporated and others
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Oakland Software Incorporated - initial API and implementation
10	*/
11
12	#include <jni.h>
13
14	#include <glib.h>
15	#include <glib/gslist.h>
16	#include <gconf/gconf-value.h>
17	#include <gconf/gconf-client.h>
18
19	#ifdef __linux__
20	#include <string.h>
21	#else
22	#include <strings.h>
23	#endif
24
25	static GConfClient *client= NULL;
26
27	static jclass proxyInfoClass;
28	static jclass stringClass;
29	static jmethodID proxyInfoConstructor;
30	static jmethodID toString;
31
32	static jmethodID hostMethod;
33	static jmethodID portMethod;
34	static jmethodID requiresAuthenticationMethod;
35	static jmethodID userMethod;
36	static jmethodID passwordMethod;
37
38	#define CHECK_NULL(X) { if ((X) == NULL) fprintf (stderr,"JNI error at line %d\n", __LINE__); }
39
40	static void gconfInit(JNIEnv *env) {
41	client = gconf_client_get_default();
42	jclass cls= NULL;
43	CHECK_NULL(cls = (*env)->FindClass(env, "org/eclipse/core/internal/net/ProxyData"));
44	proxyInfoClass = (*env)->NewGlobalRef(env, cls);
45
46	CHECK_NULL(cls = (*env)->FindClass(env, "java/lang/String"));
47	stringClass = (*env)->NewGlobalRef(env, cls);
48
49	CHECK_NULL(proxyInfoConstructor = (*env)->GetMethodID(env, proxyInfoClass, "<init>", "(Ljava/lang/String;)V"));
50
51	CHECK_NULL(toString = (*env)->GetMethodID(env, proxyInfoClass, "toString", "()Ljava/lang/String;"));
52
53	CHECK_NULL(hostMethod = (*env)->GetMethodID(env, proxyInfoClass, "setHost",
54	"(Ljava/lang/String;)V"));
55	CHECK_NULL(portMethod = (*env)->GetMethodID(env, proxyInfoClass, "setPort",
56	"(I)V"));
57	CHECK_NULL(requiresAuthenticationMethod= (*env)->GetMethodID(env, proxyInfoClass, "setRequiresAuthentication",
58	"(Z)V"));
59	CHECK_NULL(userMethod = (*env)->GetMethodID(env, proxyInfoClass, "setUserid",
60	"(Ljava/lang/String;)V"));
61	CHECK_NULL(passwordMethod = (*env)->GetMethodID(env, proxyInfoClass, "setPassword",
62	"(Ljava/lang/String;)V"));
63	}
64
65	/*
66	* Class: org_eclipse_core_internal_net_UnixProxyProvider
67	* Method: getGConfProxyInfo
68	* Signature: ([Ljava/lang/String);
69	*/
70	JNIEXPORT jobject JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getGConfProxyInfo(
71	JNIEnv *env, jclass clazz, jstring protocol) {
72
73	jboolean isCopy;
74	const char *cprotocol;
75
76	jobject proxyInfo= NULL;
77
78	if (client == NULL) {
79	gconfInit(env);
80	}
81
82	CHECK_NULL(proxyInfo = (*env)->NewObject(env, proxyInfoClass, proxyInfoConstructor, protocol));
83
84	cprotocol = (*env)->GetStringUTFChars(env, protocol, &isCopy);
85	if (cprotocol == NULL)
86	return NULL;
87
88	//printf("cprotocol: %s\n", cprotocol);
89
90	if (strcasecmp(cprotocol, "http") == 0) {
91	gboolean useProxy = gconf_client_get_bool(client,
92	"/system/http_proxy/use_http_proxy", NULL);
93	if (!useProxy) {
94	proxyInfo = NULL;
95	goto exit;
96	}
97
98	gchar *host = gconf_client_get_string(client,
99	"/system/http_proxy/host", NULL);
100	jobject jhost = (*env)->NewStringUTF(env, host);
101	(*env)->CallVoidMethod(env, proxyInfo, hostMethod, jhost);
102
103	gint port = gconf_client_get_int(client, "/system/http_proxy/port",
104	NULL);
105	(*env)->CallVoidMethod(env, proxyInfo, portMethod, port);
106
107	gboolean reqAuth = gconf_client_get_bool(client,
108	"/system/http_proxy/use_authentication", NULL);
109	(*env)->CallVoidMethod(env, proxyInfo,
110	requiresAuthenticationMethod, reqAuth);
111	if (reqAuth) {
112
113	gchar *user = gconf_client_get_string(client,
114	"/system/http_proxy/authentication_user", NULL);
115	jobject juser = (*env)->NewStringUTF(env, user);
116	(*env)->CallVoidMethod(env, proxyInfo, userMethod, juser);
117
118	gchar *password = gconf_client_get_string(client,
119	"/system/http_proxy/authentication_password", NULL);
120	jobject jpassword = (*env)->NewStringUTF(env, password);
121	(*env)->CallVoidMethod(env, proxyInfo, passwordMethod,
122	jpassword);
123	}
124	goto exit;
125	}
126
127	// Everything else applies only if the system proxy mode is manual
128	gchar *mode = gconf_client_get_string(client, "/system/proxy/mode", NULL);
129	if (strcasecmp(mode, "manual") != 0) {
130	proxyInfo = NULL;
131	goto exit;
132	}
133
134	char selector[100];
135
136	if (strcasecmp(cprotocol, "https") == 0) {
137	strcpy(selector, "/system/proxy/secure_");
138	} else if (strcasecmp(cprotocol, "socks") == 0) {
139	strcpy(selector, "/system/proxy/socks_");
140	} else if (strcasecmp(cprotocol, "ftp") == 0) {
141	strcpy(selector, "/system/proxy/ftp_");
142	} else {
143	proxyInfo = NULL;
144	goto exit;
145	}
146
147	char useSelector[100];
148	strcpy(useSelector, selector);
149
150	gchar *host = gconf_client_get_string(client, strcat(useSelector, "host"),
151	NULL);
152	jobject jhost = (*env)->NewStringUTF(env, host);
153	(*env)->CallVoidMethod(env, proxyInfo, hostMethod, jhost);
154
155	strcpy(useSelector, selector);
156	gint port = gconf_client_get_int(client, strcat(useSelector, "port"), NULL);
157	(*env)->CallVoidMethod(env, proxyInfo, portMethod, port);
158
159	exit: if (isCopy == JNI_TRUE)
160	(*env)->ReleaseStringUTFChars(env, protocol, cprotocol);
161	return proxyInfo;
162	}
163
164	typedef struct {
165	jobjectArray npHostArray;
166	JNIEnv *env;
167	int index;
168	} ListProcContext;
169
170	// user_data is the ListProcContext
171	void listProc(gpointer data, gpointer user_data) {
172	ListProcContext *lpc = user_data;
173	jobject jnpHost = (lpc->env)->NewStringUTF(lpc->env, (char )data);
174	(*lpc->env)->SetObjectArrayElement(lpc->env, lpc->npHostArray,
175	lpc->index++, jnpHost);
176	}
177
178	/*
179	* Class: org_eclipse_core_internal_net_UnixProxyProvider
180	* Method: getGConfNonProxyHosts
181	* Signature: ()[Ljava/lang/String;
182	*/
183	JNIEXPORT jobjectArray JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getGConfNonProxyHosts(
184	JNIEnv *env, jclass clazz) {
185
186	if (client == NULL) {
187	gconfInit(env);
188	}
189
190	GSList *npHosts;
191	int size;
192
193	npHosts = gconf_client_get_list(client, "/system/http_proxy/ignore_hosts",
194	GCONF_VALUE_STRING, NULL);
195	size = g_slist_length(npHosts);
196
197	// TODO - I'm not sure this is really valid, it's from the JVM implementation
198	// of ProxySelector
199	if (size == 0) {
200	npHosts = gconf_client_get_list(client, "/system/proxy/no_proxy_for",
201	GCONF_VALUE_STRING, NULL);
202	}
203	size = g_slist_length(npHosts);
204
205	jobjectArray ret = (*env)->NewObjectArray(env, size, stringClass, NULL);
206
207	ListProcContext lpc;
208	lpc.env = env;
209	lpc.npHostArray = ret;
210	lpc.index = 0;
211
212	g_slist_foreach(npHosts, listProc, &lpc);
213	return ret;
214	}
215
216	/*
217	* Class: org_eclipse_core_internal_net_UnixProxyProvider
218	* Method: getKdeProxyInfo
219	* Signature: ([Ljava/lang/String);
220	*/
221	JNIEXPORT jobject JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getKdeProxyInfo(
222	JNIEnv *env, jclass clazz, jstring protocol) {
223	//printf("getKdeProxyInfo - not implemented\n");
224	return NULL;
225	}
226
227	/*
228	* Class: org_eclipse_core_internal_net_UnixProxyProvider
229	* Method: getKdeNonProxyHosts
230	* Signature: ()Ljava/lang/String;
231	*/
232	JNIEXPORT jobject JNICALL Java_org_eclipse_core_internal_net_UnixProxyProvider_getKdeNonProxyHosts(
233	JNIEnv *env, jclass clazz) {
234	//printf("getKdeNonProxyHosts - not implemented\n");
235	return NULL;
236	}
237

Removed Link Here

(-)natives/unix/Debug/subdir.mk (-24 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	# Add inputs and outputs from these tool invocations to the build variables
6	C_SRCS += \
7	../getsystemproxy.c
8
9	OBJS += \
10	./getsystemproxy.o
11
12	C_DEPS += \
13	./getsystemproxy.d
14
15
16	# Each subdirectory must supply rules for building sources it contributes
17	%.o: ../%.c
18	@echo 'Building file: $<'
19	@echo 'Invoking: GCC C Compiler'
20	gcc -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/ -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
21	@echo 'Finished building: $<'
22	@echo ' '
23
24

Removed Link Here

(-)natives/unix/Debug/makefile (-43 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	-include ../makefile.init
6
7	RM := rm -rf
8
9	# All of the sources participating in the build are defined here
10	-include sources.mk
11	-include subdir.mk
12	-include objects.mk
13
14	ifneq ($(MAKECMDGOALS),clean)
15	ifneq ($(strip $(C_DEPS)),)
16	-include $(C_DEPS)
17	endif
18	endif
19
20	-include ../makefile.defs
21
22	# Add inputs and outputs from these tool invocations to the build variables
23
24	# All Target
25	all: libproxysupport.so
26
27	# Tool invocations
28	libproxysupport.so: $(OBJS) $(USER_OBJS)
29	@echo 'Building target: $@'
30	@echo 'Invoking: GCC C Linker'
31	gcc -m32 -shared -o"libproxysupport.so" $(OBJS) $(USER_OBJS) $(LIBS)
32	@echo 'Finished building target: $@'
33	@echo ' '
34
35	# Other Targets
36	clean:
37	-$(RM) $(OBJS)$(C_DEPS)$(LIBRARIES) libproxysupport.so
38	-@echo ' '
39
40	.PHONY: all clean dependents
41	.SECONDARY:
42
43	-include ../makefile.targets

Removed Link Here

(-)natives/unix/Debug/getsystemproxy.d (-226 lines)
1	getsystemproxy.d getsystemproxy.o: ../getsystemproxy.c \
2	/usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
3	/usr/include/glib-2.0/glib/gtypes.h \
4	/usr/lib/glib-2.0/include/glibconfig.h \
5	/usr/include/glib-2.0/glib/gmacros.h \
6	/usr/include/glib-2.0/glib/garray.h \
7	/usr/include/glib-2.0/glib/gasyncqueue.h \
8	/usr/include/glib-2.0/glib/gthread.h \
9	/usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
10	/usr/include/glib-2.0/glib/gutils.h \
11	/usr/include/glib-2.0/glib/gatomic.h \
12	/usr/include/glib-2.0/glib/gbacktrace.h \
13	/usr/include/glib-2.0/glib/gbase64.h \
14	/usr/include/glib-2.0/glib/gbookmarkfile.h \
15	/usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
16	/usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
17	/usr/include/glib-2.0/glib/gcompletion.h \
18	/usr/include/glib-2.0/glib/gconvert.h \
19	/usr/include/glib-2.0/glib/gdataset.h \
20	/usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
21	/usr/include/glib-2.0/glib/gfileutils.h \
22	/usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
23	/usr/include/glib-2.0/glib/giochannel.h \
24	/usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gslist.h \
25	/usr/include/glib-2.0/glib/gstring.h \
26	/usr/include/glib-2.0/glib/gunicode.h \
27	/usr/include/glib-2.0/glib/gkeyfile.h \
28	/usr/include/glib-2.0/glib/gmappedfile.h \
29	/usr/include/glib-2.0/glib/gmarkup.h \
30	/usr/include/glib-2.0/glib/gmessages.h \
31	/usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
32	/usr/include/glib-2.0/glib/gpattern.h \
33	/usr/include/glib-2.0/glib/gprimes.h \
34	/usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
35	/usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
36	/usr/include/glib-2.0/glib/gregex.h \
37	/usr/include/glib-2.0/glib/gscanner.h \
38	/usr/include/glib-2.0/glib/gsequence.h \
39	/usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
40	/usr/include/glib-2.0/glib/gstrfuncs.h \
41	/usr/include/glib-2.0/glib/gthreadpool.h \
42	/usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
43	/usr/include/gconf/2/gconf/gconf-value.h \
44	/usr/include/gconf/2/gconf/gconf-error.h \
45	/usr/include/gconf/2/gconf/gconf-client.h \
46	/usr/include/glib-2.0/glib-object.h \
47	/usr/include/glib-2.0/gobject/gboxed.h \
48	/usr/include/glib-2.0/gobject/gtype.h \
49	/usr/include/glib-2.0/gobject/genums.h \
50	/usr/include/glib-2.0/gobject/gobject.h \
51	/usr/include/glib-2.0/gobject/gvalue.h \
52	/usr/include/glib-2.0/gobject/gparam.h \
53	/usr/include/glib-2.0/gobject/gclosure.h \
54	/usr/include/glib-2.0/gobject/gsignal.h \
55	/usr/include/glib-2.0/gobject/gmarshal.h \
56	/usr/include/glib-2.0/gobject/gparamspecs.h \
57	/usr/include/glib-2.0/gobject/gsourceclosure.h \
58	/usr/include/glib-2.0/gobject/gtypemodule.h \
59	/usr/include/glib-2.0/gobject/gtypeplugin.h \
60	/usr/include/glib-2.0/gobject/gvaluearray.h \
61	/usr/include/glib-2.0/gobject/gvaluetypes.h \
62	/usr/include/gconf/2/gconf/gconf.h \
63	/usr/include/gconf/2/gconf/gconf-schema.h \
64	/usr/include/gconf/2/gconf/gconf-engine.h \
65	/usr/include/gconf/2/gconf/gconf-error.h \
66	/usr/include/gconf/2/gconf/gconf-enum-types.h \
67	/usr/include/gconf/2/gconf/gconf-listeners.h \
68	/usr/include/gconf/2/gconf/gconf-changeset.h
69
70	/usr/include/glib-2.0/glib.h:
71
72	/usr/include/glib-2.0/glib/galloca.h:
73
74	/usr/include/glib-2.0/glib/gtypes.h:
75
76	/usr/lib/glib-2.0/include/glibconfig.h:
77
78	/usr/include/glib-2.0/glib/gmacros.h:
79
80	/usr/include/glib-2.0/glib/garray.h:
81
82	/usr/include/glib-2.0/glib/gasyncqueue.h:
83
84	/usr/include/glib-2.0/glib/gthread.h:
85
86	/usr/include/glib-2.0/glib/gerror.h:
87
88	/usr/include/glib-2.0/glib/gquark.h:
89
90	/usr/include/glib-2.0/glib/gutils.h:
91
92	/usr/include/glib-2.0/glib/gatomic.h:
93
94	/usr/include/glib-2.0/glib/gbacktrace.h:
95
96	/usr/include/glib-2.0/glib/gbase64.h:
97
98	/usr/include/glib-2.0/glib/gbookmarkfile.h:
99
100	/usr/include/glib-2.0/glib/gcache.h:
101
102	/usr/include/glib-2.0/glib/glist.h:
103
104	/usr/include/glib-2.0/glib/gmem.h:
105
106	/usr/include/glib-2.0/glib/gslice.h:
107
108	/usr/include/glib-2.0/glib/gcompletion.h:
109
110	/usr/include/glib-2.0/glib/gconvert.h:
111
112	/usr/include/glib-2.0/glib/gdataset.h:
113
114	/usr/include/glib-2.0/glib/gdate.h:
115
116	/usr/include/glib-2.0/glib/gdir.h:
117
118	/usr/include/glib-2.0/glib/gfileutils.h:
119
120	/usr/include/glib-2.0/glib/ghash.h:
121
122	/usr/include/glib-2.0/glib/ghook.h:
123
124	/usr/include/glib-2.0/glib/giochannel.h:
125
126	/usr/include/glib-2.0/glib/gmain.h:
127
128	/usr/include/glib-2.0/glib/gslist.h:
129
130	/usr/include/glib-2.0/glib/gstring.h:
131
132	/usr/include/glib-2.0/glib/gunicode.h:
133
134	/usr/include/glib-2.0/glib/gkeyfile.h:
135
136	/usr/include/glib-2.0/glib/gmappedfile.h:
137
138	/usr/include/glib-2.0/glib/gmarkup.h:
139
140	/usr/include/glib-2.0/glib/gmessages.h:
141
142	/usr/include/glib-2.0/glib/gnode.h:
143
144	/usr/include/glib-2.0/glib/goption.h:
145
146	/usr/include/glib-2.0/glib/gpattern.h:
147
148	/usr/include/glib-2.0/glib/gprimes.h:
149
150	/usr/include/glib-2.0/glib/gqsort.h:
151
152	/usr/include/glib-2.0/glib/gqueue.h:
153
154	/usr/include/glib-2.0/glib/grand.h:
155
156	/usr/include/glib-2.0/glib/grel.h:
157
158	/usr/include/glib-2.0/glib/gregex.h:
159
160	/usr/include/glib-2.0/glib/gscanner.h:
161
162	/usr/include/glib-2.0/glib/gsequence.h:
163
164	/usr/include/glib-2.0/glib/gshell.h:
165
166	/usr/include/glib-2.0/glib/gspawn.h:
167
168	/usr/include/glib-2.0/glib/gstrfuncs.h:
169
170	/usr/include/glib-2.0/glib/gthreadpool.h:
171
172	/usr/include/glib-2.0/glib/gtimer.h:
173
174	/usr/include/glib-2.0/glib/gtree.h:
175
176	/usr/include/gconf/2/gconf/gconf-value.h:
177
178	/usr/include/gconf/2/gconf/gconf-error.h:
179
180	/usr/include/gconf/2/gconf/gconf-client.h:
181
182	/usr/include/glib-2.0/glib-object.h:
183
184	/usr/include/glib-2.0/gobject/gboxed.h:
185
186	/usr/include/glib-2.0/gobject/gtype.h:
187
188	/usr/include/glib-2.0/gobject/genums.h:
189
190	/usr/include/glib-2.0/gobject/gobject.h:
191
192	/usr/include/glib-2.0/gobject/gvalue.h:
193
194	/usr/include/glib-2.0/gobject/gparam.h:
195
196	/usr/include/glib-2.0/gobject/gclosure.h:
197
198	/usr/include/glib-2.0/gobject/gsignal.h:
199
200	/usr/include/glib-2.0/gobject/gmarshal.h:
201
202	/usr/include/glib-2.0/gobject/gparamspecs.h:
203
204	/usr/include/glib-2.0/gobject/gsourceclosure.h:
205
206	/usr/include/glib-2.0/gobject/gtypemodule.h:
207
208	/usr/include/glib-2.0/gobject/gtypeplugin.h:
209
210	/usr/include/glib-2.0/gobject/gvaluearray.h:
211
212	/usr/include/glib-2.0/gobject/gvaluetypes.h:
213
214	/usr/include/gconf/2/gconf/gconf.h:
215
216	/usr/include/gconf/2/gconf/gconf-schema.h:
217
218	/usr/include/gconf/2/gconf/gconf-engine.h:
219
220	/usr/include/gconf/2/gconf/gconf-error.h:
221
222	/usr/include/gconf/2/gconf/gconf-enum-types.h:
223
224	/usr/include/gconf/2/gconf/gconf-listeners.h:
225
226	/usr/include/gconf/2/gconf/gconf-changeset.h:

Lines 11-29 Link Here

(-)src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java (-46 / +137 lines)
11	package org.eclipse.core.internal.net.proxy.unix;	11	package org.eclipse.core.internal.net.proxy.unix;
12		12
13	import java.net.URI;	13	import java.net.URI;
14	import java.net.URISyntaxException;	14	import java.util.Locale;
15		15
16	import org.eclipse.core.internal.net.AbstractProxyProvider;	16	import org.eclipse.core.internal.net.AbstractProxyProvider;
		17	import org.eclipse.core.internal.net.Activator;
17	import org.eclipse.core.internal.net.ProxyData;	18	import org.eclipse.core.internal.net.ProxyData;
18	import org.eclipse.core.net.proxy.IProxyData;	19	import org.eclipse.core.net.proxy.IProxyData;
19		20
20	public class UnixProxyProvider extends AbstractProxyProvider {	21	public class UnixProxyProvider extends AbstractProxyProvider {
21		22
		23	public static boolean _debug = false;
		24
22	static {	25	static {
		26
		27	// Load each of the libraries separately so that we get
		28	// whichever ones work
		29	try {
		30	System.loadLibrary("proxyenv"); //$NON-NLS-1$
		31	if (_debug)
		32	System.out.println("Loaded proxyenv"); //$NON-NLS-1$
		33	} catch (UnsatisfiedLinkError ex) {
		34	// This should never happen
		35	Activator.logError("Missing native code for getenv()", ex); //$NON-NLS-1$
		36	}
		37
23	try {	38	try {
24	System.loadLibrary("libproxysupport"); //$NON-NLS-1$	39	System.loadLibrary("proxygnome"); //$NON-NLS-1$
		40	// Start it up on the main thread, it seems to hand sometimes
		41	// otherwise
		42	gconfInit();
		43	if (_debug)
		44	System.out.println("Loaded proxygnome"); //$NON-NLS-1$
25	} catch (UnsatisfiedLinkError ex) {	45	} catch (UnsatisfiedLinkError ex) {
26	// This will happen on systems that are missing Gnome libraries	46	// Expected on systems that are missing Gnome libraries
		47	Activator.logInfo("Missing gconf (Gnome) libraries", ex); //$NON-NLS-1$
27	}	48	}
28	}	49	}
29		50
Lines 34-109 Link Here
34	public IProxyData[] getProxyData(URI uri) {	55	public IProxyData[] getProxyData(URI uri) {
35	String protocol = uri.getScheme();	56	String protocol = uri.getScheme();
36		57
37	ProxyData pd = getSystemProxyInfo(protocol);	58	synchronized (getClass()) {
		59
		60	ProxyData pd = getSystemProxyInfo(protocol);
38		61
39	if (pd != null) {	62	if (pd != null) {
40	IProxyData[] pds = new IProxyData[1];	63	IProxyData[] pds = new IProxyData[1];
41	pds[0] = pd;	64	pds[0] = pd;
42	return pds;	65	return pds;
		66	}
		67
		68	return new IProxyData[0];
43	}	69	}
		70	}
44		71
45	return new IProxyData[0];	72	protected String[] debugPrint(String[] strs) {
		73	if (_debug) {
		74	System.out.println("npHosts: "); //$NON-NLS-1$
		75	for (int i = 0; i < strs.length; i++)
		76	System.out.println(i + ": " + strs[i]); //$NON-NLS-1$
		77	}
		78	return strs;
46	}	79	}
47		80
48	protected String[] getNonProxiedHosts() {	81	public String[] getNonProxiedHosts() {
49	try {	82	String[] npHosts;
50	String[] npHosts = getGConfNonProxyHosts();	83
51	if (npHosts != null && npHosts.length > 0)	84	synchronized (getClass()) {
52	return npHosts;	85
53	return getKdeNonProxyHosts();	86	try {
54	} catch (UnsatisfiedLinkError ex) {	87	// First try the environment variable which is a URL
55	// This has already been reported (the native code did not load)	88	String npEnv = null;
		89	npEnv = getEnv("no_proxy"); //$NON-NLS-1$
		90	if (npEnv != null) {
		91	if (_debug)
		92	System.out.println("got env no_proxy: " + npEnv); //$NON-NLS-1$
		93	npHosts = npEnv.split(","); //$NON-NLS-1$
		94	for (int i = 0; i < npHosts.length; i++)
		95	npHosts[i] = npHosts[i].trim();
		96	return debugPrint(npHosts);
		97	}
		98	} catch (UnsatisfiedLinkError ex) {
		99	// This has already been reported when the native code did not
		100	// load
		101	}
		102
		103	try {
		104	npHosts = getGConfNonProxyHosts();
		105	if (npHosts != null && npHosts.length > 0) {
		106	if (_debug)
		107	System.out.println("got gnome no proxy"); //$NON-NLS-1$
		108	return debugPrint(npHosts);
		109	}
		110	} catch (UnsatisfiedLinkError ex) {
		111	// This has already been reported (the native code did not load)
		112	}
		113
		114	return new String[] {};
56	}	115	}
57	return new String[] {};
58	}	116	}
59		117
60	// Returns null if something wrong or there is no proxy for the protocol	118	// Returns null if something wrong or there is no proxy for the protocol
61	protected ProxyData getSystemProxyInfo(String protocol) {	119	protected ProxyData getSystemProxyInfo(String protocol) {
62	ProxyData pd = null;	120	ProxyData pd = null;
63		121
64	// First try the environment variable which is a URL	122	String envName = null;
65	// TODO: native calls for system properties, since System#getenx is	123	String proxyEnv = null;
66	// deprecated in 1.4	124	URI uri = null;
67	String sysHttp = null;
68	// System.getenv(protocol.toLowerCase() + "_proxy"); //$NON-NLS-1$
69	if (sysHttp != null) {
70	URI uri = null;
71	try {
72	uri = new URI(sysHttp);
73	} catch (URISyntaxException e) {
74	return null;
75	}
76		125
77	pd = new ProxyData(protocol);	126	try {
78	pd.setHost(uri.getHost());	127	if (_debug)
79	pd.setPort(uri.getPort());	128	System.out.println("getting ProxyData for: " + protocol); //$NON-NLS-1$
80	return pd;	129
		130	// protocol schemes are ISO 8859 (ASCII)
		131	protocol = protocol.toLowerCase(Locale.ENGLISH);
		132
		133	// First try the environment variable which is a URL
		134	proxyEnv = null;
		135	envName = protocol + "_proxy"; //$NON-NLS-1$
		136	proxyEnv = getEnv(envName);
		137	if (_debug)
		138	System.out.println("got proxyEnv: " + proxyEnv); //$NON-NLS-1$
		139	if (proxyEnv != null) {
		140	uri = new URI(proxyEnv);
		141	pd = new ProxyData(protocol);
		142	pd.setSource("Environment Variable (getenv)- " + envName); //$NON-NLS-1$
		143	pd.setHost(uri.getHost());
		144	pd.setPort(uri.getPort());
		145	String userInfo = uri.getUserInfo();
		146	if (userInfo != null) {
		147	String user = null;
		148	String password = null;
		149	int pwInd = userInfo.indexOf(':');
		150	if (pwInd >= 0) {
		151	user = userInfo.substring(0, pwInd);
		152	password = userInfo.substring(pwInd + 1);
		153	} else {
		154	user = userInfo;
		155	}
		156	pd.setUserid(user);
		157	pd.setPassword(password);
		158	}
		159
		160	if (_debug)
		161	System.out.println("env proxy data: " + pd); //$NON-NLS-1$
		162	return pd;
		163	}
		164	} catch (UnsatisfiedLinkError ex) {
		165	// This has already been reported when the native code did not
		166	// load
		167	} catch (Exception ex) {
		168	Activator
		169	.logWarning(
		170	"Problem getting proxy from environment: " + envName + " value: " + proxyEnv + " URI: " + uri, ex); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		171	// This has already been reported when the native code did not
		172	// load
81	}	173	}
82		174
83	try {	175	try {
84	// Then ask Gnome	176	// Then ask Gnome
85	pd = getGConfProxyInfo(protocol);	177	pd = getGConfProxyInfo(protocol);
86		178	if (_debug)
87	if (pd != null)	179	System.out.println("Gnome proxy data: " + pd); //$NON-NLS-1$
		180	if (pd != null) {
		181	pd.setSource("Gnome"); //$NON-NLS-1$
88	return pd;	182	return pd;
		183	}
89		184
90	// Then ask KDE
91	pd = getKdeProxyInfo(protocol);
92	if (pd != null)
93	return pd;
94	} catch (UnsatisfiedLinkError ex) {	185	} catch (UnsatisfiedLinkError ex) {
95	// This has already been reported when the native code did not load	186	// This has already been reported when the native code did not
		187	// load
96	}	188	}
97		189
98	return null;	190	return null;
99	}	191	}
100		192
		193	protected static native String getEnv(String protocol);
		194
		195	protected static native void gconfInit();
		196
101	protected static native ProxyData getGConfProxyInfo(String protocol);	197	protected static native ProxyData getGConfProxyInfo(String protocol);
102		198
103	protected static native String[] getGConfNonProxyHosts();	199	protected static native String[] getGConfNonProxyHosts();
104
105	protected static native ProxyData getKdeProxyInfo(String protocol);
106
107	protected static native String[] getKdeNonProxyHosts();
108
109	}	200	}

Added Link Here

(-)natives/unix/GetProxyEnv/makefile (+43 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	-include ../makefile.init
6
7	RM := rm -rf
8
9	# All of the sources participating in the build are defined here
10	-include sources.mk
11	-include subdir.mk
12	-include objects.mk
13
14	ifneq ($(MAKECMDGOALS),clean)
15	ifneq ($(strip $(C_DEPS)),)
16	-include $(C_DEPS)
17	endif
18	endif
19
20	-include ../makefile.defs
21
22	# Add inputs and outputs from these tool invocations to the build variables
23
24	# All Target
25	all: libproxyenv.so
26
27	# Tool invocations
28	libproxyenv.so: $(OBJS) $(USER_OBJS)
29	@echo 'Building target: $@'
30	@echo 'Invoking: GCC C Linker'
31	gcc -m32 -shared -o"libproxyenv.so" $(OBJS) $(USER_OBJS) $(LIBS)
32	@echo 'Finished building target: $@'
33	@echo ' '
34
35	# Other Targets
36	clean:
37	-$(RM) $(OBJS)$(C_DEPS)$(LIBRARIES) libproxyenv.so
38	-@echo ' '
39
40	.PHONY: all clean dependents
41	.SECONDARY:
42
43	-include ../makefile.targets

Added Link Here

(-)natives/unix/README.txt (+12 lines)
1	The source for getting the native proxy info is in the top level unix directory. If
2	there are more specific compile options, makefiles, etc, then they should be moved
3	to subdirectories, like in org.eclipse.core.filesystem.
4
5	The GetProxy* directories actually have the make files; this is the makefile as generated by the CDT.
6
7	To build this, go into GetProxy* directory and type "make clean", then "make",
8	the library will be built in that same directory. Then you will need to copy the library to the correct org.eclipse.core.net.*
9	fragment.
10
11	There is no automatic build process for building the native code, instead the binary
12	shared libraries are checked in for each fragment, just like in org.eclipse.code.filesystem.

Added Link Here

(-)natives/unix/getproxyenv.c (+52 lines)
1	/*
2	* Copyright 2008 Oakland Software Incorporated and others
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Oakland Software Incorporated - initial API and implementation
10	*/
11
12	#include <jni.h>
13
14	#include <stdlib.h>
15	#ifdef __linux__
16	#include <string.h>
17	#else
18	#include <strings.h>
19	#endif
20
21	static int debug = 0;
22
23	/*
24	* Class: org_eclipse_core_internal_net_proxy_unix_UnixProxyProvider
25	* Method: getEnvProxyString
26	* Signature: ([Ljava/lang/String);
27	*/
28	JNIEXPORT jstring JNICALL Java_org_eclipse_core_internal_net_proxy_unix_UnixProxyProvider_getEnv(
29	JNIEnv *env, jclass clazz, jstring variable) {
30
31	jboolean isCopy;
32	const char *cvariable;
33
34	cvariable = (*env)->GetStringUTFChars(env, variable, &isCopy);
35	if (cvariable == NULL)
36	return NULL;
37
38	if (debug)
39	printf("envName: %s\n", cvariable);
40	char *envValue = getenv(cvariable);
41	if (envValue == NULL)
42	return NULL;
43
44	if (debug)
45	printf("envValue: %s\n", envValue);
46
47	jstring jenvValue = (*env)->NewStringUTF(env, envValue);
48	return jenvValue;
49	}
50
51
52

Added Link Here

(-)natives/unix/GetProxyEnv/subdir.mk (+24 lines)
1	################################################################################
2	# Automatically-generated file. Do not edit!
3	################################################################################
4
5	# Add inputs and outputs from these tool invocations to the build variables
6	C_SRCS += \
7	../getproxyenv.c
8
9	OBJS += \
10	./getproxyenv.o
11
12	C_DEPS += \
13	./getproxyenv.d
14
15
16	# Each subdirectory must supply rules for building sources it contributes
17	%.o: ../%.c
18	@echo 'Building file: $<'
19	@echo 'Invoking: GCC C Compiler'
20	gcc -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
21	@echo 'Finished building: $<'
22	@echo ' '
23
24