summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-17 22:20:20 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-17 22:20:20 +0000
commitc14d466a515e6eaa635883ec79d0da6d5bb038a0 (patch)
tree5beef325e042de63b64f6eee40005363f1a11a0c
parentef6ec88ccb0db365facedb0365c8cbf5664c5391 (diff)
downloadruby-c14d466a515e6eaa635883ec79d0da6d5bb038a0.tar.gz
ruby-c14d466a515e6eaa635883ec79d0da6d5bb038a0.tar.xz
ruby-c14d466a515e6eaa635883ec79d0da6d5bb038a0.zip
* io.c (io_fwrite): always flush IO on tty, even without newlines.
[ruby-core:15107] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dc5ab71ce..afe340b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,11 @@ Thu Jan 17 21:01:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: some trivial changes.
+Thu Jan 17 10:30:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (io_fwrite): always flush IO on tty, even without newlines.
+ [ruby-core:15107]
+
Wed Jan 16 22:45:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_register_at): make own copy. [ruby-dev:33136]
diff --git a/io.c b/io.c
index 12295c8ff..734799a83 100644
--- a/io.c
+++ b/io.c
@@ -693,7 +693,7 @@ io_fwrite(VALUE str, rb_io_t *fptr)
}
if ((fptr->mode & FMODE_SYNC) ||
(fptr->wbuf && fptr->wbuf_capa <= fptr->wbuf_len + len) ||
- ((fptr->mode & FMODE_TTY) && memchr(RSTRING_PTR(str)+offset, '\n', len))) {
+ (fptr->mode & FMODE_TTY)) {
/* xxx: use writev to avoid double write if available */
if (fptr->wbuf_len && fptr->wbuf_len+len <= fptr->wbuf_capa) {
if (fptr->wbuf_capa < fptr->wbuf_off+fptr->wbuf_len+len) {