From 910d87220b571e57a9e97a45f6a62a9f68381f77 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 17 May 2011 12:31:07 +0200 Subject: [PATCH] Use yaz_utf8_check --- src/http_command.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/http_command.c b/src/http_command.c index eb799f0..e171cc9 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1096,31 +1096,6 @@ static void cmd_ping(struct http_channel *c) release_session(c, s); } -static int utf_8_valid(const char *str) -{ - yaz_iconv_t cd = yaz_iconv_open("utf-8", "utf-8"); - if (cd) - { - /* check that query is UTF-8 encoded */ - char *inbuf = (char *) str; /* we know iconv does not alter this */ - size_t inbytesleft = strlen(inbuf); - - size_t outbytesleft = strlen(inbuf) + 10; - char *out = xmalloc(outbytesleft); - char *outbuf = out; - size_t r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); - - /* if OK, try flushing the rest */ - if (r != (size_t) (-1)) - r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft); - yaz_iconv_close(cd); - xfree(out); - if (r == (size_t) (-1)) - return 0; - } - return 1; -} - static void cmd_search(struct http_channel *c) { struct http_request *rq = c->request; @@ -1141,7 +1116,7 @@ static void cmd_search(struct http_channel *c) release_session(c,s); return; } - if (!utf_8_valid(query)) + if (!yaz_utf8_check(query)) { error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query"); release_session(c,s); -- 1.7.10.4