*/
#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;
}
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;
}
}
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) {
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);
return write_config_file(config_tree, filename);
}
-bool change_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, bool replace) {
+ assert(mesh && name && key && (replace || value));
+
char filename[PATH_MAX];
char tmpname[PATH_MAX];
- char buf[MAX_STRING_SIZE];
- const int keylen = strlen(key);
+ bool error = false;
+
+ snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ snprintf(tmpname, sizeof tmpname, "%s.tmp", filename);
- snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
- snprintf(tmpname, PATH_MAX, "%s.tmp", filename);
+ FILE *fr = fopen(filename, "r");
- FILE *in = fopen(filename, "r");
- if(!in) {
- // Hm, maybe the file does not exist? Try appending.
- return append_config_file(mesh, name, key, value);
+ if(!fr) {
+ logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
+ return false;
}
- FILE *out = fopen(tmpname, "w");
- if(!out) {
- logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmpname, strerror(errno));
- fclose(in);
+ FILE *fw = fopen(tmpname, "w");
+
+ if(!fw) {
+ logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno));
+ fclose(fr);
return false;
}
- bool ignore = false;
+ char buf[4096];
+ char *sep;
+ bool found = false;
- while(readline(in, buf, sizeof buf)) {
- if(ignore) {
- if(!strncmp(buf, "-----END", 8))
- ignore = false;
- } else {
- if(!strncmp(buf, "-----BEGIN", 10))
- ignore = true;
+ 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;
+ }
+
+ if(!value) {
+ found = true;
+ continue;
}
- if(!ignore && !strncmp(buf, key, keylen)) {
- if(strchr("\t =", buf[keylen])) {
+ // We found the key and the value. Keep one copy around.
+ if(sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value)) {
+ if(found)
continue;
- }
+ found = true;
}
- fputs(buf, out);
- fputc('\n', out);
- }
+ // We found the key but with a different value, delete it if wanted.
+ if(!found && replace)
+ continue;
- if(ferror(in)) {
- logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
- fclose(in);
- fclose(out);
- return false;
+ *sep = ' ';
+
+copy:
+ fprintf(fw, "%s\n", buf);
}
- fclose(in);
+ if(ferror(fr))
+ error = true;
+
+ fclose(fr);
+
+ // Add new key/value pair if necessary
+ if(!found && value)
+ fprintf(fw, "%s = %s\n", key, value);
+
+ if(ferror(fw))
+ error = true;
- fprintf(out, "%s = %s\n", key, value);
+ if(fclose(fw))
+ error = true;
- if(ferror(out)) {
- logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmpname, strerror(errno));
- fclose(out);
+ // If any error occured during reading or writing, exit.
+ if(error) {
+ unlink(tmpname);
return false;
}
- fclose(out);
-
+ // Try to atomically replace the old config file with the new one.
#ifdef HAVE_MINGW
- // We cannot atomically replace files on Windows.
char bakname[PATH_MAX];
- snprintf(bakname, PATH_MAX, "%s.bak", filename);
- if(rename(tmpname, bakfile) || rename(bakfile, filename)) {
- rename(bakfile, filename);
+ snprintf(bakname, sizeof bakname, "%s.bak", filename);
+ if(rename(filename, bakname) || rename(tmpname, filename)) {
+ rename(bakname, filename);
#else
if(rename(tmpname, filename)) {
#endif
- logger(mesh, MESHLINK_ERROR, "Failed to update `%s': %s", filename, strerror(errno));
return false;
+ } else {
+#ifdef HAVE_MINGW
+ unlink(bakname);
+#endif
+ return true;
}
-
- return true;
}
bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
- char filename[PATH_MAX];
- snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
-
- FILE *fp = fopen(filename, "a");
-
- if(!fp) {
- logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
- return false;
- }
-
- // Check if we don't add a duplicate entry
-
- char entry[MAX_STRING_SIZE];
- snprintf(entry, sizeof entry, "%s = %s", key, value);
-
- char buffer[MAX_STRING_SIZE];
- bool found = false;
-
- while(readline(fp, buffer, sizeof buffer)) {
- if(!strcmp(buffer, entry)) {
- found = true;
- break;
- }
- }
-
- // If not, append the new entry
-
- if(!found)
- fprintf(fp, "%s\n", entry);
-
- fclose(fp);
- return true;
+ return modify_config_file(mesh, name, key, value, false);
}