emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svlogd: fix 'SEGV on uninitialized data' and make it honor TERM

Browse Source
This commit is contained in:
Denis Vlasenko 2007-05-06 01:37:21 +00:00
parent dd4cb2b31e
commit b952835efe
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runit/svlogd.c
View File

@ -642,9 +642,11 @@ static int buffer_pread(int fd, char *s, unsigned len, struct taia *now)
trotate = dir[i].trotate; trotate = dir[i].trotate;
} }
while (1) { do {
sigprocmask(SIG_UNBLOCK, blocked_sigset, NULL); sigprocmask(SIG_UNBLOCK, blocked_sigset, NULL);
iopause(&input, 1, &trotate, now); iopause(&input, 1, &trotate, now);
// TODO: do not unblock/block, but use sigpending after iopause
// to see whether there was any sig? (one syscall less...)
sigprocmask(SIG_BLOCK, blocked_sigset, NULL); sigprocmask(SIG_BLOCK, blocked_sigset, NULL);
i = ndelay_read(fd, s, len); i = ndelay_read(fd, s, len);
if (i >= 0) break; if (i >= 0) break;
@ -653,7 +655,7 @@ static int buffer_pread(int fd, char *s, unsigned len, struct taia *now)
break; break;
} }
/* else: EAGAIN - normal, repeat silently */ /* else: EAGAIN - normal, repeat silently */
} } while (!exitasap);
if (i > 0) { if (i > 0) {
int cnt; int cnt;
@ -784,12 +786,12 @@ int svlogd_main(int argc, char **argv)
////if (buflen <= linemax) usage(); ////if (buflen <= linemax) usage();
fdwdir = xopen(".", O_RDONLY|O_NDELAY); fdwdir = xopen(".", O_RDONLY|O_NDELAY);
coe(fdwdir); coe(fdwdir);
dir = xmalloc(dirn * sizeof(struct logdir)); dir = xzalloc(dirn * sizeof(struct logdir));
for (i = 0; i < dirn; ++i) { for (i = 0; i < dirn; ++i) {
dir[i].fddir = -1; dir[i].fddir = -1;
dir[i].fdcur = -1; dir[i].fdcur = -1;
////dir[i].btmp = xmalloc(buflen); ////dir[i].btmp = xmalloc(buflen);
dir[i].ppid = 0; /*dir[i].ppid = 0;*/
} }
/* line = xmalloc(linemax + (timestamp ? 26 : 0)); */ /* line = xmalloc(linemax + (timestamp ? 26 : 0)); */
fndir = argv; fndir = argv;