--- mqtt/src/mqtt_subs.c	2012/05/08 11:45:57	1.2.2.6
+++ mqtt/src/mqtt_subs.c	2012/05/22 14:15:04	1.2.2.8
@@ -19,7 +19,7 @@ Usage(void)
 		"=== %s@%s === Compiled: %s ===\n\n"
 		" Syntax: mqtt_subs [options] <connect_to_broker[:port]> <ConnectID> [exec_script <value>]\n\n"
 		"\t-l <value2file>\t\tSave received values to file\n"
-		"\t-u\t\tUnsubscribe given topic(s)\n"
+		"\t-u\t\t\tUnsubscribe given topic(s)\n"
 		"\t-s <topic[|QoS]>\tSubscribe for this topic, if wish add different |QoS to topic\n"
 		"\t-d\t\t\tSend duplicate message\n\n"
 		"\t-C\t\t\tNot clear before connect!\n"
@@ -83,10 +83,12 @@ Unsubscribe(int sock)
 	srandomdev();
 	mid = random() % USHRT_MAX;
 
+	printf(" > Execute UNSUBSCRIBE request #%d ... ", mid);
 	if (mqtt_cli_Unsubscribe(args->cli, args->subscr, mid, args->Dup, MQTT_QOS_ACK)) {
 		printf("Error:: Unsubscribe #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		return -1;
-	}
+	} else
+		printf("OK\n");
 
 	return 0;
 }
@@ -270,7 +272,9 @@ main(int argc, char **argv)
 		else
 			lf = stdout;
 		if (lf) {
-			ret = un ? Unsubscribe(args->cli->sock) : Subscribe(args->cli->sock, lf);
+			ret = Subscribe(args->cli->sock, lf);
+			if (un)
+				Unsubscribe(args->cli->sock);
 			fclose(lf);
 		} else
 			printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno));