From e31449f624219a6162d393d345cf5594704b5a25 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Wed, 2 May 2012 14:04:21 +0000 Subject: [PATCH] Ajustes para windows, incluindo detecção via ./configure e uso da função getaddrinfo quando disponível --- Makefile.in | 2 +- glue.c | 4 ++-- host.c | 2 +- popupsc.h | 2 +- resolver.c | 4 +--- telnet.c | 2 +- trace_ds.c | 21 --------------------- 7 files changed, 7 insertions(+), 30 deletions(-) diff --git a/Makefile.in b/Makefile.in index 761a1a3..be8ca4f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,7 +28,7 @@ PACKAGE=@PACKAGE_NAME@ -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DDATADIR=\"$(datarootdir)\" -I../include +CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -I../include SSL_CFLAGS=@LIBSSL_CFLAGS@ DLL_FLAGS=@DLL_FLAGS@ diff --git a/glue.c b/glue.c index 74fb602..c4b2b96 100644 --- a/glue.c +++ b/glue.c @@ -810,7 +810,7 @@ Boolean error_popup_visible = False; /* Pop up an error dialog, based on an error number. */ -void popup_an_errno(int errn, const char *fmt, ...) +void popup_an_errno(H3270 *session, int errn, const char *fmt, ...) { char vmsgbuf[4096]; va_list args; @@ -819,7 +819,7 @@ void popup_an_errno(int errn, const char *fmt, ...) (void) vsprintf(vmsgbuf, fmt, args); va_end(args); - lib3270_write_log("3270", "Error Popup:\n%s\nrc=%d (%s)",vmsgbuf,errn,strerror(errn)); + lib3270_write_log(session, "3270", "Error Popup:\n%s\nrc=%d (%s)",vmsgbuf,errn,strerror(errn)); Error(NULL,vmsgbuf); } diff --git a/host.c b/host.c index c4a6f6f..021d8c1 100644 --- a/host.c +++ b/host.c @@ -645,7 +645,7 @@ int lib3270_connect(H3270 *h, const char *n, int wait) */ static void try_reconnect(H3270 *session) { - lib3270_write_log("3270","Starting auto-reconnect (Host: %s)",session->full_current_host ? session->full_current_host : "-"); + lib3270_write_log(session,"3270","Starting auto-reconnect (Host: %s)",session->full_current_host ? session->full_current_host : "-"); session->auto_reconnect_inprogress = False; lib3270_reconnect(session,0); } diff --git a/popupsc.h b/popupsc.h index 8e9a9bb..cad80ad 100644 --- a/popupsc.h +++ b/popupsc.h @@ -14,5 +14,5 @@ /* Non-display version of popupsc.h */ -LIB3270_INTERNAL void popup_an_errno(int errn, const char *fmt, ...); +LIB3270_INTERNAL void popup_an_errno(H3270 *session, int errn, const char *fmt, ...); LIB3270_INTERNAL void action_output(const char *fmt, ...); diff --git a/resolver.c b/resolver.c index c30c6ea..db94c7c 100644 --- a/resolver.c +++ b/resolver.c @@ -86,9 +86,7 @@ struct parms */ static int cresolve_host_and_port(H3270 *h, struct parms *p) { -#warning Should use configure to detect getaddrinfo and use it if available. - -#ifdef AF_INET6 +#ifdef HAVE_GETADDRINFO struct addrinfo hints, *res; int rc; diff --git a/telnet.c b/telnet.c index 9b9814b..26f170c 100644 --- a/telnet.c +++ b/telnet.c @@ -3277,7 +3277,7 @@ static void client_info_callback(INFO_CONST SSL *s, int where, int ret) if (ret == 0) { trace_dsn("SSL_connect: failed in %s\n",SSL_state_string_long(s)); - lib3270_write_log("SSL","connect failed in %s (Alert: %s)",SSL_state_string_long(s),SSL_alert_type_string_long(ret)); + lib3270_write_log(&h3270,"SSL","connect failed in %s (Alert: %s)",SSL_state_string_long(s),SSL_alert_type_string_long(ret)); } else if (ret < 0) { diff --git a/trace_ds.c b/trace_ds.c index c0a361f..67b6e54 100644 --- a/trace_ds.c +++ b/trace_ds.c @@ -246,27 +246,6 @@ static void __vwtrace(H3270 *session, const char *fmt, va_list args) fflush(stdout); } -/* -static void vwtrace(const char *fmt, va_list args) -{ - char buf[16384]; - - vsnprintf(buf,16384,fmt,args); - - if(!tracewindow_handle) - tracewindow_handle = console_window_new( _( "Trace Window" ), NULL ); - - if(tracewindow_handle) - console_window_append(tracewindow_handle,"%s",buf); - - if(tracef != NULL) - { - if(fwrite(buf,strlen(buf),1,tracef) != 1) - popup_an_errno(errno,_( "Write to trace file failed\n%s" ),strerror(errno)); - } -} -*/ - /* Write to the trace file. */ static void wtrace(const char *fmt, ...) { -- libgit2 0.21.2