From 3577cdab840908673e32a0fb417529c4c3e04fe5 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 14 Jul 2004 10:09:47 +0000 Subject: [PATCH] Fixed bug in stristr() SVN revision: 955 --- src/elogd.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 3af91222..d873ad64 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.381 2004/07/14 10:09:47 midas + Fixed bug in stristr() + Revision 1.380 2004/07/13 21:04:37 midas Implemented synchronizing during cloning @@ -593,25 +596,26 @@ BOOL strieq(const char *str1, const char *str2) char *stristr(const char *str, const char *pattern) { - char c1, c2, *ps; + char c1, c2, *ps, *pp; if (str == NULL || pattern == NULL) return NULL; while (*str) { ps = (char *) str; - c1 = *str; - c2 = *pattern; + pp = (char *) pattern; + c1 = *ps; + c2 = *pp; if (my_toupper(c1) == my_toupper(c2)) { - while (*pattern) { + while (*pp) { c1 = *ps++; - c2 = *pattern++; + c2 = *pp++; if (my_toupper(c1) != my_toupper(c2)) break; } - if (!*pattern) + if (!*pp) return (char *) str; } str++;