diff options
Diffstat (limited to 'runit/svlogd.c')
-rw-r--r-- | runit/svlogd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runit/svlogd.c b/runit/svlogd.c index b5eed15ab..cdf4e424b 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c | |||
@@ -361,7 +361,7 @@ static unsigned rotate(struct logdir *ld) | |||
361 | /* we presume this cannot fail */ | 361 | /* we presume this cannot fail */ |
362 | ld->filecur = fdopen(ld->fdcur, "a"); //// | 362 | ld->filecur = fdopen(ld->fdcur, "a"); //// |
363 | setvbuf(ld->filecur, NULL, _IOFBF, linelen); //// | 363 | setvbuf(ld->filecur, NULL, _IOFBF, linelen); //// |
364 | coe(ld->fdcur); | 364 | close_on_exec_on(ld->fdcur); |
365 | ld->size = 0; | 365 | ld->size = 0; |
366 | while (fchmod(ld->fdcur, 0644) == -1) | 366 | while (fchmod(ld->fdcur, 0644) == -1) |
367 | pause2cannot("set mode of current", ld->name); | 367 | pause2cannot("set mode of current", ld->name); |
@@ -482,7 +482,7 @@ static unsigned logdir_open(struct logdir *ld, const char *fn) | |||
482 | warn2("cannot open log directory", (char*)fn); | 482 | warn2("cannot open log directory", (char*)fn); |
483 | return 0; | 483 | return 0; |
484 | } | 484 | } |
485 | coe(ld->fddir); | 485 | close_on_exec_on(ld->fddir); |
486 | if (fchdir(ld->fddir) == -1) { | 486 | if (fchdir(ld->fddir) == -1) { |
487 | logdir_close(ld); | 487 | logdir_close(ld); |
488 | warn2("cannot change directory", (char*)fn); | 488 | warn2("cannot change directory", (char*)fn); |
@@ -498,7 +498,7 @@ static unsigned logdir_open(struct logdir *ld, const char *fn) | |||
498 | pause1cannot("change to initial working directory"); | 498 | pause1cannot("change to initial working directory"); |
499 | return 0; | 499 | return 0; |
500 | } | 500 | } |
501 | coe(ld->fdlock); | 501 | close_on_exec_on(ld->fdlock); |
502 | 502 | ||
503 | ld->size = 0; | 503 | ld->size = 0; |
504 | ld->sizemax = 1000000; | 504 | ld->sizemax = 1000000; |
@@ -624,7 +624,7 @@ static unsigned logdir_open(struct logdir *ld, const char *fn) | |||
624 | ld->filecur = fdopen(ld->fdcur, "a"); //// | 624 | ld->filecur = fdopen(ld->fdcur, "a"); //// |
625 | setvbuf(ld->filecur, NULL, _IOFBF, linelen); //// | 625 | setvbuf(ld->filecur, NULL, _IOFBF, linelen); //// |
626 | 626 | ||
627 | coe(ld->fdcur); | 627 | close_on_exec_on(ld->fdcur); |
628 | while (fchmod(ld->fdcur, 0644) == -1) | 628 | while (fchmod(ld->fdcur, 0644) == -1) |
629 | pause2cannot("set mode of current", ld->name); | 629 | pause2cannot("set mode of current", ld->name); |
630 | 630 | ||
@@ -851,7 +851,7 @@ int svlogd_main(int argc, char **argv) | |||
851 | if (dirn <= 0) usage(); | 851 | if (dirn <= 0) usage(); |
852 | ////if (buflen <= linemax) usage(); | 852 | ////if (buflen <= linemax) usage(); |
853 | fdwdir = xopen(".", O_RDONLY|O_NDELAY); | 853 | fdwdir = xopen(".", O_RDONLY|O_NDELAY); |
854 | coe(fdwdir); | 854 | close_on_exec_on(fdwdir); |
855 | dir = xzalloc(dirn * sizeof(struct logdir)); | 855 | dir = xzalloc(dirn * sizeof(struct logdir)); |
856 | for (i = 0; i < dirn; ++i) { | 856 | for (i = 0; i < dirn; ++i) { |
857 | dir[i].fddir = -1; | 857 | dir[i].fddir = -1; |