move wcs* and wmem* from lib/libc/locale to lib/libc/string.

This commit is contained in:
itojun 2000-12-23 23:14:33 +00:00
parent f1fc4edf08
commit 383f218a51
24 changed files with 64 additions and 63 deletions

View File

@ -1,16 +1,12 @@
# from: @(#)Makefile.inc 5.1 (Berkeley) 2/18/91
# $NetBSD: Makefile.inc,v 1.28 2000/12/22 05:21:41 itojun Exp $
# $NetBSD: Makefile.inc,v 1.29 2000/12/23 23:14:33 itojun Exp $
# locale sources
.PATH: ${ARCHDIR}/locale ${.CURDIR}/locale
SRCS+= _def_messages.c _def_monetary.c _def_numeric.c _def_time.c \
ctypeio.c iswctype.c localeconv.c nl_langinfo.c \
setlocale.c setlocale_sb.c \
wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c wcslcat.c wcslcpy.c \
wcslen.c wcsncat.c \
wcsncmp.c wcsncpy.c wcspbrk.c wcsrchr.c wcsspn.c wcsstr.c wcswidth.c \
wmemchr.c wmemcmp.c wmemcpy.c wmemmove.c wmemset.c
setlocale.c setlocale_sb.c
MAN+= nl_langinfo.3 setlocale.3
MLINKS+=setlocale.3 localeconv.3
@ -23,7 +19,7 @@ SRCS+= ___runetype_mb.c ___tolower_mb.c ___toupper_mb.c \
# -D_PATH_LOCALEMODULE=\"/usr/lib/runemodule\"
# to be dynamically loaded
#SRCS+= big5.c euc.c euctw.c iso2022.c mskanji.c utf2.c utf8.c
MAN+= iswalnum.3 towlower.3 wmemchr.3
MAN+= iswalnum.3 towlower.3
MLINKS+=iswalnum.3 iswalpha.3 iswalnum.3 iswblank.3 \
iswalnum.3 iswcntrl.3 iswalnum.3 iswdigit.3 \
@ -32,13 +28,3 @@ MLINKS+=iswalnum.3 iswalpha.3 iswalnum.3 iswblank.3 \
iswalnum.3 iswspace.3 iswalnum.3 iswupper.3 \
iswalnum.3 iswxdigit.3
MLINKS+=towlower.3 towupper.3
MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \
wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \
wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \
wmemchr.3 wcscmp.3 wmemchr.3 wcscpy.3 \
wmemchr.3 wcscspn.3 wmemchr.3 wcslcat.3 \
wmemchr.3 wcslcpy.3 wmemchr.3 wcslen.3 \
wmemchr.3 wcsncat.3 wmemchr.3 wcsncmp.3 \
wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \
wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \
wmemchr.3 wcsstr.3

View File

@ -1,12 +1,16 @@
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $NetBSD: Makefile.inc,v 1.49 1999/09/08 22:56:56 lukem Exp $
# $NetBSD: Makefile.inc,v 1.50 2000/12/23 23:14:36 itojun Exp $
# string sources
.PATH: ${ARCHDIR}/string ${.CURDIR}/string
SRCS+= bm.c strcasecmp.c strcoll.c strdup.c strerror.c strlcat.c strlcpy.c \
strmode.c strsignal.c strtok.c strtok_r.c strxfrm.c \
__strerror.c __strsignal.c
__strerror.c __strsignal.c \
wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c wcslcat.c wcslcpy.c \
wcslen.c wcsncat.c \
wcsncmp.c wcsncpy.c wcspbrk.c wcsrchr.c wcsspn.c wcsstr.c wcswidth.c \
wmemchr.c wmemcmp.c wmemcpy.c wmemmove.c wmemset.c
# machine-dependent net sources
# m-d Makefile.inc must include sources for:
@ -42,7 +46,8 @@ MAN+= bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
strsignal.3 strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3
strsignal.3 strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 \
wmemchr.3
MLINKS+=bm.3 bm_comp.3 bm.3 bm_exec.3 bm.3 bm_free.3
MLINKS+=strcasecmp.3 strncasecmp.3
@ -51,3 +56,13 @@ MLINKS+=strcmp.3 strncmp.3
MLINKS+=strcpy.3 strncpy.3
MLINKS+=strlcpy.3 strlcat.3
MLINKS+=strtok.3 strtok_r.3
MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \
wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \
wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \
wmemchr.3 wcscmp.3 wmemchr.3 wcscpy.3 \
wmemchr.3 wcscspn.3 wmemchr.3 wcslcat.3 \
wmemchr.3 wcslcpy.3 wmemchr.3 wcslen.3 \
wmemchr.3 wcsncat.3 wmemchr.3 wcsncmp.3 \
wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \
wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \
wmemchr.3 wcsstr.3

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcscat.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcscat.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcschr.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcschr.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcscmp.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcscmp.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcscmp.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcscmp.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcscpy.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcscpy.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcscspn.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcscspn.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcslcat.c,v 1.1 2000/12/22 05:21:41 itojun Exp $ */
/* $NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/* from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp */
/*
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/22 05:21:41 itojun Exp $");
__RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcslcpy.c,v 1.1 2000/12/22 05:21:41 itojun Exp $ */
/* $NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/* from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp */
/*
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/22 05:21:41 itojun Exp $");
__RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcslen.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcslen.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcsncat.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcsncat.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcsncmp.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcsncmp.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcsncmp.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcsncmp.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcsncpy.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcsncpy.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcspbrk.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcspbrk.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcsrchr.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcsrchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcsrchr.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcsrchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcsspn.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcsspn.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcsstr.c,v 1.2 2000/12/21 05:12:19 itojun Exp $ */
/* $NetBSD: wcsstr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcsstr.c,v 1.2 2000/12/21 05:12:19 itojun Exp $");
__RCSID("$NetBSD: wcsstr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wcswidth.c,v 1.2 2000/12/21 08:30:53 itojun Exp $ */
/* $NetBSD: wcswidth.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcswidth.c,v 1.2 2000/12/21 08:30:53 itojun Exp $");
__RCSID("$NetBSD: wcswidth.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
.\" $NetBSD: wmemchr.3,v 1.3 2000/12/22 05:23:27 itojun Exp $
.\" $NetBSD: wmemchr.3,v 1.1 2000/12/23 23:14:37 itojun Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.

View File

@ -1,4 +1,4 @@
/* $NetBSD: wmemchr.c,v 1.4 2000/12/21 05:12:20 itojun Exp $ */
/* $NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wmemchr.c,v 1.4 2000/12/21 05:12:20 itojun Exp $");
__RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wmemcmp.c,v 1.2 2000/12/20 14:53:24 itojun Exp $ */
/* $NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wmemcmp.c,v 1.2 2000/12/20 14:53:24 itojun Exp $");
__RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wmemcpy.c,v 1.2 2000/12/20 14:53:24 itojun Exp $ */
/* $NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wmemcpy.c,v 1.2 2000/12/20 14:53:24 itojun Exp $");
__RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wmemmove.c,v 1.2 2000/12/20 14:53:24 itojun Exp $ */
/* $NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wmemmove.c,v 1.2 2000/12/20 14:53:24 itojun Exp $");
__RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wmemset.c,v 1.2 2000/12/20 14:53:24 itojun Exp $ */
/* $NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wmemset.c,v 1.2 2000/12/20 14:53:24 itojun Exp $");
__RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#include <wchar.h>