Index: kernel/generic/include/str.h =================================================================== --- kernel/generic/include/str.h (revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c) +++ kernel/generic/include/str.h (revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef KERN_STR_H_ +#define KERN_STR_H_ + +#include + +/**< Common Unicode characters */ +#define U_SPECIAL '?' + +#define U_LEFT_ARROW 0x2190 +#define U_UP_ARROW 0x2191 +#define U_RIGHT_ARROW 0x2192 +#define U_DOWN_ARROW 0x2193 + +#define U_PAGE_UP 0x21de +#define U_PAGE_DOWN 0x21df + +#define U_HOME_ARROW 0x21f1 +#define U_END_ARROW 0x21f2 + +#define U_NULL 0x2400 +#define U_ESCAPE 0x241b +#define U_DELETE 0x2421 + +#define U_CURSOR 0x2588 + +/**< No size limit constant */ +#define STR_NO_LIMIT ((size_t) -1) + +/**< Maximum size of a string containing cnt characters */ +#define STR_BOUNDS(cnt) (cnt << 2) + +extern wchar_t str_decode(const char *str, size_t *offset, size_t sz); +extern int chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz); + +extern size_t str_size(const char *str); +extern size_t wstr_size(const wchar_t *str); + +extern size_t str_lsize(const char *str, size_t max_len); +extern size_t wstr_lsize(const wchar_t *str, size_t max_len); + +extern size_t str_length(const char *str); +extern size_t wstr_length(const wchar_t *wstr); + +extern size_t str_nlength(const char *str, size_t size); +extern size_t wstr_nlength(const wchar_t *str, size_t size); + +extern bool ascii_check(wchar_t ch); +extern bool chr_check(wchar_t ch); + +extern int str_cmp(const char *s1, const char *s2); +extern int str_lcmp(const char *s1, const char *s2, size_t max_len); + +extern void str_cpy(char *dest, size_t size, const char *src); +extern void str_ncpy(char *dest, size_t size, const char *src, size_t n); +extern void wstr_to_str(char *dest, size_t size, const wchar_t *src); + +extern char *str_chr(const char *str, wchar_t ch); + +extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos); +extern bool wstr_remove(wchar_t *str, size_t pos); + +#endif + +/** @} + */ Index: kernel/generic/include/string.h =================================================================== --- kernel/generic/include/string.h (revision 91001e26b14a5356ec8cf4cdeb642890b919a12d) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup generic - * @{ - */ -/** @file - */ - -#ifndef KERN_STRING_H_ -#define KERN_STRING_H_ - -#include - -/**< Common Unicode characters */ -#define U_SPECIAL '?' - -#define U_LEFT_ARROW 0x2190 -#define U_UP_ARROW 0x2191 -#define U_RIGHT_ARROW 0x2192 -#define U_DOWN_ARROW 0x2193 - -#define U_PAGE_UP 0x21de -#define U_PAGE_DOWN 0x21df - -#define U_HOME_ARROW 0x21f1 -#define U_END_ARROW 0x21f2 - -#define U_NULL 0x2400 -#define U_ESCAPE 0x241b -#define U_DELETE 0x2421 - -#define U_CURSOR 0x2588 - -/**< No size limit constant */ -#define STR_NO_LIMIT ((size_t) -1) - -/**< Maximum size of a string containing cnt characters */ -#define STR_BOUNDS(cnt) (cnt << 2) - -extern wchar_t str_decode(const char *str, size_t *offset, size_t sz); -extern int chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz); - -extern size_t str_size(const char *str); -extern size_t wstr_size(const wchar_t *str); - -extern size_t str_lsize(const char *str, size_t max_len); -extern size_t wstr_lsize(const wchar_t *str, size_t max_len); - -extern size_t str_length(const char *str); -extern size_t wstr_length(const wchar_t *wstr); - -extern size_t str_nlength(const char *str, size_t size); -extern size_t wstr_nlength(const wchar_t *str, size_t size); - -extern bool ascii_check(wchar_t ch); -extern bool chr_check(wchar_t ch); - -extern int str_cmp(const char *s1, const char *s2); -extern int str_lcmp(const char *s1, const char *s2, size_t max_len); - -extern void str_cpy(char *dest, size_t size, const char *src); -extern void str_ncpy(char *dest, size_t size, const char *src, size_t n); -extern void wstr_to_str(char *dest, size_t size, const wchar_t *src); - -extern char *str_chr(const char *str, wchar_t ch); - -extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos); -extern bool wstr_remove(wchar_t *str, size_t pos); - -#endif - -/** @} - */ Index: kernel/generic/include/sysinfo/sysinfo.h =================================================================== --- kernel/generic/include/sysinfo/sysinfo.h (revision 91001e26b14a5356ec8cf4cdeb642890b919a12d) +++ kernel/generic/include/sysinfo/sysinfo.h (revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c) @@ -37,5 +37,5 @@ #include -#include +#include extern bool fb_exported;