summaryrefslogtreecommitdiff
path: root/navit/map/textfile/textfile.c
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-09-01 21:10:08 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-09-01 21:10:08 +0000
commit6504c7a7c9fab7fa3b479bec349bdf864267992b (patch)
treed745a72a35bb318dac5c73e1fc757a5a56529df9 /navit/map/textfile/textfile.c
parent8e861cf4d574982c71ffb06b50ce3c3678dca240 (diff)
downloadnavit-6504c7a7c9fab7fa3b479bec349bdf864267992b.tar.gz
Fix:map_textfile:Call clearerr after fseek to reset eof
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2542 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/map/textfile/textfile.c')
-rw-r--r--navit/map/textfile/textfile.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/navit/map/textfile/textfile.c b/navit/map/textfile/textfile.c
index 2bdf07d93..f05832b61 100644
--- a/navit/map/textfile/textfile.c
+++ b/navit/map/textfile/textfile.c
@@ -278,7 +278,7 @@ map_rect_get_item_textfile(struct map_rect_priv *mr)
}
for(;;) {
if (feof(mr->f)) {
- dbg(1,"map_rect_get_item_textfile: eof\n");
+ dbg(1,"map_rect_get_item_textfile: eof %d\n",mr->item.id_hi);
if (mr->item.id_hi) {
return NULL;
}
@@ -288,8 +288,10 @@ map_rect_get_item_textfile(struct map_rect_priv *mr)
mr->f=popen(mr->args, "r");
mr->pos=0;
mr->lastlen=0;
- } else
+ } else {
fseek(mr->f, 0, SEEK_SET);
+ clearerr(mr->f);
+ }
get_line(mr);
}
if ((p=strchr(mr->line,'\n')))