From owner-svn-src-stable-7@FreeBSD.ORG Fri Mar 6 01:34:31 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25BB2106566B; Fri, 6 Mar 2009 01:34:31 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 110DA8FC08; Fri, 6 Mar 2009 01:34:31 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n261YUAb004379; Fri, 6 Mar 2009 01:34:30 GMT (envelope-from emax@svn.freebsd.org) Received: (from emax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n261YURs004375; Fri, 6 Mar 2009 01:34:30 GMT (envelope-from emax@svn.freebsd.org) Message-Id: <200903060134.n261YURs004375@svn.freebsd.org> From: Maksim Yevmenkin Date: Fri, 6 Mar 2009 01:34:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189426 - in stable/7: usr.bin/bluetooth/rfcomm_sppd usr.sbin/bluetooth/hcsecd usr.sbin/bluetooth/hcseriald usr.sbin/bluetooth/rfcomm_pppd X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 01:34:31 -0000 Author: emax Date: Fri Mar 6 01:34:30 2009 New Revision: 189426 URL: http://svn.freebsd.org/changeset/base/189426 Log: MFC r188130 Clenup code a bit and do not call fork(2) before dameon(3) where not needed. Modified: stable/7/usr.bin/bluetooth/rfcomm_sppd/ (props changed) stable/7/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c stable/7/usr.sbin/bluetooth/hcsecd/ (props changed) stable/7/usr.sbin/bluetooth/hcsecd/hcsecd.c stable/7/usr.sbin/bluetooth/hcseriald/ (props changed) stable/7/usr.sbin/bluetooth/hcseriald/hcseriald.c stable/7/usr.sbin/bluetooth/rfcomm_pppd/ (props changed) stable/7/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c Modified: stable/7/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c ============================================================================== --- stable/7/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c Fri Mar 6 01:27:51 2009 (r189425) +++ stable/7/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c Fri Mar 6 01:34:30 2009 (r189426) @@ -281,22 +281,8 @@ main(int argc, char *argv[]) } /* Became daemon if required */ - if (background) { - switch (fork()) { - case -1: - err(1, "Could not fork()"); - /* NOT REACHED */ - - case 0: - exit(0); - /* NOT REACHED */ - - default: - if (daemon(0, 0) < 0) - err(1, "Could not daemon()"); - break; - } - } + if (background && daemon(0, 0) < 0) + err(1, "Could not daemon()"); openlog(SPPD_IDENT, LOG_NDELAY|LOG_PERROR|LOG_PID, LOG_DAEMON); syslog(LOG_INFO, "Starting on %s...", (tty != NULL)? tty : "stdin/stdout"); Modified: stable/7/usr.sbin/bluetooth/hcsecd/hcsecd.c ============================================================================== --- stable/7/usr.sbin/bluetooth/hcsecd/hcsecd.c Fri Mar 6 01:27:51 2009 (r189425) +++ stable/7/usr.sbin/bluetooth/hcsecd/hcsecd.c Fri Mar 6 01:34:30 2009 (r189426) @@ -128,9 +128,8 @@ main(int argc, char *argv[]) (void * const) &filter, sizeof(filter)) < 0) err(1, "Could not set HCI socket filter"); - if (detach) - if (daemon(0, 0) < 0) - err(1, "Could not daemon()ize"); + if (detach && daemon(0, 0) < 0) + err(1, "Could not daemon()ize"); openlog(HCSECD_IDENT, LOG_NDELAY|LOG_PERROR|LOG_PID, LOG_DAEMON); Modified: stable/7/usr.sbin/bluetooth/hcseriald/hcseriald.c ============================================================================== --- stable/7/usr.sbin/bluetooth/hcseriald/hcseriald.c Fri Mar 6 01:27:51 2009 (r189425) +++ stable/7/usr.sbin/bluetooth/hcseriald/hcseriald.c Fri Mar 6 01:34:30 2009 (r189426) @@ -101,23 +101,10 @@ main(int argc, char *argv[]) /* Open device */ n = open_device(device, speed, name); - if (detach) { - pid_t pid = fork(); - - if (pid == (pid_t) -1) { - syslog(LOG_ERR, "Could not fork(). %s (%d)", - strerror(errno), errno); - exit(1); - } - - if (pid != 0) - exit(0); - - if (daemon(0, 0) < 0) { - syslog(LOG_ERR, "Could not daemon(0, 0). %s (%d)", - strerror(errno), errno); - exit(1); - } + if (detach && daemon(0, 0) < 0) { + syslog(LOG_ERR, "Could not daemon(0, 0). %s (%d)", + strerror(errno), errno); + exit(1); } /* Write PID file */ Modified: stable/7/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c ============================================================================== --- stable/7/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c Fri Mar 6 01:27:51 2009 (r189425) +++ stable/7/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c Fri Mar 6 01:34:30 2009 (r189426) @@ -166,22 +166,10 @@ main(int argc, char *argv[]) openlog(RFCOMM_PPPD, LOG_PID | LOG_PERROR | LOG_NDELAY, LOG_USER); - if (detach) { - pid = fork(); - if (pid == (pid_t) -1) { - syslog(LOG_ERR, "Could not fork(). %s (%d)", - strerror(errno), errno); - exit(1); - } - - if (pid != 0) - exit(0); - - if (daemon(0, 0) < 0) { - syslog(LOG_ERR, "Could not daemon(0, 0). %s (%d)", - strerror(errno), errno); - exit(1); - } + if (detach && daemon(0, 0) < 0) { + syslog(LOG_ERR, "Could not daemon(0, 0). %s (%d)", + strerror(errno), errno); + exit(1); } s = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);