From 4ea2a6a70153d667923e955b4fee451703e991bd Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Thu, 10 May 2012 11:33:15 +0000
Subject: [PATCH] Igualando connect windows/linux, ferramentas devem ser compiladas com o compilador do host, não com o cross

---
 src/lib3270/telnet.c  | 50 ++++++++++++++++++++++++++++++++------------------
 src/tools/Makefile.in | 12 +++++++-----
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c
index df8d162..326bc8f 100644
--- a/src/lib3270/telnet.c
+++ b/src/lib3270/telnet.c
@@ -331,9 +331,9 @@ static void ssl_info_callback(INFO_CONST SSL *s, int where, int ret);
 static void continue_tls(unsigned char *sbbuf, int len);
 #endif /*]*/
 
-#if !defined(_WIN32) /*[*/
-static void output_possible(H3270 *session);
-#endif /*]*/
+// #if !defined(_WIN32) /*[*/
+// static void output_possible(H3270 *session);
+// #endif /*]*/
 
 #if defined(_WIN32) /*[*/
 	#define socket_errno()	WSAGetLastError()
@@ -624,7 +624,7 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo
 #endif
 
 	/* set the socket to be non-delaying */
-	if (non_blocking(session,True) < 0)
+	if (non_blocking(session,False) < 0)
 		close_fail;
 
 #if !defined(_WIN32)
@@ -641,17 +641,19 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo
 
 	/* connect */
 	status_connecting(session,1);
+	rc = connect_sock(session, session->sock, &haddr.sa,ha_len);
 
-	switch(connect_sock(session, session->sock, &haddr.sa,ha_len))
+	if(!rc)
 	{
-	case 0:					// Connected
 		trace_dsn("Connected.\n");
 
-		if(non_blocking(session,False) < 0)
-			close_fail;
+//		if(non_blocking(session,False) < 0)
+//			close_fail;
+
 		net_connected(session);
-		break;
 
+/*
+		break;
 	case SE_EWOULDBLOCK:	// Connection in progress
 	case SE_EINPROGRESS:
 		*pending = True;
@@ -660,9 +662,19 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo
 		output_id = AddOutput(session->sock, session, output_possible);
 #endif
 		break;
+*/
+	}
+	else
+	{
+		char *msg = xs_buffer( _( "Can't connect to %s:%d" ), session->hostname, session->current_port);
 
-	default:
-		popup_a_sockerr(session, N_( "Can't connect to %s:%d" ),session->hostname, session->current_port);
+		lib3270_popup_dialog(	session,
+								LIB3270_NOTIFY_ERROR,
+								_( "Network error" ),
+								msg,
+								"%s",strerror(rc) );
+
+		Free(msg);
 		close_fail;
 
 	}
@@ -801,7 +813,7 @@ static void net_connected(H3270 *session)
 		}
 		else
 		{
-			non_blocking(session,False);
+			// non_blocking(session,False);
 			rc = SSL_connect(session->ssl_con);
 
 			if(rc != 1)
@@ -898,12 +910,13 @@ static void connection_complete(void)
 	net_connected(&h3270);
 }
 
-#if !defined(_WIN32) /*[*/
 /*
- * output_possible
- *	Output is possible on the socket.  Used only when a connection is
- *	pending, to determine that the connection is complete.
- */
+#if !defined(_WIN32)
+//
+// output_possible
+//	Output is possible on the socket.  Used only when a connection is
+//	pending, to determine that the connection is complete.
+//
 static void output_possible(H3270 *session)
 {
 	trace("%s: %s",__FUNCTION__,HALF_CONNECTED ? "Half connected" : "Connected");
@@ -918,7 +931,8 @@ static void output_possible(H3270 *session)
 		output_id = 0L;
 	}
 }
-#endif /*]*/
+#endif
+*/
 
 /*
  * net_disconnect
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index e2fb13b..55890df 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -30,25 +30,27 @@ PACKAGE_NAME=@PACKAGE_NAME@
 
 EXEEXT=@EXEEXT@
 OBJEXT=@OBJEXT@
-CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include
-LIBS=@LIBS@ @GTK_LIBS@
+
+GTK_CFLAGS=@GTK_CFLAGS@
+GTK_LIBS=@GTK_LIBS@
 
 CC=@CC@
 LD=@CC@
+HOST_CC=@HOST_CC@
 
 #---[ Rules ]------------------------------------------------------------------
 
 $(OBJDBG)/%.o: %.c
 	@echo "  CC   `basename $@`"
-	@$(CC) $(CFLAGS) -o $@ -c $<
+	@$(HOST_CC) -g -o $@ $<
 
 #---[ Targets ]----------------------------------------------------------------
 
 all: xml2pot$(EXEEXT)
 
-xml2pot$(EXEEXT): xml2pot$(OBJEXT)
+xml2pot$(EXEEXT): xml2pot.c Makefile
 	@echo "  CCLD `basename $@`"
-	@$(LD) -o $@ $^ $(LIBS)
+	@$(HOST_CC) $(GTK_CFLAGS) -g -o $@ xml2pot.c $(GTK_LIBS)
 
 clean:
 	@rm -f *.$(OBJEXT)
--
libgit2 0.21.2