epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Updated iocsh to allow user to select that lines from included scripts not be echoed.

Browse Source
This commit is contained in:
Keenan Lang
2016-03-04 16:08:05 -06:00
parent fbf6b6d3e5
commit 0fd07d1632
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libCom/iocsh/iocsh.cpp
View File

@@ -587,6 +587,8 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
wasOkToBlock = epicsThreadIsOkToBlock();
epicsThreadSetOkToBlock(1);
for (;;) {
bool echo = true;
/*
* Read a line
*/
@@ -608,14 +610,23 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
while ((c = raw[icin]) && isspace(c)) {
icin++;
}
/*
* @ stops the echoing of a line
*/
if (c == '@') {
echo = false;
icin++;
c = raw[icin];
}
/*
* Ignore comment lines other than to echo
* them if they came from a script. This
* avoids macLib errors from comments.
*/
if (c == '#') {
if ((prompt == NULL) && (commandLine == NULL))
if ((prompt == NULL) && (commandLine == NULL) && echo)
puts(raw);
continue;
}
@@ -633,11 +644,20 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
while ((c = line[icin]) && isspace(c)) {
icin++;
}
/*
* @ stops the echoing of a line
*/
if (c == '@') {
echo = false;
icin++;
c = raw[icin];
}
/*
* Echo non-empty lines read from a script
*/
if ((prompt == NULL) && *line && (commandLine == NULL))
if ((prompt == NULL) && *line && (commandLine == NULL) && echo)
puts(line);
/*