svn commit: trunk/busybox/miscutils

[vda at busybox.net]

Author: vda
Date: 2007-05-09 11:32:54 -0700 (Wed, 09 May 2007)
New Revision: 18593

Log:
less: fix case when regex search finds nothing


Modified:
   trunk/busybox/miscutils/less.c


Changeset:
Modified: trunk/busybox/miscutils/less.c
===================================================================
--- trunk/busybox/miscutils/less.c	2007-05-09 14:03:32 UTC (rev 18592)
+++ trunk/busybox/miscutils/less.c	2007-05-09 18:32:54 UTC (rev 18593)
@@ -788,19 +788,25 @@
 
 static void goto_match(int match)
 {
+	int sv;
+
 	if (!pattern_valid)
 		return;
 	if (match < 0)
 		match = 0;
+	sv = cur_fline;
 	/* Try to find next match if eof isn't reached yet */
 	if (match >= num_matches && eof_error > 0) {
 		cur_fline = MAXLINES; /* look as far as needed */
 		read_lines();
-		cap_cur_fline(cur_fline);
 	}
 	if (num_matches) {
+		cap_cur_fline(cur_fline);
 		normalize_match_pos(match);
 		buffer_line(match_lines[match_pos]);
+	} else {
+		cur_fline = sv;
+		print_statusline("No matches found");
 	}
 }