Merge lp:~jlmuir/epics-base/iocsh-comment-fix-3.14 into lp:~epics-core/epics-base/3.14

[J. Lewis Muir]

Fixes bug where lines that become comment lines after macro expansion are not handled as comment lines.

[Andrew Johnson (anj)]

There's a similar bug if you indent comment lines. I'll merge your change and fix that as well.

Thanks,

- Andrew

review: Approve

[J. Lewis Muir (jlmuir)]

I'm aware that indented comment lines do not work (even before macro substitution). I assumed this was by design since the EPICS Application Developer's Guide says, "A '#' in the first column of a line indicates the beginning of a comment which continues to the end of the line."

[Andrew Johnson (anj)]

Indented comment lines that have a space after the '#' character *do* work though, they get executed as a '#' command, which just takes slightly longer to do nothing. This is using 3.14.12.1:

epics> #Hello
epics> # Hello
epics> #Hello
Command #Hello not found.
epics> # Hello
epics> epicsEnvSet C #
epics> $(C)Hello
Command #Hello not found.
epics> $(C) Hello
epics> $(C)Hello
Command #Hello not found.
epics> $(C) Hello

I would rather that we permit all indented comments than try to change or explain that behaviour.

=== modified file 'src/libCom/iocsh/iocsh.cpp'
--- src/libCom/iocsh/iocsh.cpp	2011-04-26 20:18:30 +0000
+++ src/libCom/iocsh/iocsh.cpp	2012-01-11 17:47:26 +0000
@@ -568,6 +568,12 @@
             puts(line);
 
         /*
+         * Ignore lines that become comment lines after macro expansion
+         */
+        if (*line == '#')
+            continue;
+
+        /*
          * Break line into words
          */
         icout = icin = 0;