--- mqtt/src/mqtt_pub.c	2011/12/20 15:03:42	1.1.2.1
+++ mqtt/src/mqtt_pub.c	2011/12/24 17:30:29	1.1.2.3
@@ -6,9 +6,7 @@
 
 io_enableDEBUG;
 
-sl_config cfg;
 extern char compiled[], compiledby[], compilehost[];
-static char szCfgName[MAXPATHLEN];
 
 struct tagArgs *args;
 
@@ -30,7 +28,6 @@ Usage(void)
 		"\t-P <password>\t\tPassword\n"
 		"\t-W <topic>\t\tWill Topic\n"
 		"\t-M <message>\t\tWill Message\n"
-		"\t-c <config>\t\tService config\n"
 		"\t-v\t\t\tVerbose (more -vvv, more verbose)\n"
 		"\t-h\t\t\tHelp! This screen\n\n", 
 		compiledby, compilehost, compiled);
@@ -83,8 +80,7 @@ main(int argc, char **argv)
 	AIT_SET_STR(&args->Pass, "");
 
 	args->ka = MQTT_KEEPALIVE;
-	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
-	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCc:W:M:fvh")) != -1)
+	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:fvh")) != -1)
 		switch (ch) {
 			case 'T':
 				args->ka = (u_short) strtol(optarg, NULL, 0);
@@ -129,9 +125,6 @@ main(int argc, char **argv)
 			case 'f':
 				args->isFile++;
 				break;
-			case 'c':
-				strlcpy(szCfgName, optarg, sizeof szCfgName);
-				break;
 			case 'v':
 				io_incDebug;
 				break;
@@ -174,7 +167,7 @@ main(int argc, char **argv)
 	}
 
 	printf("Connected ... ");
-	switch ((ret = try2Connect(sock))) {
+	switch ((ret = ConnectClient(sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -201,10 +194,12 @@ main(int argc, char **argv)
 	if (ret == MQTT_RETCODE_ACCEPTED) {
 		ret = Publish(sock);
 		shutdown(sock, SHUT_RDWR);
-	} else
+		CloseClient(sock);
+	} else {
+		close(sock);
 		ret = 3;
+	}
 
-	close(sock);
 	args->free(args);
 	free(args);
 	return ret;