mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* io.c (rb_io_fread): may lose data on nonblocking read.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									5aadcd9349
								
							
						
					
					
						commit
						94f40186c0
					
				
					 4 changed files with 16 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -24,6 +24,10 @@ Sat Mar 22 12:44:15 2003  Tanaka Akira  <akr@m17n.org>
 | 
			
		|||
        * lib/date/format.rb, lib/uri/common.rb: `[', `]', `-' in chracter
 | 
			
		||||
          class in regexp to avoid warning.
 | 
			
		||||
 | 
			
		||||
Sat Mar 22 07:39:32 2003  Ulf Betlehem  <flu@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* io.c (rb_io_fread): may lose data on nonblocking read.
 | 
			
		||||
 | 
			
		||||
Fri Mar 21 23:40:41 2003  Tanaka Akira  <akr@m17n.org>
 | 
			
		||||
 | 
			
		||||
        * regex.c (re_compile_pattern): fix previous change.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								io.c
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								io.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -710,7 +710,7 @@ rb_io_fread(ptr, len, f)
 | 
			
		|||
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 | 
			
		||||
		  case EWOULDBLOCK:
 | 
			
		||||
#endif
 | 
			
		||||
		    if (len - n > 0) {
 | 
			
		||||
                   if (len - n >= 0) {
 | 
			
		||||
			clearerr(f);
 | 
			
		||||
			return len - n;
 | 
			
		||||
		    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -407,9 +407,7 @@ end
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
class Fixnum
 | 
			
		||||
  if not defined? Rational
 | 
			
		||||
    alias power! **
 | 
			
		||||
  end
 | 
			
		||||
  alias power! **
 | 
			
		||||
  
 | 
			
		||||
  # Redefined to handle a Complex argument.
 | 
			
		||||
  def ** (other)
 | 
			
		||||
| 
						 | 
				
			
			@ -430,9 +428,7 @@ class Fixnum
 | 
			
		|||
end
 | 
			
		||||
 | 
			
		||||
class Bignum
 | 
			
		||||
  if not defined? Rational
 | 
			
		||||
    alias power! **
 | 
			
		||||
  end
 | 
			
		||||
  alias power! **
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
class Float
 | 
			
		||||
| 
						 | 
				
			
			@ -459,7 +455,11 @@ module Math
 | 
			
		|||
	Complex(0,sqrt!(-z))
 | 
			
		||||
      end
 | 
			
		||||
    else
 | 
			
		||||
      z**Rational(1,2)
 | 
			
		||||
      if defined? Rational
 | 
			
		||||
	z**Rational(1,2)
 | 
			
		||||
      else
 | 
			
		||||
	z**0.5
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
  
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -59,13 +59,13 @@ class String
 | 
			
		|||
  def end_regexp
 | 
			
		||||
    case $KCODE[0]
 | 
			
		||||
    when ?s, ?S
 | 
			
		||||
      /#{PATTERN_SJIS}$/o
 | 
			
		||||
      /#{PATTERN_SJIS}$/on
 | 
			
		||||
    when ?e, ?E
 | 
			
		||||
      /#{PATTERN_EUC}$/o
 | 
			
		||||
      /#{PATTERN_EUC}$/on
 | 
			
		||||
    when ?u, ?U
 | 
			
		||||
      /#{PATTERN_UTF8}$/o
 | 
			
		||||
      /#{PATTERN_UTF8}$/on
 | 
			
		||||
    else
 | 
			
		||||
      /.$/o
 | 
			
		||||
      /.$/on
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue