From 42f00af5e303eae62bf88fd36628da89728c67d7 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Jun 2004 15:21:03 +0000
Subject: [PATCH] * ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing 
  CR and LF. (doesn't depend on CR+LF) [ruby-dev:23694]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 5 +++++
 ext/win32ole/win32ole.c | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 27f838afac..e3c52fe7af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 23 00:10:17  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
+	  CR and LF. (doesn't depend on CR+LF) [ruby-dev:23694]
+
 Wed Jun 23 00:00:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (return_jump, break_jump): raise unexpceted local jump
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index f856cd2516..0e9c53f016 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -501,9 +501,12 @@ ole_hresult2msg(hr)
                             NULL, hr, LOCALE_SYSTEM_DEFAULT,
                             (LPTSTR)&p_msg, 0, NULL);
     if (dwCount > 0) {
-	term = strrchr(p_msg, '\r');
-	if (term) {
-	    *term = '\0';
+	term = p_msg + strlen(p_msg);
+	while (p_msg < term) {
+	    term--;
+	    if (*term == '\r' || *term == '\n')
+	        *term = '\0';
+	    else break;
 	}
         if (p_msg[0] != '\0') {
             rb_str_cat2(msg, p_msg);