Changeset 1748

Timestamp:

Dec 21, 2004, 2:33:03 AM (21 years ago)

Author:

bird

Message:

Some wide string functions.

Location:

trunk/src/emx/src/lib

Files:

• bsd/string/wcscat.c (modified) (2 diffs, 1 prop)
• bsd/string/wcschr.c (modified) (2 diffs, 1 prop)
• bsd/string/wcscmp.c (modified) (2 diffs, 1 prop)
• bsd/string/wcscoll.c (modified) (3 diffs, 1 prop)
• bsd/string/wcscpy.c (modified) (2 diffs, 1 prop)
• bsd/string/wcscspn.c (modified) (2 diffs, 1 prop)
• bsd/string/wcslcat.c (modified) (2 diffs, 1 prop)
• bsd/string/wcslcpy.c (modified) (2 diffs, 1 prop)
• bsd/string/wcslen.c (modified) (2 diffs, 1 prop)
• bsd/string/wcsncat.c (modified) (2 diffs, 1 prop)
• bsd/string/wcsncmp.c (modified) (2 diffs, 1 prop)
• bsd/string/wcsncpy.c (modified) (2 diffs, 1 prop)
• bsd/string/wcspbrk.c (modified) (2 diffs, 1 prop)
• bsd/string/wcsrchr.c (modified) (2 diffs, 1 prop)
• bsd/string/wcsspn.c (modified) (2 diffs, 1 prop)
• bsd/string/wcsstr.c (modified) (2 diffs, 1 prop)
• bsd/string/wcstok.c (modified) (2 diffs, 1 prop)
• bsd/string/wcswidth.c (modified) (2 diffs, 1 prop)
• libc.def (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/bsd/string/wcscat.c

@@ -27 +27 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -38 +39 @@
 
 wchar_t *
-wcscat(s1, s2)
+_STD(wcscat)(s1, s2)
         wchar_t * __restrict s1;
         const wchar_t * __restrict s2;

trunk/src/emx/src/lib/bsd/string/wcschr.c

@@ -25 +25 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.7 2002/10/23 10:47:47 tjr Exp $");
@@ -31 +32 @@
 
 wchar_t *
-wcschr(const wchar_t *s, wchar_t c)
+_STD(wcschr)(const wchar_t *s, wchar_t c)
 {
 

trunk/src/emx/src/lib/bsd/string/wcscmp.c

@@ -35 +35 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -50 +51 @@
  */
 int
-wcscmp(s1, s2)
+_STD(wcscmp)(s1, s2)
         const wchar_t *s1, *s2;
 {

trunk/src/emx/src/lib/bsd/string/wcscoll.c

@@ -25 +25 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/string/wcscoll.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
@@ -32 +33 @@
 #include <string.h>
 #include <wchar.h>
-#include "collate.h"
+/*#include "collate.h"*/
 
 static char *__mbsdup(const wchar_t *);
@@ -42 +43 @@
  */
 int
-wcscoll(const wchar_t *ws1, const wchar_t *ws2)
+_STD(wcscoll)(const wchar_t *ws1, const wchar_t *ws2)
 {
         char *mbs1, *mbs2;
         int diff, sverrno;
 
-        if (__collate_load_error || MB_CUR_MAX > 1)
+        if (/*__collate_load_error || */MB_CUR_MAX > 1)
                 /*
                  * Locale has no special collating order, could not be

trunk/src/emx/src/lib/bsd/string/wcscpy.c

@@ -27 +27 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -38 +39 @@
 
 wchar_t *
-wcscpy(s1, s2)
+_STD(wcscpy)(s1, s2)
         wchar_t * __restrict s1;
         const wchar_t * __restrict s2;

trunk/src/emx/src/lib/bsd/string/wcscspn.c

@@ -27 +27 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -38 +39 @@
 
 size_t
-wcscspn(s, set)
+_STD(wcscspn)(s, set)
         const wchar_t *s;
         const wchar_t *set;

trunk/src/emx/src/lib/bsd/string/wcslcat.c

@@ -28 +28 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -47 +48 @@
  */
 size_t
-wcslcat(dst, src, siz)
+_STD(wcslcat)(dst, src, siz)
         wchar_t *dst;
         const wchar_t *src;

trunk/src/emx/src/lib/bsd/string/wcslcpy.c

@@ -28 +28 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -45 +46 @@
  */
 size_t
-wcslcpy(dst, src, siz)
+_STD(wcslcpy)(dst, src, siz)
         wchar_t *dst;
         const wchar_t *src;

trunk/src/emx/src/lib/bsd/string/wcslen.c

@@ -27 +27 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -38 +39 @@
 
 size_t
-wcslen(s)
+_STD(wcslen)(s)
         const wchar_t *s;
 {

trunk/src/emx/src/lib/bsd/string/wcsncat.c

@@ -27 +27 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -38 +39 @@
 
 wchar_t *
-wcsncat(s1, s2, n)
+_STD(wcsncat)(s1, s2, n)
         wchar_t * __restrict s1;
         const wchar_t * __restrict s2;

trunk/src/emx/src/lib/bsd/string/wcsncmp.c

@@ -32 +32 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -44 +45 @@
 
 int
-wcsncmp(s1, s2, n)
+_STD(wcsncmp)(s1, s2, n)
         const wchar_t *s1, *s2;
         size_t n;

trunk/src/emx/src/lib/bsd/string/wcsncpy.c

@@ -35 +35 @@
  */
 
+#include "namespace.h"
 #if 0
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -50 +51 @@
  */
 wchar_t *
-wcsncpy(wchar_t * __restrict dst, const wchar_t * __restrict src, size_t n)
+_STD(wcsncpy)(wchar_t * __restrict dst, const wchar_t * __restrict src, size_t n)
 {
         if (n != 0) {

trunk/src/emx/src/lib/bsd/string/wcspbrk.c

@@ -27 +27 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -38 +39 @@
 
 wchar_t *
-wcspbrk(s, set)
+_STD(wcspbrk)(s, set)
         const wchar_t *s;
         const wchar_t *set;

trunk/src/emx/src/lib/bsd/string/wcsrchr.c

@@ -25 +25 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/string/wcsrchr.c,v 1.7 2002/10/23 10:52:04 tjr Exp $");
@@ -31 +32 @@
 
 wchar_t *
-wcsrchr(const wchar_t *s, wchar_t c)
+_STD(wcsrchr)(const wchar_t *s, wchar_t c)
 {
         const wchar_t *last;

trunk/src/emx/src/lib/bsd/string/wcsspn.c

@@ -27 +27 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 #if 0
@@ -38 +39 @@
 
 size_t
-wcsspn(s, set)
+_STD(wcsspn)(s, set)
         const wchar_t *s;
         const wchar_t *set;

trunk/src/emx/src/lib/bsd/string/wcsstr.c

@@ -35 +35 @@
  */
 
+#include "namespace.h"
 #if 0
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -49 +50 @@
  */
 wchar_t *
-wcsstr(const wchar_t * __restrict s, const wchar_t * __restrict find)
+_STD(wcsstr)(const wchar_t * __restrict s, const wchar_t * __restrict find)
 {
         wchar_t c, sc;

trunk/src/emx/src/lib/bsd/string/wcstok.c

@@ -37 +37 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/string/wcstok.c,v 1.2 2003/03/12 06:41:49 tjr Exp $");
@@ -43 +44 @@
 
 wchar_t *
-wcstok(wchar_t * __restrict s, const wchar_t * __restrict delim,
+_STD(wcstok)(wchar_t * __restrict s, const wchar_t * __restrict delim,
     wchar_t ** __restrict last)
 {

trunk/src/emx/src/lib/bsd/string/wcswidth.c

@@ -40 +40 @@
  */
 
+#include "namespace.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/string/wcswidth.c,v 1.6 2002/08/20 02:06:28 ache Exp $");
@@ -46 +47 @@
 
 int
-wcswidth(const wchar_t *pwcs, size_t n)
+_STD(wcswidth)(const wchar_t *pwcs, size_t n)
 {
         wchar_t wc;

trunk/src/emx/src/lib/libc.def

@@ -1354 +1354 @@
     "___libc_GLocaleWCtype" @1369
 
+    "__std_wcscat" @1370
+    "__std_wcschr" @1371
+    "__std_wcscmp" @1372
+    "__std_wcscoll" @1373
+    "__std_wcscpy" @1374
+    "__std_wcscspn" @1375
+    "__std_wcslcat" @1376
+    "__std_wcslcpy" @1377
+    "__std_wcslen" @1378
+    "__std_wcsncat" @1379
+    "__std_wcsncmp" @1380
+    "__std_wcsncpy" @1381
+    "__std_wcspbrk" @1382
+    "__std_wcsrchr" @1383
+    "__std_wcsspn" @1384
+    "__std_wcsstr" @1385
+    "__std_wcstok" @1386
+    "__std_wcswidth" @1387