4 files changed, 13 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index e042bd07362..54a7641daac 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-02  Karl Berry  <karl@tug.org>
+
+	* tex.ch (\write18): say "executed safely" instead of just
+	"executed", since the command may have been quoted before it was
+	actually executed.
+
 2009-12-25  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (EXTRA_DIST): eliminate it.
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 042bb631d9f..5090b24c57e 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-02  Karl Berry  <karl@tug.org>
+
+	* texmfmp.c (runsystem): doc fix.
+
 2009-12-23  Karl Berry  <karl@tug.org>
 
 	* usage.c (usagehelp)
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 6e471b7132b..52ab3da4c9a 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -414,7 +414,8 @@ shell_cmd_is_allowed (const char *cmd, char **safecmd, char **cmdname)
    0 if CMD is not allowed; given shellenabledp==1, this is because
       shell escapes are restricted and CMD is not allowed.
    1 if shell escapes are not restricted, hence any command is allowed.
-   2 if shell escapes are restricted and CMD is allowed.  */
+   2 if shell escapes are restricted and CMD is allowed (possibly after
+      quoting).  */
    
 int
 runsystem (const char *cmd)
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index bb99339c99a..7c2bc6fbe7a 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -5108,7 +5108,7 @@ if j=18 then
       if runsystem_ret = -1 then print("quotation error in system command")
       else if runsystem_ret = 0 then print("disabled (restricted)")
       else if runsystem_ret = 1 then print("executed")
-      else if runsystem_ret = 2 then print("executed (allowed)")
+      else if runsystem_ret = 2 then print("executed safely (allowed)")
     end;
   end else begin
     print("disabled"); {|shellenabledp| false}