X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffmt_scan.c;fp=sbr%2Ffmt_scan.c;h=6cfc17657d02291b100412022256a221d542ee64;hp=a8e773a953fd04b8a89c9dbbe91c46b2dc54c4f9;hb=4c30d368bca8b3f108a7e86a5b890e33470cdebf;hpb=f16ae6eedeacce086d513e10461938c1650e265e

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index a8e773a..6cfc176 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -688,32 +688,10 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 		/* 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';
+				unquote_string(buffer, buffer2);
 				str = buffer2;
 			}
 			break;