obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Added rewinddir before each readdir so that the directories are always

Browse Source 
read properly
This commit is contained in:
Celine Mercier
2017-11-24 18:04:58 +01:00
parent 0998268955
commit ea73047fc7
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/obiview.c
View File

@ -562,6 +562,7 @@ static bool view_exists(OBIDMS_p dms, const char* view_name)
if (file_name == NULL) if (file_name == NULL)
return -1; return -1;
rewinddir(dms->view_directory);
while ((dp = readdir(dms->view_directory)) != NULL) while ((dp = readdir(dms->view_directory)) != NULL)
{ {
if ((dp->d_name)[0] == '.') if ((dp->d_name)[0] == '.')
@ -581,6 +582,7 @@ static bool view_exists(OBIDMS_p dms, const char* view_name)
if (file_name == NULL) if (file_name == NULL)
return -1; return -1;
rewinddir(dms->view_directory);
while ((dp = readdir(dms->view_directory)) != NULL) while ((dp = readdir(dms->view_directory)) != NULL)
{ {
if ((dp->d_name)[0] == '.') if ((dp->d_name)[0] == '.')
@ -2537,6 +2539,7 @@ int obi_clean_unfinished_views(OBIDMS_p dms)
d = 0; d = 0;
// Look for unfinished views and delete them // Look for unfinished views and delete them
rewinddir(dms->view_directory);
while ((dp = readdir(dms->view_directory)) != NULL) while ((dp = readdir(dms->view_directory)) != NULL)
{ {
if ((dp->d_name)[0] == '.') if ((dp->d_name)[0] == '.')
@ -2754,6 +2757,7 @@ int obi_rollback_view(Obiview_p view)
{ {
strcpy(view_file_name, (view->infos)->name); strcpy(view_file_name, (view->infos)->name);
strcat(view_file_name, ".obiview_unfinished"); strcat(view_file_name, ".obiview_unfinished");
rewinddir((view->dms)->view_directory);
while ((dp = readdir((view->dms)->view_directory)) != NULL) while ((dp = readdir((view->dms)->view_directory)) != NULL)
{ {
if ((dp->d_name)[0] == '.') if ((dp->d_name)[0] == '.')