--- mqtt/src/mqtt_subs.c	2012/07/03 12:46:00	1.4
+++ mqtt/src/mqtt_subs.c	2017/10/08 22:49:25	1.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: mqtt_subs.c,v 1.4 2012/07/03 12:46:00 misho Exp $
+* $Id: mqtt_subs.c,v 1.5 2017/10/08 22:49:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,8 +49,6 @@ SUCH DAMAGE.
 #include "client.h"
 
 
-io_enableDEBUG;
-
 extern char compiled[], compiledby[], compilehost[];
 volatile intptr_t Kill;
 sched_root_task_t *root;
@@ -173,11 +171,11 @@ execProc(sched_task_t *task)
 	snprintf(szLine, sizeof szLine, "%s '%s' %hu %u", AIT_GET_STR(&args->Value), 
 			(char*) TASK_ARG(task), (u_short) TASK_VAL(task), (u_int) TASK_DATLEN(task));
 	if (TASK_ARG(task))
-		io_free(TASK_ARG(task));
+		e_free(TASK_ARG(task));
 
 	f = popen(szLine, "w");
 	if (!f) {
-		ioSYSERR(0);
+		ESYSERR(0);
 		return NULL;
 	} else
 		fputs(TASK_DATA(task), f);
@@ -214,8 +212,7 @@ pubRX(sched_task_t *task)
 				else {
 					siz = mqtt_pktLen(hdr);
 					rlen -= siz;
-					ioVERBOSE(4) printf("Remains %d bytes, packet %d bytes\n", 
-							rlen, siz);
+					EVERBS(4) printf("Remains %d bytes, packet %d bytes\n", rlen, siz);
 				}
 
 				/* send to output */
@@ -235,7 +232,7 @@ pubRX(sched_task_t *task)
 
 				/* if exists exec script */
 				if (!AIT_ISEMPTY(&args->Value))
-					schedEvent(root, execProc, io_strdup(szTopic), mid, data, siz);
+					schedEvent(root, execProc, e_strdup(szTopic), mid, data, siz);
 
 				memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen);
 				break;
@@ -253,7 +250,7 @@ pubRX(sched_task_t *task)
 				memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen);
 				break;
 			default:
-				ioVERBOSE(1) printf("Unwanted message type #%d ...\n", hdr->mqtt_msg.type);
+				EVERBS(1) printf("Unwanted message type #%d ...\n", hdr->mqtt_msg.type);
 				goto end;
 		}
 	}
@@ -275,14 +272,14 @@ main(int argc, char **argv)
 	FILE *lf;
 	struct sigaction sa;
 
-	if (!(args = io_malloc(sizeof(struct tagArgs)))) {
+	if (!(args = e_malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in arguments #%d - %s\n", errno, strerror(errno));
 		return 1;
 	} else
 		memset(args, 0, sizeof(struct tagArgs));
 	if (!(args->subscr = mqtt_subAlloc(idx))) {
 		printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
-		io_free(args);
+		e_free(args);
 		return 1;
 	} else
 		args->free = cleanArgs;
@@ -290,7 +287,7 @@ main(int argc, char **argv)
 	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
 		printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		return 1;
 	}
 
@@ -328,7 +325,7 @@ main(int argc, char **argv)
 				if (!sub) {
 					printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 					args->free(args);
-					io_free(args);
+					e_free(args);
 					return 1;
 				} else
 					sub += idx++;
@@ -351,7 +348,7 @@ main(int argc, char **argv)
 				if (args->QoS > MQTT_QOS_EXACTLY) {
 					printf("Error:: invalid QoS level %d\n", args->QoS);
 					args->free(args);
-					io_free(args);
+					e_free(args);
 					return 1;
 				}
 				break;
@@ -368,7 +365,7 @@ main(int argc, char **argv)
 				batch = 0;
 				break;
 			case 'v':
-				io_incDebug;
+				e_incVerbose;
 				break;
 			case 'u':
 				un = 1;
@@ -376,7 +373,7 @@ main(int argc, char **argv)
 			case 'h':
 			default:
 				args->free(args);
-				io_free(args);
+				e_free(args);
 				Usage();
 				return 1;
 		}
@@ -385,7 +382,7 @@ main(int argc, char **argv)
 	if (argc < 2) {
 		printf("Error:: host for connect not found, connection id or topic not supplied!\n\n");
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		Usage();
 		return 1;
 	} else {
@@ -396,16 +393,17 @@ main(int argc, char **argv)
 		AIT_FREE_VAL(&args->Value);
 		AIT_SET_STR(&args->Value, argv[2]);
 	}
-	if (!io_gethostbyname(*argv, port, &args->addr)) {
-		printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());
+	if (!e_gethostbyname(*argv, port, &args->addr)) {
+		printf("Error:: host not valid #%d - %s\n", elwix_GetErrno(), elwix_GetError());
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		Usage();
 		return 1;
 	}
-	printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
+	printf("Connecting to %s:%d ... ", e_n2addr(&args->addr, &val), e_n2port(&args->addr));
 	AIT_FREE_VAL(&val);
 
+	memset(&sa, 0, sizeof sa);
 	sa.sa_handler = sigz;
 	sigemptyset(&sa.sa_mask);
 	sigaction(SIGTERM, &sa, NULL);
@@ -490,6 +488,6 @@ main(int argc, char **argv)
 	mqtt_cli_Close(&args->cli);
 end:
 	args->free(args);
-	io_free(args);
+	e_free(args);
 	return ret;
 }