X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fm_getfld2.c;h=488a445cd0da0aa59d54130f36d8c530b20d5863;hb=bdd3e72e5d8929b420af8fa28565888d39ba9f91;hp=cd1c6bea09186849db1942434c796ffe0b99ec33;hpb=bf1c715de0935bc1a472925fcf80be70b30d2724;p=mmh

diff --git a/sbr/m_getfld2.c b/sbr/m_getfld2.c
index cd1c6be..488a445 100644
--- a/sbr/m_getfld2.c
+++ b/sbr/m_getfld2.c
@@ -10,7 +10,6 @@
 #include <h/utils.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <stdbool.h>
 
 
 enum threestate {
@@ -24,7 +23,7 @@ enum threestate {
 */
 static enum threestate is_falted(FILE *);
 static size_t copyname(char *, char *);
-static bool is_separator(char *);
+static boolean is_separator(char *);
 
 
 /*
@@ -97,17 +96,13 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
 			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) {
-				ret = LENERR2;
-			}
-
 			if (*(tmpline + nchars - 1) != '\n') {
 				ret = FMTERR2;
 			}
@@ -204,7 +199,7 @@ copyname(char *dst, char *src)
 	}
 
 	len = sep - src;
-	if (len >= NAMESZ) {
+	if (len >= NAMESZ - 1) {
 		return 0;
 	}
 
@@ -214,7 +209,7 @@ copyname(char *dst, char *src)
 	return strlen(dst);
 }
 
-static bool
+static boolean
 is_separator(char *line)
 {
 	/*
@@ -225,7 +220,7 @@ is_separator(char *line)
 		line++;
 	}
 	if (strcmp("\n", line) == 0 || strcmp("\r\n", line) == 0 ) {
-		return true;
+		return TRUE;
 	}
-	return false;
+	return FALSE;
 }