]> git.marmaro.de Git - mmh/commitdiff
don't warn if lenerr is ignored
authorPhilipp Takacs <philipp@bureaucracy.de>
Sun, 8 May 2016 16:21:34 +0000 (18:21 +0200)
committerPhilipp Takacs <philipp@bureaucracy.de>
Sun, 8 May 2016 16:21:34 +0000 (18:21 +0200)
uip/mhparse.c
uip/pick.c
uip/prompter.c
uip/scansbr.c
uip/slocal.c
uip/sortm.c
uip/whom.c

index c2506755663e4e7c498861ad18a5b87c703b8f8f..b860dcfaf1990728c2c2e60a2dc218cad21c4d56 100644 (file)
@@ -251,7 +251,6 @@ get_content(FILE *in, char *file, int toplevel)
        for (compnum = 1, state = FLD2;;) {
                switch (state = m_getfld2(state, &f, in)) {
                case LENERR2:
-                       advise(NULL, "To long field");
                        state = FLD2;
                        /* FALL */
                case FLD2:
index b0205fdfaa819ec2df9dd1975061bcb925d57eca..7d9c086994b22fecaf273054329f912ec247d3f2 100644 (file)
@@ -1249,6 +1249,10 @@ plist
        fseek(fp, start, SEEK_SET);
        for (state = FLD2, bp = NULL;;) {
                switch (state = m_getfld2(state, &f, fp)) {
+               case LENERR2:
+                       state = FLD2;
+                       /* FALL */
+
                case FLD2:
                        if (bp) {
                                mh_free0(&bp);
@@ -1259,7 +1263,6 @@ plist
                        }
                        continue;
 
-               case LENERR2:
                case FMTERR2:
                        advise(NULL, "format error in message %d", msgnum);
                        state = FLD2;
index bc7cd43f6454dea9fe49df51e28b4b5d0ae2752a..ea17b91a0194e0891291821da1eebca8748d47d5 100644 (file)
@@ -141,9 +141,9 @@ main(int argc, char **argv)
        for (state = FLD2;;) {
                switch (state = m_getfld2(state, &f, in)) {
                case LENERR2:
-                       advise(NULL, "Header to long");
                        state = FLD2;
                        /* FALL */
+
                case FLD2:
                        /*
                        ** Check if the value of field contains
index feef5c0495be89910ff621cdf9b4651ec6aabf67..04958388be8349796f5279c9c851b49746499cea 100644 (file)
@@ -107,6 +107,9 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
        for (compnum = 1, state = FLD2; ; ) {
                state = m_getfld2(state, &f, inb);
                switch (state) {
+               case LENERR2:
+                       state = FLD2;
+                       /* FALL */
                case FLD2:
                        compnum++;
                        if (incing) {
@@ -191,16 +194,14 @@ body:;
                        }
                        goto finished;
 
-               case LENERR2:
-                       advise(NULL, "line \"%s\" too long", trim(f.value));
-                       goto handleerror;
-
                case FMTERR2:
                        if (strncmp("From ", f.value, 5)==0) {
                                state = FILEEOF2;
                                goto finished;
                        }
-                       /* FALL */
+                       compnum++;
+                       advise(NULL, "formate error in component #%d", compnum);
+                       continue;
 
                case IOERR2:
 handleerror:;
index 26cad52e0ccaf194125f745276d4b0b9a53fdb75..bff4320c540d1bee7ddeed9c83ec6530a4657a30 100644 (file)
@@ -759,7 +759,6 @@ parse(int fd)
        for (i = 0, state = FLD2;;) {
                switch (state = m_getfld2(state, &f, in)) {
                case LENERR2:
-                       advise(NULL, "format error in message");
                        state = FLD2;
                        /* FALL */
 
index 061ae5a435876941f39939255a085e9ef46ff16a..ff69bc9e2b8a1ebe4fa1558c33f1c2c5faae933f 100644 (file)
@@ -332,7 +332,6 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
        for (compnum = 1, state = FLD2;; compnum++) {
                switch (state = m_getfld2(state, &f, in)) {
                case LENERR2:
-                       admonish(NULL, "To long header field in message %d (header %s, #%d)", msg, f.name, compnum);
                        state = FLD2;
                        /* FALL */
                case FLD2:
@@ -355,6 +354,10 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
                        break;
 
                case FMTERR2:
+                       admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
+                       state = FLD2;
+                       continue;
+
                case IOERR2:
                        admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
                        if (datecomp) {
index e02994f139ebdb4151bb780afd7423b88ff5377c..7486dd897f0dbb3315efbf6edd084724681d18b5 100644 (file)
@@ -216,7 +216,6 @@ process(char *file)
        for (compnum=1, state=FLD2;; compnum++) {
                switch (state = m_getfld2(state, &f, in)) {
                case LENERR2:
-                       advise(NULL, "field %d contains a to long line", f.name);
                        state = FLD2;
                        /* FALL */
                case FLD2:
@@ -228,6 +227,9 @@ process(char *file)
                        break;
 
                case FMTERR2:
+                       advise(NULL, "message format error in component #%d", compnum);
+                       continue;
+
                case IOERR2:
                        adios(EX_DATAERR, NULL, "message format error in component #%d",
                                        compnum);