Fixed a problem on Input/Output/Error streams

library/pthread/pthread_testcancel.c

@@ -43,7 +43,7 @@ pthread_testcancel(void) {
 
     inf = GetCurrentThreadInfo();
 
-    if (inf->canceled && (inf->cancelstate == PTHREAD_CANCEL_ENABLE))
+    if (inf && inf->canceled && (inf->cancelstate == PTHREAD_CANCEL_ENABLE))
         pthread_exit(PTHREAD_CANCELED);
 
     SetSignal(SIGBREAKF_CTRL_C, 0);

library/stdio/file_init.c

@@ -67,12 +67,13 @@ int
 wb_file_init(struct _clib4 *__clib4) {
     int result = ERROR;
     STRPTR window_specifier = NULL;
+    ENTER();
 
     __clib4->__original_current_directory = SetCurrentDir(__clib4->__WBenchMsg->sm_ArgList[0].wa_Lock);
     __clib4->__current_directory_changed = TRUE;
 
     if (__clib4->__WBenchMsg->sm_ToolWindow != NULL) {
-        __clib4->input = Open(__clib4->__WBenchMsg->sm_ToolWindow, MODE_OLDFILE);
+        __clib4->input = Open(__clib4->__WBenchMsg->sm_ToolWindow, MODE_NEWFILE);
     } else {
         STRPTR tool_name;
         size_t len;
@@ -94,6 +95,7 @@ wb_file_init(struct _clib4 *__clib4) {
     }
 
     if (__clib4->input == BZERO) {
+        SHOWMSG((" __clib4->input is BZERO. Open NIL:\n"));
         __clib4->input = Open("NIL:", MODE_OLDFILE);
     }
 
@@ -118,8 +120,15 @@ wb_file_init(struct _clib4 *__clib4) {
     if (__clib4->output == BZERO)
         __clib4->output = Open("NIL:", MODE_OLDFILE);
 
-    if (__clib4->input == BZERO || __clib4->output == BZERO || __clib4->error == BZERO)
+    if (__clib4->input == BZERO || __clib4->output == BZERO || __clib4->error == BZERO) {
+        D(("One of stream still BZERO [%x %x %x].. Goto out\n", __clib4->input, __clib4->output, __clib4->error));
         goto out;
+    }
+
+    // Reset FDs for input/output/error
+    __clib4->__fd[0]->fd_DefaultFile = __clib4->input;
+    __clib4->__fd[1]->fd_DefaultFile = __clib4->output;
+    __clib4->__fd[2]->fd_DefaultFile = __clib4->error;
 
     __clib4->old_input = SelectInput(__clib4->input);
     __clib4->old_output = SelectOutput(__clib4->output);
@@ -130,9 +139,12 @@ wb_file_init(struct _clib4 *__clib4) {
 
 out:
 
-    if (window_specifier != NULL)
+    if (window_specifier != NULL) {
         FreeVec(window_specifier);
+        window_specifier = NULL;
+    }
 
+    RETURN(result);
     return (result);
 }
 

library/stdio/fread.c

@@ -203,7 +203,6 @@ fread(void *ptr, size_t element_size, size_t count, FILE *stream) {
     size_t total = element_size * count;
     size_t nread = __fread_internal(ptr, element_size, count, stream);
     struct iob *file = (struct iob *) stream;
-    DebugPrintF("Total: %ld\n", total);
 
     if (FLAG_IS_SET(file->iob_Flags, IOBF_LITTLE_ENDIAN) && (total == 2 || total == 4 || total == 8)) {
         DebugPrintF("[fread] Reading in Little endian mode\n");