Wed Aug 5 15:17:02 2009 UTC ()
Revert to revision 1.8.  Blindly ignoring options is not acceptable
behavior and hides more problems than it is fixing.

Discussion:
http://mail-index.netbsd.org/current-users/2009/02/03/msg007761.html

Approved by: core@


(joerg)
diff -r1.11 -r1.12 src/lib/libc/iconv/iconv.c
cvs diff -r1.11 -r1.12 src/lib/libc/iconv/iconv.c (expand / switch to unified diff)

--- src/lib/libc/iconv/iconv.c 2009/03/03 16:22:33 1.11
+++ src/lib/libc/iconv/iconv.c 2009/08/05 15:17:02 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */ 1/* $NetBSD: iconv.c,v 1.12 2009/08/05 15:17:02 joerg Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c)2003 Citrus Project, 4 * Copyright (c)2003 Citrus Project,
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -18,86 +18,61 @@ @@ -18,86 +18,61 @@
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30#if defined(LIBC_SCCS) && !defined(lint) 30#if defined(LIBC_SCCS) && !defined(lint)
31__RCSID("$NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $"); 31__RCSID("$NetBSD: iconv.c,v 1.12 2009/08/05 15:17:02 joerg Exp $");
32#endif /* LIBC_SCCS and not lint */ 32#endif /* LIBC_SCCS and not lint */
33 33
34#include "namespace.h" 34#include "namespace.h"
35#include <assert.h> 35#include <assert.h>
36#include <errno.h> 36#include <errno.h>
37#include <paths.h> 37#include <paths.h>
38#include <sys/queue.h> 38#include <sys/queue.h>
39 39
40#include <iconv.h> 40#include <iconv.h>
41 41
42#ifdef __weak_alias 42#ifdef __weak_alias
43__weak_alias(iconv, _iconv) 43__weak_alias(iconv, _iconv)
44__weak_alias(iconv_open, _iconv_open) 44__weak_alias(iconv_open, _iconv_open)
45__weak_alias(iconv_close, _iconv_close) 45__weak_alias(iconv_close, _iconv_close)
46#endif 46#endif
47 47
48#ifdef HAVE_CITRUS 48#ifdef HAVE_CITRUS
49#include <sys/types.h> 49#include <sys/types.h>
50#include <string.h> 
51#include <stdlib.h> 
52#include "citrus_types.h" 50#include "citrus_types.h"
53#include "citrus_module.h" 51#include "citrus_module.h"
54#include "citrus_esdb.h" 52#include "citrus_esdb.h"
55#include "citrus_hash.h" 53#include "citrus_hash.h"
56#include "citrus_iconv.h" 54#include "citrus_iconv.h"
57 55
58#define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1) 56#define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1)
59 57
 58
60iconv_t 59iconv_t
61iconv_open(const char *out, const char *in) 60iconv_open(const char *out, const char *in)
62{ 61{
63 int ret; 62 int ret;
64 struct _citrus_iconv *handle; 63 struct _citrus_iconv *handle;
65 char *out_truncated; 
66 char *p; 
67 
68 /* 
69 * Remove anything following a //, as these are options (like 
70 * //ignore, //translate, etc) and we just don't handle them. 
71 * This is for compatibilty wiht software that uses thees 
72 * blindly. 
73 */ 
74 out_truncated = strdup(out); 
75 if (out_truncated == NULL) { 
76 errno = ENOMEM; 
77 return ((iconv_t)-1); 
78 } 
79  
80 p = out_truncated; 
81 while (*p != 0) { 
82 if (p[0] == '/' && p[1] == '/') { 
83 *p = '\0'; 
84 break; 
85 } 
86 p++; 
87 } 
88 64
89 ret = _citrus_iconv_open(&handle, _PATH_ICONV, in, out_truncated); 65 ret = _citrus_iconv_open(&handle, _PATH_ICONV, in, out);
90 free(out_truncated); 
91 if (ret) { 66 if (ret) {
92 errno = ret == ENOENT? EINVAL : ret; 67 errno = ret == ENOENT? EINVAL : ret;
93 return ((iconv_t)-1); 68 return ((iconv_t)-1);
94 } 69 }
95 70
96 return ((iconv_t)(void *)handle); 71 return ((iconv_t)(void *)handle);
97} 72}
98 73
99int 74int
100iconv_close(iconv_t handle) 75iconv_close(iconv_t handle)
101{ 76{
102 if (ISBADF(handle)) { 77 if (ISBADF(handle)) {
103 errno = EBADF; 78 errno = EBADF;