From owner-svn-src-all@FreeBSD.ORG Tue Nov 12 15:09:29 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73DBF79; Tue, 12 Nov 2013 15:09:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 544AA2378; Tue, 12 Nov 2013 15:09:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACF9TRp083170; Tue, 12 Nov 2013 15:09:29 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACF9Sw9083168; Tue, 12 Nov 2013 15:09:28 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311121509.rACF9Sw9083168@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 12 Nov 2013 15:09:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258049 - in head: contrib/smbfs/lib/smb lib/libsmb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.16 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: Tue, 12 Nov 2013 15:09:29 -0000 Author: glebius Date: Tue Nov 12 15:09:28 2013 New Revision: 258049 URL: http://svnweb.freebsd.org/changeset/base/258049 Log: Just disable recoding support in libsmb if built WITHOUT_ICONV. Modified: head/contrib/smbfs/lib/smb/nls.c head/lib/libsmb/Makefile Modified: head/contrib/smbfs/lib/smb/nls.c ============================================================================== --- head/contrib/smbfs/lib/smb/nls.c Tue Nov 12 15:04:11 2013 (r258048) +++ head/contrib/smbfs/lib/smb/nls.c Tue Nov 12 15:09:28 2013 (r258049) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -47,10 +46,16 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef HAVE_ICONV +#include +#endif + u_char nls_lower[256]; u_char nls_upper[256]; +#ifdef HAVE_ICONV static iconv_t nls_toext, nls_toloc; +#endif int nls_setlocale(const char *name) @@ -71,9 +76,7 @@ nls_setlocale(const char *name) int nls_setrecode(const char *local, const char *external) { -#ifdef APPLE - return ENOENT; -#else +#ifdef HAVE_ICONV iconv_t icd; if (nls_toext) @@ -93,12 +96,15 @@ nls_setrecode(const char *local, const c } nls_toloc = icd; return 0; +#else + return ENOENT; #endif } char * nls_str_toloc(char *dst, const char *src) { +#ifdef HAVE_ICONV char *p = dst; size_t inlen, outlen; @@ -113,11 +119,15 @@ nls_str_toloc(char *dst, const char *src } *p = 0; return dst; +#else + return strcpy(dst, src); +#endif } char * nls_str_toext(char *dst, const char *src) { +#ifdef HAVE_ICONV char *p = dst; size_t inlen, outlen; @@ -132,11 +142,15 @@ nls_str_toext(char *dst, const char *src } *p = 0; return dst; +#else + return strcpy(dst, src); +#endif } void * nls_mem_toloc(void *dst, const void *src, int size) { +#ifdef HAVE_ICONV char *p = dst; const char *s = src; size_t inlen, outlen; @@ -154,11 +168,15 @@ nls_mem_toloc(void *dst, const void *src outlen--; } return dst; +#else + return memcpy(dst, src, size); +#endif } void * nls_mem_toext(void *dst, const void *src, int size) { +#ifdef HAVE_ICONV char *p = dst; const char *s = src; size_t inlen, outlen; @@ -177,6 +195,9 @@ nls_mem_toext(void *dst, const void *src outlen--; } return dst; +#else + return memcpy(dst, src, size); +#endif } char * Modified: head/lib/libsmb/Makefile ============================================================================== --- head/lib/libsmb/Makefile Tue Nov 12 15:04:11 2013 (r258048) +++ head/lib/libsmb/Makefile Tue Nov 12 15:09:28 2013 (r258049) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb @@ -16,4 +18,8 @@ SRCS= rcfile.c ctx.c cfopt.c subr.c nls. WARNS?= 1 CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include +.if ${MK_ICONV} != "no" +CFLAGS+= -DHAVE_ICONV=1 +.endif + .include