wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-12 10:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #358: fix modify events for /etc/finit.conf

Browse Source 
- iwatch events return filenames in dir field, ignore file for those
 - improve warning message on failure
 - drop bogus "Out of memory" error log message

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-07-10 14:20:36 +02:00
parent 458d68533f
commit 4153c7966d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.c
+6 -5
View File
@@ -1235,7 +1235,10 @@ static int conf_change_act(char *dir, char *name, uint32_t mask)
struct conf_change *node;
char *rp = NULL;
paste(fn, sizeof(fn), dir, name);
if (name[0])
paste(fn, sizeof(fn), dir, name);
else
strlcpy(fn, dir, sizeof(fn));
dbg("path: %s mask: %08x", fn, mask);
/* Handle disabling/removal of service */
@@ -1266,7 +1269,7 @@ static int conf_change_act(char *dir, char *name, uint32_t mask)
dbg("event registered for %s, mask 0x%x", rp, mask);
return 0;
fail:
warn("failed registering %s event", fn);
warn("failed registering %s event mask %08x", fn, mask);
return 1;
}
@@ -1329,10 +1332,8 @@ static int conf_iwatch_read(int fd)
if (!iwp)
continue;
if (conf_change_act(iwp->path, ev->name, ev->mask)) {
err(1, " Out of memory");
if (conf_change_act(iwp->path, ev->name, ev->mask))
break;
}
}
return 0;