diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2002-08-17 20:30:34 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2002-08-17 20:30:34 +0000 |
commit | d8d0cebecd2b8a52757baf357883a377b40716d1 (patch) | |
tree | 1e5364fa4e881b907110d567a95dc1c405eef664 /lib | |
parent | 1c15ec1eabfbcf56e22415ae041882dbec7d8571 (diff) | |
download | src-d8d0cebecd2b8a52757baf357883a377b40716d1.tar.gz src-d8d0cebecd2b8a52757baf357883a377b40716d1.zip |
Move wcwidth() to separate file, it doesn't belong to iswctype.c at all
Notes
Notes:
svn path=/head/; revision=102033
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/locale/Makefile.inc | 2 | ||||
-rw-r--r-- | lib/libc/locale/iswctype.c | 10 | ||||
-rw-r--r-- | lib/libc/locale/wcwidth.c | 57 |
3 files changed, 58 insertions, 11 deletions
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc index c30a7b98550a..dfa543130c31 100644 --- a/lib/libc/locale/Makefile.inc +++ b/lib/libc/locale/Makefile.inc @@ -9,7 +9,7 @@ SRCS+= ansi.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrune.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wctob.c wctrans.c wctype.c + tolower.c toupper.c utf2.c wctob.c wctrans.c wctype.c wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c index dc3c52c74d43..05d13299fcae 100644 --- a/lib/libc/locale/iswctype.c +++ b/lib/libc/locale/iswctype.c @@ -212,13 +212,3 @@ towupper(wc) return (__toupper(wc)); } -int -wcwidth(wc) - wchar_t wc; -{ - int width = __maskrune(wc, _CTYPE_SWM); - - return (width ? (unsigned)width >> _CTYPE_SWS - : (iswprint(wc) ? 1 : -1)); -} - diff --git a/lib/libc/locale/wcwidth.c b/lib/libc/locale/wcwidth.c new file mode 100644 index 000000000000..2be3bcb6839e --- /dev/null +++ b/lib/libc/locale/wcwidth.c @@ -0,0 +1,57 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. + * + * This code is derived from software contributed to Berkeley by + * Paul Borman at Krystal Technologies. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <wchar.h> +#include <wctype.h> + +int +wcwidth(wc) + wchar_t wc; +{ + int width = __maskrune(wc, _CTYPE_SWM); + + return (width ? (int)((unsigned)width >> _CTYPE_SWS) + : (iswprint(wc) ? 1 : -1)); +} + |