d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't lock newfd if it is not opened.

Browse Source 
PR:		5961
This commit is contained in:
Dmitrij Tejblum 1998-09-13 12:48:47 +00:00
parent 2b1470681a
commit 99c167bba4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=39124
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libc_r/uthread/uthread_dup2.c
View File

@ -30,6 +30,7 @@
* SUCH DAMAGE.
*
*/
#include <errno.h>
#include <unistd.h>
#ifdef _THREAD_SAFE
#include <pthread.h>
@ -39,11 +40,20 @@ int
dup2(int fd, int newfd)
{
int ret;
int newfd_opened;
/* Check if the file descriptor is out of range: */
if (newfd < 0 || newfd >= _thread_dtablesize) {
/* Return a bad file descriptor error: */
errno = EBADF;
ret = -1;
}
/* Lock the file descriptor: */
if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
else if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
/* Lock the file descriptor: */
if ((ret = _FD_LOCK(newfd, FD_RDWR, NULL)) == 0) {
if (!(newfd_opened = (_thread_fd_table[newfd] != NULL)) ||
(ret = _FD_LOCK(newfd, FD_RDWR, NULL)) == 0) {
/* Perform the 'dup2' syscall: */
if ((ret = _thread_sys_dup2(fd, newfd)) < 0) {
}
@ -63,7 +73,8 @@ dup2(int fd, int newfd)
}
/* Unlock the file descriptor: */
_FD_UNLOCK(newfd, FD_RDWR);
if (newfd_opened)
_FD_UNLOCK(newfd, FD_RDWR);
}
/* Unlock the file descriptor: */
_FD_UNLOCK(fd, FD_RDWR);