diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/Makefile | 19 | ||||
| -rw-r--r-- | wcsmbs/mbscmp.c | 63 | ||||
| -rw-r--r-- | wcsmbs/wchar.h | 133 | ||||
| -rw-r--r-- | wcsmbs/wcpcpy.c | 47 | ||||
| -rw-r--r-- | wcsmbs/wcpncpy.c | 89 | ||||
| -rw-r--r-- | wcsmbs/wcscoll.c | 26 | ||||
| -rw-r--r-- | wcsmbs/wcscpy.c | 5 | ||||
| -rw-r--r-- | wcsmbs/wcsncpy.c | 4 | ||||
| -rw-r--r-- | wcsmbs/wcstod.c | 25 | ||||
| -rw-r--r-- | wcsmbs/wcstof.c | 31 | ||||
| -rw-r--r-- | wcsmbs/wcstol.c | 22 | ||||
| -rw-r--r-- | wcsmbs/wcstold.c | 31 | ||||
| -rw-r--r-- | wcsmbs/wcstoq.c | 22 | ||||
| -rw-r--r-- | wcsmbs/wcstoul.c | 22 | ||||
| -rw-r--r-- | wcsmbs/wcstouq.c | 22 | ||||
| -rw-r--r-- | wcsmbs/wcswidth.c | 39 | ||||
| -rw-r--r-- | wcsmbs/wcsxfrm.c | 27 | ||||
| -rw-r--r-- | wcsmbs/wcwidth.c | 27 | ||||
| -rw-r--r-- | wcsmbs/wcwidth.h | 40 |
19 files changed, 624 insertions, 70 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 99d9dd5..f713892 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -22,11 +22,26 @@ subdir := wcsmbs headers := wchar.h +distribute := wcwidth.h routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ wcsncmp wcsncpy wcspbrk wcsrchr wcsspn wcstok wcsstr wmemchr \ - wmemcmp wmemcpy wmemmove wmemset \ + wmemcmp wmemcpy wmemmove wmemset wcpcpy wcpncpy \ btowc wctob mbsinit \ - mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs + mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \ + wcstol wcstoul wcstoq wcstouq wcstod wcstold wcstof \ + wcscoll wcsxfrm \ + wcwidth wcswidth include ../Rules + +CFLAGS-wcwidth.c = -I../wctype +CFLAGS-wcswidth.c = -I../wctype + +CFLAGS-wcstol.c = -I../stdlib +CFLAGS-wcstoul.c = -I../stdlib +CFLAGS-wcstoq.c = -I../stdlib +CFLAGS-wcstouq.c = -I../stdlib +CFLAGS-wcstod.c = -I../stdlib +CFLAGS-wcstold.c = -I../stdlib +CFLAGS-wcstof.c = -I../stdlib diff --git a/wcsmbs/mbscmp.c b/wcsmbs/mbscmp.c deleted file mode 100644 index 04f6f47..0000000 --- a/wcsmbs/mbscmp.c +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright (C) 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include <mbstr.h> -#include <stdlib.h> - -#define __need_wchar_t -/* FIXME: should be defined in stddef.h. -!!! #define __need_uwchar_t */ -typedef unsigned int uwchar_t; -#include <stddef.h> - - -/* Compare MBS1 and MBS2. */ -int -mbscmp (mbs1, mbs2) - const char *mbs1; - const char *mbs2; -{ - int len1 = 0; - int len2 = 0; - uwchar_t c1; - uwchar_t c2; - - /* Reset multibyte characters to their initial state. */ - (void) mblen ((char *) NULL, 0); - - do - { - len1 = mbtowc ((wchar_t *) &c1, mbs1, MB_CUR_MAX); - len2 = mbtowc ((wchar_t *) &c2, mbs2, MB_CUR_MAX); - - if (len1 == 0) - return len2 == 0 ? 0 : -1; - if (len2 == 0) - return 1; - if (len1 < 0 || len2 < 0) - /* FIXME: an illegal character appears. What to do? */ - return c1 - c2; - - mbs1 += len1; - mbs2 += len2; - } - while (c1 == c2); - - return c1 - c2; -} - diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 69ad2d3..2292bd8 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -59,8 +59,12 @@ typedef int mbstate_t; /* FIXME */ hold any value corresponding to members of the extended character set, as well as at least one value that does not correspond to any member of the extended character set. */ +#ifndef __have_wint_t_defined +#define __have_wint_t_defined 1 +/* This is a hack!!! */ typedef unsigned int wint_t; #endif +#endif /* Copy SRC to DEST. */ @@ -81,6 +85,14 @@ extern int wcscmp __P ((__const wchar_t *__s1, __const wchar_t *__s2)); extern int wcsncmp __P ((__const wchar_t *__s1, __const wchar_t *__s2, size_t __n)); +/* Compare S1 and S2, both interpreted as appropriate to the + LC_COLLATE category of the current locale. */ +extern int wcscoll __P ((__const wchar_t *__s1, __const wchar_t *__s2)); +/* Transform S2 into array pointed to by S1 such that if wcscmp is + applied to two transformed strings the result is the as applying + `wcscoll' to the original strings. */ +extern size_t wcsxfrm __P ((wchar_t *__s1, __const wchar_t *__s2, size_t __n)); + /* Duplicate S, returning an identical malloc'd string. */ extern wchar_t *wcsdup __P ((__const wchar_t *__s)); @@ -163,6 +175,127 @@ extern size_t mbsrtowcs __P ((wchar_t *__dst, __const char **__src, extern size_t wcsrtombs __P ((char *__dst, __const wchar_t **__src, size_t __len, mbstate_t *__ps)); + +#ifdef __USE_GNU +/* The following functions are extensions found in X/Open CAE. */ + +/* Determine number of column positions required for C. */ +extern int wcwidth __P ((wint_t __c)); + +/* Determine number of column positions required for first N wide + characters (or fewer if S ends before this) in S. */ +extern int wcswidth __P ((__const wchar_t *__s, size_t __n)); +#endif /* use GNU */ + + +/* Convert initial portion of the wide string NPTR to `double' + representation. */ +extern double wcstod __P ((__const wchar_t *__nptr, wchar_t **__endptr)); + +#ifdef USE_GNU +/* Likewise for `float' and `long double' sizes of floating-point numbers. */ +extern float wcstof __P ((__const wchar_t *__nptr, wchar_t **__endptr)); +extern __long_double_t wcstold __P ((__const wchar_t *__nptr, + wchar_t **__endptr)); +#endif /* GNU */ + + +/* Convert initial portion of wide string NPTR to `long int' + representation. */ +extern long int wcstol __P ((__const wchar_t *__nptr, wchar_t **__endptr, + int __base)); + +/* Convert initial portion of wide string NPTR to `unsigned long int' + representation. */ +extern unsigned long int wcstoul __P ((__const wchar_t *__nptr, + wchar_t **__endptr, int __base)); + +#if defined (__GNUC__) && defined (__USE_GNU) +/* Convert initial portion of wide string NPTR to `long int' + representation. */ +extern long long int wcstoq __P ((__const wchar_t *__nptr, wchar_t **__endptr, + int __base)); + +/* Convert initial portion of wide string NPTR to `unsigned long long int' + representation. */ +extern unsigned long long int wcstouq __P ((__const wchar_t *__nptr, + wchar_t **__endptr, int __base)); +#endif /* GCC and use GNU. */ + + +/* The internal entry points for `wcstoX' take an extra flag argument + saying whether or not to parse locale-dependent number grouping. */ +extern double __wcstod_internal __P ((__const wchar_t *__nptr, + wchar_t **_endptr, int __group)); +extern float __wcstof_internal __P ((__const wchar_t *__nptr, + wchar_t **_endptr, int __group)); +extern __long_double_t __wcstold_internal __P ((__const wchar_t *__nptr, + wchar_t **_endptr, + int __group)); + +extern long int __wcstol_internal __P ((__const wchar_t *__nptr, + wchar_t **__endptr, int __base, + int __group)); +extern unsigned long int __wcstoul_internal __P ((__const wchar_t *__nptr, + wchar_t **__endptr, + int __base, int __group)); +#ifdef __GNUC__ +extern long long int __wcstoq_internal __P ((__const wchar_t *__nptr, + wchar_t **__endptr, int __base, + int __group)); +extern unsigned long long int __wcstouq_internal __P ((__const wchar_t *__nptr, + wchar_t **__endptr, + int __base, + int __group)); +#endif /* GCC */ + + +#if defined (__OPTIMIZE__) && __GNUC__ >= 2 +/* Define inline functions which call the internal entry points. */ + +extern __inline double wcstod (__const wchar_t *__nptr, wchar_t **__endptr) +{ return __wcstod_internal (__nptr, __endptr, 0); } +extern __inline long int wcstol (__const wchar_t *__nptr, + wchar_t **__endptr, int __base) +{ return __wcstol_internal (__nptr, __endptr, __base, 0); } +extern __inline unsigned long int wcstoul (__const wchar_t *__nptr, + wchar_t **__endptr, int __base) +{ return __wcstoul_internal (__nptr, __endptr, __base, 0); } + +#ifdef __USE_GNU +extern __inline float wcstof (__const wchar_t *__nptr, wchar_t **__endptr) +{ return __wcstof_internal (__nptr, __endptr, 0); } +extern __inline __long_double_t wcstold (__const wchar_t *__nptr, + wchar_t **__endptr) +{ return __wcstold_internal (__nptr, __endptr, 0); } +#endif + +#ifdef __USE_BSD +extern __inline long long int wcstoq (__const wchar_t *__nptr, + wchar_t **__endptr, int __base) +{ return __wcstoq_internal (__nptr, __endptr, __base, 0); } +extern __inline unsigned long long int wcstouq (__const wchar_t *__nptr, + wchar_t **__endptr, int __base) +{ return __wcstouq_internal (__nptr, __endptr, __base, 0); } +#endif +#endif /* Optimizing GCC >=2. */ + + +#ifdef __USE_GNU +/* Copy SRC to DEST, returning the address of the terminating L'\0' in + DEST. */ +extern wchar_t *__wcpcpy __P ((wchar_t *__dest, __const wchar_t *__src)); +extern wchar_t *wcpcpy __P ((wchar_t *__dest, __const wchar_t *__src)); + +/* Copy no more than N characters of SRC to DEST, returning the address of + the last character written into DEST. */ +extern wchar_t *__wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src, + size_t __n)); +extern wchar_t *wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src, + size_t __n)); +#endif /* use GNU */ + + __END_DECLS #endif /* wchar.h */ diff --git a/wcsmbs/wcpcpy.c b/wcsmbs/wcpcpy.c new file mode 100644 index 0000000..2fe5985 --- /dev/null +++ b/wcsmbs/wcpcpy.c @@ -0,0 +1,47 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <wchar.h> + +#define __need_ptrdiff_t +#include <stddef.h> + + +/* Copy SRC to DEST, returning the address of the terminating L'\0' in + DEST. */ +wchar_t * +__wcpcpy (dest, src) + wchar_t *dest; + const wchar_t *src; +{ + wchar_t *wcp = (wchar_t *) dest - 1; + wint_t c; + const ptrdiff_t off = src - dest + 1; + + do + { + c = wcp[off]; + *++wcp = c; + } + while (c != L'\0'); + + return wcp; +} + +weak_alias (__wcpcpy, wcpcpy) diff --git a/wcsmbs/wcpncpy.c b/wcsmbs/wcpncpy.c new file mode 100644 index 0000000..2ff7abf --- /dev/null +++ b/wcsmbs/wcpncpy.c @@ -0,0 +1,89 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <wchar.h> + + +/* Copy no more than N wide-characters of SRC to DEST, returning the + address of the last character written into DEST. */ +wchar_t * +__wcpncpy (dest, src, n) + wchar_t *dest; + const wchar_t *src; + size_t n; +{ + wint_t c; + wchar_t *const s = dest; + + --dest; + + if (n >= 4) + { + size_t n4 = n >> 2; + + for (;;) + { + c = *src++; + *++dest = c; + if (c == L'\0') + break; + c = *src++; + *++dest = c; + if (c == L'\0') + break; + c = *src++; + *++dest = c; + if (c == L'\0') + break; + c = *src++; + *++dest = c; + if (c == L'\0') + break; + if (--n4 == 0) + goto last_chars; + } + n = n - (dest - s) - 1; + if (n == 0) + return dest; + goto zero_fill; + } + + last_chars: + n &= 3; + if (n == 0) + return dest; + + do + { + c = *src++; + *++dest = c; + if (--n == 0) + return dest; + } + while (c != L'\0'); + + zero_fill: + do + *++dest = L'\0'; + while (--n > 0); + + return dest; +} + +weak_alias (__wcpncpy, wcpncpy) diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c new file mode 100644 index 0000000..e033b4a --- /dev/null +++ b/wcsmbs/wcscoll.c @@ -0,0 +1,26 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <wchar.h> + +#define STRING_TYPE wchar_t +#define USTRING_TYPE uwchar_t +#define STRCOLL wcscoll +#define STRCMP wcscmp + +#include "../string/strcoll.c" diff --git a/wcsmbs/wcscpy.c b/wcsmbs/wcscpy.c index 3aa897e..469134e 100644 --- a/wcsmbs/wcscpy.c +++ b/wcsmbs/wcscpy.c @@ -1,6 +1,6 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. -Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu> +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -30,7 +30,7 @@ wcscpy (dest, src) const wchar_t *src; { wchar_t *wcp = (wchar_t *) src; - wchar_t c; + wint_t c; const ptrdiff_t off = dest - src - 1; do @@ -42,4 +42,3 @@ wcscpy (dest, src) return dest; } - diff --git a/wcsmbs/wcsncpy.c b/wcsmbs/wcsncpy.c index 180da79..ffa791a 100644 --- a/wcsmbs/wcsncpy.c +++ b/wcsmbs/wcsncpy.c @@ -1,6 +1,6 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. -Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu> +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -27,7 +27,7 @@ wcsncpy (dest, src, n) const wchar_t *src; size_t n; { - wchar_t c; + wint_t c; wchar_t *const s = dest; --dest; diff --git a/wcsmbs/wcstod.c b/wcsmbs/wcstod.c new file mode 100644 index 0000000..9a77c8c --- /dev/null +++ b/wcsmbs/wcstod.c @@ -0,0 +1,25 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +/* The actual implementation for all floating point sizes is in strtod.c. */ + +#define USE_WIDE_CHAR 1 + +#include "strtod.c" diff --git a/wcsmbs/wcstof.c b/wcsmbs/wcstof.c new file mode 100644 index 0000000..4cccdf0 --- /dev/null +++ b/wcsmbs/wcstof.c @@ -0,0 +1,31 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +/* The actual implementation for all floating point sizes is in strtod.c. + These macros tell it to produce the `float' version, `wcstof'. */ + +#define FLOAT float +#define FLT LDBL +#define STRTOF wcstof +#define MPN2FLOAT __mpn_construct_float +#define FLOAT_HUGE_VAL HUGE_VALf +#define USE_WIDE_CHAR 1 + +#include "strtod.c" diff --git a/wcsmbs/wcstol.c b/wcsmbs/wcstol.c new file mode 100644 index 0000000..a1d877e --- /dev/null +++ b/wcsmbs/wcstol.c @@ -0,0 +1,22 @@ +/* wcstol - Function to parse a `long int' from text. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define USE_WIDE_CHAR 1 + +#include "strtol.c" diff --git a/wcsmbs/wcstold.c b/wcsmbs/wcstold.c new file mode 100644 index 0000000..b19a48e --- /dev/null +++ b/wcsmbs/wcstold.c @@ -0,0 +1,31 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +/* The actual implementation for all floating point sizes is in strtod.c. + These macros tell it to produce the `long double' version, `wcstold'. */ + +#define FLOAT long double +#define FLT LDBL +#define STRTOF wcstold +#define MPN2FLOAT __mpn_construct_long_double +#define FLOAT_HUGE_VAL HUGE_VALl +#define USE_WIDE_CHAR 1 + +#include "strtod.c" diff --git a/wcsmbs/wcstoq.c b/wcsmbs/wcstoq.c new file mode 100644 index 0000000..cc66e92 --- /dev/null +++ b/wcsmbs/wcstoq.c @@ -0,0 +1,22 @@ +/* wcstoq - Function to parse a `long long int' from text. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define QUAD 1 + +#include "wcstol.c" diff --git a/wcsmbs/wcstoul.c b/wcsmbs/wcstoul.c new file mode 100644 index 0000000..e345ca8 --- /dev/null +++ b/wcsmbs/wcstoul.c @@ -0,0 +1,22 @@ +/* wcstoul - Function to parse an `unsigned long int' from text. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define UNSIGNED 1 + +#include "wcstol.c" diff --git a/wcsmbs/wcstouq.c b/wcsmbs/wcstouq.c new file mode 100644 index 0000000..c50d9be --- /dev/null +++ b/wcsmbs/wcstouq.c @@ -0,0 +1,22 @@ +/* wcstouq - Function to parse an `unsigned long long int' from text. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define QUAD 1 + +#include "wcstoul.c" diff --git a/wcsmbs/wcswidth.c b/wcsmbs/wcswidth.c new file mode 100644 index 0000000..ae074f2 --- /dev/null +++ b/wcsmbs/wcswidth.c @@ -0,0 +1,39 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edi>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include "wcwidth.h" + +/* Determine number of column positions required for first N wide + characters (or fewer if S ends before this) in S. */ +int +wcswidth (const wchar_t *s, size_t n) +{ + int result = 0; + + while (n > 0 && *s != L'\0') + { + int now = internal_wcwidth (*s); + if (now == -1) + return -1; + result += now; + ++s; + } + + return result; +} diff --git a/wcsmbs/wcsxfrm.c b/wcsmbs/wcsxfrm.c new file mode 100644 index 0000000..96a3238 --- /dev/null +++ b/wcsmbs/wcsxfrm.c @@ -0,0 +1,27 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <wchar.h> + +#define STRING_TYPE wchar_t +#define USTRING_TYPE uwchar_t +#define STRXFRM wcsxfrm +#define STRLEN wcslen +#define STPNCPY __wcpncpy + +#include "../string/strxfrm.c" diff --git a/wcsmbs/wcwidth.c b/wcsmbs/wcwidth.c new file mode 100644 index 0000000..5c7f8b6 --- /dev/null +++ b/wcsmbs/wcwidth.c @@ -0,0 +1,27 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edi>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include "wcwidth.h" + +/* Determine number of column positions required for CH. */ +int +wcwidth (wint_t ch) +{ + return internal_wcwidth (ch); +} diff --git a/wcsmbs/wcwidth.h b/wcsmbs/wcwidth.h new file mode 100644 index 0000000..3e60d49 --- /dev/null +++ b/wcsmbs/wcwidth.h @@ -0,0 +1,40 @@ +/* Internal header containing implementation of wcwidth() function. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edi>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <wchar.h> +#include "cname-lookup.h" + +/* Array containing width information. */ +extern unsigned char *__ctype_width; + +static __inline int +internal_wcwidth (wint_t ch) +{ + size_t idx; + + if (ch == L'\0') + return 0; + + idx = cname_lookup (ch); + if (idx == ~((size_t) 0)) + return -1; + + return (int) __ctype_width[idx]; +} |