summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-28 04:24:26 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-28 04:24:26 +0000
commit67ea4d0242a205da6e6ae4964bd24a6e74eb3866 (patch)
treea3807e7e10fa7c3f087ef463684d3aa1193ed1d6 /win32
parent1260f211d786d24c4c40df5773dc568c3cc08468 (diff)
* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
error message on bccwin32 + winsock) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 530cada51f..f4a3ee6375 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;
}