mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* configure.in (sigsetmask): check when signal semantics is not POSIX.
* signal.c (USE_TRAP_MASK): set true if sigprocmask or sigsetmask is available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									2d8bfbb017
								
							
						
					
					
						commit
						300264c0e8
					
				
					 4 changed files with 26 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -1,3 +1,10 @@
 | 
			
		|||
Fri Feb 15 02:40:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* configure.in (sigsetmask): check when signal semantics is not POSIX.
 | 
			
		||||
 | 
			
		||||
	* signal.c (USE_TRAP_MASK): set true if sigprocmask or sigsetmask is
 | 
			
		||||
	  available.
 | 
			
		||||
 | 
			
		||||
Thu Feb 14 17:44:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* ext/dl/ptr.c (dlmem_each_i): typo fixed.  a patch from IKOMA
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -670,6 +670,7 @@ fi
 | 
			
		|||
if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
 | 
			
		||||
   AC_DEFINE(POSIX_SIGNAL)
 | 
			
		||||
else
 | 
			
		||||
  AC_CHECK_FUNCS(sigsetmask)
 | 
			
		||||
  AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
 | 
			
		||||
    [AC_TRY_RUN([
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
| 
						 | 
				
			
			@ -692,7 +693,7 @@ main()
 | 
			
		|||
],
 | 
			
		||||
	rb_cv_bsd_signal=yes,
 | 
			
		||||
	rb_cv_bsd_signal=no,
 | 
			
		||||
	rb_cv_bsd_signal=no)])
 | 
			
		||||
	rb_cv_bsd_signal=$ac_cv_func_sigsetmask)])
 | 
			
		||||
  if test "$rb_cv_bsd_signal" = yes; then
 | 
			
		||||
    AC_DEFINE(BSD_SIGNAL)
 | 
			
		||||
  fi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										22
									
								
								signal.c
									
										
									
									
									
								
							
							
						
						
									
										22
									
								
								signal.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -21,6 +21,12 @@
 | 
			
		|||
#undef SIGBUS
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined HAVE_SIGPROCMASK || defined HAVE_SIGSETMASK
 | 
			
		||||
#define USE_TRAP_MASK 1
 | 
			
		||||
#else
 | 
			
		||||
#define USE_TRAP_MASK 0
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef NSIG
 | 
			
		||||
# ifdef DJGPP
 | 
			
		||||
#  define NSIG SIGMAX
 | 
			
		||||
| 
						 | 
				
			
			@ -666,7 +672,7 @@ rb_trap_exec()
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
struct trap_arg {
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
# ifdef HAVE_SIGPROCMASK
 | 
			
		||||
    sigset_t mask;
 | 
			
		||||
# else
 | 
			
		||||
| 
						 | 
				
			
			@ -815,7 +821,7 @@ trap(arg)
 | 
			
		|||
    trap_list[sig].cmd = command;
 | 
			
		||||
    trap_list[sig].safe = ruby_safe_level;
 | 
			
		||||
    /* enable at least specified signal. */
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
#ifdef HAVE_SIGPROCMASK
 | 
			
		||||
    sigdelset(&arg->mask, sig);
 | 
			
		||||
#else
 | 
			
		||||
| 
						 | 
				
			
			@ -825,7 +831,7 @@ trap(arg)
 | 
			
		|||
    return oldcmd;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
static VALUE
 | 
			
		||||
trap_ensure(arg)
 | 
			
		||||
    struct trap_arg *arg;
 | 
			
		||||
| 
						 | 
				
			
			@ -844,7 +850,7 @@ trap_ensure(arg)
 | 
			
		|||
void
 | 
			
		||||
rb_trap_restore_mask()
 | 
			
		||||
{
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
# ifdef HAVE_SIGPROCMASK
 | 
			
		||||
    sigprocmask(SIG_SETMASK, &trap_last_mask, NULL);
 | 
			
		||||
# else
 | 
			
		||||
| 
						 | 
				
			
			@ -904,7 +910,7 @@ sig_trap(argc, argv)
 | 
			
		|||
    if (OBJ_TAINTED(arg.cmd)) {
 | 
			
		||||
	rb_raise(rb_eSecurityError, "Insecure: tainted signal trap");
 | 
			
		||||
    }
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
    /* disable interrupt */
 | 
			
		||||
# ifdef HAVE_SIGPROCMASK
 | 
			
		||||
    sigfillset(&arg.mask);
 | 
			
		||||
| 
						 | 
				
			
			@ -987,7 +993,7 @@ init_sigchld(sig)
 | 
			
		|||
    int sig;
 | 
			
		||||
{
 | 
			
		||||
    sighandler_t oldfunc;
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
# ifdef HAVE_SIGPROCMASK
 | 
			
		||||
    sigset_t mask;
 | 
			
		||||
# else
 | 
			
		||||
| 
						 | 
				
			
			@ -995,7 +1001,7 @@ init_sigchld(sig)
 | 
			
		|||
# endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
    /* disable interrupt */
 | 
			
		||||
# ifdef HAVE_SIGPROCMASK
 | 
			
		||||
    sigfillset(&mask);
 | 
			
		||||
| 
						 | 
				
			
			@ -1012,7 +1018,7 @@ init_sigchld(sig)
 | 
			
		|||
	trap_list[sig].cmd = 0;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#ifndef _WIN32
 | 
			
		||||
#if USE_TRAP_MASK
 | 
			
		||||
#ifdef HAVE_SIGPROCMASK
 | 
			
		||||
    sigdelset(&mask, sig);
 | 
			
		||||
    sigprocmask(SIG_SETMASK, &mask, NULL);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
#define RUBY_VERSION "1.8.6"
 | 
			
		||||
#define RUBY_RELEASE_DATE "2008-02-14"
 | 
			
		||||
#define RUBY_RELEASE_DATE "2008-02-15"
 | 
			
		||||
#define RUBY_VERSION_CODE 186
 | 
			
		||||
#define RUBY_RELEASE_CODE 20080214
 | 
			
		||||
#define RUBY_RELEASE_CODE 20080215
 | 
			
		||||
#define RUBY_PATCHLEVEL 5000
 | 
			
		||||
 | 
			
		||||
#define RUBY_VERSION_MAJOR 1
 | 
			
		||||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
#define RUBY_VERSION_TEENY 6
 | 
			
		||||
#define RUBY_RELEASE_YEAR 2008
 | 
			
		||||
#define RUBY_RELEASE_MONTH 2
 | 
			
		||||
#define RUBY_RELEASE_DAY 14
 | 
			
		||||
#define RUBY_RELEASE_DAY 15
 | 
			
		||||
 | 
			
		||||
#ifdef RUBY_EXTERN
 | 
			
		||||
RUBY_EXTERN const char ruby_version[];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue