aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--iconv/gconv_open.c4
-rw-r--r--iconvdata/gen-8bit-gap-1.sh6
-rw-r--r--iconvdata/gen-8bit-gap.sh6
-rw-r--r--iconvdata/gen-8bit.sh4
-rw-r--r--locale/programs/ld-collate.c17
-rw-r--r--localedata/tst-rpmatch.c6
7 files changed, 34 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index b98e41f172..caf87ac01f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
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
unknown character.
@@ -21,8 +30,8 @@
2000-06-23 Thorsten Kukuk <kukuk@suse.de>
- * xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from Jens
- Moeller <jens.moeller@waii.com>.
+ * sunrpc/xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from
+ Jens Moeller <jens.moeller@waii.com>.
2000-06-24 Ulrich Drepper <drepper@redhat.com>
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index 2374703e21..c54054a3e5 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -188,12 +188,12 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
{
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
output buffer. */
result->__data[cnt].__flags = conv_flags;
+ /* Would have to be done if we would not clear the whole
+ array above. */
#if 0
/* Reset the counter. */
result->__data[cnt].__invocation_counter = 0;
diff --git a/iconvdata/gen-8bit-gap-1.sh b/iconvdata/gen-8bit-gap-1.sh
index 5e949e7a2e..87d879bba2 100644
--- a/iconvdata/gen-8bit-gap-1.sh
+++ b/iconvdata/gen-8bit-gap-1.sh
@@ -1,15 +1,15 @@
#! /bin/sh
echo "static const uint32_t iso88597_to_ucs4[96] = {"
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
echo "};"
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
echo " { start: 0xffff, end: 0xffff, idx: 0 }"
echo "};"
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
echo "};"
diff --git a/iconvdata/gen-8bit-gap.sh b/iconvdata/gen-8bit-gap.sh
index 7c11832710..ce14c0be01 100644
--- a/iconvdata/gen-8bit-gap.sh
+++ b/iconvdata/gen-8bit-gap.sh
@@ -1,15 +1,15 @@
#! /bin/sh
echo "static const uint32_t to_ucs4[256] = {"
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
echo "};"
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
echo " { start: 0xffff, end: 0xffff, idx: 0 }"
echo "};"
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
echo "};"
diff --git a/iconvdata/gen-8bit.sh b/iconvdata/gen-8bit.sh
index de6605f7fc..e434c05984 100644
--- a/iconvdata/gen-8bit.sh
+++ b/iconvdata/gen-8bit.sh
@@ -1,11 +1,11 @@
#! /bin/sh
echo "static const uint32_t to_ucs4[256] = {"
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
echo "};"
echo "static const char from_ucs4[] = {"
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
echo "};"
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 205cf966f2..73a186df26 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -2696,14 +2696,17 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
return;
}
- /* Get the locale definition. */
- copy_locale = load_locale (LC_COLLATE, now->val.str.startmb,
- repertoire_name, charmap, NULL);
- if ((copy_locale->avail & COLLATE_LOCALE) == 0)
+ if (! ignore_content)
{
- /* Not yet loaded. So do it now. */
- if (locfile_read (copy_locale, charmap) != 0)
- goto skip_category;
+ /* Get the locale definition. */
+ copy_locale = load_locale (LC_COLLATE, now->val.str.startmb,
+ repertoire_name, charmap, NULL);
+ if ((copy_locale->avail & COLLATE_LOCALE) == 0)
+ {
+ /* Not yet loaded. So do it now. */
+ if (locfile_read (copy_locale, charmap) != 0)
+ goto skip_category;
+ }
}
lr_ignore_rest (ldfile, 1);
diff --git a/localedata/tst-rpmatch.c b/localedata/tst-rpmatch.c
index f79930408e..e13c1996e3 100644
--- a/localedata/tst-rpmatch.c
+++ b/localedata/tst-rpmatch.c
@@ -1,5 +1,5 @@
-/* Test program for
- Copyright (C) 1998 Free Software Foundation, Inc.
+/* Test program for rpmatch function.
+ Copyright (C) 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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]));
exit (EXIT_FAILURE);
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}