* Start numbering top-level MIME parts as 1, 2... not 1.1, 1.2...

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 4421a38e4bce22d9006fd744cf5f6deb6b1c6e97..47d1af2a3cc0bd62a886034de321efa87f28d0ff 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.19  2000/10/29 18:11:07  ajc
+ * Start numbering top-level MIME parts as 1, 2... not 1.1, 1.2...
+
  Revision 573.18  2000/10/28 14:14:19  error
  * msgbase.c: eliminated most gotos; a single goto in alias() remains because
    it actually makes sense to do it that way...
@@ -2113,3 +2116,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index 34decdd0211b798209210f1d6f292fe0e560108a..057ec6c4ebea19d1988b104cc86ae92ab2b22854 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -319,8 +319,14 @@ void the_mime_parser(char *partnum,
                        if ((!strcasecmp(buf, startary))
                            || (!strcasecmp(buf, endary))) {
                                if (part_start != NULL) {
-                                       sprintf(nested_partnum, "%s.%d",
-                                               partnum, ++part_seq);
+                                       if (strlen(partnum) > 0) {
+                                               sprintf(nested_partnum, "%s.%d",
+                                                       partnum, ++part_seq);
+                                       }
+                                       else {
+                                               sprintf(nested_partnum, "%d",
+                                                       ++part_seq);
+                                       }
                                        the_mime_parser(nested_partnum,
                                                    part_start, part_end,
                                                        CallBack);
@@ -369,5 +375,5 @@ void mime_parser(char *content_start, char *content_end,
 {
 
        lprintf(9, "mime_parser() called\n");
-       the_mime_parser("1", content_start, content_end, CallBack);
+       the_mime_parser("", content_start, content_end, CallBack);
 }