summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2002-04-30 02:35:37 +0000
committerhpa <hpa>2002-04-30 02:35:37 +0000
commit83b3e784e2226dbda6345e54031c0eb4ceca34eb (patch)
tree57b73c8654a56de4ec300b2fc4e7d1c8d7d9b79d
parent4f68977d754b6c61325df57d906719c345ef4fe9 (diff)
downloadsyslinux-83b3e784e2226dbda6345e54031c0eb4ceca34eb.tar.gz
Fix parsing bug which caused the last vkernel to be lostsyslinux-1.73-pre8
-rw-r--r--parseconfig.inc26
1 files changed, 10 insertions, 16 deletions
diff --git a/parseconfig.inc b/parseconfig.inc
index 2b8f5a96..a46694a4 100644
--- a/parseconfig.inc
+++ b/parseconfig.inc
@@ -18,14 +18,6 @@
;;
;
-; Main loop for configuration file parsing
-;
-parse_config:
- call getcommand
- jnc parse_config ; If not EOF do it again
- ret ; Return on EOF
-
-;
; "default" command
;
pc_default: mov di,default_cmd
@@ -314,6 +306,16 @@ pc_getfile: mov di,trackbuf
jmp searchdir ; tailcall
;
+; Main loop for configuration file parsing
+;
+parse_config:
+ call getcommand
+ jnc parse_config ; If not EOF do it again
+ ;
+ ; The fall through to commit_vk to commit any final
+ ; VKernel being read
+ ;
+;
; commit_vk: Store the current VKernelBuf into buffer segment
;
commit_vk:
@@ -334,11 +336,3 @@ commit_vk:
cvk_ret: ret
cvk_overflow: mov word [VKernelCtr],max_vk ; No more than max_vk, please
ret
-
-;
-; End of configuration file
-;
-; Commit vkernel and then return
-;
-end_config_file equ commit_vk
-