From 5ffd1c33ce095020fefdcba936c6de4b41a622c7 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 23 Nov 2018 15:15:47 -0200
Subject: [PATCH] Updating test program.

---
 src/lib3270/Makefile.in               |   8 ++++----
 src/lib3270/testprogram/testprogram.c |  33 +++++++++++++++++++++++++++++++++
 src/testprogram/testprogram.c         | 100 ----------------------------------------------------------------------------------------------------
 3 files changed, 37 insertions(+), 104 deletions(-)
 create mode 100644 src/lib3270/testprogram/testprogram.c
 delete mode 100644 src/testprogram/testprogram.c

diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index c7a6e60..84e44a3 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -35,7 +35,7 @@ SOURCES= \
 	$(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c
 
 TEST_SOURCES= \
-	$(wildcard src/testprogram/*.c)
+	$(wildcard testprogram/*.c)
 
 #---[ Tools ]----------------------------------------------------------------------------
 
@@ -284,11 +284,11 @@ locale: \
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
-	$(BINDBG)/$(LIBNAME)@DLLEXT@
+	$(BINDBG)/$(LIBNAME)@EXEEXT@
 
 $(BINDBG)/$(LIBNAME)@EXEEXT@: \
-	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \
-	$(foreach SRC, $(basename $(TEST_SOURCES)), $(OBJDBG)/$(SRC).o)
+	$(foreach SRC, $(basename $(TEST_SOURCES)), $(OBJDBG)/$(SRC).o) \
+	$(BINDBG)/$(LIBNAME)@DLLEXT@
 
 	@$(MKDIR) `dirname $@`
 	@echo $< ...
diff --git a/src/lib3270/testprogram/testprogram.c b/src/lib3270/testprogram/testprogram.c
new file mode 100644
index 0000000..fb4e486
--- /dev/null
+++ b/src/lib3270/testprogram/testprogram.c
@@ -0,0 +1,33 @@
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <lib3270.h>
+
+#define MAX_ARGS 10
+
+int main(int numpar, char *param[])
+{
+	H3270		* h;
+	int			  rc	= 0;
+	const char  * url	= getenv("TN3270URL");
+
+
+	h = lib3270_session_new("");
+	printf("3270 session %p created\n]",h);
+
+//	lib3270_set_toggle(session,LIB3270_TOGGLE_DS_TRACE,1);
+
+	lib3270_set_url(h,url ? url : "tn3270://fandezhi.efglobe.com");
+	rc = lib3270_connect(h,1);
+
+	printf("\nConnect exits with rc=%d\n",rc);
+
+	lib3270_wait_for_ready(h,10);
+
+
+	lib3270_session_free(h);
+
+	return 0;
+}
diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c
deleted file mode 100644
index f1618d8..0000000
--- a/src/testprogram/testprogram.c
+++ /dev/null
@@ -1,100 +0,0 @@
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-// #include <pthread.h>
-
-#include "../lib3270/private.h"
-#include <lib3270/macros.h>
-
-#define MAX_ARGS 10
-
-static H3270 *session = NULL;
-
-static void * mainloop(void *dunno)
-{
-	while(session)
-	{
-		lib3270_main_iterate(session,1);
-	}
-	return NULL;
-}
-
-int main(int numpar, char *param[])
-{
-	H3270		* h;
-	int			  rc	= 0;
-	const char  * url	= getenv("TN3270URL");
-//	char	 	  line[4096];
-//	pthread_t	  thread;
-
-	lib3270_initialize();
-
-	session = h = lib3270_session_new("");
-	printf("3270 session %p created\n]",h);
-
-//	lib3270_set_toggle(session,LIB3270_TOGGLE_DS_TRACE,1);
-
-//	pthread_create(&thread, NULL, mainloop, NULL);
-//	pthread_detach(thread);
-
-	lib3270_set_url(h,url ? url : "tn3270://fandezhi.efglobe.com");
-	rc = lib3270_connect(h,1);
-
-	printf("\nConnect exits with rc=%d\n",rc);
-
-	mainloop(0);
-
-/*
-	while(fgets(line,4095,stdin))
-	{
-//		const LIB3270_MACRO_LIST *cmd = get_3270_calls();
-
-		int		 	  f;
-		int			  argc = 0;
-		const char	* argv[MAX_ARGS+1];
-		char		* ptr;
-
-		line[4095] = 0;	// Just in case.
-
-		for(ptr = line;ptr && *ptr != '\n';ptr++);
-		*ptr = 0;
-
-		if(!*line)
-			break;
-
-		argv[argc++] = strtok(line," ");
-		for(f=1;f<MAX_ARGS;f++)
-		{
-			if( (argv[argc++] = strtok(NULL," ")) == NULL)
-				break;
-		}
-		argv[argc] = NULL;
-
-		if(!strcmp(argv[0],"quit"))
-			break;
-
-		ptr = lib3270_run_macro(h,argv);
-		if(ptr)
-		{
-			printf("\n%s\n",ptr);
-			lib3270_free(ptr);
-		}
-		else
-		{
-			printf("\nNo response\n");
-		}
-
-		printf("\n]");
-
-	}
-
-	session = 0;
-	pthread_cancel(thread);
-
-	printf("Ending 3270 session %p\n",h);
-	lib3270_session_free(h);
-*/
-
-	return 0;
-}
--
libgit2 0.21.2