Page MenuHomeFreeBSD
Files F143414194

D3081.id7495.diff
No OneTemporary
Actions

D3081.id7495.diff
View Options

Index: usr.sbin/syslogd/syslogd.c
===================================================================
--- usr.sbin/syslogd/syslogd.c
+++ usr.sbin/syslogd/syslogd.c
@@ -349,6 +349,18 @@
static void timedout(int);
static void increase_rcvbuf(int);
+static void
+close_filed(struct filed *f)
+{
+
+ if (f == NULL || f->f_file == -1)
+ return;
+
+ (void)close(f->f_file);
+ f->f_file = -1;
+ f->f_type = F_UNUSED;
+}
+
int
main(int argc, char *argv[])
{
@@ -1024,7 +1036,8 @@
(void)strlcpy(f->f_lasttime, timestamp,
sizeof(f->f_lasttime));
fprintlog(f, flags, msg);
- (void)close(f->f_file);
+ close(f->f_file);
+ f->f_file = -1;
}
(void)sigsetmask(omask);
return;
@@ -1313,8 +1326,7 @@
*/
if (errno != ENOSPC) {
int e = errno;
- (void)close(f->f_file);
- f->f_type = F_UNUSED;
+ close_filed(f);
errno = e;
logerror(f->f_un.f_fname);
}
@@ -1338,7 +1350,7 @@
}
if (writev(f->f_file, iov, IOV_SIZE) < 0) {
int e = errno;
- (void)close(f->f_file);
+ close_filed(f);
if (f->f_un.f_pipe.f_pid > 0)
deadq_enter(f->f_un.f_pipe.f_pid,
f->f_un.f_pipe.f_pname);
@@ -1446,7 +1458,7 @@
for (f = Files; f; f = f->f_next)
if (f->f_type == F_PIPE &&
f->f_un.f_pipe.f_pid == pid) {
- (void)close(f->f_file);
+ close_filed(f);
f->f_un.f_pipe.f_pid = 0;
log_deadchild(pid, status,
f->f_un.f_pipe.f_pname);
@@ -1550,7 +1562,7 @@
if (f->f_prevcount)
fprintlog(f, 0, (char *)NULL);
if (f->f_type == F_PIPE && f->f_un.f_pipe.f_pid > 0) {
- (void)close(f->f_file);
+ close_filed(f);
f->f_un.f_pipe.f_pid = 0;
}
}
@@ -1634,11 +1646,11 @@
case F_FORW:
case F_CONSOLE:
case F_TTY:
- (void)close(f->f_file);
+ close_filed(f);
break;
case F_PIPE:
if (f->f_un.f_pipe.f_pid > 0) {
- (void)close(f->f_file);
+ close_filed(f);
deadq_enter(f->f_un.f_pipe.f_pid,
f->f_un.f_pipe.f_pname);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 31, 4:35 AM (5 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28108395
Default Alt Text
D3081.id7495.diff (1 KB)

Event Timeline