diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-09-25 04:27:59 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-09-25 04:27:59 +0000 |
| commit | c386d8bdd0fc4e29be2e7acc61e5ee84fd52d1f9 (patch) | |
| tree | fef4eed1c94889e05996884d40ab3f15ec98748b /source3 | |
| parent | e3249d0196a3bf0c159acf69bb5fb1d0c78d1290 (diff) | |
| download | samba-c386d8bdd0fc4e29be2e7acc61e5ee84fd52d1f9.tar.gz samba-c386d8bdd0fc4e29be2e7acc61e5ee84fd52d1f9.tar.bz2 samba-c386d8bdd0fc4e29be2e7acc61e5ee84fd52d1f9.zip | |
allow all ucs2 chars in utf8, rather than mapping some to a single
char like libiconv does
(This used to be commit e13e8b190c70136cb2c3588bdcf7328a7f61d152)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/iconv.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c index a8962726e0..05292264c2 100644 --- a/source3/lib/iconv.c +++ b/source3/lib/iconv.c @@ -529,16 +529,7 @@ static size_t utf8_push(void *cd, char **inbuf, size_t *inbytesleft, unsigned char *uc = (unsigned char *)*inbuf; int len=1; - if ((uc[1] & 0xf8) == 0xd8) { - if (*outbytesleft < 3) { - DEBUG(0,("short utf8 write\n")); - goto toobig; - } - c[0] = 0xed; - c[1] = 0x9f; - c[2] = 0xbf; - len = 3; - } else if (uc[1] & 0xf8) { + if (uc[1] & 0xf8) { if (*outbytesleft < 3) { DEBUG(0,("short utf8 write\n")); goto toobig; |