From 55219903e32e750cfdf58260e7c3a2c4f2bfe16e Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Mon, 25 Jul 2011 15:31:21 +0530 Subject: libglusterfs: Bring in os_daemon_* routines to replace modified FreeBSD code Change-Id: I41f4635b1b75adb6d22e2e325b99941f8d7a0b42 BUG: 3206 Reviewed-on: http://review.gluster.com/100 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- contrib/apple/daemon.c | 101 ------------------------------------------------- contrib/apple/daemon.h | 21 ---------- 2 files changed, 122 deletions(-) delete mode 100644 contrib/apple/daemon.c delete mode 100644 contrib/apple/daemon.h (limited to 'contrib') diff --git a/contrib/apple/daemon.c b/contrib/apple/daemon.c deleted file mode 100644 index 060f6a4307b..00000000000 --- a/contrib/apple/daemon.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - Copyright (c) 2010 Gluster, Inc. - - Based on http://www.opensource.apple.com/source/Libc/Libc-583/gen/FreeBSD/daemon.c - */ - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -int -os_daemon_return(nochdir, noclose) - int nochdir, noclose; -{ - struct sigaction osa, sa; - int fd; - pid_t newgrp; - int oerrno; - int osa_ok; - int ret; - - /* A SIGHUP may be thrown when the parent exits below. */ - sigemptyset(&sa.sa_mask); - sa.sa_handler = SIG_IGN; - sa.sa_flags = 0; - osa_ok = sigaction(SIGHUP, &sa, &osa); - - ret = fork(); - if (ret) - return ret; - - newgrp = setsid(); - oerrno = errno; - if (osa_ok != -1) - sigaction(SIGHUP, &osa, NULL); - - if (newgrp == -1) { - errno = oerrno; - return (-1); - } - - if (!nochdir) - (void)chdir("/"); - - /* Was using '_PATH_DEVNULL' earlier. As it was not defined in solaris, - changed to hardcoded path (and removed '#include ' too) */ - if (!noclose && (fd = open("/dev/null", O_RDWR, 0)) != -1) { - (void)dup2(fd, STDIN_FILENO); - (void)dup2(fd, STDOUT_FILENO); - (void)dup2(fd, STDERR_FILENO); - if (fd > 2) - (void)close(fd); - } - return (0); -} - -int -os_daemon(int nochdir, int noclose) -{ - int ret; - - ret = os_daemon_return(nochdir, noclose); - if (ret <= 0) - return ret; - - _exit(0); -} diff --git a/contrib/apple/daemon.h b/contrib/apple/daemon.h deleted file mode 100644 index aa88d9baa56..00000000000 --- a/contrib/apple/daemon.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - Copyright (c) 2010 Gluster, Inc. - This file is part of GlusterFS. - - GlusterFS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - GlusterFS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see - . -*/ - -int os_daemon_return(int nochdir, int noclose); -int os_daemon(int nochdir, int noclose); -- cgit