Merge branch 'streaming' of git://github.com/frx/shogun

shogun-toolbox · Jun 8, 2011 · 5c3d0b9 · 5c3d0b9
2 parents 95b4248 + c8e2553
commit 5c3d0b9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/libshogun/lib/AsciiFile.cpp b/src/libshogun/lib/AsciiFile.cpp
@@ -1055,6 +1055,8 @@ ssize_t CAsciiFile::getdelim(char **lineptr, size_t *n, char delimiter, FILE *st
 
 		if (pos==-1)
 		{
+			if (feof(stream))
+				return -1;
 			total_bytes_read+=bytes_read;
 			*lineptr=(char*) SG_REALLOC(*lineptr, (*n)*2);
 			*n=(*n)*2;
@@ -1064,6 +1066,8 @@ ssize_t CAsciiFile::getdelim(char **lineptr, size_t *n, char delimiter, FILE *st
 		{
 			total_bytes_read+=pos+1;
 			(*lineptr)[total_bytes_read]='\0';
+			// Seek back to position after \n
+			fseek(stream, (bytes_read-pos-1) * -1, SEEK_CUR);
 			return total_bytes_read;
 		}
 	}