X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=db91d5fb3c9b900a1d4d20d78a8b0df2a9929501;hb=HEAD;hp=1ed5ff614a73514ba6bbcfcbcffb1e1a579b8471;hpb=b511667bc50e324255eed9427c4588ffdf70be42;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index 1ed5ff61..db91d5fb 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -79,7 +79,9 @@ static bool deltree(const char *dirname) {
 
 		while((ent = readdir(d))) {
 			if(ent->d_name[0] == '.') {
-				continue;
+				if(!ent->d_name[1] || (ent->d_name[1] == '.' && !ent->d_name[2])) {
+					continue;
+				}
 			}
 
 			char filename[PATH_MAX];
@@ -403,7 +405,7 @@ bool config_rename(meshlink_handle_t *mesh, const char *old_conf_subdir, const c
 bool config_sync(meshlink_handle_t *mesh, const char *conf_subdir) {
 	assert(conf_subdir);
 
-	if(!mesh->confbase) {
+	if(!mesh->confbase || mesh->storage_policy == MESHLINK_STORAGE_DISABLED) {
 		return true;
 	}
 
@@ -482,11 +484,13 @@ bool meshlink_confbase_exists(meshlink_handle_t *mesh) {
 }
 
 /// Lock the main configuration file. Creates confbase if necessary.
-bool main_config_lock(meshlink_handle_t *mesh) {
+bool main_config_lock(meshlink_handle_t *mesh, const char *lock_filename) {
 	if(!mesh->confbase) {
 		return true;
 	}
 
+	assert(lock_filename);
+
 	if(mkdir(mesh->confbase, 0700) && errno != EEXIST) {
 		logger(NULL, MESHLINK_ERROR, "Cannot create configuration directory %s: %s", mesh->confbase, strerror(errno));
 		meshlink_close(mesh);
@@ -494,13 +498,10 @@ bool main_config_lock(meshlink_handle_t *mesh) {
 		return NULL;
 	}
 
-	char path[PATH_MAX];
-	snprintf(path, sizeof(path), "%s" SLASH "meshlink.lock", mesh->confbase);
-
-	mesh->lockfile = fopen(path, "w+");
+	mesh->lockfile = fopen(lock_filename, "w+");
 
 	if(!mesh->lockfile) {
-		logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", path, strerror(errno));
+		logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", lock_filename, strerror(errno));
 		meshlink_errno = MESHLINK_ESTORAGE;
 		return false;
 	}
@@ -514,7 +515,7 @@ bool main_config_lock(meshlink_handle_t *mesh) {
 #else
 
 	if(flock(fileno(mesh->lockfile), LOCK_EX | LOCK_NB) != 0) {
-		logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", path, strerror(errno));
+		logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", lock_filename, strerror(errno));
 		fclose(mesh->lockfile);
 		mesh->lockfile = NULL;
 		meshlink_errno = MESHLINK_EBUSY;