Add exec support for 2>@1

See TIP #202: http://www.tcl.tk/cgi-bin/tct/tip/202.html

1 files changed, 19 insertions, 7 deletions

diff --git a/jim-exec.c b/jim-exec.c
index 4ad9b21..4d3364c 100644
--- a/jim-exec.c
+++ b/jim-exec.c
@@ -693,14 +693,26 @@ Jim_CreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, int **pid
     /* If we are redirecting stderr with 2>filename or 2>@fileId, then we ignore errFilePtr */
     if (error != NULL) {
         if (errorFile == FILE_HANDLE) {
-            Jim_Obj *fhObj = Jim_NewStringObj(interp, error, -1);
-            FILE *fh = Jim_AioFilehandle(interp, fhObj);
-            Jim_FreeNewObj(interp, fhObj);
-            if (fh == NULL) {
-                goto error;
+            if (strcmp(error, "1") == 0) {
+                /* Special 2>@1 */
+                if (lastOutputId >= 0) {
+                    errorId = dup(lastOutputId);
+                }
+                else {
+                    /* No redirection stdout, so just use 2>@stdout */
+                    error = "stdout";
+                }
+            }
+            if (errorId < 0) {
+                Jim_Obj *fhObj = Jim_NewStringObj(interp, error, -1);
+                FILE *fh = Jim_AioFilehandle(interp, fhObj);
+                Jim_FreeNewObj(interp, fhObj);
+                if (fh == NULL) {
+                    goto error;
+                }
+                fflush(fh);
+                errorId = dup(fileno(fh));
             }
-            fflush(fh);
-            errorId = dup(fileno(fh));
         }
         else {
             /*