--- mqtt/src/Attic/mqtt.c	2011/12/13 08:43:51	1.1.1.1.2.22
+++ mqtt/src/Attic/mqtt.c	2011/12/13 09:01:43	1.1.1.1.2.23
@@ -20,14 +20,16 @@ Usage(void)
 	printf(	" -= MQTT Client =- Publisher/Subscriber from ELWIX\n"
 		"=== %s@%s === Compiled: %s ===\n\n"
 		" Syntax: mqtt [options] <connect_to_broker[:port]> [value_for_publish]\n\n"
-		"\t-p <topic>\t\tPublish topic\n"
+		"\t-t <topic>\t\tPublish topic\n"
 		"\t-s <topic[|QoS]>\tSubscribe for this topic, if wish add different |QoS to topic\n"
 		"\t-q <QoS>\t\tQoS level (0-at most 1, 1-at least 1, 2-exactly 1)\n"
 		"\t-d\t\t\tSend duplicate message\n"
 		"\t-r\t\t\tRetain message from broker\n"
 		"\t-c <config>\t\tService config\n"
 		"\t-f\t\t\t'value_for_publish' is file instead text\n"
-		"\t-P <port>\t\tDifferent port for connect (default: 1883)\n"
+		"\t-p <port>\t\tDifferent port for connect (default: 1883)\n"
+		"\t-U <username>\t\tUsername\n"
+		"\t-P <password>\t\tPassword\n"
 		"\t-D\t\t\tDaemon mode\n"
 		"\t-v\t\t\tVerbose (more -vvv, more verbose)\n"
 		"\t-h\t\t\tHelp! This screen\n\n", 
@@ -37,6 +39,8 @@ Usage(void)
 static void
 cleanArgs(struct tagArgs * __restrict args)
 {
+	AIT_FREE_VAL(&args->User);
+	AIT_FREE_VAL(&args->Pass);
 	AIT_FREE_VAL(&args->Publish);
 	AIT_FREE_VAL(&args->Value);
 	io_freeVars(&args->Subscribes);
@@ -62,12 +66,20 @@ main(int argc, char **argv)
 		args->free = cleanArgs;
 
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
-	while ((ch = getopt(argc, argv, "P:p:s:q:drc:fDvh")) != -1)
+	while ((ch = getopt(argc, argv, "U:P:p:t:s:q:drc:fDvh")) != -1)
 		switch (ch) {
+			case 'U':
+				AIT_FREE_VAL(&args->User);
+				AIT_SET_STR(&args->User, optarg);
+				break;
 			case 'P':
-				port = (u_short) strtol(optarg, NULL, 0);
+				AIT_FREE_VAL(&args->Pass);
+				AIT_SET_STR(&args->Pass, optarg);
 				break;
 			case 'p':
+				port = (u_short) strtol(optarg, NULL, 0);
+				break;
+			case 't':
 				AIT_FREE_VAL(&args->Publish);
 				AIT_SET_STR(&args->Publish, optarg);
 				break;