1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a

Browse Source 
bug of underlying library.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-11-06 14:41:53 +00:00
parent 62bb03bf5a
commit 7665deeb12
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Nov 6 23:39:13 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
bug of underlying library.
Sun Nov 6 21:43:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> Sun Nov 6 21:43:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch * ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch

17
ext/iconv/iconv.c
View File

@ -88,6 +88,7 @@ static VALUE rb_eIconvFailure;
static VALUE rb_eIconvIllegalSeq; static VALUE rb_eIconvIllegalSeq;
static VALUE rb_eIconvInvalidChar; static VALUE rb_eIconvInvalidChar;
static VALUE rb_eIconvOutOfRange; static VALUE rb_eIconvOutOfRange;
static VALUE rb_eIconvBrokenLibrary;
static ID rb_success, rb_failed; static ID rb_success, rb_failed;
static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)); static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
@ -207,7 +208,10 @@ iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *
#else #else
#define ICONV_INPTR_CAST (char **) #define ICONV_INPTR_CAST (char **)
#endif #endif
size_t ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen); size_t ret;
errno = 0;
ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
if (ret == (size_t)-1) { if (ret == (size_t)-1) {
if (!*inlen) if (!*inlen)
return Qfalse; return Qfalse;
@ -219,6 +223,8 @@ iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *
return rb_eIconvIllegalSeq; return rb_eIconvIllegalSeq;
case EINVAL: case EINVAL:
return rb_eIconvInvalidChar; return rb_eIconvInvalidChar;
case 0:
return rb_eIconvBrokenLibrary;
default: default:
rb_sys_fail("iconv"); rb_sys_fail("iconv");
} }
@ -768,6 +774,13 @@ iconv_failure_inspect(VALUE self)
* Iconv library internal error. Must not occur. * Iconv library internal error. Must not occur.
*/ */
/*
* Document-class: Iconv::BrokenLibrary
*
* Detected a bug of underlying iconv(3) libray.
* * returns an error without setting errno properly
*/
void void
Init_iconv(void) Init_iconv(void)
{ {
@ -792,10 +805,12 @@ Init_iconv(void)
rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError); rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError); rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError); rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);
rb_eIconvBrokenLibrary = rb_define_class_under(rb_cIconv, "BrokenLibrary", rb_eRuntimeError);
rb_include_module(rb_eIconvInvalidEncoding, rb_eIconvFailure); rb_include_module(rb_eIconvInvalidEncoding, rb_eIconvFailure);
rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure); rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure);
rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure); rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure);
rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure); rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure);
rb_include_module(rb_eIconvBrokenLibrary, rb_eIconvFailure);
rb_success = rb_intern("success"); rb_success = rb_intern("success");
rb_failed = rb_intern("failed"); rb_failed = rb_intern("failed");