Deleted Added
full compact
iconv_xlat.c (75332) iconv_xlat.c (109623)
1/*
2 * Copyright (c) 2000-2001, Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. All advertising materials mentioning features or use of this software
14 * must display the following acknowledgement:
15 * This product includes software developed by Boris Popov.
16 * 4. Neither the name of the author nor the names of any co-contributors
17 * may be used to endorse or promote products derived from this software
18 * without specific prior written permission.
19 *
20 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 2000-2001, Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. All advertising materials mentioning features or use of this software
14 * must display the following acknowledgement:
15 * This product includes software developed by Boris Popov.
16 * 4. Neither the name of the author nor the names of any co-contributors
17 * may be used to endorse or promote products derived from this software
18 * without specific prior written permission.
19 *
20 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/libkern/iconv_xlat.c 75332 2001-04-09 09:39:29Z bp $
32 * $FreeBSD: head/sys/libkern/iconv_xlat.c 109623 2003-01-21 08:56:16Z alfred $
33 */
34#include <sys/param.h>
35#include <sys/kernel.h>
36#include <sys/systm.h>
37#include <sys/malloc.h>
38#include <sys/iconv.h>
39
40#include "iconv_converter_if.h"
41
42/*
43 * "XLAT" converter
44 */
45
46#ifdef MODULE_DEPEND
47MODULE_DEPEND(iconv_xlat, libiconv, 1, 1, 1);
48#endif
49
50/*
51 * XLAT converter instance
52 */
53struct iconv_xlat {
54 KOBJ_FIELDS;
55 u_char * d_table;
56 struct iconv_cspair * d_csp;
57};
58
59static int
60iconv_xlat_open(struct iconv_converter_class *dcp,
61 struct iconv_cspair *csp, struct iconv_cspair *cspf, void **dpp)
62{
63 struct iconv_xlat *dp;
64
33 */
34#include <sys/param.h>
35#include <sys/kernel.h>
36#include <sys/systm.h>
37#include <sys/malloc.h>
38#include <sys/iconv.h>
39
40#include "iconv_converter_if.h"
41
42/*
43 * "XLAT" converter
44 */
45
46#ifdef MODULE_DEPEND
47MODULE_DEPEND(iconv_xlat, libiconv, 1, 1, 1);
48#endif
49
50/*
51 * XLAT converter instance
52 */
53struct iconv_xlat {
54 KOBJ_FIELDS;
55 u_char * d_table;
56 struct iconv_cspair * d_csp;
57};
58
59static int
60iconv_xlat_open(struct iconv_converter_class *dcp,
61 struct iconv_cspair *csp, struct iconv_cspair *cspf, void **dpp)
62{
63 struct iconv_xlat *dp;
64
65 dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, M_WAITOK);
65 dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, 0);
66 dp->d_table = csp->cp_data;
67 dp->d_csp = csp;
68 csp->cp_refcount++;
69 *dpp = (void*)dp;
70 return 0;
71}
72
73static int
74iconv_xlat_close(void *data)
75{
76 struct iconv_xlat *dp = data;
77
78 dp->d_csp->cp_refcount--;
79 kobj_delete((struct kobj*)data, M_ICONV);
80 return 0;
81}
82
83static int
84iconv_xlat_conv(void *d2p, const char **inbuf,
85 size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
86{
87 struct iconv_xlat *dp = (struct iconv_xlat*)d2p;
88 const char *src;
89 char *dst;
90 int n, r;
91
92 if (inbuf == NULL || *inbuf == NULL || outbuf == NULL || *outbuf == NULL)
93 return 0;
94 r = n = min(*inbytesleft, *outbytesleft);
95 src = *inbuf;
96 dst = *outbuf;
97 while(r--)
98 *dst++ = dp->d_table[(u_char)*src++];
99 *inbuf += n;
100 *outbuf += n;
101 *inbytesleft += n;
102 *outbytesleft -= n;
103 return 0;
104}
105
106static const char *
107iconv_xlat_name(struct iconv_converter_class *dcp)
108{
109 return "xlat";
110}
111
112static kobj_method_t iconv_xlat_methods[] = {
113 KOBJMETHOD(iconv_converter_open, iconv_xlat_open),
114 KOBJMETHOD(iconv_converter_close, iconv_xlat_close),
115 KOBJMETHOD(iconv_converter_conv, iconv_xlat_conv),
116#if 0
117 KOBJMETHOD(iconv_converter_init, iconv_xlat_init),
118 KOBJMETHOD(iconv_converter_done, iconv_xlat_done),
119#endif
120 KOBJMETHOD(iconv_converter_name, iconv_xlat_name),
121 {0, 0}
122};
123
124KICONV_CONVERTER(xlat, sizeof(struct iconv_xlat));
66 dp->d_table = csp->cp_data;
67 dp->d_csp = csp;
68 csp->cp_refcount++;
69 *dpp = (void*)dp;
70 return 0;
71}
72
73static int
74iconv_xlat_close(void *data)
75{
76 struct iconv_xlat *dp = data;
77
78 dp->d_csp->cp_refcount--;
79 kobj_delete((struct kobj*)data, M_ICONV);
80 return 0;
81}
82
83static int
84iconv_xlat_conv(void *d2p, const char **inbuf,
85 size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
86{
87 struct iconv_xlat *dp = (struct iconv_xlat*)d2p;
88 const char *src;
89 char *dst;
90 int n, r;
91
92 if (inbuf == NULL || *inbuf == NULL || outbuf == NULL || *outbuf == NULL)
93 return 0;
94 r = n = min(*inbytesleft, *outbytesleft);
95 src = *inbuf;
96 dst = *outbuf;
97 while(r--)
98 *dst++ = dp->d_table[(u_char)*src++];
99 *inbuf += n;
100 *outbuf += n;
101 *inbytesleft += n;
102 *outbytesleft -= n;
103 return 0;
104}
105
106static const char *
107iconv_xlat_name(struct iconv_converter_class *dcp)
108{
109 return "xlat";
110}
111
112static kobj_method_t iconv_xlat_methods[] = {
113 KOBJMETHOD(iconv_converter_open, iconv_xlat_open),
114 KOBJMETHOD(iconv_converter_close, iconv_xlat_close),
115 KOBJMETHOD(iconv_converter_conv, iconv_xlat_conv),
116#if 0
117 KOBJMETHOD(iconv_converter_init, iconv_xlat_init),
118 KOBJMETHOD(iconv_converter_done, iconv_xlat_done),
119#endif
120 KOBJMETHOD(iconv_converter_name, iconv_xlat_name),
121 {0, 0}
122};
123
124KICONV_CONVERTER(xlat, sizeof(struct iconv_xlat));