Experimental Physics and
Industrial Control System

Andrew Johnson <[email protected]> · Fri, 5 Jan 2018 18:14:35 -0600

Hi Mark,

On 12/15/2017 05:20 PM, Mark Rivers wrote:
...
> So the iocsh commands are not echoed, I only see the epics> prompt, not
> the command that is being executed.  This seems like an undesirable
> change in behavior?

You will also find that in iocsh you can't use the VxWorks command-line
editing keys any more; I didn't notice that I had disabled the ledLib
implementation of our readline code, and this explains the change in
output that you see.

A fix for the Base-3.16 branch is below. The same changes should work on
EPICS 7 but some of the files have moved around slightly, src/libCom is
now modules/libcom/src/libCom. I will commit equivalent changes sometime
next week.

- Andrew

diff --git a/configure/os/CONFIG.Common.vxWorksCommon
b/configure/os/CONFIG.Common.vxWorksCommon
index e7be9fa..50f6269 100644
--- a/configure/os/CONFIG.Common.vxWorksCommon
+++ b/configure/os/CONFIG.Common.vxWorksCommon
@@ -171,6 +171,10 @@ VXCPPFLAGS = $(filter-out
$(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
 PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@

 #--------------------------------------------------
+# Use LEDLIB for command-line editing
+COMMANDLINE_LIBRARY = LEDLIB
+
+#--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon
diff --git a/src/libCom/osi/epicsReadline.c b/src/libCom/osi/epicsReadline.c
index 936cbce..b1632f7 100644
--- a/src/libCom/osi/epicsReadline.c
+++ b/src/libCom/osi/epicsReadline.c
@@ -20,6 +20,7 @@
 #define EPICS_COMMANDLINE_LIBRARY_READLINE  2
 #define EPICS_COMMANDLINE_LIBRARY_READLINE_CURSES  2
 #define EPICS_COMMANDLINE_LIBRARY_READLINE_NCURSES 2
+#define EPICS_COMMANDLINE_LIBRARY_LEDLIB    1

 #ifndef EPICS_COMMANDLINE_LIBRARY
 #  define EPICS_COMMANDLINE_LIBRARY EPICS_COMMANDLINE_LIBRARY_EPICS
diff --git a/src/libCom/osi/os/vxWorks/osdReadline.c
b/src/libCom/osi/os/vxWorks/osdReadline.c
index 9195b6b..dee24fd 100644
--- a/src/libCom/osi/os/vxWorks/osdReadline.c
+++ b/src/libCom/osi/os/vxWorks/osdReadline.c
@@ -33,7 +33,7 @@ struct osdContext {
 static void
 osdReadlineBegin(struct readlineContext *context)
 {
-    struct osdContext osd = malloc(sizeof *osd);
+    struct osdContext *osd = malloc(sizeof *osd);

     if (osd != NULL) {
         osd->ledId = (LED_ID) ERROR;



-- 
Arguing for surveillance because you have nothing to hide is no
different than making the claim, "I don't care about freedom of
speech because I have nothing to say." -- Edward Snowdon


Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System