diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | process.c | 12 |
3 files changed, 26 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Sat Apr 25 18:21:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (ac_cv_func_daemon): use daemon(3) only on *BSD. + + * process.c (proc_daemon): double fork to ensure not having ctty. + [ruby-core:23311] + Sat Apr 25 16:19:48 2009 Tanaka Akira <akr@fsij.org> * time.c (month_arg): extracted from time_arg. diff --git a/configure.in b/configure.in index 127901f80..fe99222ba 100644 --- a/configure.in +++ b/configure.in @@ -728,6 +728,14 @@ AC_ARG_ENABLE(pthread, dnl Checks for libraries. case "$target_os" in +when(*bsd*|dragonfly*) + ;; +when(*) + ac_cv_func_daemon=no + ;; +esac + +case "$target_os" in when(nextstep*) ;; when(openstep*) ;; when(rhapsody*) ;; @@ -744,7 +752,6 @@ when(darwin*) RUBY_PREPEND_OPTION(LIBS, -lobjc) AC_MSG_RESULT($macosx_10_5) if test $macosx_10_5 = yes; then ac_cv_header_ucontext_h=no - ac_cv_func_daemon=no else AC_DEFINE(BROKEN_SETREUID, 1) AC_DEFINE(BROKEN_SETREGID, 1) @@ -4545,7 +4545,7 @@ proc_daemon(int argc, VALUE *argv) #elif defined(HAVE_FORK) switch (rb_fork(0, 0, 0, Qnil)) { case -1: - return (-1); + return INT2FIX(-1); case 0: break; default: @@ -4554,6 +4554,16 @@ proc_daemon(int argc, VALUE *argv) proc_setsid(); + /* must not be process-leader */ + switch (rb_fork(0, 0, 0, Qnil)) { + case -1: + return INT2FIX(-1); + case 0: + break; + default: + _exit(0); + } + if (!RTEST(nochdir)) (void)chdir("/"); |