From 9f0e9f3d123be745752fe76bf6172536ea6d29ed Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 20 Feb 2019 16:57:40 -0300
Subject: [PATCH] Refactoring IPC compatiblity module for linux.

---
 hllapi.cbp                    |  20 ++++++++++++++++++--
 src/dbus3270/test.sh          | 126 ------------------------------------------------------------------------------------------------------------------------------
 src/plugin/linux/gobject.c    |  13 +++++--------
 src/plugin/linux/main.c       |   1 +
 src/testprogram/linux/test.sh | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 150 insertions(+), 136 deletions(-)
 delete mode 100755 src/dbus3270/test.sh
 create mode 100755 src/testprogram/linux/test.sh

diff --git a/hllapi.cbp b/hllapi.cbp
index 4796fd4..b185ef8 100644
--- a/hllapi.cbp
+++ b/hllapi.cbp
@@ -3,11 +3,12 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="pw3270 HLLAPI v5.1 compatibility plugin" />
+		<Option makefile_is_custom="1" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/pw3270 HLLAPI v5" prefix_auto="1" extension_auto="1" />
+				<Option output=".bin/Debug/ipc3270c" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -16,7 +17,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin/Release/pw3270 HLLAPI v5" prefix_auto="1" extension_auto="1" />
+				<Option output=".bin/Release/ipc3270c" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -31,6 +32,21 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="src/plugin/linux/daemon.h" />
+		<Unit filename="src/plugin/linux/globals.h" />
+		<Unit filename="src/plugin/linux/gobject.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugin/linux/main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugin/linux/misc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugin/linux/service.h" />
+		<Unit filename="src/testprogram/testprogram.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/src/dbus3270/test.sh b/src/dbus3270/test.sh
deleted file mode 100755
index 376ed60..0000000
--- a/src/dbus3270/test.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-
-SESSION=a
-DEST=br.com.bb.pw3270
-BPATH=/br/com/bb/pw3270
-
-run_command()
-{
-
-	case $1 in
-
-		revision)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getRevision
-			;;
-
-		message)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getMessageID
-			;;
-
-		ssl)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getSecureState
-			;;
-
-		connect)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.connect string:$2 int32:10
-			;;
-
-		disconnect)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.disconnect
-			;;
-
-		url)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getURL
-			;;
-
-		quit)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.quit
-			;;
-
-		get)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getScreenContents
-			;;
-
-		gettext)
-#			addr,len,lf
-#			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getText int32:1 int32:-1 byte:0
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getText int32:1 int32:-1 byte:10
-			;;
-
-		protect)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getIsProtectedAt int32:$2 int32:$3 
-			;;
-
-		set)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.setTextAt int32:$2 int32:$3 string:$4
-			;;
-
-		action)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.action string:$2
-			;;
-
-		enter)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.enter
-			;;
-
-		isconnected)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.isConnected
-			;;
-
-		hostcharset)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getHostCharset
-			;;
-
-		displaycharset)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getDisplayCharset
-			;;
-
-		unlockdelay)
-			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.setUnlockDelay int32:$2
-			;;
-
-		*)
-			echo "Comando $1 desconhecido"
-			;;
-
-	esac
-}
-
-
-
-until [ -z "$1" ]
-do
-        if [ ${1:0:2} = '--' ]; then
-                tmp=${1:2}
-                parameter=${tmp%%=*}
-                parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")
-                value=${tmp##*=}
-
-		case "$parameter" in
-		SESSION)
-			SESSION=$value
-			;;
-		HELP)
-			echo "$0 options"
-			echo ""
-			echo "Options:"
-			echo ""
-			echo "	--session	pw3270's session manager"
-			echo ""
-			exit 0
-			;;
-
-		*)
-			eval $parameter=$value
-			;;
-
-		esac
-
-	else
-		run_command $@
-		exit 0
-	fi
-
-        shift
-done
-
diff --git a/src/plugin/linux/gobject.c b/src/plugin/linux/gobject.c
index 47e705f..59cc640 100644
--- a/src/plugin/linux/gobject.c
+++ b/src/plugin/linux/gobject.c
@@ -66,11 +66,12 @@ static void pw3270_dbus_class_init(PW3270DbusClass *klass)
 	GObjectClass *object_class;
 	object_class = G_OBJECT_CLASS (klass);
 	object_class->finalize = pw3270_dbus_finalize;
+	debug("%s",__FUNCTION__);
 }
 
-static void pw3270_dbus_init(PW3270Dbus G_GNUC_UNUSED(*object))
+static void pw3270_dbus_init(PW3270Dbus *object)
 {
-
+	debug("%s(%p)",__FUNCTION__,object);
 }
 
 PW3270Dbus * pw3270_dbus_new(void)
@@ -80,12 +81,8 @@ PW3270Dbus * pw3270_dbus_new(void)
 
 void pw3270_dbus_get_revision(PW3270Dbus *object, DBusGMethodInvocation *context)
 {
-	trace("%s object=%p context=%p",__FUNCTION__,object,context);
-#ifdef PACKAGE_REVISION
-	dbus_g_method_return(context,PACKAGE_REVISION);
-#else
-	dbus_g_method_return(context,BUILD_DATE);
-#endif
+	debug("%s object=%p context=%p",__FUNCTION__,object,context);
+	dbus_g_method_return(context,lib3270_get_revision());
 }
 
 void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context)
diff --git a/src/plugin/linux/main.c b/src/plugin/linux/main.c
index aa4ff90..53e4617 100644
--- a/src/plugin/linux/main.c
+++ b/src/plugin/linux/main.c
@@ -171,6 +171,7 @@
 
  H3270 * pw3270_dbus_get_session_handle(PW3270Dbus G_GNUC_UNUSED(*object))
  {
+ 	debug("%s=%p",__FUNCTION__,lib3270_get_default_session_handle());
 	return lib3270_get_default_session_handle();
  }
 
diff --git a/src/testprogram/linux/test.sh b/src/testprogram/linux/test.sh
new file mode 100755
index 0000000..376ed60
--- /dev/null
+++ b/src/testprogram/linux/test.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+SESSION=a
+DEST=br.com.bb.pw3270
+BPATH=/br/com/bb/pw3270
+
+run_command()
+{
+
+	case $1 in
+
+		revision)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getRevision
+			;;
+
+		message)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getMessageID
+			;;
+
+		ssl)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getSecureState
+			;;
+
+		connect)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.connect string:$2 int32:10
+			;;
+
+		disconnect)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.disconnect
+			;;
+
+		url)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getURL
+			;;
+
+		quit)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.quit
+			;;
+
+		get)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getScreenContents
+			;;
+
+		gettext)
+#			addr,len,lf
+#			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getText int32:1 int32:-1 byte:0
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getText int32:1 int32:-1 byte:10
+			;;
+
+		protect)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getIsProtectedAt int32:$2 int32:$3 
+			;;
+
+		set)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.setTextAt int32:$2 int32:$3 string:$4
+			;;
+
+		action)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.action string:$2
+			;;
+
+		enter)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.enter
+			;;
+
+		isconnected)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.isConnected
+			;;
+
+		hostcharset)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getHostCharset
+			;;
+
+		displaycharset)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.getDisplayCharset
+			;;
+
+		unlockdelay)
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.setUnlockDelay int32:$2
+			;;
+
+		*)
+			echo "Comando $1 desconhecido"
+			;;
+
+	esac
+}
+
+
+
+until [ -z "$1" ]
+do
+        if [ ${1:0:2} = '--' ]; then
+                tmp=${1:2}
+                parameter=${tmp%%=*}
+                parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")
+                value=${tmp##*=}
+
+		case "$parameter" in
+		SESSION)
+			SESSION=$value
+			;;
+		HELP)
+			echo "$0 options"
+			echo ""
+			echo "Options:"
+			echo ""
+			echo "	--session	pw3270's session manager"
+			echo ""
+			exit 0
+			;;
+
+		*)
+			eval $parameter=$value
+			;;
+
+		esac
+
+	else
+		run_command $@
+		exit 0
+	fi
+
+        shift
+done
+
--
libgit2 0.21.2