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

r18455 reverted.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-09 23:33:37 +00:00
parent 1bca9ada54
commit 94dc1e0b4a
2 changed files with 92 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -30,12 +30,6 @@ Sat Aug 9 21:10:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of * configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of
AC_TRY_RUN. AC_TRY_RUN.
Sat Aug 9 19:28:50 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (transcode_char_start): arguments changed.
(transcode_restartable): arguments changed to avoid *in_pos points
out of buffer by decreasing *in_pos.
Sat Aug 9 16:33:21 2008 Tanaka Akira <akr@fsij.org> Sat Aug 9 16:33:21 2008 Tanaka Akira <akr@fsij.org>
* transcode_data.h (rb_transcoding): new fields: next_info and next_byte. * transcode_data.h (rb_transcoding): new fields: next_info and next_byte.

179
transcode.c
View File

@ -328,20 +328,20 @@ output_replacement_character(unsigned char **out_pp, rb_encoding *enc)
static const unsigned char * static const unsigned char *
transcode_char_start(rb_transcoding *my_transcoding, transcode_char_start(rb_transcoding *my_transcoding,
const unsigned char *in_start, const unsigned char **in_pos,
ssize_t char_start, const unsigned char *in_p,
ssize_t pos) int readlen)
{ {
const unsigned char *ptr; const unsigned char *ptr;
if (char_start < 0) { if (in_p - *in_pos < readlen) {
/* -char_start == my_transcoding->readlen */ int restlen = readlen - my_transcoding->readlen;
int restlen = pos-char_start - my_transcoding->readlen;
MEMCPY(TRANSCODING_READBUF(my_transcoding) + my_transcoding->readlen, MEMCPY(TRANSCODING_READBUF(my_transcoding) + my_transcoding->readlen,
in_start, unsigned char, restlen); in_p - restlen, unsigned char, restlen);
my_transcoding->readlen = readlen;
ptr = TRANSCODING_READBUF(my_transcoding); ptr = TRANSCODING_READBUF(my_transcoding);
} }
else { else {
ptr = in_start + char_start; ptr = in_p - readlen;
} }
return ptr; return ptr;
} }
@ -355,67 +355,61 @@ typedef enum {
} transcode_result_t; } transcode_result_t;
static transcode_result_t static transcode_result_t
transcode_restartable(rb_transcoding *tc, transcode_restartable(const unsigned char **in_pos, unsigned char **out_pos,
const unsigned char *in_start, const unsigned char *in_stop, unsigned char *out_stop,
const unsigned char *in_stop, rb_transcoding *my_transcoding,
ssize_t *in_moved_ret,
unsigned char **out_pos,
unsigned char *out_stop,
const int opt) const int opt)
{ {
const rb_transcoder *tr = tc->transcoder; const rb_transcoder *my_transcoder = my_transcoding->transcoder;
int unitlen = tr->input_unit_length; int unitlen = my_transcoder->input_unit_length;
ssize_t char_start;
ssize_t pos;
size_t in_size;
const unsigned char *in_p;
unsigned char *out_p; unsigned char *out_p;
int readlen;
unsigned char empty_buf;
unsigned char *empty_ptr = &empty_buf;
const BYTE_LOOKUP *next_table; const BYTE_LOOKUP *next_table;
VALUE next_info; VALUE next_info;
unsigned char next_byte; unsigned char next_byte;
if (!in_start) unsigned char empty_buf;
in_start = in_stop = empty_ptr; unsigned char *empty_ptr = &empty_buf;
char_start = -tc->readlen;
pos = 0; if (!in_pos) {
in_size = in_stop - in_start; in_pos = (const unsigned char **)&empty_ptr;
in_stop = empty_ptr;
}
if (!out_pos) { if (!out_pos) {
out_pos = &empty_ptr; out_pos = &empty_ptr;
out_stop = empty_ptr; out_stop = empty_ptr;
} }
out_p = *out_pos;
next_table = tc->next_table; in_p = *in_pos;
next_info = tc->next_info; out_p = *out_pos;
next_byte = tc->next_byte; readlen = my_transcoding->readlen;
next_table = my_transcoding->next_table;
next_info = my_transcoding->next_info;
next_byte = my_transcoding->next_byte;
#define SUSPEND(ret, num) \ #define SUSPEND(ret, num) \
do { \ do { \
tc->resume_position = (num); \ my_transcoding->resume_position = (num); \
if (tc->readlen < pos-char_start) \ if (my_transcoding->readlen < readlen) \
MEMCPY(TRANSCODING_READBUF(tc)+tc->readlen, \ MEMCPY(TRANSCODING_READBUF(my_transcoding)+my_transcoding->readlen, \
in_start+(char_start+tc->readlen), \ in_p - (readlen-my_transcoding->readlen), \
unsigned char, \ unsigned char, \
pos-char_start - tc->readlen); \ readlen-my_transcoding->readlen); \
*in_pos = in_p; \
*out_pos = out_p; \ *out_pos = out_p; \
tc->readlen = pos-char_start; \ my_transcoding->readlen = readlen; \
tc->next_table = next_table; \ my_transcoding->next_table = next_table; \
tc->next_info = next_info; \ my_transcoding->next_info = next_info; \
tc->next_byte = next_byte; \ my_transcoding->next_byte = next_byte; \
if (in_moved_ret) \
*in_moved_ret = pos; \
return ret; \ return ret; \
resume_label ## num:; \ resume_label ## num:; \
} while (0) } while (0)
switch (tc->resume_position) { switch (my_transcoding->resume_position) {
case 0: break; case 0: break;
case 1: goto resume_label1; case 1: goto resume_label1;
case 2: goto resume_label2; case 2: goto resume_label2;
@ -434,18 +428,17 @@ transcode_restartable(rb_transcoding *tc,
} }
while (1) { while (1) {
if (in_size <= pos) { if (in_stop <= in_p) {
if (!(opt & PARTIAL_INPUT)) if (!(opt & PARTIAL_INPUT))
break; break;
SUSPEND(transcode_ibuf_empty, 7); SUSPEND(transcode_ibuf_empty, 7);
continue; continue;
} }
tc->readlen = 0; my_transcoding->readlen = readlen = 0;
char_start = pos; next_table = my_transcoder->conv_tree_start;
next_table = tr->conv_tree_start; next_byte = (unsigned char)*in_p++;
next_byte = (unsigned char)in_start[pos]; readlen++;
pos++;
follow_byte: follow_byte:
if (next_byte < next_table->base[0] || next_table->base[1] < next_byte) if (next_byte < next_table->base[0] || next_table->base[1] < next_byte)
next_info = INVALID; next_info = INVALID;
@ -461,13 +454,13 @@ transcode_restartable(rb_transcoding *tc,
continue; continue;
case 0x00: case 0x04: case 0x08: case 0x0C: case 0x00: case 0x04: case 0x08: case 0x0C:
case 0x10: case 0x14: case 0x18: case 0x1C: case 0x10: case 0x14: case 0x18: case 0x1C:
while (in_size <= pos) { while (in_p >= in_stop) {
if (!(opt & PARTIAL_INPUT)) if (!(opt & PARTIAL_INPUT))
goto invalid; goto invalid;
SUSPEND(transcode_ibuf_empty, 5); SUSPEND(transcode_ibuf_empty, 5);
} }
next_byte = (unsigned char)in_start[pos]; next_byte = (unsigned char)*in_p++;
pos++; readlen++;
next_table = (const BYTE_LOOKUP *)next_info; next_table = (const BYTE_LOOKUP *)next_info;
goto follow_byte; goto follow_byte;
case ZERObt: /* drop input */ case ZERObt: /* drop input */
@ -495,42 +488,58 @@ transcode_restartable(rb_transcoding *tc,
*out_p++ = getBT3(next_info); *out_p++ = getBT3(next_info);
continue; continue;
case FUNii: case FUNii:
next_info = (VALUE)(*tr->func_ii)(tc, next_info); next_info = (VALUE)(*my_transcoder->func_ii)(my_transcoding, next_info);
goto follow_info; goto follow_info;
case FUNsi: case FUNsi:
{ {
const unsigned char *char_start_ptr; const unsigned char *char_start;
char_start_ptr = transcode_char_start(tc, in_start, char_start, pos); char_start = transcode_char_start(my_transcoding, in_pos, in_p, readlen);
next_info = (VALUE)(*tr->func_si)(tc, char_start_ptr, (size_t)(pos-char_start)); next_info = (VALUE)(*my_transcoder->func_si)(my_transcoding, char_start, (size_t)readlen);
break; break;
} }
case FUNio: case FUNio:
while (out_stop - out_p < tr->max_output) { SUSPEND(transcode_obuf_full, 13); } while (out_stop - out_p < my_transcoder->max_output) { SUSPEND(transcode_obuf_full, 13); }
out_p += (VALUE)(*tr->func_io)(tc, next_info, out_p); out_p += (VALUE)(*my_transcoder->func_io)(my_transcoding, next_info, out_p);
break; break;
case FUNso: case FUNso:
{ {
const unsigned char *char_start_ptr; const unsigned char *char_start;
while (out_stop - out_p < tr->max_output) { SUSPEND(transcode_obuf_full, 14); } while (out_stop - out_p < my_transcoder->max_output) { SUSPEND(transcode_obuf_full, 14); }
char_start_ptr = transcode_char_start(tc, in_start, char_start, pos); char_start = transcode_char_start(my_transcoding, in_pos, in_p, readlen);
out_p += (VALUE)(*tr->func_so)(tc, char_start_ptr, (size_t)(pos-char_start), out_p); out_p += (VALUE)(*my_transcoder->func_so)(my_transcoding, char_start, (size_t)readlen, out_p);
break; break;
} }
case INVALID: case INVALID:
if (pos-char_start <= unitlen) { {
while ((opt & PARTIAL_INPUT) && in_size - char_start < unitlen) { int step;
pos = in_size; if (readlen <= unitlen) {
SUSPEND(transcode_ibuf_empty, 8); while ((opt & PARTIAL_INPUT) && readlen + (in_stop - in_p) < unitlen) {
step = in_stop - in_p;
readlen += step;
in_p = in_stop;
SUSPEND(transcode_ibuf_empty, 8);
}
if (readlen + (in_stop - in_p) <= unitlen) {
step = in_stop - in_p;
readlen += step;
in_p = in_stop;
}
else {
step = unitlen - readlen;
readlen = unitlen;
in_p += step;
}
} }
if (in_size - char_start <= unitlen) else {
pos = in_size; /* xxx: step may be negative.
else * possibly in_p is lesser than *in_pos.
pos = char_start + unitlen; * caller may want to access readbuf. */
step = ((readlen - 1) / unitlen) * unitlen - readlen;
in_p += step;
readlen += step;
}
goto invalid;
} }
else {
pos = char_start + ((pos-char_start-1) / unitlen) * unitlen;
}
goto invalid;
case UNDEF: case UNDEF:
goto undef; goto undef;
} }
@ -546,11 +555,11 @@ transcode_restartable(rb_transcoding *tc,
} }
/* cleanup */ /* cleanup */
if (tr->finish_func) { if (my_transcoder->finish_func) {
while (out_stop - out_p < tr->max_output) { while (out_stop - out_p < my_transcoder->max_output) {
SUSPEND(transcode_obuf_full, 4); SUSPEND(transcode_obuf_full, 4);
} }
out_p += tr->finish_func(tc, out_p); out_p += my_transcoder->finish_func(my_transcoding, out_p);
} }
while (1) while (1)
SUSPEND(transcode_finished, 6); SUSPEND(transcode_finished, 6);
@ -585,7 +594,6 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
const rb_transcoder *my_transcoder = my_transcoding->transcoder; const rb_transcoder *my_transcoder = my_transcoding->transcoder;
transcode_result_t ret; transcode_result_t ret;
unsigned char *out_start = *out_pos; unsigned char *out_start = *out_pos;
ssize_t in_moved;
my_transcoding->resume_position = 0; my_transcoding->resume_position = 0;
my_transcoding->readlen = 0; my_transcoding->readlen = 0;
@ -600,8 +608,7 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
} while(0) } while(0)
resume: resume:
ret = transcode_restartable(my_transcoding, *in_pos, in_stop, &in_moved, out_pos, out_stop, opt); ret = transcode_restartable(in_pos, out_pos, in_stop, out_stop, my_transcoding, opt);
*in_pos += in_moved;
if (ret == transcode_invalid_input) { if (ret == transcode_invalid_input) {
/* deal with invalid byte sequence */ /* deal with invalid byte sequence */
/* todo: add more alternative behaviors */ /* todo: add more alternative behaviors */
@ -656,7 +663,6 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
transcode_result_t ret; transcode_result_t ret;
unsigned char *out_start = *out_pos; unsigned char *out_start = *out_pos;
const unsigned char *ptr; const unsigned char *ptr;
ssize_t in_moved;
my_transcoding->resume_position = 0; my_transcoding->resume_position = 0;
my_transcoding->readlen = 0; my_transcoding->readlen = 0;
@ -679,15 +685,14 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
if (ret == transcode_ibuf_empty) { if (ret == transcode_ibuf_empty) {
if (ptr < in_stop) { if (ptr < in_stop) {
input_byte = *ptr; input_byte = *ptr;
ret = transcode_restartable(my_transcoding, p, p+1, &in_moved, out_pos, out_stop, opt|PARTIAL_INPUT); ret = transcode_restartable(&p, out_pos, p+1, out_stop, my_transcoding, opt|PARTIAL_INPUT);
p += in_moved;
} }
else { else {
ret = transcode_restartable(my_transcoding, NULL, NULL, NULL, out_pos, out_stop, opt); ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoding, opt);
} }
} }
else { else {
ret = transcode_restartable(my_transcoding, NULL, NULL, NULL, out_pos, out_stop, opt|PARTIAL_INPUT); ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoding, opt|PARTIAL_INPUT);
} }
if (&input_byte != p) if (&input_byte != p)
ptr += p - &input_byte; ptr += p - &input_byte;