aboutsummaryrefslogtreecommitdiffstats
path: root/ext/iconv
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-15 08:16:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-15 08:16:18 +0000
commit44c9592d62884cce649f136b2bebaf45154debb5 (patch)
treead88b73b033739afeb7b73a4750ca366d438923d /ext/iconv
parentff5c6d343cdc113d25b9bcc719e967cb9773818b (diff)
downloadruby-44c9592d62884cce649f136b2bebaf45154debb5.tar.gz
* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
errno is not set. [ruby-dev:41317] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/iconv')
-rw-r--r--ext/iconv/iconv.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 964cfff7a0..a25e9cb079 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -173,6 +173,18 @@ map_charset(VALUE *code)
return StringValuePtr(*code);
}
+NORETURN(static void rb_iconv_sys_fail(const char *s));
+static void
+rb_iconv_sys_fail(const char *s)
+{
+ if (errno == 0) {
+ rb_raise(rb_eIconvBrokenLibrary, "%s", s);
+ }
+ rb_sys_fail(s);
+}
+
+#define rb_sys_fail(s) rb_iconv_sys_fail(s)
+
static iconv_t
iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
{