Simplify and fix label string scanning

Simplify and fix bugs in the code to store and match label names
without filename mangling.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/core/ui.inc b/core/ui.inc
index 0ff9d104..26b6fa09 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -309,24 +309,18 @@ vk_check:
 		sub di,cx			; Return to beginning of buf
 		push si
 		mov si,command_line
-		mov cx,FILENAME_MAX
 .loop:
-		dec cx
-		jz .done
 		lodsb
-		mov ah,[di]
-		inc di
-		cmp ah,al
-		je .match
-		jmp .nomatch
-.match:
 		cmp al,' '
-		jna .done
-		jmp .loop
+		jbe .done
+		scasb
+		je .loop
 .nomatch:
 		pop si
 		jmp .scan
 .done:
+		cmp byte [di],0			; Must match end of string
+		jne .nomatch
 		pop si
 
 ;