use iconv to convert RFC-2047 encoded headers to the character set used

[mmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index c9b882da395bb987e89496cebabea4db28700d94..357484b0bd50f3ce2d3f05ded56cf9a8588b988f 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -130,7 +130,7 @@ match (char *str, char *sub)
                                sp++;\
                        }\
                        while ((c = (unsigned char) *sp++) && --i >= 0 && cp < ep)\
                                sp++;\
                        }\
                        while ((c = (unsigned char) *sp++) && --i >= 0 && cp < ep)\

-                               if (isgraph(c)) \
+                               if (!iscntrl(c) && !isspace(c)) \

                                    *cp++ = c;\
                                else {\
                                        while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
                                    *cp++ = c;\
                                else {\
                                        while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\


@@ -148,7 +148,7 @@ match (char *str, char *sub)
                    while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
                        sp++;\
                    while((c = (unsigned char) *sp++) && cp < ep)\
                    while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
                        sp++;\
                    while((c = (unsigned char) *sp++) && cp < ep)\

-                       if (isgraph(c)) \
+                       if (!iscntrl(c) && !isspace(c)) \

                            *cp++ = c;\
                        else {\
                            while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
                            *cp++ = c;\
                        else {\
                            while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\