g+
g+ Communities
Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  <20122013  2014  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  <20122013  2014 
<== Date ==> <== Thread ==>

Subject: [Merge] lp:~jlmuir/epics-base/iocsh-comment-fix-3.14 into lp:epics-base/3.14
From: "J. Lewis Muir" <jlmuir@anl.gov>
To: mp+88243@code.launchpad.net
Date: Wed, 11 Jan 2012 17:48:25 -0000
J. Lewis Muir has proposed merging lp:~jlmuir/epics-base/iocsh-comment-fix-3.14 into lp:epics-base/3.14.

Requested reviews:
  EPICS Core Developers (epics-core)

For more details, see:
https://code.launchpad.net/~jlmuir/epics-base/iocsh-comment-fix-3.14/+merge/88243

Fixes bug where lines that become comment lines after macro expansion are not handled as comment lines.
-- 
https://code.launchpad.net/~jlmuir/epics-base/iocsh-comment-fix-3.14/+merge/88243
Your team EPICS Core Developers is requested to review the proposed merge of lp:~jlmuir/epics-base/iocsh-comment-fix-3.14 into lp:epics-base/3.14.
=== 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;


Navigate by Date:
Prev: Re: [Merge] lp:~jlmuir/epics-base/iocsh-if-flow-control-3.14 into lp:epics-base Andrew Johnson
Next: DBF_STRING to DBF_ENUM/MENU/DEVICE Conversions Andrew Johnson
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  <20122013  2014 
Navigate by Thread:
Prev: [Merge] lp:~jlmuir/epics-base/iocsh-if-flow-control-3.14 into lp:epics-base Andrew Johnson
Next: DBF_STRING to DBF_ENUM/MENU/DEVICE Conversions Andrew Johnson
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  <20122013  2014 
ANJ, 26 Nov 2012 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· EPICSv4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·