AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* iconvdata/gen-8bit-gap-1.sh: Update for new charmap format.
	* iconvdata/gen-8bit-gap.sh: Likewise.
	* iconvdata/gen-8bit.sh: Likewise.

	* iconv/gconv_open.c (__gconv_open): Move comment to correct position.

	* locale/programs/ld-collate.c (collate_read): Don't actually read
	the copy locale if we are ignoring the content.

	* sunrpc/xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from
	Jens Moeller <jens.moeller@waii.com>.
This commit is contained in:
Ulrich Drepper 2000-06-26 00:26:21 +00:00
parent 45a9eda2f9
commit 8b682b9907
7 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,5 +1,14 @@
2000-06-25 Ulrich Drepper <drepper@redhat.com> 2000-06-25 Ulrich Drepper <drepper@redhat.com>
* iconvdata/gen-8bit-gap-1.sh: Update for new charmap format.
* iconvdata/gen-8bit-gap.sh: Likewise.
* iconvdata/gen-8bit.sh: Likewise.
* iconv/gconv_open.c (__gconv_open): Move comment to correct position.
* locale/programs/ld-collate.c (collate_read): Don't actually read
the copy locale if we are ignoring the content.
* locale/programs/ld-address.c (INT_STR_ELEM): Correct test for * locale/programs/ld-address.c (INT_STR_ELEM): Correct test for
unknown character. unknown character.
@ -21,8 +30,8 @@
2000-06-23 Thorsten Kukuk <kukuk@suse.de> 2000-06-23 Thorsten Kukuk <kukuk@suse.de>
* xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from Jens * sunrpc/xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from
Moeller <jens.moeller@waii.com>. Jens Moeller <jens.moeller@waii.com>.
2000-06-24 Ulrich Drepper <drepper@redhat.com> 2000-06-24 Ulrich Drepper <drepper@redhat.com>

4
iconv/gconv_open.c
View File

@ -188,12 +188,12 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
{ {
size_t size; size_t size;
/* Would have to be done if we would not clear the whole
array above. */
/* If this is the last step we must not allocate an /* If this is the last step we must not allocate an
output buffer. */ output buffer. */
result->__data[cnt].__flags = conv_flags; result->__data[cnt].__flags = conv_flags;
/* Would have to be done if we would not clear the whole
array above. */
#if 0 #if 0
/* Reset the counter. */ /* Reset the counter. */
result->__data[cnt].__invocation_counter = 0; result->__data[cnt].__invocation_counter = 0;

6
iconvdata/gen-8bit-gap-1.sh
View File

@ -1,15 +1,15 @@
#! /bin/sh #! /bin/sh
echo "static const uint32_t iso88597_to_ucs4[96] = {" echo "static const uint32_t iso88597_to_ucs4[96] = {"
sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \
-e 's/^[^[:space:]]*[[:space:]]*.x\([A-F].\)[[:space:]]*<U\(....\)>.*/ [0x\1 - 0xA0] = 0x\2,/p' \ -e 's/^<U\(....\)>[[:space:]]*.x\([A-F].\).*/ [0x\2 - 0xA0] = 0x\1,/p' \
"$@" | sort -u "$@" | sort -u
echo "};" echo "};"
echo "static const struct gap from_idx[] = {" echo "static const struct gap from_idx[] = {"
sed -ne 's/^[^[:space:]]*[[:space:]]*.x\([A-F].\)[[:space:]]*<U\(....\)>.*/\2/p' \ sed -ne 's/^<U\(....\)>[[:space:]]*.x[A-F]..*/\1/p' \
"$@" | sort -u | $AWK -f gap.awk "$@" | sort -u | $AWK -f gap.awk
echo " { start: 0xffff, end: 0xffff, idx: 0 }" echo " { start: 0xffff, end: 0xffff, idx: 0 }"
echo "};" echo "};"
echo "static const char iso88597_from_ucs4[] = {" echo "static const char iso88597_from_ucs4[] = {"
sed -ne 's/^[^[:space:]]*[[:space:]]*.x\([A-F].\)[[:space:]]*<U\(....\)>.*/0x\2 0x\1/p' \ sed -ne 's/^<U\(....\)>[[:space:]]*.x\([A-F].\).*/0x\1 0x\2/p' \
"$@" | sort -u | $AWK -f gaptab.awk "$@" | sort -u | $AWK -f gaptab.awk
echo "};" echo "};"

6
iconvdata/gen-8bit-gap.sh
View File

@ -1,15 +1,15 @@
#! /bin/sh #! /bin/sh
echo "static const uint32_t to_ucs4[256] = {" echo "static const uint32_t to_ucs4[256] = {"
sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \
-e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/ [0x\1] = 0x\2,/p' \ -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/ [0x\2] = 0x\1,/p' \
"$@" | sort -u "$@" | sort -u
echo "};" echo "};"
echo "static const struct gap from_idx[] = {" echo "static const struct gap from_idx[] = {"
sed -ne 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/\2/p' \ sed -ne 's/^<U\(....\).*/\1/p' \
"$@" | sort -u | $AWK -f gap.awk "$@" | sort -u | $AWK -f gap.awk
echo " { start: 0xffff, end: 0xffff, idx: 0 }" echo " { start: 0xffff, end: 0xffff, idx: 0 }"
echo "};" echo "};"
echo "static const char from_ucs4[] = {" echo "static const char from_ucs4[] = {"
sed -ne 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/\2 \1/p' \ sed -ne 's/^<U\(....\)>[[:space:]]*.x\(..\).*/\1 \2/p' \
"$@" | sort -u | $AWK -f gaptab.awk "$@" | sort -u | $AWK -f gaptab.awk
echo "};" echo "};"

4
iconvdata/gen-8bit.sh
View File

@ -1,11 +1,11 @@
#! /bin/sh #! /bin/sh
echo "static const uint32_t to_ucs4[256] = {" echo "static const uint32_t to_ucs4[256] = {"
sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \
-e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/ [0x\1] = 0x\2,/p' \ -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/ [0x\2] = 0x\1,/p' \
"$@" | sort -u "$@" | sort -u
echo "};" echo "};"
echo "static const char from_ucs4[] = {" echo "static const char from_ucs4[] = {"
sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \
-e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/ [0x\2] = 0x\1,/p' \ -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/ [0x\1] = 0x\2,/p' \
"$@" | sort -u "$@" | sort -u
echo "};" echo "};"

3
locale/programs/ld-collate.c
View File

@ -2696,6 +2696,8 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
return; return;
} }
if (! ignore_content)
{
/* Get the locale definition. */ /* Get the locale definition. */
copy_locale = load_locale (LC_COLLATE, now->val.str.startmb, copy_locale = load_locale (LC_COLLATE, now->val.str.startmb,
repertoire_name, charmap, NULL); repertoire_name, charmap, NULL);
@ -2705,6 +2707,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
if (locfile_read (copy_locale, charmap) != 0) if (locfile_read (copy_locale, charmap) != 0)
goto skip_category; goto skip_category;
} }
}
lr_ignore_rest (ldfile, 1); lr_ignore_rest (ldfile, 1);

6
localedata/tst-rpmatch.c
View File

@ -1,5 +1,5 @@
/* Test program for /* Test program for rpmatch function.
Copyright (C) 1998 Free Software Foundation, Inc. Copyright (C) 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Jochen Hein <jochen.hein@delphi.central.de>. Contributed by Jochen Hein <jochen.hein@delphi.central.de>.
@ -33,5 +33,5 @@ main (int argc, char* argv[])
argv[1], argv[2], argv[3], rpmatch (argv[2])); argv[1], argv[2], argv[3], rpmatch (argv[2]));
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
exit (EXIT_SUCCESS); return EXIT_SUCCESS;
} }