--- mqtt/src/mqtt_pub.c	2012/05/09 13:57:39	1.2.2.6
+++ mqtt/src/mqtt_pub.c	2012/07/03 09:02:50	1.3
@@ -52,7 +52,11 @@ Publish(int sock)
 	int siz = 0;
 	u_short mid = 0;
 
+#ifdef __NetBSD__
+	srandom(getpid() ^ time(NULL));
+#else
 	srandomdev();
+#endif
 	mid = random() % USHRT_MAX;
 
 	printf(" > Execute PUBLISH request #%d ... ", mid);
@@ -62,7 +66,7 @@ Publish(int sock)
 		printf("Error:: Publish #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		return -1;
 	} else
-		printf("OK\n");
+		printf("Sended %d bytes \n", siz);
 
 	return siz;
 }
@@ -76,7 +80,7 @@ main(int argc, char **argv)
 	u_short port = atoi(MQTT_PORT);
 	int ret = 0;
 
-	if (!(args = malloc(sizeof(struct tagArgs)))) {
+	if (!(args = io_malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
 		return 1;
 	} else
@@ -86,7 +90,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);
-		free(args);
+		io_free(args);
 		return 1;
 	}
 
@@ -124,7 +128,7 @@ main(int argc, char **argv)
 				if (args->QoS > MQTT_QOS_EXACTLY) {
 					printf("Error:: invalid QoS level %d\n", args->QoS);
 					args->free(args);
-					free(args);
+					io_free(args);
 					return 1;
 				}
 				break;
@@ -146,7 +150,7 @@ main(int argc, char **argv)
 			case 'h':
 			default:
 				args->free(args);
-				free(args);
+				io_free(args);
 				Usage();
 				return 1;
 		}
@@ -155,7 +159,7 @@ main(int argc, char **argv)
 	if (argc < 4) {
 		printf("Error:: host for connect not found, connection id, topic or value not supplied!\n\n");
 		args->free(args);
-		free(args);
+		io_free(args);
 		Usage();
 		return 1;
 	} else {
@@ -169,7 +173,7 @@ main(int argc, char **argv)
 	if (!io_gethostbyname(*argv, port, &args->addr)) {
 		printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());
 		args->free(args);
-		free(args);
+		io_free(args);
 		Usage();
 		return 1;
 	}
@@ -178,14 +182,14 @@ main(int argc, char **argv)
 
 	if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) {
 		args->free(args);
-		free(args);
+		io_free(args);
 		return 2;
 	}
 
 	if (args->isFile && !OpenFile()) {
 		mqtt_cli_Close(&args->cli);
 		args->free(args);
-		free(args);
+		io_free(args);
 		return 3;
 	}
 
@@ -222,6 +226,6 @@ main(int argc, char **argv)
 
 	CloseFile();
 	args->free(args);
-	free(args);
+	io_free(args);
 	return ret;
 }