merge revision(s) 14858:

shyouhei · shyouhei · commit f161d2b7a68a · 2008-06-07T21:01:48.000Z
* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun  8 06:01:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
+
 Sun Jun  8 05:53:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
diff --git a/io.c b/io.c
@@ -2169,6 +2169,7 @@ fptr_finalize(fptr, noraise)
 {
     int n1 = 0, n2 = 0, f1, f2 = -1;
 
+    errno = 0;
     if (fptr->f2) {
 	f2 = fileno(fptr->f2);
 	while (n2 = 0, fflush(fptr->f2) < 0) {
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 162
+#define RUBY_PATCHLEVEL 163
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -2169,6 +2169,7 @@ fptr_finalize(fptr, noraise)`
`2169`	`2169`	`{`
`2170`	`2170`	`int n1 = 0, n2 = 0, f1, f2 = -1;`
`2171`	`2171`
	`2172`	`+ errno = 0;`
`2172`	`2173`	`if (fptr->f2) {`
`2173`	`2174`	`f2 = fileno(fptr->f2);`
`2174`	`2175`	`while (n2 = 0, fflush(fptr->f2) < 0) {`