From 444d1ff1f12e5e92ce673bd171b82ebe05ec13b4 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 5 Jan 2026 13:00:22 -0800
Subject: [PATCH] colorize outer exception printing

---
 ioc/groupsourcehooks.cpp | 4 +---
 qsrv/Makefile            | 2 ++
 qsrv/softMain.cpp        | 3 ++-
 src/utilpvt.h            | 5 +++++
 tools/call.cpp           | 8 ++++----
 tools/get.cpp            | 2 +-
 tools/info.cpp           | 2 +-
 tools/list.cpp           | 2 +-
 tools/monitor.cpp        | 2 +-
 tools/mshim.cpp          | 6 +++---
 tools/put.cpp            | 6 +++---
 tools/pvxvct.cpp         | 2 +-
 12 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/ioc/groupsourcehooks.cpp b/ioc/groupsourcehooks.cpp
index 8a2bd89..d7ab319 100644
--- a/ioc/groupsourcehooks.cpp
+++ b/ioc/groupsourcehooks.cpp
@@ -23,6 +23,7 @@
 #include <pvxs/iochooks.h>
 
 #include "qsrvpvt.h"
+#include "utilpvt.h"
 #include "groupsource.h"
 #include "groupconfigprocessor.h"
 #include "iocshcommand.h"
@@ -30,9 +31,6 @@
 #if EPICS_VERSION_INT < VERSION_INT(7, 0, 3, 1)
 #  define iocshSetError(ret) do { (void)ret; }while(0)
 #endif
-#ifndef ERL_ERROR
-#  define ERL_ERROR "ERROR"
-#endif
 
 // include last to avoid clash of #define printf with other headers
 #include <epicsStdio.h>
diff --git a/qsrv/Makefile b/qsrv/Makefile
index 03b3f1b..9d231cf 100644
--- a/qsrv/Makefile
+++ b/qsrv/Makefile
@@ -5,6 +5,8 @@ include $(TOP)/configure/CONFIG
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 #=============================
 
+USR_CPPFLAGS += -I$(TOP)/src
+
 PROD_IOC += softIocPVX
 
 softIocPVX_SRCS += softMain.cpp
diff --git a/qsrv/softMain.cpp b/qsrv/softMain.cpp
index aa8b0bb..7f3df8f 100644
--- a/qsrv/softMain.cpp
+++ b/qsrv/softMain.cpp
@@ -32,6 +32,7 @@
 #include "iocsh.h"
 #include "osiFileName.h"
 #include "epicsInstallDir.h"
+#include "utilpvt.h"
 
 #include <pvxs/iochooks.h>
 
@@ -289,7 +290,7 @@ int main(int argc, char *argv[])
         return 0;
 
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         epicsExit(2);
         return 2;
     }
diff --git a/src/utilpvt.h b/src/utilpvt.h
index fd7a261..8d95bad 100644
--- a/src/utilpvt.h
+++ b/src/utilpvt.h
@@ -30,6 +30,7 @@
 
 #include <compilerDependencies.h>
 #include <epicsThread.h>
+#include <errlog.h>
 
 #include <pvxs/version.h>
 #include <pvxs/util.h>
@@ -46,6 +47,10 @@
 #  endif
 #endif
 
+#ifndef ERL_ERROR
+#  define ERL_ERROR "ERROR"
+#endif
+
 #include <epicsThread.h>
 
 namespace pvxs {namespace impl {
diff --git a/tools/call.cpp b/tools/call.cpp
index fa171ef..9a853e5 100644
--- a/tools/call.cpp
+++ b/tools/call.cpp
@@ -86,14 +86,14 @@ int main(int argc, char *argv[])
             auto sep = fv.find_first_of('=');
 
             if(sep==std::string::npos) {
-                std::cerr<<"Error: expected <fld>=<value> not \""<<escape(fv)<<"\"\n";
+                std::cerr<<ERL_ERROR ": expected <fld>=<value> not \""<<escape(fv)<<"\"\n";
                 return 1;
             }
 
             auto key(fv.substr(0, sep));
 
             if(values.find(key)!=values.end()) {
-                std::cerr<<"Error: duplicate argument name "<<key<<"\n";
+                std::cerr<<ERL_ERROR ": duplicate argument name "<<key<<"\n";
                 return 1;
             }
 
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
                     std::cout<<val;
                 ret=0;
             }catch(std::exception& e){
-                std::cerr<<"Error "<<typeid(e).name()<<" : "<<e.what()<<"\n";
+                std::cerr<<ERL_ERROR " "<<typeid(e).name()<<" : "<<e.what()<<"\n";
                 ret=1;
             }
             done.signal();
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
             return ret;
         }
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         return 1;
     }
 }
diff --git a/tools/get.cpp b/tools/get.cpp
index e791352..c2dd614 100644
--- a/tools/get.cpp
+++ b/tools/get.cpp
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
             return 2;
         }
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         return 1;
     }
 }
diff --git a/tools/info.cpp b/tools/info.cpp
index 07330c7..3d7090c 100644
--- a/tools/info.cpp
+++ b/tools/info.cpp
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
             return 2;
         }
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         return 1;
     }
 }
diff --git a/tools/list.cpp b/tools/list.cpp
index f35065c..e6788e2 100644
--- a/tools/list.cpp
+++ b/tools/list.cpp
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
         return 0;
 
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         return 1;
     }
 }
diff --git a/tools/monitor.cpp b/tools/monitor.cpp
index 8724190..0aa1e4c 100644
--- a/tools/monitor.cpp
+++ b/tools/monitor.cpp
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
             return 2;
         }
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         return 1;
     }
 }
diff --git a/tools/mshim.cpp b/tools/mshim.cpp
index 62b2984..71ebfd4 100644
--- a/tools/mshim.cpp
+++ b/tools/mshim.cpp
@@ -60,7 +60,7 @@ SockEndpoint parseEP(const char* optarg, const server::Config& conf)
         ep = SockEndpoint(optarg, conf.udp_port);
 
     }catch(std::exception& e){
-        std::cerr<<"Error: Invalid group spec. '"<<escape(optarg)<<"' : "<<e.what()<<std::endl;
+        std::cerr<<ERL_ERROR ": Invalid group spec. '"<<escape(optarg)<<"' : "<<e.what()<<std::endl;
         exit(1);
     }
     if(ep.addr.family()!=AF_INET) {
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
 
         if(argc!=optind) {
             usage(argv[0]);
-            std::cerr<<"Error: Unexpected arguments."<<std::endl;
+            std::cerr<<ERL_ERROR ": Unexpected arguments."<<std::endl;
             return 1;
         }
 
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
 
         return 0;
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         return 1;
     }
 }
diff --git a/tools/put.cpp b/tools/put.cpp
index 1298e79..a57b453 100644
--- a/tools/put.cpp
+++ b/tools/put.cpp
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
                 auto sep = fv.find_first_of('=');
 
                 if(sep==std::string::npos) {
-                    std::cerr<<"Error: expected <fld>=<value> not \""<<escape(fv)<<"\"\n";
+                    std::cerr<<ERL_ERROR ": expected <fld>=<value> not \""<<escape(fv)<<"\"\n";
                     return 1;
                 }
 
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
                     try {
                         result();
                     }catch(std::exception& e){
-                        std::cerr<<"Error "<<typeid(e).name()<<" : "<<e.what()<<"\n";
+                        std::cerr<<ERL_ERROR " "<<typeid(e).name()<<" : "<<e.what()<<"\n";
                         ret=1;
                     }
                     done.signal();
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
             return ret;
         }
     }catch(std::exception& e){
-        std::cerr<<"Error: "<<e.what()<<"\n";
+        std::cerr<<ERL_ERROR ": "<<e.what()<<"\n";
         return 1;
     }
 }
diff --git a/tools/pvxvct.cpp b/tools/pvxvct.cpp
index 0aab98c..3778fec 100644
--- a/tools/pvxvct.cpp
+++ b/tools/pvxvct.cpp
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
         return 0;
     }catch(std::runtime_error& e) {
         errlogFlush();
-        std::cerr<<"Error: "<<e.what()<<std::endl;
+        std::cerr<<ERL_ERROR ": "<<e.what()<<std::endl;
         return 1;
     }
 }