nicolabs/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-05-21 12:24:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Windows implementation of client config files.

Browse source
This commit is contained in:
Roger A. Light 2014-10-26 22:06:54 +00:00
parent ab49b96db1
commit 0c3e4e50cc
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
client/client_shared.c
View file

@ -50,14 +50,16 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
FILE *fptr;
char line[1024];
int count;
#ifndef WIN32
char *env;
char *loc = NULL;
int len;
char *args[3];
args[0] = NULL;
#ifndef WIN32
char *env;
#else
char env[1024];
#endif
args[0] = NULL;
init_config(cfg);
@ -89,6 +91,22 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
}
}
#else
rc = GetEnvironmentVariable("USERPROFILE", env, 1024);
if(rc > 0 && rc < 1024){
len = strlen(env) + strlen("\\mosquitto_pub.conf") + 1;
loc = malloc(len);
if(pub_or_sub == CLIENT_PUB){
snprintf(loc, len, "%s\\mosquitto_pub.conf", env);
}else{
snprintf(loc, len, "%s\\mosquitto_sub.conf", env);
}
loc[len-1] = '\0';
}else{
fprintf(stderr, "Warning: Unable to locate configuration directory, default config not loaded.\n");
}
#endif
if(loc){
fptr = fopen(loc, "rt");
if(fptr){
@ -120,9 +138,6 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
}
free(loc);
}
#else
// FIXME - config file support
#endif
/* Deal with real argc/argv */
rc = client_config_line_proc(cfg, pub_or_sub, argc, argv);