Fixes to files_by_thread option submitted by Oliver Meili

Author: Peter McCluskey

Changelog

@@ -1,5 +1,13 @@
 Version Changes for Hypermail
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Peter McCluskey (Mar 19, 2005)
+  Fixes to files_by_thread option submitted by Oliver Meili.
+
+ Peter McCluskey (Dec 2, 2004)
+  Patch from Ulf H�rnhammar to fix two format string bugs in Hypermail.
+  They could have caused crashes if using incremental mode on edited
+  pre-existing archives with data like "%n%n%n%n%n%n%n%n" in certain lines.
+
  Peter McCluskey (Nov 28, 2004)
   Add filename_base option.
 

src/print.c

@@ -1069,7 +1069,7 @@ void printheaders (FILE *fp, struct emailinfo *email)
 	d_index = MSG_EXPIRED;
       if (email->is_deleted == 4 || email->is_deleted == 8)
 	d_index = MSG_FILTERED_OUT;
-      fprintf(fp, "<a name=\"start\" accesskey=\"j\" id=\"start\"></a>");
+      fprintf(fp, "<a name=\"start%d\" accesskey=\"j\" id=\"start\"></a>", email->msgnum);
       fprintf(fp, "<p>%s</p>\n", lang[d_index]);  /* AUDIT biege: No more warnings about format-bug */
       return;
     }
@@ -1164,14 +1164,14 @@ void printbody(FILE *fp, struct emailinfo *email, int maybe_reply, int is_reply)
 	d_index = MSG_EXPIRED;
       if (email->is_deleted == 4 || email->is_deleted == 8)
 	d_index = MSG_FILTERED_OUT;
-      fprintf(fp, "<a name=\"start\" accesskey=\"j\" id=\"start\"></a>");
+      fprintf(fp, "<a name=\"start%d\" accesskey=\"j\" id=\"start\"></a>", email->msgnum);
       fprintf(fp, "<p>%s</p>\n", lang[d_index]);	/* AUDIT biege: No more warnings about format-bug */
       return;
     }
 
     if (!set_showhtml) {
 	fprintf(fp, "<pre id=\"body\">\n");
-	fprintf(fp, "<a name=\"start\" accesskey=\"j\" id=\"start\"></a>");
+	fprintf(fp, "<a name=\"start%d\" accesskey=\"j\" id=\"start\"></a>", email->msgnum);
 	pre = TRUE;
     }
 
@@ -1496,8 +1496,8 @@ int print_links_up(FILE *fp, struct emailinfo *email, int pos, int in_thread_fil
 
 	    fprintf(fp, "<li>\n");
 	    fprintf(fp, "<dfn>%s</dfn>:\n", lang[MSG_THIS_MESSAGE]);
-	    fprintf(fp, "[ <a href=\"#start\" name=\"options1\" id=\"options1\" tabindex=\"1\">"
-		    "%s</a> ]\n", lang[MSG_MSG_BODY]);
+	    fprintf(fp, "[ <a href=\"#start%d\" name=\"options1\" id=\"options1\" tabindex=\"1\">"
+		    "%s</a> ]\n", email->msgnum, lang[MSG_MSG_BODY]);
 	    if (set_mailcommand && set_hmail) {
 	      if ((email->msgid && email->msgid[0]) || (email->subject && email->subject[0])) {
 		ptr = makemailcommand(set_replymsg_command, set_hmail, email->msgid, 
@@ -1638,8 +1638,8 @@ int print_links(FILE *fp, struct emailinfo *email, int pos, int in_thread_file)
 	  ** format for items: <li><dfn>Next</dfn>: <a href="0047.html" 
 	  title="wai thing">subject of message</a></li>\n */
 
-	  fprintf (fp, "<li><dfn>%s</dfn>: [ <a href=\"#start\">%s</a> ]</li>\n", 
-		   lang[MSG_THIS_MESSAGE], lang[MSG_MSG_BODY]);
+	  fprintf (fp, "<li><dfn>%s</dfn>: [ <a href=\"#start%d\">%s</a> ]</li>\n", 
+		   lang[MSG_THIS_MESSAGE], email->msgnum, lang[MSG_MSG_BODY]);
 
 	  printcomment(fp, "lnext", "start");
 	  /*

src/threadprint.c

@@ -251,20 +251,20 @@ static void format_thread_info(FILE *fp, struct emailinfo *email,
 
     if (set_files_by_thread) {
 	int maybe_reply = 0;
-	int is_reply;
+	int is_reply = 1;
 	fprintf(fp_body, "<a name =\"%.4d\"></a>", email->msgnum);
 	print_headers(fp_body, email, TRUE);
-	is_reply = print_links(fp_body, email, PAGE_TOP, TRUE);
 	if ((set_show_msg_links && set_show_msg_links != 4) || !set_usetable) {
 	    fprintf(fp_body, "</ul>\n");
 	}
 	/* maybe_reply only affects code in finelink.c which we don't want to run twice? */
 	printbody(fp_body, email, maybe_reply, is_reply);
 	if (level == 0) {
-	    sprintf(buffer, "<a href=\"thread_body%d.%s\">",
+	    sprintf(buffer, "thread_body%d.%s",
 		    threadnum, set_htmlsuffix);
 	    href = buffer;
 	}
+	is_reply = print_links(fp_body, email, PAGE_TOP, TRUE);
     }
     if (!href)
 	href = msg_href(email, subdir_email, FALSE);