diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-28 04:24:26 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-28 04:24:26 +0000 |
| commit | 71d7be90101a21ca67d7c1fc8265b840f25e5d2c (patch) | |
| tree | a3807e7e10fa7c3f087ef463684d3aa1193ed1d6 | |
| parent | 5cacf4ba3687aba253f09c68803cb32e57c92fdb (diff) | |
| download | ruby-71d7be90101a21ca67d7c1fc8265b840f25e5d2c.tar.gz ruby-71d7be90101a21ca67d7c1fc8265b840f25e5d2c.tar.xz ruby-71d7be90101a21ca67d7c1fc8265b840f25e5d2c.zip | |
* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
error message on bccwin32 + winsock)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Nov 28 13:08:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken + error message on bccwin32 + winsock) + Mon Nov 28 09:21:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * lib/mkmf.rb (create_makefile): should not change sodir with diff --git a/win32/win32.c b/win32/win32.c index 530cada51..f4a3ee637 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1712,9 +1712,9 @@ rb_w32_strerror(int e) buffer[sizeof(buffer) - 1] = 0; } - for (p = buffer + strlen(buffer) - 1; buffer <= p; p--) { - if (*p != '\r' && *p != '\n') break; - *p = 0; + p = buffer; + while ((p = strpbrk(p, "\r\n")) != NULL) { + memmove(p, p + 1, strlen(p)); } return buffer; } |