From cd71a13a14912feac991f496e57f7b71d8d26d17 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 25 Jun 2009 15:54:03 +0000
Subject: [PATCH] Okay, so I screwed up when testing this, doh. Unbreak so that
 CAN/SUB actually do cancel the sequence, and tweak to make the code more
 clear.

---
 input.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/input.c b/input.c
index d5bf0900..4c0195b7 100644
--- a/input.c
+++ b/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.5 2009/06/04 14:24:49 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.6 2009/06/04 14:42:14 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -399,13 +399,16 @@ input_state_sequence_first(u_char ch, struct input_ctx *ictx)
 		if (ch == 0x1b) {			/* ESC */
 			/* Abort sequence and begin with new. */
 			input_state(ictx, input_state_escape);
-		} else if (ch != 0x18 && ch != 0x1a) {	/* CAN and SUB */
+			return;
+		} else if (ch == 0x18 || ch == 0x1a) {	/* CAN and SUB */
 			/* Abort sequence. */
 			input_state(ictx, input_state_first);
-		} else {
-			/* Handle C0 immediately. */
-			input_handle_c0_control(ch, ictx);
+			return;
 		}
+
+		/* Handle C0 immediately. */
+		input_handle_c0_control(ch, ictx);
+
 		/*
 		 * Just come back to this state, in case the next character
 		 * is the start of a private sequence.
@@ -467,13 +470,16 @@ input_state_sequence_next(u_char ch, struct input_ctx *ictx)
 		if (ch == 0x1b) {			/* ESC */
 			/* Abort sequence and begin with new. */
 			input_state(ictx, input_state_escape);
-		} else if (ch != 0x18 && ch != 0x1a) {	/* CAN and SUB */
+			return;
+		} else if (ch == 0x18 || ch == 0x1a) {	/* CAN and SUB */
 			/* Abort sequence. */
 			input_state(ictx, input_state_first);
-		} else  {
-			/* Handle C0 immediately. */
-			input_handle_c0_control(ch, ictx);
+			return;
 		}
+
+		/* Handle C0 immediately. */
+		input_handle_c0_control(ch, ictx);
+
 		return;
 	}