* mime_parser.c: recurse into message/rfc822 parts as if they were

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 51d78547b73f0d7ca55045e18f9d07d2fd7b4d07..31ccb60d6c32f4ade3d8b1540158c0626bbb0e91 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1168,7 +1168,11 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp,
                for (i=0; i<num_tokens(CC->preferred_formats, '|'); ++i) {
                        extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
                        if (!strcasecmp(buf, cbtype)) {
-                               strcpy(ma->chosen_part, partnum);
+                               if (num_tokens(partnum, '.') < 3) {
+                                       lprintf(CTDL_DEBUG, "REPLACING MA <%s> WITH <%s>\n",
+                                               ma->chosen_part, partnum);
+                                       safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part);
+                               }
                        }
                }
        }