*/
#include "system.h"
+#include <assert.h>
#include "splay_tree.h"
#include "connection.h"
}
logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ cfg->variable, cfg->file, cfg->line);
return false;
}
return true;
logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ cfg->variable, cfg->file, cfg->line);
return false;
}
-bool set_config_int(config_t *cfg, int val)
-{
+bool set_config_int(config_t *cfg, int val) {
if(!cfg)
return false;
return true;
}
-bool set_config_string(config_t *cfg, const char* val)
-{
+bool set_config_string(config_t *cfg, const char *val) {
if(!cfg)
return false;
}
logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ cfg->variable, cfg->file, cfg->line);
return false;
}
/*
Read exactly one line and strip the trailing newline if any.
*/
-static char *readline(FILE * fp, char *buf, size_t buflen) {
+static char *readline(FILE *fp, char *buf, size_t buflen) {
char *newline = NULL;
char *p;
if(!*value) {
const char err[] = "No value for variable";
logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s",
- err, variable, lineno, fname);
+ err, variable, lineno, fname);
return NULL;
}
}
for(;;) {
- line = readline(fp, buffer, sizeof buffer);
+ line = readline(fp, buffer, sizeof(buffer));
if(!line) {
if(feof(fp))
}
cfg = parse_config_line(line, fname, lineno);
- if (!cfg)
+ if(!cfg)
break;
config_add(config_tree, cfg);
}
return result;
}
-bool write_config_file(const struct splay_tree_t *config_tree, const char *fname)
-{
+bool write_config_file(const struct splay_tree_t *config_tree, const char *fname) {
FILE *fp;
fp = fopen(fname, "w+");
return false;
}
- for splay_each(config_t, cnf, config_tree)
- {
- if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable)) {
- logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
- return false;
- }
+ for splay_each(config_t, cnf, config_tree) {
+ if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable))
+ goto error;
- if(fwrite(" = ", sizeof(char), 3, fp) < 3) {
- logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
- return false;
- }
+ if(fwrite(" = ", sizeof(char), 3, fp) < 3)
+ goto error;
- if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) {
- logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
- return false;
- }
+ if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value))
+ goto error;
- if(fwrite("\n", sizeof(char), 1, fp) < 1) {
- logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
- return false;
- }
+ if(fwrite("\n", sizeof(char), 1, fp) < 1)
+ goto error;
}
fclose(fp);
-
return true;
+
+error:
+ logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+ fclose(fp);
+ return false;
}
bool read_server_config(meshlink_handle_t *mesh) {
char filename[PATH_MAX];
bool x;
- snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
+ snprintf(filename, PATH_MAX, "%s" SLASH "meshlink.conf", mesh->confbase);
errno = 0;
x = read_config_file(mesh->config, filename);
char filename[PATH_MAX];
bool x;
- snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
x = read_config_file(config_tree, filename);
return x;
}
-bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name)
-{
+bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name) {
char filename[PATH_MAX];
- snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
return write_config_file(config_tree, filename);
}
-bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
+bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, int trim) {
+ assert(mesh && name && key);
+
char filename[PATH_MAX];
- snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ char tmpname[PATH_MAX];
+ bool error = false;
- FILE *fp = fopen(filename, "a");
+ snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename);
- if(!fp) {
+ FILE *fr = fopen(filename, "r");
+
+ if(!fr) {
logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
+ return false;
+ }
+
+ FILE *fw = fopen(tmpname, "w");
+
+ if(!fw) {
+ logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno));
+ fclose(fr);
+ return false;
+ }
+
+ char buf[4096];
+ char *sep;
+ int found = 0;
+
+ if(value) {
+ fprintf(fw, "%s = %s\n", key, value);
+ found++;
+ }
+
+ while(readline(fr, buf, sizeof(buf))) {
+ if(!*buf || *buf == '#')
+ goto copy;
+
+ sep = strchr(buf, ' ');
+ if(!sep)
+ goto copy;
+
+ *sep = 0;
+ if(strcmp(buf, key)) {
+ *sep = ' ';
+ goto copy;
+ }
+
+ // We found the key and the value. We already added it at the top, so ignore this one.
+ if(value && sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value))
+ continue;
+
+ // We found the key but with a different value, delete it if wanted.
+ found++;
+ if((!value || trim) && found > trim)
+ continue;
+
+ *sep = ' ';
+
+copy:
+ fprintf(fw, "%s\n", buf);
+ }
+
+ if(ferror(fr))
+ error = true;
+
+ fclose(fr);
+
+ if(ferror(fw))
+ error = true;
+
+ if(fclose(fw))
+ error = true;
+
+ // If any error occured during reading or writing, exit.
+ if(error) {
+ unlink(tmpname);
+ return false;
+ }
+
+ // Try to atomically replace the old config file with the new one.
+#ifdef HAVE_MINGW
+ char bakname[PATH_MAX];
+ snprintf(bakname, sizeof(bakname), "%s.bak", filename);
+ if(rename(filename, bakname) || rename(tmpname, filename)) {
+ rename(bakname, filename);
+#else
+ if(rename(tmpname, filename)) {
+#endif
+ return false;
} else {
- fprintf(fp, "%s = %s\n", key, value);
- fclose(fp);
+#ifdef HAVE_MINGW
+ unlink(bakname);
+#endif
+ return true;
}
+}
- return fp != NULL;
+bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
+ return modify_config_file(mesh, name, key, value, 0);
}
projects / meshlink / blobdiff