2004-01-22 Thomas Pfaff <tpfaff@gmx.net>
* libc/stdio/findfp.c (__sfp): Protect global FILE pointer list
        by a lock when newlib is multithreaded.
			
			
This commit is contained in:
		| @@ -1,3 +1,8 @@ | |||||||
|  | 2004-01-22  Thomas Pfaff  <tpfaff@gmx.net> | ||||||
|  |  | ||||||
|  | 	* libc/stdio/findfp.c (__sfp): Protect global FILE pointer list | ||||||
|  | 	by a lock when newlib is multithreaded.  | ||||||
|  |  | ||||||
| 2004-01-21  Jeff Johnston  <jjohnstn@redhat.com> | 2004-01-21  Jeff Johnston  <jjohnstn@redhat.com> | ||||||
|  |  | ||||||
| 	* libc/stdlib/mbrtowc.c (_mbrtowc_r): Fix case where s is null | 	* libc/stdlib/mbrtowc.c (_mbrtowc_r): Fix case where s is null | ||||||
|   | |||||||
| @@ -86,6 +86,12 @@ __sfp (d) | |||||||
|   int n; |   int n; | ||||||
|   struct _glue *g; |   struct _glue *g; | ||||||
|  |  | ||||||
|  | #ifndef __SINGLE_THREAD__ | ||||||
|  |   __LOCK_INIT(static, lock); | ||||||
|  |  | ||||||
|  |   __lock_acquire(lock);  | ||||||
|  | #endif | ||||||
|  |  | ||||||
|   if (!_GLOBAL_REENT->__sdidinit) |   if (!_GLOBAL_REENT->__sdidinit) | ||||||
|     __sinit (_GLOBAL_REENT); |     __sinit (_GLOBAL_REENT); | ||||||
|   for (g = &_GLOBAL_REENT->__sglue;; g = g->_next) |   for (g = &_GLOBAL_REENT->__sglue;; g = g->_next) | ||||||
| @@ -97,11 +103,17 @@ __sfp (d) | |||||||
| 	  (g->_next = __sfmoreglue (d, NDYNAMIC)) == NULL) | 	  (g->_next = __sfmoreglue (d, NDYNAMIC)) == NULL) | ||||||
| 	break; | 	break; | ||||||
|     } |     } | ||||||
|  | #ifndef __SINGLE_THREAD__ | ||||||
|  |   __lock_release(lock);  | ||||||
|  | #endif | ||||||
|   d->_errno = ENOMEM; |   d->_errno = ENOMEM; | ||||||
|   return NULL; |   return NULL; | ||||||
|  |  | ||||||
| found: | found: | ||||||
|   fp->_flags = 1;		/* reserve this slot; caller sets real flags */ |   fp->_flags = 1;		/* reserve this slot; caller sets real flags */ | ||||||
|  | #ifndef __SINGLE_THREAD__ | ||||||
|  |   __lock_release(lock);  | ||||||
|  | #endif | ||||||
|   fp->_p = NULL;		/* no current pointer */ |   fp->_p = NULL;		/* no current pointer */ | ||||||
|   fp->_w = 0;			/* nothing to read or write */ |   fp->_w = 0;			/* nothing to read or write */ | ||||||
|   fp->_r = 0; |   fp->_r = 0; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user