Changeset 19134 for trunk

Timestamp:

08/03/18 16:13:43 (6 years ago)

Author:

tbretz

Message:

Skip empty lines reading an environment file.

File:

• trunk/FACT++/src/rootifysql.cc (modified) (2 diffs)

trunk/FACT++/src/rootifysql.cc

@@ -95 +95 @@
         "$TEST or ${TEST} by '1, 2, 3'. This is useful for the SQL `IN` keyword. "
         "You can also read the values for an enviroment substitution from a file "
-        "(one element per line), e.g. --env.TEST=file.txt. Lines starting with a # "
-        "are skipped.\n"
+        "(one element per line), e.g. --env.TEST=file.txt. Empty lines and lines "
+        "starting with a # are skipped.\n"
         "\n"
         "Comments in the query-file can be placed according to the SQL standard inline "
@@ -442 +442 @@
 
         for (string line; getline(fin, line); )
-            if (Tools::Trim(line)[0]!='#')
+        {
+            const auto &l = Tools::Trim(line);
+            if (!l.empty() && l[0]!='#')
                 envs[ident].push_back(line);