- 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-d3aeb78583b8master
parent
6235a7d6d5
commit
99ed9dc9fe
|
@ -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:
|
||||
|
|
4
proto.h
4
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);
|
||||
|
|
8
utils.c
8
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
|
||||
|
|
Loading…
Reference in New Issue