X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=8f81e77a3f7f9ea1c00b379365909ea426c11156;hb=aa2501ef873e96a8500c53b05280dcc0ade952c2;hp=357484b0bd50f3ce2d3f05ded56cf9a8588b988f;hpb=4c24408bdff496a631709326b0d07a4e12fa9277;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 357484b..8f81e77 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -442,14 +442,14 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	    break;
 
 	case FT_LS_DECODECOMP:
-	    if (decode_rfc2047(fmt->f_comp->c_text, buffer2))
+	    if (decode_rfc2047(fmt->f_comp->c_text, buffer2, sizeof(buffer2)))
 		str = buffer2;
 	    else
 		str = fmt->f_comp->c_text;
 	    break;
 
 	case FT_LS_DECODE:
-	    if (str && decode_rfc2047(str, buffer2))
+	    if (str && decode_rfc2047(str, buffer2, sizeof(buffer2)))
 		str = buffer2;
 	    break;
 
@@ -458,6 +458,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 		    char *xp;
 
 		    strncpy(buffer, str, sizeof(buffer));
+		    buffer[sizeof(buffer)-1] = '\0';
 		    str = buffer;
 		    while (isspace(*str))
 			    str++;
@@ -646,6 +647,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	    if ((str = mn->m_pers) == NULL) {
 	        if ((str = mn->m_note)) {
 	            strncpy (buffer, str, sizeof(buffer));
+		    buffer[sizeof(buffer)-1] = '\0';
 	            str = buffer;
 	            if (*str == '(')
 	            	str++;
@@ -682,6 +684,40 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 		  }
 		}
 	    }
+	    break;  
+
+
+		/* UNQUOTEs RFC-2822 quoted-string and quoted-pair */
+	case FT_LS_UNQUOTE:
+	    if (str) {	  	
+		int m;
+		strncpy(buffer, str, sizeof(buffer));
+		/* strncpy doesn't NUL-terminate if it fills the buffer */
+		buffer[sizeof(buffer)-1] = '\0';
+		str = buffer;
+	
+		/* we will parse from buffer to buffer2 */
+		n = 0; /* n is the input position in str */
+		m = 0; /* m is the ouput position in buffer2 */
+
+		while ( str[n] != '\0') {
+		    switch ( str[n] ) {
+			case '\\':
+			    n++;
+			    if ( str[n] != '\0') 
+				buffer2[m++] = str[n++];
+			    break;
+			case '"':
+			    n++;
+			    break;
+			default:
+			    buffer2[m++] = str[n++];
+			    break;
+			}		 
+		}
+		buffer2[m] = '\0';
+		str = buffer2;
+            }
 	    break;
 
 	case FT_LOCALDATE: