Ticket #524: pr524.diff

src/newlibc.c

@@ -42 +42 @@
  
 #include <stdio.h>
 
+int _fwalk(struct _reent *ptr, int (*function) (FILE *) );
+
 int              libc_reentrant;        /* do we think we are reentrant? */
 struct _reent    libc_global_reent;
 
@@ -196 +198 @@
  *
  */
 
+int newlib_free_buffers(
+  FILE *fp
+)
+{
+  switch ( fileno(fp) ) {
+    case 0:
+    case 1:
+    case 2:
+      if (fp->_flags & __SMBF) {
+        free( fp->_bf._base );
+        fp->_flags &= ~__SMBF;
+        fp->_bf._base = fp->_p = (unsigned char *) NULL;
+      }
+      break;
+    default:
+     fclose(fp);
+  }
+  return 0;
+}
+
 rtems_extension libc_delete_hook(
   rtems_tcb *current_task,
   rtems_tcb *deleted_task
@@ -215 +237 @@
 
   /* if (ptr) */
   if (ptr && ptr != &libc_global_reent) {
+/*
     _wrapup_reent(ptr);
     _reclaim_reent(ptr);
+*/
+    /*
+     *  Just in case there are some buffers lying around.
+     */ 
+    _fwalk(ptr, newlib_free_buffers);
 #if REENT_MALLOCED
     free(ptr);
 #else