sysdb: Only try to reconnect before executing a command or on an empty line.

[sysdb.git] / src / tools / sysdb / scanner.l

diff --git a/src/tools/sysdb/scanner.l b/src/tools/sysdb/scanner.l
index 1404690a1256354f078ab87f863e516d57ff270e..16defa61859085dc20dad932c8f812986af494e3 100644 (file)
--- a/src/tools/sysdb/scanner.l
+++ b/src/tools/sysdb/scanner.l
@@ -48,6 +48,8 @@
 
 #define APPEND() \
        do { \
+               if (! isspace((int)yytext[0])) \
+                       sysdb_input->have_input = 1; \
                sysdb_input->query_len += strlen(yytext); \
        } while (0)
 
@@ -63,7 +65,7 @@
 
 %x CSC
 
-newline                        ([\n\r]+)
+newline                        (\n|\r\n)
 simple_comment ("--"[^\n\r]*)
 
 /*
@@ -99,10 +101,17 @@ string             ('([^']|'')*')
         * The following rules are specific to the command line tool.
         */
 
+";\n"          { APPEND(); sdb_input_exec_query(); }
 ";"                    { APPEND(); sdb_input_exec_query(); }
 
+{newline}      {
+                               APPEND();
+                               if (! sysdb_input->have_input)
+                                       /* give the input module a chance to do stuff on empty lines */
+                                       sdb_input_exec_query();
+                       }
+
 .                      { APPEND(); }
-{newline}      { APPEND(); }
 
 %%