Add --version for all clients.
This commit is contained in:
parent
5daa5ee162
commit
e2123b2561
@ -61,6 +61,7 @@ Clients:
|
|||||||
- mosquitto_pub now sends 0 length files without an error when using `-f`.
|
- mosquitto_pub now sends 0 length files without an error when using `-f`.
|
||||||
- mosquitto_sub now supports extra format specifiers for field width and
|
- mosquitto_sub now supports extra format specifiers for field width and
|
||||||
precision for some parameters.
|
precision for some parameters.
|
||||||
|
- Add `--version` for all clients.
|
||||||
|
|
||||||
|
|
||||||
1.6.9 - 20200227
|
1.6.9 - 20200227
|
||||||
|
@ -1102,6 +1102,8 @@ int client_config_line_proc(struct mosq_config *cfg, int pub_or_sub, int argc, c
|
|||||||
goto unknown_option;
|
goto unknown_option;
|
||||||
}
|
}
|
||||||
cfg->verbose = 1;
|
cfg->verbose = 1;
|
||||||
|
}else if(!strcmp(argv[i], "--version")){
|
||||||
|
return 3;
|
||||||
}else if(!strcmp(argv[i], "-W")){
|
}else if(!strcmp(argv[i], "-W")){
|
||||||
if(pub_or_sub == CLIENT_PUB){
|
if(pub_or_sub == CLIENT_PUB){
|
||||||
goto unknown_option;
|
goto unknown_option;
|
||||||
|
@ -366,6 +366,14 @@ void pub_shared_cleanup(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void print_version(void)
|
||||||
|
{
|
||||||
|
int major, minor, revision;
|
||||||
|
|
||||||
|
mosquitto_lib_version(&major, &minor, &revision);
|
||||||
|
printf("mosquitto_pub version %s running on libmosquitto %d.%d.%d.\n", VERSION, major, minor, revision);
|
||||||
|
}
|
||||||
|
|
||||||
void print_usage(void)
|
void print_usage(void)
|
||||||
{
|
{
|
||||||
int major, minor, revision;
|
int major, minor, revision;
|
||||||
@ -496,6 +504,8 @@ int main(int argc, char *argv[])
|
|||||||
if(rc == 2){
|
if(rc == 2){
|
||||||
/* --help */
|
/* --help */
|
||||||
print_usage();
|
print_usage();
|
||||||
|
}else if(rc == 3){
|
||||||
|
print_version();
|
||||||
}else{
|
}else{
|
||||||
fprintf(stderr, "\nUse 'mosquitto_pub --help' to see usage.\n");
|
fprintf(stderr, "\nUse 'mosquitto_pub --help' to see usage.\n");
|
||||||
}
|
}
|
||||||
|
@ -153,6 +153,14 @@ void my_publish_callback(struct mosquitto *mosq, void *obj, int mid, int reason_
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void print_version(void)
|
||||||
|
{
|
||||||
|
int major, minor, revision;
|
||||||
|
|
||||||
|
mosquitto_lib_version(&major, &minor, &revision);
|
||||||
|
printf("mosquitto_rr version %s running on libmosquitto %d.%d.%d.\n", VERSION, major, minor, revision);
|
||||||
|
}
|
||||||
|
|
||||||
void print_usage(void)
|
void print_usage(void)
|
||||||
{
|
{
|
||||||
int major, minor, revision;
|
int major, minor, revision;
|
||||||
@ -280,6 +288,9 @@ int main(int argc, char *argv[])
|
|||||||
if(rc == 2){
|
if(rc == 2){
|
||||||
/* --help */
|
/* --help */
|
||||||
print_usage();
|
print_usage();
|
||||||
|
}else if(rc == 3){
|
||||||
|
/* --version */
|
||||||
|
print_version();
|
||||||
}else{
|
}else{
|
||||||
fprintf(stderr, "\nUse 'mosquitto_rr --help' to see usage.\n");
|
fprintf(stderr, "\nUse 'mosquitto_rr --help' to see usage.\n");
|
||||||
}
|
}
|
||||||
|
@ -175,6 +175,14 @@ void my_log_callback(struct mosquitto *mosq, void *obj, int level, const char *s
|
|||||||
printf("%s\n", str);
|
printf("%s\n", str);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void print_version(void)
|
||||||
|
{
|
||||||
|
int major, minor, revision;
|
||||||
|
|
||||||
|
mosquitto_lib_version(&major, &minor, &revision);
|
||||||
|
printf("mosquitto_sub version %s running on libmosquitto %d.%d.%d.\n", VERSION, major, minor, revision);
|
||||||
|
}
|
||||||
|
|
||||||
void print_usage(void)
|
void print_usage(void)
|
||||||
{
|
{
|
||||||
int major, minor, revision;
|
int major, minor, revision;
|
||||||
@ -319,6 +327,9 @@ int main(int argc, char *argv[])
|
|||||||
if(rc == 2){
|
if(rc == 2){
|
||||||
/* --help */
|
/* --help */
|
||||||
print_usage();
|
print_usage();
|
||||||
|
}else if(rc == 3){
|
||||||
|
/* --version */
|
||||||
|
print_version();
|
||||||
}else{
|
}else{
|
||||||
fprintf(stderr, "\nUse 'mosquitto_sub --help' to see usage.\n");
|
fprintf(stderr, "\nUse 'mosquitto_sub --help' to see usage.\n");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user