summaryrefslogtreecommitdiff
path: root/lib/uniconv/u8-conv-to-enc.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/uniconv/u8-conv-to-enc.c')
-rw-r--r--lib/uniconv/u8-conv-to-enc.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/lib/uniconv/u8-conv-to-enc.c b/lib/uniconv/u8-conv-to-enc.c
index aaa10da..9b2f3b7 100644
--- a/lib/uniconv/u8-conv-to-enc.c
+++ b/lib/uniconv/u8-conv-to-enc.c
@@ -1,11 +1,20 @@
/* Conversion from UTF-8 to legacy encodings.
- Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or
+ modify it under the terms of either:
+ * the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ or
+
+ * the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ or both in parallel, as here.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -41,13 +50,11 @@ u8_conv_to_encoding (const char *tocode,
char *result;
/* Conversion from UTF-8 to UTF-8. No need to go through iconv(). */
-#if CONFIG_UNICODE_SAFETY
if (u8_check (src, srclen))
{
errno = EILSEQ;
return NULL;
}
-#endif
/* Memory allocation. */
if (resultbuf != NULL && *lengthp >= srclen)