- utils.c:strcasestr(),revstrcasestr() - Renamed to stristr and revstristr since...

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1089 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 77f2052e3039a1ffad22384858aaca8e06c4e12e..ce516aef6a65dd43a111368de64668945bd9f57a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,11 @@ CVS code -
 - utils.c:
   strstrwrapper()
        - NANO_SMALL test was backwards (Ken Tyler).
+- utils.c:
+  strcasestr(),revstrcasestr()
+       - Renamed to stristr and revstristr since strcasestr has not
+         been confirmed to be detected properly on various Linux
+         systems.
 - nanorc.sample
        - Mention unset in the sample nanorc.
 - po/ca.po, po/es.po:

diff --git a/proto.h b/proto.h
index cbe8856724e0437b856a598eae9e3d6cc896d779..745aef79a65df0d979e64d69b6dabfa6c2230fc9 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -86,8 +86,8 @@ extern toggle *toggles;
 /* Programs we want available */
 
 char *revstrstr(char *haystack, char *needle, char *rev_start);
-char *strcasestr(char *haystack, char *needle);
-char *revstrcasestr(char *haystack, char *needle, char *rev_start);
+char *stristr(char *haystack, char *needle);
+char *revstristr(char *haystack, char *needle, char *rev_start);
 char *strstrwrapper(char *haystack, char *needle, char *rev_start);
 int search_init(int replacing);
 int renumber(filestruct * fileptr);

diff --git a/utils.c b/utils.c
index ed1c3068c34e4e269b79deb421be85b861849c22..810cde6547fe1358624308a23b378ea391359f56 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -77,7 +77,7 @@ char *revstrstr(char *haystack, char *needle, char *rev_start)
     return 0;
 }
 
-char *revstrcasestr(char *haystack, char *needle, char *rev_start)
+char *revstristr(char *haystack, char *needle, char *rev_start)
 {
     char *p, *q, *r;
 
@@ -92,7 +92,7 @@ char *revstrcasestr(char *haystack, char *needle, char *rev_start)
 
 /* This is now mutt's version (called mutt_stristr) because it doesn't
    use memory allocation to do a simple search (yuck). */
-char *strcasestr(char *haystack, char *needle)
+char *stristr(char *haystack, char *needle)
 {
     const char *p, *q;
 
@@ -151,10 +151,10 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 
     } else {
        if (ISSET(REVERSE_SEARCH))
-           return revstrcasestr(haystack, needle, rev_start);
+           return revstristr(haystack, needle, rev_start);
        else
 #endif
-           return strcasestr(haystack, needle);
+           return stristr(haystack, needle);
 #ifndef NANO_SMALL
     }
 #endif