diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | process.c | 9 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Mar 30 13:57:08 2010 Akinori MUSHA <knu@iDaemons.org> + + * process.c (proc_daemon): Process.daemon should raise an error on + failure regardless of whether the implementation uses daemon(3) + or not. [ruby-dev:40832] + Tue Mar 30 13:11:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * tool/file2lastrev.rb (VCS::GIT_SVN): removed because git-log can @@ -4531,8 +4531,8 @@ proc_setmaxgroups(VALUE obj, VALUE val) #if defined(HAVE_DAEMON) || defined(HAVE_FORK) /* * call-seq: - * Process.daemon() => fixnum - * Process.daemon(nochdir=nil,noclose=nil) => fixnum + * Process.daemon() => 0 + * Process.daemon(nochdir=nil,noclose=nil) => 0 * * Detach the process from controlling terminal and run in * the background as system daemon. Unless the argument @@ -4540,6 +4540,7 @@ proc_setmaxgroups(VALUE obj, VALUE val) * working directory to the root ("/"). Unless the argument * noclose is true, daemon() will redirect standard input, * standard output and standard error to /dev/null. + * Return zero on success, or raise one of Errno::*. */ static VALUE @@ -4561,7 +4562,7 @@ proc_daemon(int argc, VALUE *argv) #elif defined(HAVE_FORK) switch (rb_fork(0, 0, 0, Qnil)) { case -1: - return INT2FIX(-1); + rb_sys_fail("daemon"); case 0: break; default: @@ -4573,7 +4574,7 @@ proc_daemon(int argc, VALUE *argv) /* must not be process-leader */ switch (rb_fork(0, 0, 0, Qnil)) { case -1: - return INT2FIX(-1); + rb_sys_fail("daemon"); case 0: break; default: |