From 99ed9dc9fe7e23378f6428bc455b6891ee65ef83 Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Thu, 28 Feb 2002 00:57:18 +0000
Subject: [PATCH] - utils.c:strcasestr(),revstrcasestr() - Renamed to stristr
and revstristr since strcasestr has not been confirmed to be detected
properly on various Linux systems
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1089 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 5 +++++
proto.h | 4 ++--
utils.c | 8 ++++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 77f2052e..ce516aef 100644
--- 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 cbe88567..745aef79 100644
--- 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 ed1c3068..810cde65 100644
--- 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
--
GitLab