From owner-svn-src-user@freebsd.org Thu Jul 30 05:13:14 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07B619AD5CA for ; Thu, 30 Jul 2015 05:13:14 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2FAEB01; Thu, 30 Jul 2015 05:13:13 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6U5DDjT041581; Thu, 30 Jul 2015 05:13:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6U5DDUD041580; Thu, 30 Jul 2015 05:13:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201507300513.t6U5DDUD041580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 30 Jul 2015 05:13:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r286065 - user/ngie/more-tests/usr.sbin/syslogd X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2015 05:13:14 -0000 Author: ngie Date: Thu Jul 30 05:13:12 2015 New Revision: 286065 URL: https://svnweb.freebsd.org/changeset/base/286065 Log: Revert local change accidentally committed with r285905 Modified: user/ngie/more-tests/usr.sbin/syslogd/syslogd.c Modified: user/ngie/more-tests/usr.sbin/syslogd/syslogd.c ============================================================================== --- user/ngie/more-tests/usr.sbin/syslogd/syslogd.c Thu Jul 30 04:53:53 2015 (r286064) +++ user/ngie/more-tests/usr.sbin/syslogd/syslogd.c Thu Jul 30 05:13:12 2015 (r286065) @@ -349,22 +349,6 @@ static int waitdaemon(int, int, int); static void timedout(int); static void increase_rcvbuf(int); -static void -close_filed(struct filed *f) -{ - int saved_errno; - - if (f == NULL || f->f_file == -1) - return; - - saved_errno = errno; - - close(f->f_file); - f->f_file = -1; - f->f_type = F_UNUSED; - errno = saved_errno; -} - int main(int argc, char *argv[]) { @@ -1041,7 +1025,6 @@ logmsg(int pri, const char *msg, const c sizeof(f->f_lasttime)); fprintlog(f, flags, msg); (void)close(f->f_file); - f->f_file = -1; } (void)sigsetmask(omask); return; @@ -1330,7 +1313,8 @@ fprintlog(struct filed *f, int flags, co */ if (errno != ENOSPC) { int e = errno; - close_filed(f); + (void)close(f->f_file); + f->f_type = F_UNUSED; errno = e; logerror(f->f_un.f_fname); } @@ -1353,11 +1337,13 @@ fprintlog(struct filed *f, int flags, co } } if (writev(f->f_file, iov, IOV_SIZE) < 0) { - close_filed(f); + int e = errno; + (void)close(f->f_file); 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); f->f_un.f_pipe.f_pid = 0; + errno = e; logerror(f->f_un.f_pipe.f_pname); } break; @@ -1460,7 +1446,7 @@ reapchild(int signo __unused) for (f = Files; f; f = f->f_next) if (f->f_type == F_PIPE && f->f_un.f_pipe.f_pid == pid) { - close_filed(f); + (void)close(f->f_file); f->f_un.f_pipe.f_pid = 0; log_deadchild(pid, status, f->f_un.f_pipe.f_pname); @@ -1564,7 +1550,7 @@ die(int signo) if (f->f_prevcount) fprintlog(f, 0, (char *)NULL); if (f->f_type == F_PIPE && f->f_un.f_pipe.f_pid > 0) { - close_filed(f); + (void)close(f->f_file); f->f_un.f_pipe.f_pid = 0; } } @@ -1649,11 +1635,10 @@ init(int signo) case F_CONSOLE: case F_TTY: (void)close(f->f_file); - f->f_file = -1; break; case F_PIPE: if (f->f_un.f_pipe.f_pid > 0) { - close_filed(f); + (void)close(f->f_file); deadq_enter(f->f_un.f_pipe.f_pid, f->f_un.f_pipe.f_pname); }