qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* iconvdata/tst-tables.sh: Actually return with an error if
	something goes wrong.
	* iconvdata/tst-table.sh: Return with an error if any of the cmp fails.
	* iconvdata/big5hkscs.c (BODY of FROM_LOOP): Reject 0xff as input.
This commit is contained in:
Ulrich Drepper 2000-09-08 04:31:55 +00:00
parent c329332e73
commit 63e18f77e2
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2000-09-07 Ulrich Drepper <drepper@redhat.com> 2000-09-07 Ulrich Drepper <drepper@redhat.com>
* iconvdata/tst-tables.sh: Actually return with an error if
something goes wrong.
* iconvdata/tst-table.sh: Return with an error if any of the cmp fails.
* iconvdata/big5hkscs.c (BODY of FROM_LOOP): Reject 0xff as input.
* iconvdata/tst-tables.sh: Add BIG5HKSCS. * iconvdata/tst-tables.sh: Add BIG5HKSCS.
* iconvdata/tst-table-to.c (main): Correct cast in iconv call. * iconvdata/tst-table-to.c (main): Correct cast in iconv call.

5
iconvdata/big5hkscs.c
View File

@ -11727,6 +11727,11 @@ static struct
\ \
inptr += 2; \ inptr += 2; \
} \ } \
else if (__builtin_expect (ch, 0) == 0xff) \
{ \
result = __GCONV_ILLEGAL_INPUT; \
break; \
} \
else \ else \
++inptr; \ ++inptr; \
\ \

9
iconvdata/tst-table.sh
View File

@ -61,15 +61,18 @@ diff ${objpfx}tst-${charset}.table ${objpfx}tst-${charset}.inverse.table | \
grep '^[<>]' | sed -e 's,^. ,,' > ${objpfx}tst-${charset}.irreversible.table grep '^[<>]' | sed -e 's,^. ,,' > ${objpfx}tst-${charset}.irreversible.table
# Check 1: charmap and iconv forward should be identical. # Check 1: charmap and iconv forward should be identical.
cmp -s ${objpfx}tst-${charset}.charmap.table ${objpfx}tst-${charset}.table cmp -s ${objpfx}tst-${charset}.charmap.table ${objpfx}tst-${charset}.table ||
exit 1
# Check 2: the difference between the two iconv directions. # Check 2: the difference between the two iconv directions.
if test -f ${irreversible}; then if test -f ${irreversible}; then
cat ${objpfx}tst-${charset}.charmap.table ${irreversible} | sort | uniq -u \ cat ${objpfx}tst-${charset}.charmap.table ${irreversible} | sort | uniq -u \
> ${objpfx}tst-${charset}.tmp.table > ${objpfx}tst-${charset}.tmp.table
cmp -s ${objpfx}tst-${charset}.tmp.table ${objpfx}tst-${charset}.inverse.table cmp -s ${objpfx}tst-${charset}.tmp.table ${objpfx}tst-${charset}.inverse.table ||
exit 1
else else
cmp -s ${objpfx}tst-${charset}.table ${objpfx}tst-${charset}.inverse.table cmp -s ${objpfx}tst-${charset}.table ${objpfx}tst-${charset}.inverse.table ||
exit 1
fi fi
exit 0 exit 0

15
iconvdata/tst-tables.sh
View File

@ -179,7 +179,7 @@ cat <<EOF |
ISO-IR-197 ISO-IR-197
TIS-620 TIS-620
KOI8-U KOI8-U
ISIRI-3342 #ISIRI-3342 This charset concept is completely broken
# #
# Multibyte encodings come here # Multibyte encodings come here
# #
@ -205,9 +205,14 @@ cat <<EOF |
EOF EOF
while read charset charmap; do while read charset charmap; do
case ${charset} in \#*) continue;; esac case ${charset} in \#*) continue;; esac
echo "Testing ${charset}" 1>&2 echo -n "Testing ${charset}" 1>&2
./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap} \ if ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}; then
|| { echo "failed: ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}"; status=1; } echo 1>&2
else
echo "failed: ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}"
echo " *** FAILED ***" 1>&2
exit 1
fi
done done
exit $status exit $?