From 5babc068babfeb0c02075f550c9c3b156f44ed15 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Thu, 25 Sep 2014 13:17:14 +0200 Subject: [PATCH] stringdex(): Clarified what it does `stringdex' stands for `string index'. (See Changlog for why the `g' was added.) This function is different to strcasestr() ... in the order of the arguments and in the return value. --- sbr/strindex.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sbr/strindex.c b/sbr/strindex.c index 2513b30..b3a2b74 100644 --- a/sbr/strindex.c +++ b/sbr/strindex.c @@ -1,5 +1,6 @@ /* ** strindex.c -- "unsigned" lexical index +** -- Returns the index at which `needle' appears in `haystack' ** ** This code is Copyright (c) 2002, by the authors of nmh. See the ** COPYRIGHT file in the root directory of the nmh distribution for @@ -9,16 +10,16 @@ #include int -stringdex(char *p1, char *p2) +stringdex(char *needle, char *haystack) { char *p; - if (p1 == NULL || p2 == NULL) + if (needle == NULL || haystack == NULL) return -1; - for (p = p2; *p; p++) - if (uprf(p, p1)) - return (p - p2); + for (p = haystack; *p; p++) + if (strncasecmp(p, needle, strlen(needle))==0) + return (p - haystack); return -1; } -- 1.7.10.4