#include <h/utils.h>
#include <stdio.h>
#include <ctype.h>
-#include <stdbool.h>
enum threestate {
*/
static enum threestate is_falted(FILE *);
static size_t copyname(char *, char *);
-static bool is_separator(char *);
-
-struct field free_field = { "\0", 0, NULL, 0, 0 };
+static boolean is_separator(char *);
/*
nchars = getline(&tmpline, &len, msg);
if (nchars < 1) {
free(f->value);
- *f = free_field;
+ *f = (struct field) { "\0", 0, NULL, 0, 0 };
if (feof(msg)) {
return FILEEOF2;
} else {
}
}
- if (nchars >= NAMESZ) {
+ f->crlf = (nchars > 2 && tmpline[nchars-2] == '\r');
+ if (nchars > NAMESZ+1 || (!f->crlf && nchars > NAMESZ)) {
ret = LENERR2;
}
f->valuelen = nchars;
}
- while (ret == FLD2 && (falted = is_falted(msg)) == B_TRUE) {
+ while ((ret == FLD2 || ret == LENERR2) && (falted = is_falted(msg)) == B_TRUE) {
nchars = getline(&tmpline, &len, msg);
if (nchars <= 0) {
free(tmpline);
return IOERR2;
}
- if (nchars >= NAMESZ) {
+ if (nchars > NAMESZ+1 || (!f->crlf && nchars > NAMESZ)) {
ret = LENERR2;
}
return ret;
case BODY2:
- free(f->value);
- *f = free_field;
+ *f->name = '\0';
+ f->namelen = 0;
nchars = getline(&tmpline, &len, msg);
if (nchars < 1) {
- free(tmpline);
+ free(f->value);
+ f->value = NULL;
+ f->valuelen = 0;
+ f->alloclen = 0;
if (feof(msg)) {
return FILEEOF2;
} else {
}
}
- if (nchars >= NAMESZ) {
- ret = LENERR2;
- }
-
+ f->crlf = (nchars > 2 && tmpline[nchars-2] == '\r');
+ free(f->value);
f->value = tmpline;
f->valuelen = nchars;
f->alloclen = len;
return strlen(dst);
}
-static bool
+static boolean
is_separator(char *line)
{
/*
line++;
}
if (strcmp("\n", line) == 0 || strcmp("\r\n", line) == 0 ) {
- return true;
+ return TRUE;
}
- return false;
+ return FALSE;
}