From patchwork Fri Nov 6 11:04:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 37836 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 64C15B70B3 for ; Fri, 6 Nov 2009 22:03:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754493AbZKFLDH (ORCPT ); Fri, 6 Nov 2009 06:03:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754103AbZKFLDH (ORCPT ); Fri, 6 Nov 2009 06:03:07 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:40970 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754493AbZKFLDG (ORCPT ); Fri, 6 Nov 2009 06:03:06 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 1CC20678A3; Fri, 6 Nov 2009 11:03:11 +0000 (UTC) From: Mike Frysinger To: stephen.hemminger@vyatta.com, netdev@vger.kernel.org Subject: [PATCH v2] arpd/ifstat/nstat/rtacct: use daemon() Date: Fri, 6 Nov 2009 06:04:39 -0500 Message-Id: <1257505479-13631-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.6.5.1 In-Reply-To: <1257344795-8665-3-git-send-email-vapier@gentoo.org> References: <1257344795-8665-3-git-send-email-vapier@gentoo.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A bunch of misc utils basically reimplement the daemon() function (the whole fork/close/chdir/etc...). Rather than do that, use daemon() as that will work under nommu Linux systems that lack fork(). Signed-off-by: Mike Frysinger --- misc/arpd.c | 24 +++--------------------- misc/ifstat.c | 8 ++++---- misc/nstat.c | 8 ++++---- misc/rtacct.c | 8 ++++---- 4 files changed, 15 insertions(+), 33 deletions(-) diff --git a/misc/arpd.c b/misc/arpd.c index 71cd082..128c49d 100644 --- a/misc/arpd.c +++ b/misc/arpd.c @@ -775,27 +775,9 @@ int main(int argc, char **argv) load_initial_table(); - if (1) { - int fd; - pid_t pid = fork(); - - if (pid > 0) - _exit(0); - if (pid < 0) { - perror("arpd: fork"); - goto do_abort; - } - - chdir("/"); - fd = open("/dev/null", O_RDWR); - if (fd >= 0) { - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - if (fd > 2) - close(fd); - } - setsid(); + if (daemon(0, 0)) { + perror("arpd: daemon"); + goto do_abort; } openlog("arpd", LOG_PID | LOG_CONS, LOG_DAEMON); diff --git a/misc/ifstat.c b/misc/ifstat.c index 68dfdee..0ce8c92 100644 --- a/misc/ifstat.c +++ b/misc/ifstat.c @@ -663,10 +663,10 @@ int main(int argc, char *argv[]) perror("ifstat: listen"); exit(-1); } - if (fork()) - exit(0); - chdir("/"); - close(0); close(1); close(2); setsid(); + if (daemon(0, 0)) { + perror("ifstat: daemon"); + exit(-1); + } signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, sigchild); server_loop(fd); diff --git a/misc/nstat.c b/misc/nstat.c index 80e695f..2e44ed2 100644 --- a/misc/nstat.c +++ b/misc/nstat.c @@ -513,10 +513,10 @@ int main(int argc, char *argv[]) perror("nstat: listen"); exit(-1); } - if (fork()) - exit(0); - chdir("/"); - close(0); close(1); close(2); setsid(); + if (daemon(0, 0)) { + perror("nstat: daemon"); + exit(-1); + } signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, sigchild); server_loop(fd); diff --git a/misc/rtacct.c b/misc/rtacct.c index eb3ea9e..a247dfd 100644 --- a/misc/rtacct.c +++ b/misc/rtacct.c @@ -524,10 +524,10 @@ int main(int argc, char *argv[]) perror("rtacct: listen"); exit(-1); } - if (fork()) - exit(0); - chdir("/"); - close(0); close(1); close(2); setsid(); + if (daemon(0, 0)) { + perror("rtacct: daemon"); + exit(-1); + } signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, sigchild); server_loop(fd);