From: Eric Andersen Date: Wed, 4 Apr 2001 19:25:57 +0000 (-0000) Subject: Seems that stupid libc5 doesn't implement daemon(), so conditionally X-Git-Tag: 0_51~50 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2e3e9b0c9149f0c7e1e6a8b46587d7cb53b68aa;p=oweals%2Fbusybox.git Seems that stupid libc5 doesn't implement daemon(), so conditionally inclde that here. -Erik --- diff --git a/Makefile b/Makefile index c8c9d4687..85ba823fb 100644 --- a/Makefile +++ b/Makefile @@ -236,7 +236,7 @@ endif LIBBB = libbb LIBBB_LIB = libbb.a LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c copy_file.c \ -copy_file_chunk.c create_path.c device_open.c error_msg.c \ +copy_file_chunk.c create_path.c daemon.c device_open.c error_msg.c \ find_mount_point.c find_pid_by_name.c find_root_device.c full_read.c \ full_write.c get_console.c get_last_path_component.c get_line_from_file.c \ human_readable.c inode_hash.c isdirectory.c kernel_version.c loop.c \ diff --git a/include/libbb.h b/include/libbb.h index b5c845952..d850befea 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -39,6 +39,8 @@ #if ! defined __GLIBC__ && ! defined __UCLIBC__ /* libc5 doesn't define socklen_t */ typedef unsigned int socklen_t; +/* libc5 doesn't implement BSD 4.4 daemon() */ +extern int daemon (int nochdir, int noclose); #endif /* Some useful definitions */ diff --git a/libbb/daemon.c b/libbb/daemon.c new file mode 100644 index 000000000..55a776ce0 --- /dev/null +++ b/libbb/daemon.c @@ -0,0 +1,103 @@ +/* vi: set sw=4 ts=4: */ +/* + * daemon implementation for uClibc + * + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * Modified for uClibc by Erik Andersen + * , + * + * The uClibc Library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * The GNU C Library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with the GNU C Library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Original copyright notice is retained at the end of this file. + */ + +#include +#include +#include +#include + + +/* Stupid libc doesn't have a reliable way for use to know + * that libc5 is being used. Assume this is good enough */ +#if ! defined __GLIBC__ && ! defined __UCLIBC__ + +int daemon( int nochdir, int noclose ) +{ + int fd; + + switch (fork()) { + case -1: + return(-1); + case 0: + break; + default: + _exit(0); + } + + if (setsid() == -1) + return(-1); + + if (!nochdir) + chdir("/"); + + if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { + dup2(fd, STDIN_FILENO); + dup2(fd, STDOUT_FILENO); + dup2(fd, STDERR_FILENO); + if (fd > 2) + close(fd); + } + return(0); +} +#endif + + +/*- + * 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. + * + * 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. + */ + + diff --git a/libbb/libbb.h b/libbb/libbb.h index b5c845952..d850befea 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -39,6 +39,8 @@ #if ! defined __GLIBC__ && ! defined __UCLIBC__ /* libc5 doesn't define socklen_t */ typedef unsigned int socklen_t; +/* libc5 doesn't implement BSD 4.4 daemon() */ +extern int daemon (int nochdir, int noclose); #endif /* Some useful definitions */