Changed the stream redirection functions to FILE*

Usage of file descriptors caused some stability bugs on some new
platforms (mostly ucrt). As the multithreading was included in previous
versions and the "standard streams" separated for each thread (fInput,
fError, fOutput), there is really no need to perform any dup() or dup2()
on files descriptors (except for external programs). This new
implementation increases portability as uses mostly only c standard
functions, and speed also as it only use variables susbstition instead
of system level calls.

Author: darkbatcher

pbat/Makefile

@@ -53,7 +53,8 @@ SRC_FILES := \
 	./errors/pBat_Errors.c ./lang/pBat_Lang.c ./core/pBat_Debug.c \
 	./core/pBat_FilePath.c ./core/pBat_ParseBlock.c ./lang/pBat_ShowHelp.c \
 	./core/pBat_ExpandDef.c ./core/pBat_ReadScript.c ./core/pBat_Clone.c \
-	./core/pBat_EsCache.c ./command/pBat_Def.c ./command/pBat_Ask.c \
+	./core/pBat_EsCache.c ./core/pBat_Pipe.c \
+	./command/pBat_Def.c ./command/pBat_Ask.c \
 	./command/pBat_Block.c ./command/pBat_Call.c ./command/pBat_Cd.c \
 	./command/pBat_Cls.c ./command/pBat_Color.c ./command/pBat_Copy.c \
 	./command/pBat_Del.c ./command/pBat_Dir.c ./command/pBat_Echo.c \
@@ -70,7 +71,7 @@ SRC_FILES := \
 	./core/pBat_Exec.c ./core/pBat_Prompt.c ./command/pBat_Pecho.c \
 	./command/pBat_CommandInfo.c ./core/pBat_Completion.c \
 	./command/pBat_Timeout.c ./command/pBat_Mod.c \
-	./command/pBat_Ver.c ./command/pBat_Locale.c $(SRC_LINENOISE) \
+	./command/pBat_Ver.c ./command/pBat_Locale.c $(SRC_LINENOISE)
 
 OBJ_FILES := $(SRC_FILES:.c=.o) $(OBJ_RC)
 

pbat/command/pBat_For.c

@@ -1183,8 +1183,8 @@ int pBat_ForVarCheckAssignment(FORINFO* lpfrInfo)
 int pBat_ForMakeInputInfo(ESTR* lpInput, INPUTINFO* lpipInfo, FORINFO* lpfrInfo)
 {
 	int bUsebackq=lpfrInfo->bUsebackq,
-	    iInputType,
-	    iPipeFd[2];
+	    iInputType;
+    FILE *pipef[2];
     int status;
 
 	char *lpToken=pBat_EsToChar(lpInput);
@@ -1295,7 +1295,7 @@ int pBat_ForMakeInputInfo(ESTR* lpInput, INPUTINFO* lpipInfo, FORINFO* lpfrInfo)
             /* Serialize this with pBat_RunFile() */
             PBAT_RUNFILE_LOCK();
 
-			if (_pBat_Pipe(iPipeFd, 4096, O_BINARY) == -1)
+			if (pBat_Pipe(pipef) == -1)
 				pBat_ShowErrorMessage(PBAT_CREATE_PIPE | PBAT_PRINT_C_ERROR ,
                                         __FILE__ "/pBat_MakeInputInfo()",
                                         PBAT_CREATE_PIPE);
@@ -1304,7 +1304,7 @@ int pBat_ForMakeInputInfo(ESTR* lpInput, INPUTINFO* lpipInfo, FORINFO* lpfrInfo)
 
 			/* Launch the actual command from which we get input on a separate
                pBat thread */
-			if ((status = pBat_ForInputProcess(lpInput, lpipInfo, iPipeFd)))
+			if ((status = pBat_ForInputProcess(lpInput, lpipInfo, pipef)))
 				return status;
 
 
@@ -1351,8 +1351,7 @@ void pBat_ExecuteForSubCommand(struct pipe_launch_data_t* arg)
 {
     BLOCKINFO bkBlock;
 
-    lppsStreamStack = pBat_OpenOutputD(lppsStreamStack, arg->fdout, PBAT_STDOUT);
-    close(arg->fdout);
+    lppsStreamStack = pBat_OpenOutputF(lppsStreamStack, arg->out, PBAT_STDOUT);
 
     bIgnoreExit = TRUE;
 
@@ -1368,38 +1367,24 @@ void pBat_ExecuteForSubCommand(struct pipe_launch_data_t* arg)
 
 }
 
-int pBat_ForInputProcess(ESTR* lpInput, INPUTINFO* lpipInfo, int* iPipeFd)
+int pBat_ForInputProcess(ESTR* lpInput, INPUTINFO* lpipInfo, FILE** pipef)
 {
     struct pipe_launch_data_t* param;
-    FILE* pFile;
-
-    if (!(pFile=fdopen(iPipeFd[0], "rb"))) {
-
-        pBat_ShowErrorMessage(PBAT_UNABLE_DUPLICATE_FD,
-                              iPipeFd[0],
-                              FALSE);
-
-        close(iPipeFd[0]);
-        close(iPipeFd[1]);
-
-        return PBAT_UNABLE_DUPLICATE_FD;
-
-    }
 
     if ((param = malloc(sizeof(struct pipe_launch_data_t))) == NULL)
         pBat_ShowErrorMessage(PBAT_FAILED_ALLOCATION | PBAT_PRINT_C_ERROR,
                                 __FILE__ "/pBat_ForInputProcess()", -1);
 
 
-    param->fdout = iPipeFd[1];
+    param->out = pipef[1];
     param->str = pBat_EsInit();
 
     pBat_EsCpyE(param->str, lpInput);
 
     lpipInfo->Info.InputFile.handle
         = pBat_CloneInstance((void (*)(void *))pBat_ExecuteForSubCommand, param);
 
-	lpipInfo->Info.InputFile.pFile=pFile;
+	lpipInfo->Info.InputFile.pFile=pipef[0];
 
 	lpipInfo->Info.InputFile.lpesFiles[1]=NULL;
 	lpipInfo->Info.InputFile.index=0;

pbat/command/pBat_For.h

@@ -172,7 +172,7 @@ int pBat_ForAdjustInput(char* lpInput);
 
 int pBat_ForInputParseFileList(FILE_LIST_T* lpList, ESTR* lpInput);
 
-int pBat_ForInputProcess(ESTR* lpInput, INPUTINFO* lpipInfo, int* iPipeFd);
+int pBat_ForInputProcess(ESTR* lpInput, INPUTINFO* lpipInfo, FILE** pipef);
 /* Start a new process for command input */
 
 int pBat_ForGetInputLine(ESTR* lpReturn, INPUTINFO* lpipInfo);

pbat/core/pBat_Clone.c

@@ -85,8 +85,6 @@ void* pBat_CloneTrampoline(void* data)
     fInput = cloned->fInput;
     fOutput = cloned->fOutput;
     fError = cloned->fError;
-    _fError = fError;
-    _fOutput = fOutput;
 
     lpAltPromptString = NULL;
 
@@ -101,6 +99,10 @@ void* pBat_CloneTrampoline(void* data)
 
     pBat_Exit();
 
+    fclose(fInput);
+    fclose(fOutput);
+    fclose(fError);
+
     pBat_EndThread((void*)iErrorLevel);
 
     return (void*)iErrorLevel;
@@ -146,9 +148,15 @@ int pBat_DuplicateData(struct clone_data_t* data)
                                 | PBAT_PRINT_C_ERROR, \
                                 __FILE__ "/pBat_DuplicateData()", -1)
 
-    DUPLICATE_STREAM(data->fInput, fInput, "r");
-    DUPLICATE_STREAM(data->fOutput, fOutput, "w");
-    DUPLICATE_STREAM(data->fError, fError, "w");
+    DUPLICATE_STREAM(data->fInput, fInput, "rb");
+    DUPLICATE_STREAM(data->fOutput, fOutput, "wb");
+    DUPLICATE_STREAM(data->fError, fError, "wb");
+
+    if (isatty(fileno(fOutput)))
+        setvbuf(fOutput, NULL, _IONBF, 0);
+
+    if (isatty(fileno(fError)))
+        setvbuf(fError, NULL, _IONBF, 0);
 
     return 0;
 }

pbat/core/pBat_Core.h

@@ -54,6 +54,7 @@
 #include "pBat_Exec.h"
 #include "pBat_Prompt.h"
 #include "pBat_Completion.h"
+#include "pBat_Pipe.h"
 
 #if defined(WIN32) && defined(PBAT_USE_LIBCU8)
 #include <libcu8.h>

pbat/core/pBat_Exec.c

@@ -441,12 +441,14 @@ int pBat_StartFile(EXECINFO* info, int* error)
     if (pBat_LockMutex(&mThreadLock))
         pBat_ShowErrorMessage(PBAT_LOCK_MUTEX_ERROR,
                                 __FILE__ "/pBat_StartFile()",
-                                    -1);
+                                -1);
+    PBAT_RUNFILE_LOCK();
     pBat_ApplyEnv(lpeEnv);
     pBat_ApplyStreams(lppsStreamStack);
 	status = !ShellExecuteExW(&shinfo);
 	pBat_UnApplyStreams(lppsStreamStack);
     pBat_UnApplyEnv(lpeEnv);
+    PBAT_RUNFILE_RELEASE();
 
     if (pBat_ReleaseMutex(&mThreadLock))
         pBat_ShowErrorMessage(PBAT_RELEASE_MUTEX_ERROR,
@@ -512,11 +514,13 @@ int pBat_StartFile(EXECINFO* info, int* error)
                                     -1);
 
     /* apply pBat internal environment variables */
+    PBAT_RUNFILE_LOCK();
 	pBat_ApplyEnv(lpeEnv);
 	pBat_ApplyStreams(lppsStreamStack);
 	status = !ShellExecuteExA(&shinfo);
 	pBat_UnApplyStreams(lppsStreamStack);
     pBat_UnApplyEnv(lpeEnv);
+    PBAT_RUNFILE_RELEASE();
 
     if (pBat_ReleaseMutex(&mThreadLock))
         pBat_ShowErrorMessage(PBAT_RELEASE_MUTEX_ERROR,

pbat/core/pBat_ExitInt.c

@@ -36,10 +36,4 @@ void pBat_Exit(void)
 	pBat_DirStackFree();
 
 	pBat_EsCacheDrop(&ecEstrCache);
-
-    /* pBat_WaitForAllThreads(); */
-
-    fclose(fInput);
-    fclose(fOutput);
-    fclose(fError);
 }

pbat/core/pBat_Globals.c

@@ -78,8 +78,8 @@ __thread struct dirstack_t dsDirStack; /* current directory stack */
 
 __thread COLOR colColor=PBAT_COLOR_DEFAULT;
 __thread FILE* fInput; /* current thread input stream */
-__thread FILE *fOutput, *_fOutput; /* current thread output stream */
-__thread FILE *fError, *_fError; /* current thread error stream */
+__thread FILE *fOutput; /* current thread output stream */
+__thread FILE *fError; /* current thread error stream */
 /* Note : the underscore prefixed version are internally used to
    handle output substitution (eg. 2>&1) to be used as backup and
    so prevent unnecessary duplication of files */

pbat/core/pBat_Globals.h

@@ -74,8 +74,8 @@ extern __thread COLOR colColor; /* current command prompt colors */
 extern __thread INPUT_FILE ifIn; /* current parsed script */
 extern __thread ENVBUF* lpeEnv; /* environment variables local to threads */
 extern __thread FILE *fInput; /* current thread input stream */
-extern __thread FILE *fOutput, *_fOutput; /* current thread output stream */
-extern __thread FILE *fError, *_fError; /* current thread error stream */
+extern __thread FILE *fOutput; /* current thread output stream */
+extern __thread FILE *fError; /* current thread error stream */
 extern __thread ENVSTACK* lpesEnv;
 extern __thread char lpCurrentDir[FILENAME_MAX]; /* current path */
 extern __thread ESTRCACHE ecEstrCache; /* ESTR cache */

pbat/core/pBat_Parse.h

@@ -46,16 +46,16 @@ typedef struct PARSED_LINE {
 	struct PARSED_LINE* lppsNode;
 } PARSED_LINE;
 
-#define PARSED_STREAM_STDOUT2STDERR   2
-#define PARSED_STREAM_STDERR2STDOUT   1
+#define PARSED_STREAM_STDOUT2STDERR   PBAT_STREAM_SUBST_FERROR
+#define PARSED_STREAM_STDERR2STDOUT   PBAT_STREAM_SUBST_FERROR
 
 #define PARSED_STREAM_NODE_NONE 0x00
 #define PARSED_STREAM_NODE_YES 0x01
 #define PARSED_STREAM_NODE_NOT 0x02
 #define PARSED_STREAM_NODE_PIPE 0x03
 #define PARSED_STREAM_NODE_RESET -1
 
-#define PARSED_STREAM_MODE_TRUNCATE 0x04
+#define PARSED_STREAM_MODE_TRUNCATE PBAT_STREAM_MODE_TRUNCATE
 
 PARSED_LINE* pBat_ParseLine(ESTR* lpLine);