From c11a31f5499f54bc471693a799f691f69b41da55 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 26 Apr 2011 14:57:26 -0500
Subject: [PATCH] libCom/iocsh: Set IOCSH_STARTUP_SCRIPT env var.

---
 documentation/RELEASE_NOTES.html | 10 ++++++++--
 src/libCom/iocsh/iocsh.cpp       |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 16dacd411..5c957e771 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -14,8 +14,8 @@
 <h2 align="center">Changes between 3.14.12 and 3.14.12.1</h2>
 
 <p>This release only contains changes that fix bugs or add build configuration
-files for new or updated target architectures.  No new functionality has been
-added, and as this is a patch release the software has not gone through as
+files for new or updated target architectures.  No functionality has been
+changed, and as this is a patch release the software has not gone through as
 rigorous a testing regime as it does for a normal minor release.</p>
 
 <h4>Launchpad Bugs Resolved</h4>
@@ -69,6 +69,12 @@ fixed in this release:</p>
 
 </dl>
 
+<h4>IOCSH_STARTUP_SCRIPT environment variable</h4>
+
+<p>The function <tt>iocsh(const char *pathname)</tt> now sets the environment
+variable <tt>IOCSH_STARTUP_SCRIPT</tt> to the value of its pathname
+argument before it starts executing the script commands.</p>
+
 <h4>RTEMS-mvme5500</h4>
 
 <p>This target now automatically links binary files with the bspExt library, and
diff --git a/src/libCom/iocsh/iocsh.cpp b/src/libCom/iocsh/iocsh.cpp
index ce15ed9a1..f2d42b973 100644
--- a/src/libCom/iocsh/iocsh.cpp
+++ b/src/libCom/iocsh/iocsh.cpp
@@ -798,6 +798,7 @@ iocshBody (const char *pathname, const char *commandLine)
 int epicsShareAPI
 iocsh (const char *pathname)
 {
+    epicsEnvSet("IOCSH_STARTUP_SCRIPT", pathname);
     return iocshBody(pathname, NULL);
 }