summaryrefslogtreecommitdiff
path: root/libc/string/strstr.c
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-01-03 14:50:18 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-01-03 14:50:18 +0000
commit167d5e33fcb821e51e2f9dcf460591737c3c7972 (patch)
tree79acefdd8c9781098adbf77278415eda6365fd3d /libc/string/strstr.c
parentfe68563b9a070fedf117c8738652587945427bb3 (diff)
Complete split of all the string functions. Hope haven't broken too much. wcscoll/strcoll needs some love ...
Diffstat (limited to 'libc/string/strstr.c')
-rw-r--r--libc/string/strstr.c41
1 files changed, 36 insertions, 5 deletions
diff --git a/libc/string/strstr.c b/libc/string/strstr.c
index f7ae4ffaf..7256b9da2 100644
--- a/libc/string/strstr.c
+++ b/libc/string/strstr.c
@@ -1,14 +1,45 @@
/*
+ * Copyright (C) 2002 Manuel Novoa III
* Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
*
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-#define L_strstr
-#define Wstrstr __strstr
+#include "_string.h"
-#include "wstring.c"
+#ifdef WANT_WIDE
+# define __Wstrstr __wcsstr
+# define Wstrstr wcsstr
+#else
+# define __Wstrstr __strstr
+# define Wstrstr strstr
+#endif
-strong_alias(__strstr, strstr)
+/* NOTE: This is the simple-minded O(len(s1) * len(s2)) worst-case approach. */
-#undef L_strstr
+Wchar attribute_hidden *__Wstrstr(const Wchar *s1, const Wchar *s2)
+{
+ register const Wchar *s = s1;
+ register const Wchar *p = s2;
+
+ do {
+ if (!*p) {
+ return (Wchar *) s1;;
+ }
+ if (*p == *s) {
+ ++p;
+ ++s;
+ } else {
+ p = s2;
+ if (!*s) {
+ return NULL;
+ }
+ s = ++s1;
+ }
+ } while (1);
+}
+
+strong_alias(__Wstrstr,Wstrstr)
+#ifdef WANT_WIDE
+strong_alias(__wcsstr,wcswcs)
+#endif