* eval.c (block_pass): should not downgrade safe level.

* ext/dbm/extconf.rb: allow specifying dbm-type explicitly.

* ext/dbm/extconf.rb: avoid gdbm if possible, because it leaks
  memory, whereas gdbm.so doesn't.  potential incompatibility.

* string.c (rb_str_insert): new method.

* parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.

* array.c (rb_ary_insert): new method.

* array.c (rb_ary_update): new utility function.

* io.c (set_outfile): should check if closed before assignment.

* eval.c (rb_eval): should preserve value of ruby_errinfo.

* eval.c (rb_thread_schedule): infinite sleep should not cause
  dead lock.

* array.c (rb_ary_flatten_bang): proper recursive detection.

* eval.c (yield_under): need not to prohibit at safe level 4.

* pack.c (pack_pack): p/P packs nil into NULL.

* pack.c (pack_unpack): p/P unpacks NULL into nil.

* pack.c (pack_pack): size check for P template.

* ruby.c (set_arg0): wrong predicate when new $0 value is bigger
  than original space.

* gc.c (id2ref): should use NUM2ULONG()

* object.c (rb_mod_const_get): check whether name is a class
  variable name.

* object.c (rb_mod_const_set): ditto.

* object.c (rb_mod_const_defined): ditto.

* marshal.c (w_float): precision changed to "%.16g"

* eval.c (rb_call0): wrong retry behavior.

* numeric.c (fix_aref): a bug on long>int architecture.

* eval.c (rb_eval_string_wrap): should restore ruby_wrapper.

* regex.c (re_compile_pattern): char class at either edge of range
  should be invalid.

* eval.c (handle_rescue): use === to compare exception match.

* error.c (syserr_eqq): comparison between SytemCallErrors should
  based on their error numbers.

* eval.c (safe_getter): should use INT2NUM().

* bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long.

* regex.c (calculate_must_string): wrong length calculation.

* eval.c (rb_thread_start_0): fixed memory leak.

* parse.y (none): should clear cmdarg_stack too.

* io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on
  some platforms.

* file.c (rb_stat_dev): device functions should honor stat field
  types (except long long such as dev_t).

* eval.c (rb_mod_nesting): should not push nil for nesting array.

* eval.c (rb_mod_s_constants): should not search array by
  rb_mod_const_at() for nil (happens for singleton class).

* class.c (rb_singleton_class_attached): should modify iv_tbl by
  itself, no longer use rb_iv_set() to avoid freeze check error.

* variable.c (rb_const_get): error message "uninitialized constant
  Foo at Bar::Baz" instead of "uninitialized constantBar::Baz::Foo".

* eval.c (rb_mod_included): new hook called from rb_mod_include().

* io.c (opt_i_set): should strdup() inplace_edit string.

* eval.c (exec_under): need to push cref too.

* eval.c (rb_f_missing): raise NameError for "undefined local
  variable or method".

* error.c (Init_Exception): new exception NoMethodError.
  NameError moved under ScriptError again.

* eval.c (rb_f_missing): use NoMethodError instead of NameError.

* file.c (Init_File): should redifine "new" class method.

* eval.c (PUSH_CREF): sharing cref node was problematic.  maintain
  runtime cref list instead.

* eval.c (rb_eval): copy defn node before registering.

* eval.c (rb_load): clear ruby_cref before loading.

* variable.c (rb_const_get): no recursion to show full class path
  for modules.

* eval.c (rb_set_safe_level): should set safe level in curr_thread
  as well.

* eval.c (safe_setter): ditto.

* object.c (rb_obj_is_instance_of): nil belongs to false, not true.

* time.c (make_time_t): proper (I hope) daylight saving time
  handling for both US and Europe.  I HATE DST!

* eval.c (rb_thread_wait_for): non blocked signal interrupt should
  stop the interval.

* eval.c (proc_eq): class check aded.

* eval.c (proc_eq): typo fixed ("return" was ommitted).

* error.c (Init_Exception): move NameError under StandardError.

* class.c (rb_mod_clone): should copy method bodies too.

* bignum.c (bigdivrem): should trim trailing zero bdigits of
  remainder, even if dd == 0.

* file.c (check3rdbyte): safe string check moved here.

* time.c (make_time_t): remove HAVE_TM_ZONE code since it
  sometimes reports wrong time.

* time.c (make_time_t): remove unnecessary range check for
  platforms where negative time_t is available.

* process.c (proc_waitall): should push Process::Status instead of
  Finuxm status.

* process.c (waitall_each): should add all entries in pid_tbl.
  these changes are inspired by Koji Arai.  Thanks.

* process.c (proc_wait): should not iterate if pid_tbl is 0.

* process.c (proc_waitall): ditto.

* numeric.c (flodivmod): a bug in no fmod case.

* process.c (pst_wifsignaled): should apply WIFSIGNALED for status
  (int), not st (VALUE).

* io.c (Init_IO): value of $/ and $\ are no longer restricted to
  strings.  type checks are done on demand.

* class.c (rb_include_module): module inclusion should be check
  taints.

* ruby.h (STR2CSTR): replace to StringType() and StringTypePtr().

* ruby.h (rb_str2cstr): ditto.

* eval.c (rb_load): should not copy topleve local variables.  It
  cause variable/method ambiguity.  Thanks to L. Peter Deutsch.

* class.c (rb_include_module): freeze check at first.

* eval.c (rb_attr): sprintf() and rb_intern() moved into
  conditional body.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 157 insertions, 148 deletions

diff --git a/util.c b/util.c
index 5bb9c87f13..ddc919584c 100644
--- a/util.c
+++ b/util.c
@@ -201,19 +201,25 @@ ruby_add_suffix(str, suffix)
     if (*suffix == '.') {        /* Style 1 */
         if (strEQ(ext, suffix)) goto fallback;
 	strcpy(p, suffix);
-    } else if (suffix[1] == '\0') {  /* Style 2 */
+    }
+    else if (suffix[1] == '\0') {  /* Style 2 */
         if (extlen < 4) { 
 	    ext[extlen] = *suffix;
 	    ext[++extlen] = '\0';
-        } else if (baselen < 8) {
+        }
+	else if (baselen < 8) {
    	    *p++ = *suffix;
-	} else if (ext[3] != *suffix) {
+	}
+	else if (ext[3] != *suffix) {
 	    ext[3] = *suffix;
-	} else if (buf[7] != *suffix) {
+	}
+	else if (buf[7] != *suffix) {
 	    buf[7] = *suffix;
-	} else goto fallback;
+	}
+	else goto fallback;
 	strcpy(p, ext);
-    } else { /* Style 3:  Panic */
+    }
+    else { /* Style 3:  Panic */
 fallback:
 	(void)memcpy(p, strEQ(ext, suffix1) ? suffix2 : suffix1, 5);
     }
@@ -418,7 +424,8 @@ static void mmswap(a, b) register char *a, *b;
    if (low != 0) { s = A[0]; A[0] = B[0]; B[0] = s;
      if (low >= 8) { s = A[1]; A[1] = B[1]; B[1] = s;
        if (low == 12) {s = A[2]; A[2] = B[2]; B[2] = s;}}}
- }else{
+ }
+ else {
    register char *t = a + mmsize;
    do {s = *a; *a++ = *b; *b++ = s;} while (a < t);
  }
@@ -435,12 +442,13 @@ static void mmrot3(a, b, c) register char *a, *b, *c;
        s = A[1]; A[1] = B[1]; B[1] = C[1]; C[1] = s;
        s = A[2]; A[2] = B[2]; B[2] = C[2]; C[2] = s;
        s = A[3]; A[3] = B[3]; B[3] = C[3]; C[3] = s; a += 16; b += 16; c += 16;
-     }while (a < t);
+     } while (a < t);
    }
    if (low != 0) { s = A[0]; A[0] = B[0]; B[0] = C[0]; C[0] = s;
      if (low >= 8) { s = A[1]; A[1] = B[1]; B[1] = C[1]; C[1] = s;
        if (low == 12) {s = A[2]; A[2] = B[2]; B[2] = C[2]; C[2] = s;}}}
- }else{
+ }
+ else {
    register char *t = a + mmsize;
    do {s = *a; *a++ = *b; *b++ = *c; *c++ = s;} while (a < t);
  }
@@ -465,145 +473,146 @@ typedef struct { char *LL, *RR; } stack_node; /* Stack structure for L,l,R,r */
 
 void ruby_qsort (base, nel, size, cmp) void* base; int nel; int size; int (*cmp)();
 {
- register char *l, *r, *m;          	/* l,r:left,right group   m:median point */
- register int  t, eq_l, eq_r;       	/* eq_l: all items in left group are equal to S */
- char *L = base;                    	/* left end of curren region */
- char *R = (char*)base + size*(nel-1); 	/* right end of current region */
- int  chklim = 63;                      /* threshold of ordering element check */
- stack_node stack[32], *top = stack;    /* 32 is enough for 32bit CPU */
-
- if (nel <= 1) return;        /* need not to sort */
- mmprepare(base, size);
- goto start;
-  
- nxt:
- if (stack == top) return;    /* return if stack is empty */
- POP(L,R);
-   
- for (;;) {
-   start:
-   if (L + size == R) {if ((*cmp)(L,R) > 0) mmswap(L,R); goto nxt;}/* 2 elements */
-   
-   l = L; r = R;
-   t = (r - l + size) / size;  /* number of elements */
-   m = l + size * (t >> 1);    /* calculate median value */
-   
-   if (t >= 60) {
-     register char *m1;
-     register char *m3;
-     if (t >= 200) {
-       t = size*(t>>3); /* number of bytes in splitting 8 */
-       {
-       register char *p1 = l  + t;
-       register char *p2 = p1 + t;
-       register char *p3 = p2 + t;
-       m1 = med3(p1, p2, p3);
-       p1 = m  + t;
-       p2 = p1 + t;
-       p3 = p2 + t;
-       m3 = med3(p1, p2, p3);
-       }
-     }else{
-       t = size*(t>>2); /* number of bytes in splitting 4 */
-       m1 = l + t;
-       m3 = m + t;
-     }
-     m = med3(m1, m, m3);
-   }
-   
-   if ((t = (*cmp)(l,m)) < 0) {                             /*3-5-?*/
-     if ((t = (*cmp)(m,r)) < 0) {                           /*3-5-7*/
-       if (chklim && nel >= chklim) {   /* check if already ascending order */
-         char *p;
-         chklim = 0;
-         for (p=l; p<r; p+=size) if ((*cmp)(p,p+size) > 0) goto fail;
-         goto nxt;
-       }
-       fail: goto loopA;                                    /*3-5-7*/
-     }
-     if (t > 0) {
-       if ((*cmp)(l,r) <= 0) {mmswap(m,r); goto loopA;}     /*3-5-4*/
-       mmrot3(r,m,l); goto loopA;                           /*3-5-2*/
-     }
-     goto loopB;                                            /*3-5-5*/
-   }
-   
-   if (t > 0) {                                             /*7-5-?*/
-     if ((t = (*cmp)(m,r)) > 0) {                           /*7-5-3*/
-       if (chklim && nel >= chklim) {   /* check if already ascending order */
-         char *p;
-         chklim = 0;
-         for (p=l; p<r; p+=size) if ((*cmp)(p,p+size) < 0) goto fail2;
-         while (l<r) {mmswap(l,r); l+=size; r-=size;}  /* reverse region */
-         goto nxt;
-       }
-       fail2: mmswap(l,r); goto loopA;                      /*7-5-3*/
-     }
-     if (t < 0) {
-       if ((*cmp)(l,r) <= 0) {mmswap(l,m); goto loopB;}     /*7-5-8*/
-       mmrot3(l,m,r); goto loopA;                           /*7-5-6*/
-     }
-     mmswap(l,r); goto loopA;                               /*7-5-5*/
-   }
-    
-   if ((t = (*cmp)(m,r)) < 0)  {goto loopA;}                /*5-5-7*/
-   if (t > 0) {mmswap(l,r); goto loopB;}                    /*5-5-3*/
-   
-   /* deteming splitting type in case 5-5-5 */              /*5-5-5*/
-   for (;;) {
-     if ((l += size) == r)      goto nxt;                   /*5-5-5*/
-     if (l == m) continue;
-     if ((t = (*cmp)(l,m)) > 0) {mmswap(l,r); l = L; goto loopA;}  /*575-5*/
-     if (t < 0)                 {mmswap(L,l); l = L; goto loopB;}  /*535-5*/
-   }
-   
-   loopA: eq_l = 1; eq_r = 1;  /* splitting type A */ /* left <= median < right */
-   for (;;) {
-     for (;;) {
-       if ((l += size) == r)
-         {l -= size; if (l != m) mmswap(m,l); l -= size; goto fin;}
-       if (l == m) continue;
-       if ((t = (*cmp)(l,m)) > 0) {eq_r = 0; break;}
-       if (t < 0) eq_l = 0;
-     }
-     for (;;) {
-       if (l == (r -= size))
-         {l -= size; if (l != m) mmswap(m,l); l -= size; goto fin;}
-       if (r == m) {m = l; break;}
-       if ((t = (*cmp)(r,m)) < 0) {eq_l = 0; break;}
-       if (t == 0) break;
-     }
-     mmswap(l,r);    /* swap left and right */
-   }
-   
-   loopB: eq_l = 1; eq_r = 1;  /* splitting type B */ /* left < median <= right */
-   for (;;) {
-     for (;;) {
-       if (l == (r -= size))
-         {r += size; if (r != m) mmswap(r,m); r += size; goto fin;}
-       if (r == m) continue;
-       if ((t = (*cmp)(r,m)) < 0) {eq_l = 0; break;}
-       if (t > 0) eq_r = 0;
-     }
-     for (;;) {
-       if ((l += size) == r)
-         {r += size; if (r != m) mmswap(r,m); r += size; goto fin;}
-       if (l == m) {m = r; break;}
-       if ((t = (*cmp)(l,m)) > 0) {eq_r = 0; break;}
-       if (t == 0) break;
-     }
-     mmswap(l,r);    /* swap left and right */
-   }
-   
-   fin:
-   if (eq_l == 0)                         /* need to sort left side */
-     if (eq_r == 0)                       /* need to sort right side */
-       if (l-L < R-r) {PUSH(r,R); R = l;} /* sort left side first */
-       else           {PUSH(L,l); L = r;} /* sort right side first */
-     else R = l;                          /* need to sort left side only */
-   else if (eq_r == 0) L = r;             /* need to sort right side only */
-   else goto nxt;                         /* need not to sort both sides */
- }
+  register char *l, *r, *m;          	/* l,r:left,right group   m:median point */
+  register int  t, eq_l, eq_r;       	/* eq_l: all items in left group are equal to S */
+  char *L = base;                    	/* left end of curren region */
+  char *R = (char*)base + size*(nel-1); 	/* right end of current region */
+  int  chklim = 63;                      /* threshold of ordering element check */
+  stack_node stack[32], *top = stack;    /* 32 is enough for 32bit CPU */
+
+  if (nel <= 1) return;        /* need not to sort */
+  mmprepare(base, size);
+  goto start;
+
+  nxt:
+  if (stack == top) return;    /* return if stack is empty */
+  POP(L,R);
+
+  for (;;) {
+    start:
+    if (L + size == R) {if ((*cmp)(L,R) > 0) mmswap(L,R); goto nxt;}/* 2 elements */
+
+    l = L; r = R;
+    t = (r - l + size) / size;  /* number of elements */
+    m = l + size * (t >> 1);    /* calculate median value */
+
+    if (t >= 60) {
+      register char *m1;
+      register char *m3;
+      if (t >= 200) {
+	t = size*(t>>3); /* number of bytes in splitting 8 */
+	{
+	  register char *p1 = l  + t;
+	  register char *p2 = p1 + t;
+	  register char *p3 = p2 + t;
+	  m1 = med3(p1, p2, p3);
+	  p1 = m  + t;
+	  p2 = p1 + t;
+	  p3 = p2 + t;
+	  m3 = med3(p1, p2, p3);
+	}
+      }
+      else {
+	t = size*(t>>2); /* number of bytes in splitting 4 */
+	m1 = l + t;
+	m3 = m + t;
+      }
+      m = med3(m1, m, m3);
+    }
+
+    if ((t = (*cmp)(l,m)) < 0) {                             /*3-5-?*/
+      if ((t = (*cmp)(m,r)) < 0) {                           /*3-5-7*/
+	if (chklim && nel >= chklim) {   /* check if already ascending order */
+	  char *p;
+	  chklim = 0;
+	  for (p=l; p<r; p+=size) if ((*cmp)(p,p+size) > 0) goto fail;
+	  goto nxt;
+	}
+	fail: goto loopA;                                    /*3-5-7*/
+      }
+      if (t > 0) {
+	if ((*cmp)(l,r) <= 0) {mmswap(m,r); goto loopA;}     /*3-5-4*/
+	mmrot3(r,m,l); goto loopA;                           /*3-5-2*/
+      }
+      goto loopB;                                            /*3-5-5*/
+    }
+
+    if (t > 0) {                                             /*7-5-?*/
+      if ((t = (*cmp)(m,r)) > 0) {                           /*7-5-3*/
+	if (chklim && nel >= chklim) {   /* check if already ascending order */
+	  char *p;
+	  chklim = 0;
+	  for (p=l; p<r; p+=size) if ((*cmp)(p,p+size) < 0) goto fail2;
+	  while (l<r) {mmswap(l,r); l+=size; r-=size;}  /* reverse region */
+	  goto nxt;
+	}
+	fail2: mmswap(l,r); goto loopA;                      /*7-5-3*/
+      }
+      if (t < 0) {
+	if ((*cmp)(l,r) <= 0) {mmswap(l,m); goto loopB;}     /*7-5-8*/
+	mmrot3(l,m,r); goto loopA;                           /*7-5-6*/
+      }
+      mmswap(l,r); goto loopA;                               /*7-5-5*/
+    }
+
+    if ((t = (*cmp)(m,r)) < 0)  {goto loopA;}                /*5-5-7*/
+    if (t > 0) {mmswap(l,r); goto loopB;}                    /*5-5-3*/
+
+    /* deteming splitting type in case 5-5-5 */              /*5-5-5*/
+    for (;;) {
+      if ((l += size) == r)      goto nxt;                   /*5-5-5*/
+      if (l == m) continue;
+      if ((t = (*cmp)(l,m)) > 0) {mmswap(l,r); l = L; goto loopA;}  /*575-5*/
+      if (t < 0)                 {mmswap(L,l); l = L; goto loopB;}  /*535-5*/
+    }
+
+    loopA: eq_l = 1; eq_r = 1;  /* splitting type A */ /* left <= median < right */
+    for (;;) {
+      for (;;) {
+	if ((l += size) == r)
+	  {l -= size; if (l != m) mmswap(m,l); l -= size; goto fin;}
+	if (l == m) continue;
+	if ((t = (*cmp)(l,m)) > 0) {eq_r = 0; break;}
+	if (t < 0) eq_l = 0;
+      }
+      for (;;) {
+	if (l == (r -= size))
+	  {l -= size; if (l != m) mmswap(m,l); l -= size; goto fin;}
+	if (r == m) {m = l; break;}
+	if ((t = (*cmp)(r,m)) < 0) {eq_l = 0; break;}
+	if (t == 0) break;
+      }
+      mmswap(l,r);    /* swap left and right */
+    }
+
+    loopB: eq_l = 1; eq_r = 1;  /* splitting type B */ /* left < median <= right */
+    for (;;) {
+      for (;;) {
+	if (l == (r -= size))
+	  {r += size; if (r != m) mmswap(r,m); r += size; goto fin;}
+	if (r == m) continue;
+	if ((t = (*cmp)(r,m)) < 0) {eq_l = 0; break;}
+	if (t > 0) eq_r = 0;
+      }
+      for (;;) {
+	if ((l += size) == r)
+	  {r += size; if (r != m) mmswap(r,m); r += size; goto fin;}
+	if (l == m) {m = r; break;}
+	if ((t = (*cmp)(l,m)) > 0) {eq_r = 0; break;}
+	if (t == 0) break;
+      }
+      mmswap(l,r);    /* swap left and right */
+    }
+
+    fin:
+    if (eq_l == 0)                         /* need to sort left side */
+      if (eq_r == 0)                       /* need to sort right side */
+	if (l-L < R-r) {PUSH(r,R); R = l;} /* sort left side first */
+	else           {PUSH(L,l); L = r;} /* sort right side first */
+      else R = l;                          /* need to sort left side only */
+    else if (eq_r == 0) L = r;             /* need to sort right side only */
+    else goto nxt;                         /* need not to sort both sides */
+  }
 }
 
 char *