[netfilter-cvslog] r3385 - trunk/nfsim/core

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-15 05:41:05 +0100 (Wed, 15 Dec 2004)
New Revision: 3385

Modified:
   trunk/nfsim/core/tui.c
Log:
peejix: line-numbers reported are crap.


Modified: trunk/nfsim/core/tui.c
===================================================================
--- trunk/nfsim/core/tui.c	2004-12-15 04:02:04 UTC (rev 3384)
+++ trunk/nfsim/core/tui.c	2004-12-15 04:41:05 UTC (rev 3385)
@@ -222,7 +222,6 @@
 	add_history(line);
 	if (tui_echo_commands)
 		printf("%u:%s\n", linenum, line);
-	linenum++;
 
 	/* FIXME: only handles quotes at the beginning and end of args */
 	while (*line) {
@@ -236,12 +235,11 @@
 		line++;
 	}
 
-	if (!argc)
-		return;
+	if ((!argc) ||
 	
 	/* ignore comments */
-	if (*argv[0] == '#')
-		return;
+	   (*argv[0] == '#'))
+		goto skip;
 
 	argv[argc] = NULL;
 
@@ -260,6 +258,9 @@
 		    && tui_abort_on_fail)
 			script_fail("%s not found", argv[0]);
 	}
+skip:
+   linenum++;
+   return;
 }
 
 int tui_userinput(int fd)