clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #11214 (patch by Steph Fox)

Browse Source
This commit is contained in:
Edin Kadribasic 2002-07-29 13:12:57 +00:00
parent 8f94a8a744
commit 0737394d80
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
win32/readdir.c
View File

@ -113,29 +113,31 @@ int closedir(DIR *dp)
return 0;
}
void rewinddir(DIR *dir_Info)
int rewinddir(DIR *dp)
{
/* Re-set to the beginning */
char *filespec;
long handle;
int index;
dir_Info->handle = 0;
dir_Info->offset = 0;
dir_Info->finished = 0;
_findclose(dp->handle);
filespec = malloc(strlen(dir_Info->dir) + 2 + 1);
strcpy(filespec, dir_Info->dir);
dp->offset = 0;
dp->finished = 0;
filespec = malloc(strlen(dp->dir) + 2 + 1);
strcpy(filespec, dp->dir);
index = strlen(filespec) - 1;
if (index >= 0 && (filespec[index] == '/' || filespec[index] == '\\'))
filespec[index] = '\0';
strcat(filespec, "/*");
if ((handle = _findfirst(filespec, &(dir_Info->fileinfo))) < 0) {
if (errno == ENOENT) {
dir_Info->finished = 1;
if ((handle = _findfirst(filespec, &(dp->fileinfo))) < 0) {
if (errno == ENOENT)
dp->finished = 1;
}
}
dir_Info->handle = handle;
dp->handle = handle;
free(filespec);
return 0;
}

2
win32/readdir.h
View File

@ -38,7 +38,7 @@ DIR *opendir(const char *);
struct dirent *readdir(DIR *);
int readdir_r(DIR *, struct dirent *, struct dirent **);
int closedir(DIR *);
void rewinddir(DIR *);
int rewinddir(DIR *);
#endif /* READDIR_H */