mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-12 14:21:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

2005-01-16 GOTO Masanori <gotom@debian.or.jp>

Browse Source 
[BZ #734]
	* sysdeps/unix/rewinddir.c: Reset filepos.
	* dirent/tst-seekdir.c: Check telldir value after calling rewinddir.
This commit is contained in:
Roland McGrath 2005-02-16 10:43:02 +00:00
parent ca0a2bd894
commit ecaab38901
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dirent/tst-seekdir.c
View File

@ -11,8 +11,23 @@ main (int argc, char *argv[])
int i = 0;
int result = 0;
struct dirent *dp;
long int save0;
long int rewind;
dirp = opendir (".");
if (dirp == NULL)
{
printf ("opendir failed: %m\n");
return 1;
}
save0 = telldir (dirp);
if (save0 == -1)
{
printf ("telldir failed: %m\n");
result = 1;
}
for (dp = readdir (dirp); dp != NULL; dp = readdir (dirp))
{
/* save position 3 (after fourth entry) */
@ -44,6 +59,19 @@ main (int argc, char *argv[])
for (dp = readdir (dirp); dp != NULL; dp = readdir (dirp))
printf ("%s\n", dp->d_name);
/* Check rewinddir */
rewinddir (dirp);
rewind = telldir (dirp);
if (rewind == -1)
{
printf ("telldir failed: %m\n");
result = 1;
}
else if (save0 != rewind)
{
printf ("rewinddir didn't reset directory stream\n");
result = 1;
}
closedir (dirp);
return result;

1
sysdeps/unix/rewinddir.c
View File

@ -30,6 +30,7 @@ rewinddir (dirp)
{
__libc_lock_lock (dirp->lock);
(void) __lseek (dirp->fd, (off_t) 0, SEEK_SET);
dirp->filepos = 0;
dirp->offset = 0;
dirp->size = 0;
__libc_lock_unlock (dirp->lock);