diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-26 00:26:21 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-26 00:26:21 +0000 |
| commit | 8b682b9907ad1d60bdd45431e0e3bbdf358837ec (patch) | |
| tree | 6ec38a6f3aac595638af0fb14ec497a7a9c83b16 /iconvdata | |
| parent | 45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6 (diff) | |
| download | glibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.tar glibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.tar.gz glibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.tar.bz2 glibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.zip | |
Update.
* 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>.
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/gen-8bit-gap-1.sh | 6 | ||||
| -rw-r--r-- | iconvdata/gen-8bit-gap.sh | 6 | ||||
| -rw-r--r-- | iconvdata/gen-8bit.sh | 4 |
3 files changed, 8 insertions, 8 deletions
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 "};" |