From 4dad48271a3d70a6c6bcc29d015faee496f9b5a9 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Wed, 12 Jun 2013 15:11:15 +0200 Subject: [PATCH] Move wchar.h functions into their own directory. --- libc/Makefile | 34 +++++++++++++++++----------------- libc/sortix/wchar/.gitignore | 0 libc/{ => wchar}/mbrlen.cpp | 2 +- libc/{ => wchar}/mbrtowc.cpp | 2 +- libc/{ => wchar}/mbsrtowcs.cpp | 2 +- libc/{ => wchar}/wcrtomb.cpp | 2 +- libc/{ => wchar}/wcscat.cpp | 2 +- libc/{ => wchar}/wcschr.cpp | 2 +- libc/{ => wchar}/wcschrnul.cpp | 2 +- libc/{ => wchar}/wcscmp.cpp | 2 +- libc/{ => wchar}/wcscpy.cpp | 2 +- libc/{ => wchar}/wcscspn.cpp | 2 +- libc/{ => wchar}/wcslen.cpp | 2 +- libc/{ => wchar}/wcsncat.cpp | 2 +- libc/{ => wchar}/wcsncpy.cpp | 2 +- libc/{ => wchar}/wcsrchr.cpp | 2 +- libc/{ => wchar}/wcsrtombs.cpp | 2 +- libc/{ => wchar}/wcsspn.cpp | 2 +- libc/{ => wchar}/wcstok.cpp | 2 +- 19 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 libc/sortix/wchar/.gitignore rename libc/{ => wchar}/mbrlen.cpp (99%) rename libc/{ => wchar}/mbrtowc.cpp (99%) rename libc/{ => wchar}/mbsrtowcs.cpp (98%) rename libc/{ => wchar}/wcrtomb.cpp (99%) rename libc/{ => wchar}/wcscat.cpp (98%) rename libc/{ => wchar}/wcschr.cpp (98%) rename libc/{ => wchar}/wcschrnul.cpp (98%) rename libc/{ => wchar}/wcscmp.cpp (98%) rename libc/{ => wchar}/wcscpy.cpp (98%) rename libc/{ => wchar}/wcscspn.cpp (98%) rename libc/{ => wchar}/wcslen.cpp (98%) rename libc/{ => wchar}/wcsncat.cpp (98%) rename libc/{ => wchar}/wcsncpy.cpp (98%) rename libc/{ => wchar}/wcsrchr.cpp (98%) rename libc/{ => wchar}/wcsrtombs.cpp (98%) rename libc/{ => wchar}/wcsspn.cpp (98%) rename libc/{ => wchar}/wcstok.cpp (98%) diff --git a/libc/Makefile b/libc/Makefile index 5d26e596..76030ad4 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -75,9 +75,6 @@ integer.o \ ldiv.o \ lldiv.o \ mblen.o \ -mbrlen.o \ -mbrtowc.o \ -mbsrtowcs.o \ mbstowcs.o \ mbtowc.o \ op-new.o \ @@ -139,20 +136,23 @@ time/timegm.o \ ungetc.o \ vfscanf.o \ vsscanf.o \ -wcrtomb.o \ -wcscat.o \ -wcschrnul.o \ -wcschr.o \ -wcscmp.o \ -wcscpy.o \ -wcscspn.o \ -wcslen.o \ -wcsncat.o \ -wcsncpy.o \ -wcsrchr.o \ -wcsrtombs.o \ -wcsspn.o \ -wcstok.o \ +wchar/mbrlen.o \ +wchar/mbrtowc.o \ +wchar/mbsrtowcs.o \ +wchar/wcrtomb.o \ +wchar/wcscat.o \ +wchar/wcschrnul.o \ +wchar/wcschr.o \ +wchar/wcscmp.o \ +wchar/wcscpy.o \ +wchar/wcscspn.o \ +wchar/wcslen.o \ +wchar/wcsncat.o \ +wchar/wcsncpy.o \ +wchar/wcsrchr.o \ +wchar/wcsrtombs.o \ +wchar/wcsspn.o \ +wchar/wcstok.o \ wcstombs.o \ wctomb.o \ wctype.o \ diff --git a/libc/sortix/wchar/.gitignore b/libc/sortix/wchar/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/libc/mbrlen.cpp b/libc/wchar/mbrlen.cpp similarity index 99% rename from libc/mbrlen.cpp rename to libc/wchar/mbrlen.cpp index aa4601ac..d9417009 100644 --- a/libc/mbrlen.cpp +++ b/libc/wchar/mbrlen.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - mbrlen.cpp + wchar/mbrlen.cpp Determine number of bytes in next multibyte character. *******************************************************************************/ diff --git a/libc/mbrtowc.cpp b/libc/wchar/mbrtowc.cpp similarity index 99% rename from libc/mbrtowc.cpp rename to libc/wchar/mbrtowc.cpp index 7c9a34dd..2c82644b 100644 --- a/libc/mbrtowc.cpp +++ b/libc/wchar/mbrtowc.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - mbrtowc.cpp + wchar/mbrtowc.cpp Convert a multibyte sequence to a wide character. *******************************************************************************/ diff --git a/libc/mbsrtowcs.cpp b/libc/wchar/mbsrtowcs.cpp similarity index 98% rename from libc/mbsrtowcs.cpp rename to libc/wchar/mbsrtowcs.cpp index f056018c..0808ea89 100644 --- a/libc/mbsrtowcs.cpp +++ b/libc/wchar/mbsrtowcs.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - mbsrtowcs.cpp + wchar/mbsrtowcs.cpp Convert a multibyte string to a wide-character string. *******************************************************************************/ diff --git a/libc/wcrtomb.cpp b/libc/wchar/wcrtomb.cpp similarity index 99% rename from libc/wcrtomb.cpp rename to libc/wchar/wcrtomb.cpp index 20426944..f684e498 100644 --- a/libc/wcrtomb.cpp +++ b/libc/wchar/wcrtomb.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcrtomb.cpp + wchar/wcrtomb.cpp Convert a wide character to a multibyte sequence. *******************************************************************************/ diff --git a/libc/wcscat.cpp b/libc/wchar/wcscat.cpp similarity index 98% rename from libc/wcscat.cpp rename to libc/wchar/wcscat.cpp index bbe4c0b4..48268539 100644 --- a/libc/wcscat.cpp +++ b/libc/wchar/wcscat.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcscat.cpp + wchar/wcscat.cpp Appends a string onto another string. *******************************************************************************/ diff --git a/libc/wcschr.cpp b/libc/wchar/wcschr.cpp similarity index 98% rename from libc/wcschr.cpp rename to libc/wchar/wcschr.cpp index 58a6f933..58d8258e 100644 --- a/libc/wcschr.cpp +++ b/libc/wchar/wcschr.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcschr.cpp + wchar/wcschr.cpp Searches a string for a specific character. *******************************************************************************/ diff --git a/libc/wcschrnul.cpp b/libc/wchar/wcschrnul.cpp similarity index 98% rename from libc/wcschrnul.cpp rename to libc/wchar/wcschrnul.cpp index 1aa34ec4..5de15fce 100644 --- a/libc/wcschrnul.cpp +++ b/libc/wchar/wcschrnul.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcschrnul.cpp + wchar/wcschrnul.cpp Searches a string for a specific character. *******************************************************************************/ diff --git a/libc/wcscmp.cpp b/libc/wchar/wcscmp.cpp similarity index 98% rename from libc/wcscmp.cpp rename to libc/wchar/wcscmp.cpp index 694f4866..ae0a02cf 100644 --- a/libc/wcscmp.cpp +++ b/libc/wchar/wcscmp.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcscmp.cpp + wchar/wcscmp.cpp Compares two strings. *******************************************************************************/ diff --git a/libc/wcscpy.cpp b/libc/wchar/wcscpy.cpp similarity index 98% rename from libc/wcscpy.cpp rename to libc/wchar/wcscpy.cpp index 0966313d..2c16a19b 100644 --- a/libc/wcscpy.cpp +++ b/libc/wchar/wcscpy.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcscpy.cpp + wchar/wcscpy.cpp Copies a string and returns dest. *******************************************************************************/ diff --git a/libc/wcscspn.cpp b/libc/wchar/wcscspn.cpp similarity index 98% rename from libc/wcscspn.cpp rename to libc/wchar/wcscspn.cpp index 86df14b8..0dd33c99 100644 --- a/libc/wcscspn.cpp +++ b/libc/wchar/wcscspn.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcscspn.cpp + wchar/wcscspn.cpp Search a string for a set of characters. *******************************************************************************/ diff --git a/libc/wcslen.cpp b/libc/wchar/wcslen.cpp similarity index 98% rename from libc/wcslen.cpp rename to libc/wchar/wcslen.cpp index f792b160..13ad2f4e 100644 --- a/libc/wcslen.cpp +++ b/libc/wchar/wcslen.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcslen.cpp + wchar/wcslen.cpp Returns the length of a string. *******************************************************************************/ diff --git a/libc/wcsncat.cpp b/libc/wchar/wcsncat.cpp similarity index 98% rename from libc/wcsncat.cpp rename to libc/wchar/wcsncat.cpp index 1d78ac81..80c023ed 100644 --- a/libc/wcsncat.cpp +++ b/libc/wchar/wcsncat.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcsncat.cpp + wchar/wcsncat.cpp Appends parts of a string onto another string. *******************************************************************************/ diff --git a/libc/wcsncpy.cpp b/libc/wchar/wcsncpy.cpp similarity index 98% rename from libc/wcsncpy.cpp rename to libc/wchar/wcsncpy.cpp index e4d571b7..15fe10ce 100644 --- a/libc/wcsncpy.cpp +++ b/libc/wchar/wcsncpy.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcsncpy.cpp + wchar/wcsncpy.cpp Copies a string into a fixed size buffer and returns dest. *******************************************************************************/ diff --git a/libc/wcsrchr.cpp b/libc/wchar/wcsrchr.cpp similarity index 98% rename from libc/wcsrchr.cpp rename to libc/wchar/wcsrchr.cpp index 3e3c5f39..84a97748 100644 --- a/libc/wcsrchr.cpp +++ b/libc/wchar/wcsrchr.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcsrchr.cpp + wchar/wcsrchr.cpp Searches a string for a specific character. *******************************************************************************/ diff --git a/libc/wcsrtombs.cpp b/libc/wchar/wcsrtombs.cpp similarity index 98% rename from libc/wcsrtombs.cpp rename to libc/wchar/wcsrtombs.cpp index 2b3db50f..a616e30f 100644 --- a/libc/wcsrtombs.cpp +++ b/libc/wchar/wcsrtombs.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcsrtombs.cpp + wchar/wcsrtombs.cpp Convert a wide-character string to multibyte string. *******************************************************************************/ diff --git a/libc/wcsspn.cpp b/libc/wchar/wcsspn.cpp similarity index 98% rename from libc/wcsspn.cpp rename to libc/wchar/wcsspn.cpp index a9414e90..0d1a6143 100644 --- a/libc/wcsspn.cpp +++ b/libc/wchar/wcsspn.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcsspn.cpp + wchar/wcsspn.cpp Search a string for a set of characters. *******************************************************************************/ diff --git a/libc/wcstok.cpp b/libc/wchar/wcstok.cpp similarity index 98% rename from libc/wcstok.cpp rename to libc/wchar/wcstok.cpp index ac8c19f5..8cbbc1e1 100644 --- a/libc/wcstok.cpp +++ b/libc/wchar/wcstok.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with the Sortix C Library. If not, see . - wcstok.cpp + wchar/wcstok.cpp Extract tokens from strings. *******************************************************************************/