don't crash on `0N...$`, but always throw an errorHEADmaster-fmsbw-cimaster

See also 8a8edaa2daf37f7c12e21b9199755b5de8e489f5.

1 files changed, 21 insertions, 9 deletions

diff --git a/src/search.c b/src/search.c
index 1b5026a..357a0c0 100644
--- a/src/search.c
+++ b/src/search.c
@@ -152,14 +152,6 @@ teco_state_search_initial(teco_machine_main_t *ctx, GError **error)
 			teco_error_range_set(error, "S");
 			return FALSE;
 		}
-	} else if (v2 == 0) {
-		/*
-		 * NOTE: Video TECO always succeeds on `0S...$`.
-		 * TECOC however fails just like we do.
-		 */
-		g_set_error_literal(error, TECO_ERROR, TECO_ERROR_FAILED,
-		                    "The search counter must not be zero.");
-		return FALSE;
 	} else {
 		/* search for v2-th occurrence */
 		teco_search_parameters.count = (gint)v2;
@@ -172,6 +164,16 @@ teco_state_search_initial(teco_machine_main_t *ctx, GError **error)
 		}
 	}
 
+	if (!teco_search_parameters.count) {
+		/*
+		 * NOTE: Video TECO always succeeds on `0S...$`.
+		 * TECOC however fails just like we do.
+		 */
+		g_set_error_literal(error, TECO_ERROR, TECO_ERROR_FAILED,
+		                    "The search counter must not be zero.");
+		return FALSE;
+	}
+
 	teco_search_parameters.from_buffer = teco_qreg_current ? NULL : teco_ring_current;
 	teco_search_parameters.to_buffer = NULL;
 	return TRUE;
@@ -1251,7 +1253,17 @@ teco_state_search_all_initial(teco_machine_main_t *ctx, GError **error)
 		}
 	}
 
-	if (teco_search_parameters.count >= 0) {
+	if (!teco_search_parameters.count) {
+		/*
+		 * NOTE: Video TECO always succeeds on `0N...$`.
+		 * TECOC however fails just like we do.
+		 */
+		g_set_error_literal(error, TECO_ERROR, TECO_ERROR_FAILED,
+		                    "The search counter must not be zero.");
+		return FALSE;
+	}
+
+	if (teco_search_parameters.count > 0) {
 		teco_search_parameters.from = teco_search_parameters.pos;
 		teco_search_parameters.to = teco_interface_ssm(SCI_GETLENGTH, 0, 0);
 	} else {