Fixes #37 : warn_surpressions should be spelled as warn_suppressions

Author: jkbzh

Changelog

@@ -4,6 +4,10 @@ Version Changes for Hypermail
 HYPERMAIL VERSION 2.3.1:
 ============================
 
+ Jose Kahan (June 19, 2018)
+  - Changed mispelled configuration option warn_surpressions to the
+    correct spelling warn_suppressions.
+
  Jose Kahan (June 14, 2018)
   - Hypermail would segfault or have an incorrect thread view if it was
     handling an archive with a message (msg1) that was a reply to a message not

configs/hmrc.example

@@ -798,15 +798,15 @@ show_index_links = 1
 # the default if save_alts = 1:
 #alts_text = <hr>
 
-# warn_surpressions = [ 0 | 1 ]
+# warn_suppressions = [ 0 | 1 ]
 #
 #  Set this to 1 to get warnings (on stdout) about messages that
 # are not converted because of they are missing a msgid (if
 # require_msgids is On) or because one of the following options
-# surpressed it: deleted expires delete_msgnum filter_out
+# suppressed it: deleted expires delete_msgnum filter_out
 # filter_require filter_out_full_body filter_require_full_body.
 
-# warn_surpressions = 1
+# warn_suppressions = 1
 
 # unsafe_chars = list of chars to prohibit
 #  Any characters listed in this string are removed from user-specified

configs/hypermail.rc

@@ -580,9 +580,9 @@ alts_text = "alternate version of message"
 # Set this to On to get warnings (on stdout) about messages that
 # are not converted because of they are missing a msgid (if
 # require_msgids is On) or because one of the following options
-# surpressed it: deleted expires delete_msgnum filter_out
+# suppressed it: deleted expires delete_msgnum filter_out
 # filter_require filter_out_full_body filter_require_full_body.
-warn_surpressions = On
+warn_suppressions = On
 
 # Any characters listed in this string are removed from user-specified
 # attachment filenames. Those characters will be replaced by a "_"

docs/hmrc.4

@@ -547,11 +547,11 @@ If save_alts is 1, this text is put between the alternatives.
 If save_alts is 2, this text is used to describe the link to each
 alternative file.
 .TP
-.B warn_surpressions = boolean_number
+.B warn_suppressions = boolean_number
 Set this to On to get warnings (on stdout) about messages that
 are not converted because of they are missing a msgid (if
 require_msgids is On) or because one of the following options
-surpressed it: deleted expires delete_msgnum filter_out
+suppressed it: deleted expires delete_msgnum filter_out
 filter_require filter_out_full_body filter_require_full_body.
 .TP
 .B unsafe_chars = "characters"

docs/hmrc.html

@@ -182,7 +182,7 @@ <h1 align=center><img src="hypermail.png" width="60" align="middle" height="60"
     <li><a href="#delete_incremental">delete_incremental</a> remove previous deleted messages on-the-fly
     <li><a href="#htmlmessage_deleted">htmlmessage_deleted</a> custom markup body for deleted messages
     <li><a href="#progress">progress</a> verbosity
-    <li><a href="#warn_surpressions">warn_surpressions</a> warn about ignored messages
+    <li><a href="#warn_suppressions">warn_suppressions</a> warn about ignored messages
     <li><a href="#uselock">uselock</a> serialize
     <li><a href="#locktime">locktime</a> timeouts
     <li><a href="#base_url">base_url</a>
@@ -1313,15 +1313,15 @@ <h3><a name="sysmisc">System miscellaneous</a></h3>
 <br>
 <br><i>progress = 0</i>
 </dd>
-<a name="warn_surpressions"></a>
-<dt><strong> warn_surpressions = [ 0 | 1 ]</strong></dt><dd>
+<a name="warn_suppressions"></a>
+<dt><strong> warn_suppressions = [ 0 | 1 ]</strong></dt><dd>
 Set this to 1 to get warnings (on stdout) about messages that
 are not converted because of they are missing a msgid (if
 require_msgids is On) or because one of the following options
-surpressed it: deleted expires delete_msgnum filter_out
+suppressed it: deleted expires delete_msgnum filter_out
 filter_require filter_out_full_body filter_require_full_body.
 <br>
-<br><i>warn_surpressions = 1</i>
+<br><i>warn_suppressions = 1</i>
 </dd>
 <a name="uselock"></a>
 <dt><strong> uselock = [ 0 | 1 ]</strong></dt><dd>

src/finelink.c

@@ -202,7 +202,7 @@ static int add_anchor(int msgnum, int quoting_msgnum, int quote_num, const char
 		    break;
 		}
 		fputs(buffer, fp2);
-		/* surpress decrement for lines inserted by html conversion: */
+		/* suppress decrement for lines inserted by html conversion: */
 		if (!strcasecmp(buffer, "<p>\n"))
 		    ++count_quoted_lines;
 		else {
@@ -593,17 +593,17 @@ void replace_maybe_replies(const char *filename, struct emailinfo *ep, int new_r
 		    MSG_PREVIOUS_MESSAGE
 		};
 		int i;
-		int surpress = 0;
+		int suppress = 0;
 		for (i = 0; patts[i]; ++i) {
 		    char temp[256];
 		    snprintf(temp,sizeof(temp), patts[i], lang[indices[i]]);
 		    if ((ptr = strcasestr(buffer, temp))
 			&& (i < 4 || new_reply_to == atoi(ptr + strlen(temp)))) {
-			surpress = 1;
+			suppress = 1;
 			break;
 		    }
 		}
-		if (surpress)
+		if (suppress)
 		    continue;
 	    }
 	    /* check for old critmail format */

src/parse.c

@@ -3978,7 +3978,7 @@ void fixreplyheader(char *dir, int num, int remove_maybes, int max_update)
 		    || strcasestr(bp->line, old2_next_pattern)
 		    || strstr(bp->line, old_next_pattern))) {
 	        bp = bp->next;
-		continue; /* line duplicates next in thread; surpress */
+		continue; /* line duplicates next in thread; suppress */
 	    }
 
 	    if (!remove_maybes

src/setup.c

@@ -67,7 +67,7 @@ bool set_writehaof;
 bool set_append;
 char *set_append_filename;
 bool set_nonsequential;
-bool set_warn_surpressions;
+bool set_warn_suppressions;
 bool set_files_by_thread;
 bool set_href_detection;
 bool set_mbox_shortened;
@@ -761,11 +761,11 @@ struct Config cfg[] = {
      "# If save_alts is 2, this text is used to describe the link to each\n"
      "# alternative file.\n", FALSE},
 
-    {"warn_surpressions", &set_warn_surpressions, BTRUE, CFG_SWITCH,
+    {"warn_suppressions", &set_warn_suppressions, BTRUE, CFG_SWITCH,
      "# Set this to On to get warnings (on stdout) about messages that\n"
      "# are not converted because of they are missing a msgid (if\n"
      "# require_msgids is On) or because one of the following options\n"
-     "# surpressed it: deleted expires delete_msgnum filter_out\n"
+     "# suppressed it: deleted expires delete_msgnum filter_out\n"
      "# filter_require filter_out_full_body filter_require_full_body.\n", FALSE},
 
     {"unsafe_chars", &set_unsafe_chars, NULL, CFG_STRING,

src/setup.h

@@ -86,7 +86,7 @@ extern bool set_writehaof;
 extern bool set_append;
 extern char *set_append_filename;
 extern bool set_nonsequential;
-extern bool set_warn_surpressions;
+extern bool set_warn_suppressions;
 extern bool set_files_by_thread;
 extern bool set_href_detection;
 extern bool set_mbox_shortened;

src/struct.c

@@ -168,7 +168,7 @@ struct emailinfo *addhash(int num, char *date, char *name, char *email, char *ms
     if (!msgid) {
 	/* SEVERE ERROR, all mails MUST have a Message-ID, ignore it! */
 	if (set_require_msgids) {
-	    if (set_warn_surpressions)
+	    if (set_warn_suppressions)
 				printf("Message-ID is missing, ignoring message with subject '%s'.\n", subject ? subject : "<unknown>");
 	    return NULL;
 	}
@@ -339,7 +339,7 @@ int insert_in_lists(struct emailinfo *emp, const bool * require_filter, int rlen
 	h->data = emp;
 	h->next = deletedlist;
 	deletedlist = h;
-	if (set_warn_surpressions && require_filter) {
+	if (set_warn_suppressions && require_filter) {
 	    const char *option = "??";
 			switch (emp->is_deleted) {
 			case FILTERED_DELETE: