From f6b13420d716db6982656ab4ebd259e25feb7336 Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Fri, 7 Jul 2000 04:25:00 +0000
Subject: [PATCH] Regexp/search fixes by Bill Soudan
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@82 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
po/nano.pot | 2 +-
search.c | 2 +-
utils.c | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/po/nano.pot b/po/nano.pot
index be130d8a..4b05bc5f 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-06 22:35-0400\n"
+"POT-Creation-Date: 2000-07-07 00:29-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/search.c b/search.c
index 0773124f..4756cc7d 100644
--- a/search.c
+++ b/search.c
@@ -405,7 +405,7 @@ int do_replace(void)
do_replace();
return 0;
- } else { /* First page, last page, for example could get here */
+ } else if (i != -2 ) { /* First page, last page, for example could get here */
do_early_abort();
replace_abort();
diff --git a/utils.c b/utils.c
index a4fa9542..53e9bddb 100644
--- a/utils.c
+++ b/utils.c
@@ -18,6 +18,7 @@
* *
**************************************************************************/
+#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
@@ -80,12 +81,14 @@ char *strcasestr(char *haystack, char *needle)
char *strstrwrapper(char *haystack, char *needle)
{
+#ifdef _POSIX_VERSION
if (ISSET(USE_REGEXP)) {
int result=regexec(&search_regexp, haystack, 10, regmatches, 0);
if (!result)
return haystack+regmatches[0].rm_so;
return 0;
}
+#endif
if (ISSET(CASE_SENSITIVE))
return strstr(haystack, needle);
else
--
GitLab