JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Jeff Johnston 2005-07-07 17:29:13 +00:00
parent 469b489504
commit b32adfc5cf
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,3 +1,9 @@
2005-07-05 Shaun Jackman <sjackman@gmail.com>
* newlib/libc/unix/ttyname.c (ttyname): Avoid calling _closedir
twice for the same directory. _closedir calls free, and freeing
the same pointer twice may cause a crash.
2005-07-06 Aldy Hernandez <aldyh@redhat.com> 2005-07-06 Aldy Hernandez <aldyh@redhat.com>
* configure.host: Added entry for ms1*. * configure.host: Added entry for ms1*.

8
newlib/libc/unix/ttyname.c
View File

@ -56,7 +56,6 @@ ttyname (fd)
struct dirent *dirp; struct dirent *dirp;
DIR *dp; DIR *dp;
struct stat dsb; struct stat dsb;
char *rval;
/* Must be a terminal. */ /* Must be a terminal. */
if (tcgetattr (fd, &tty) < 0) if (tcgetattr (fd, &tty) < 0)
@ -69,7 +68,7 @@ ttyname (fd)
if ((dp = _opendir (_PATH_DEV)) == NULL) if ((dp = _opendir (_PATH_DEV)) == NULL)
return NULL; return NULL;
for (rval = NULL; dirp = _readdir (dp);) while ((dirp = _readdir (dp)) != NULL)
{ {
if (dirp->d_ino != sb.st_ino) if (dirp->d_ino != sb.st_ino)
continue; continue;
@ -78,9 +77,8 @@ ttyname (fd)
sb.st_ino != dsb.st_ino) sb.st_ino != dsb.st_ino)
continue; continue;
(void) _closedir (dp); (void) _closedir (dp);
rval = buf; return buf;
break;
} }
(void) _closedir (dp); (void) _closedir (dp);
return rval; return NULL;
} }