* io.c (rb_io_mode_flags): preserve append mode flag.

  [ruby-dev:24436]

* io.c (rb_io_modenum_mode): do not use external output buffer.

* string.c (rb_str_justify): differ pointer retrieval to prevent
  padding string modification.  [ruby-dev:24434]

* range.c (range_each_func): allow func to terminate loop by
  returning RANGE_EACH_BREAK.

* range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]


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

1 files changed, 8 insertions, 12 deletions

diff --git a/string.c b/string.c
index ac87b8d68f..d82d81db2c 100644
--- a/string.c
+++ b/string.c
@@ -1243,9 +1243,6 @@ static VALUE
 rb_str_match(x, y)
     VALUE x, y;
 {
-    VALUE reg;
-    long start;
-
     switch (TYPE(y)) {
       case T_STRING:
 	rb_raise(rb_eTypeError, "type mismatch: String given");
@@ -4462,18 +4459,17 @@ rb_str_justify(argc, argv, str, jflag)
     long n;
     VALUE pad;
 
-    if (rb_scan_args(argc, argv, "11", &w, &pad) == 2) {
-        if (!NIL_P(pad)) {
-            StringValue(pad);
-            if (RSTRING(pad)->len > 0) {
-                f = RSTRING(pad)->ptr;
-                flen = RSTRING(pad)->len;
-            }
-        }
-    }
+    rb_scan_args(argc, argv, "11", &w, &pad);
     width = NUM2LONG(w);
     if (width < 0 || RSTRING(str)->len >= width) return rb_str_dup(str);
     res = rb_str_new5(str, 0, width);
+    if (argc == 2) {
+	StringValue(pad);
+	if (RSTRING(pad)->len > 0) {
+	    f = RSTRING(pad)->ptr;
+	    flen = RSTRING(pad)->len;
+	}
+    }
     p = RSTRING(res)->ptr;
     if (jflag != 'l') {
         n = width - RSTRING(str)->len;