- utils.c:strcasestr() - Renamed to stristr since strcasestr has not been confirmed...

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

diff --git a/ChangeLog b/ChangeLog
index 886170aecada0469c1723706842ea4e807c14ee5..43d0884f8179898630d0042a9965590f0bf84e58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ CVS code -
          end key code (fixes BUG #69).
   bottombars(), onekey()
        - Make bottom list dynamic with screen size (Guus Sliepen & Chris).
+- utils.c:
+  strcasestr()
+       - Renamed to stristr since strcasestr has not been confirmed to
+         be detected properly on various Linux systems.
 - THANKS:
        - Added missing entry for Eivind Kjørstad.
 - po/no.po:

diff --git a/proto.h b/proto.h
index 24e749d22ca1c307632819a3c138a5c86dc68033..b8ae075010b90b58d6e9a1b49643a30a2d681a4b 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -65,7 +65,7 @@ extern toggle toggles[TOGGLE_LEN];
 
 /* Programs we want available */
 
-char *strcasestr(char *haystack, char *needle);
+char *stristr(char *haystack, char *needle);
 char *strstrwrapper(char *haystack, char *needle);
 int search_init(int replacing);
 int renumber(filestruct * fileptr);

diff --git a/utils.c b/utils.c
index 0c0e9648d5c74e5159898eb7518acf930e929d09..9af8ac48afdbbe7f11d07910f7784f973c41b4d6 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -50,7 +50,7 @@ void lowercase(char *src)
 
 /* 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;
 
@@ -83,7 +83,7 @@ char *strstrwrapper(char *haystack, char *needle)
     if (ISSET(CASE_SENSITIVE))
        return strstr(haystack, needle);
     else
-       return strcasestr(haystack, needle);
+       return stristr(haystack, needle);
 }
 
 /* Thanks BG, many ppl have been asking for this... */