summaryrefslogtreecommitdiff
path: root/csv-test.c
diff options
context:
space:
mode:
Diffstat (limited to 'csv-test.c')
-rw-r--r--csv-test.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/csv-test.c b/csv-test.c
index 97cc558..c414c98 100644
--- a/csv-test.c
+++ b/csv-test.c
@@ -182,12 +182,12 @@ csv_read(csv_t *csv, FILE *in)
182 case ZST_START_FIELD: 182 case ZST_START_FIELD:
183 csv_field_append(&csv->csv_field, csv->csv_string.pos); 183 csv_field_append(&csv->csv_field, csv->csv_string.pos);
184 184
185 ch = fgetc(in); 185 ch = getc(in);
186 if ( ch == EOF ) { 186 if ( ch == EOF ) {
187 zst = ZST_END_FILE; 187 zst = ZST_END_FILE;
188 } 188 }
189 else if ( ch == '\r' ) { /* Teste auf CR.. */ 189 else if ( ch == '\r' ) { /* Teste auf CR.. */
190 ch = fgetc(in); 190 ch = getc(in);
191 if ( ch != '\n' ) { /* ... LF */ 191 if ( ch != '\n' ) { /* ... LF */
192 ungetc(ch, in); 192 ungetc(ch, in);
193 } 193 }
@@ -210,12 +210,12 @@ csv_read(csv_t *csv, FILE *in)
210 210
211 case ZST_QUOTED_FIELD: 211 case ZST_QUOTED_FIELD:
212 do { 212 do {
213 ch = fgetc(in); 213 ch = getc(in);
214 if ( ch == EOF ) { 214 if ( ch == EOF ) {
215 zst = ZST_END_FILE; 215 zst = ZST_END_FILE;
216 } 216 }
217 else if ( ch == QUOTE ) { 217 else if ( ch == QUOTE ) {
218 ch = fgetc(in); 218 ch = getc(in);
219 if ( ch == EOF ) { 219 if ( ch == EOF ) {
220 zst = ZST_END_FILE; 220 zst = ZST_END_FILE;
221 } 221 }
@@ -226,7 +226,7 @@ csv_read(csv_t *csv, FILE *in)
226 zst = ZST_END_FIELD; 226 zst = ZST_END_FIELD;
227 } 227 }
228 else if ( ch == '\r' ) { 228 else if ( ch == '\r' ) {
229 ch = fgetc(in); 229 ch = getc(in);
230 if ( ch != '\n' ) { 230 if ( ch != '\n' ) {
231 ungetc(ch, in); 231 ungetc(ch, in);
232 } 232 }
@@ -248,7 +248,7 @@ csv_read(csv_t *csv, FILE *in)
248 248
249 case ZST_SIMPLE_FIELD: 249 case ZST_SIMPLE_FIELD:
250 do { 250 do {
251 ch = fgetc(in); 251 ch = getc(in);
252 if ( ch == EOF ) { 252 if ( ch == EOF ) {
253 zst = ZST_END_FILE; 253 zst = ZST_END_FILE;
254 } 254 }
@@ -256,7 +256,7 @@ csv_read(csv_t *csv, FILE *in)
256 zst = ZST_END_FIELD; 256 zst = ZST_END_FIELD;
257 } 257 }
258 else if ( ch == '\r' ) { 258 else if ( ch == '\r' ) {
259 ch = fgetc(in); 259 ch = getc(in);
260 if ( ch != '\n' ) { 260 if ( ch != '\n' ) {
261 ungetc(ch, in); 261 ungetc(ch, in);
262 } 262 }