X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=af8b0b0e20ba5e44a3c9953e5562577ef17eafd8;hb=adbe9a0c31825a0285e2a0e06558e1a5d8694005;hp=2195d69c42ff32230e85f54c67bae00aeac9a674;hpb=06e5c20b092578b496593c4e2934ee726cb12469;p=meshlink diff --git a/src/conf.c b/src/conf.c index 2195d69c..af8b0b0e 100644 --- a/src/conf.c +++ b/src/conf.c @@ -18,6 +18,7 @@ */ #include "system.h" +#include #include "splay_tree.h" #include "connection.h" @@ -333,30 +334,26 @@ bool write_config_file(const struct splay_tree_t *config_tree, const char *fname 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; - } + 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) { @@ -391,96 +388,110 @@ bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t * 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, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); - snprintf(tmpname, PATH_MAX, "%s.tmp", filename); + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + snprintf(tmpname, sizeof tmpname, "%s.tmp", filename); - FILE *in = fopen(filename, "r"); - if(!in) { - // Hm, maybe the file does not exist? Try appending. - return append_config_file(mesh, name, key, value); + FILE *fr = fopen(filename, "r"); + + 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(!ignore && !strncmp(buf, key, keylen)) { - if(strchr("\t =", buf[keylen])) { + if(!value) { + found = true; + continue; + } + + // 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; + + *sep = ' '; - if(ferror(in)) { - logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno)); - fclose(in); - fclose(out); - return false; +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)); - } else { - fprintf(fp, "%s = %s\n", key, value); - fclose(fp); - } - - return fp != NULL; + return modify_config_file(mesh, name, key, value, false); }