From owner-svn-src-all@FreeBSD.ORG Fri Feb 25 00:10:27 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2145F106566C; Fri, 25 Feb 2011 00:10:27 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 067A68FC18; Fri, 25 Feb 2011 00:10:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1P0AQxm069663; Fri, 25 Feb 2011 00:10:26 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1P0AQhC069660; Fri, 25 Feb 2011 00:10:26 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201102250010.p1P0AQhC069660@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 25 Feb 2011 00:10:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219020 - in head/tools: build/options test/iconv X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 00:10:27 -0000 Author: gabor Date: Fri Feb 25 00:10:26 2011 New Revision: 219020 URL: http://svn.freebsd.org/changeset/base/219020 Log: - Add two more iconv-related files, which were left out from previous commit Approved by: delphij (mentor) Added: head/tools/build/options/WITH_ICONV (contents, props changed) head/tools/test/iconv/const-gnuism.c (contents, props changed) Added: head/tools/build/options/WITH_ICONV ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_ICONV Fri Feb 25 00:10:26 2011 (r219020) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to build iconv as part of libc. Added: head/tools/test/iconv/const-gnuism.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/test/iconv/const-gnuism.c Fri Feb 25 00:10:26 2011 (r219020) @@ -0,0 +1,70 @@ +/*- + * Copyright (C) 2010 Gabor Kovesdan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#include +#include +#include +#include + +int +main(void) +{ + iconv_t cd; + size_t inbytes, outbytes; + char *str1 = "FOOBAR"; + const char *str2 = "FOOBAR"; + char ** in1; + const char ** in2 = &str2; + char *out1, *out2; + + inbytes = outbytes = strlen("FOOBAR"); + + if ((cd = iconv_open("UTF-8", "ASCII")) == (iconv_t)-1) + err(1, NULL); + + if ((out2 = malloc(inbytes)) == NULL) + err(1, NULL); + + if (iconv(cd, in2, &inbytes, &out2, &outbytes) == -1) + err(1, NULL); + + in1 = &str1; + inbytes = outbytes = strlen("FOOBAR"); + + if ((out1 = malloc(inbytes)) == NULL) + err(1, NULL); + + if (iconv(cd, in1, &inbytes, &out1, &outbytes) == -1) + err(1, NULL); + + return (EXIT_SUCCESS); + +}