diff options
author | tijl <tijl@FreeBSD.org> | 2014-04-15 09:49:44 +0000 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2014-04-15 09:49:44 +0000 |
commit | 1cbbe6f2d4f3072dbd2c8607cd56bea514637d82 (patch) | |
tree | a9679901144507309a5b71a4e0ae37b76368fb52 /lib/libc/iconv/citrus_csmapper.c | |
parent | e8ab551e5fb0c3b4da36ce4cd1879d73dd2cdf26 (diff) | |
download | FreeBSD-src-1cbbe6f2d4f3072dbd2c8607cd56bea514637d82.zip FreeBSD-src-1cbbe6f2d4f3072dbd2c8607cd56bea514637d82.tar.gz |
MFC r263986:
- In the libiconv module for ISO 2022 restore the original order of the
fields of a private struct such that variables of this type are
initialised correctly. Fixes conversion from ISO 2022.
Also do this in the BIG5 module to prevent similar errors in the future.
- In the libiconv module for EUC-TW replace 2^cs with 1<<cs. Fixes
conversion from EUC-TW.
- Synchronise iconv code with NetBSD. In most cases this only updates
the RCS id because the changes are already there or are NetBSD specific.
+ libc/iconv/citrus_csmapper.c: Add a comment.
+ libc/iconv/citrus_db_factory.c: Remove put16().
+ libc/iconv/citrus_iconv.c: Return EINVAL on error.
+ libc/iconv/citrus_mapper.c: Return EINVAL on error.
+ libc/iconv/citrus_memstream.c: Fix type of a variable.
+ libc/iconv/citrus_prop.h: Sync definition of _CITRUS_PROP_HINT_END.
+ libc/iconv/citrus_stdenc.c: Return EINVAL on error.
+ libiconv_modules/mapper_std/citrus_mapper_std.c: Plug memory leak.
Obtained from: NetBSD
Diffstat (limited to 'lib/libc/iconv/citrus_csmapper.c')
-rw-r--r-- | lib/libc/iconv/citrus_csmapper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libc/iconv/citrus_csmapper.c b/lib/libc/iconv/citrus_csmapper.c index e2d10d5..353adc9 100644 --- a/lib/libc/iconv/citrus_csmapper.c +++ b/lib/libc/iconv/citrus_csmapper.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $NetBSD: citrus_csmapper.c,v 1.10 2009/01/11 02:46:24 christos Exp $ */ +/* $NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $ */ /*- * Copyright (c)2003 Citrus Project, @@ -140,6 +140,7 @@ find_best_pivot_pvdb(const char *src, const char *dst, char *pivot, if (ret) goto quit3; if (_db_lookup_by_s(db3, dst, &r2, NULL) != 0) + /* don't break the loop, test all src/dst pairs. */ goto quit4; /* r2: norm among pivot and dst */ ret = get32(&r2, &val32); |