X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fwu.c;h=6bcaf0009bffe8d415ad86c5e61fa88a34c5c43e;hp=d419397c9592fc81cc28ed19cded3510d41db7ac;hb=e23882161e21b6e14dc9283933967d344f231954;hpb=df4925d696e7ec0fc03065058ac3cd00504bcce5

diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c
index d419397c9..6bcaf0009 100644
--- a/src/lib/subs/wu.c
+++ b/src/lib/subs/wu.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     Markus Armbruster, 2005-2011
+ *     Markus Armbruster, 2005-2021
  */
 
 #include <config.h>
@@ -37,14 +37,12 @@
 #include <stdarg.h>
 #include <sys/uio.h>
 #include <unistd.h>
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
-#include "player.h"
 #include "prototypes.h"
-#include "server.h"
 #include "tel.h"
+#include "update.h"
 
 static struct telstr last_tel[MAXNOC];
 
@@ -54,18 +52,13 @@ clear_telegram_is_new(natid to)
     last_tel[to].tel_from = NATID_BAD;
 }
 
-/*
- * telegram_is_new counts new telegrams the same as read_telegrams in
- * lib/commands/mail.c and lib/commands/rea.c
- */
-
 static int
 telegram_is_new(natid to, struct telstr *tel)
 {
     if (tel->tel_from != last_tel[to].tel_from
 	|| tel->tel_type != last_tel[to].tel_type
 	|| (tel->tel_type != TEL_UPDATE
-	    && abs(tel->tel_date - last_tel[to].tel_date) > TEL_SECONDS)) {
+	    && tel->tel_date - last_tel[to].tel_date > TEL_SECONDS)) {
 	last_tel[to] = *tel;
 	return 1;
     }
@@ -73,11 +66,11 @@ telegram_is_new(natid to, struct telstr *tel)
 }
 
 /*
- * Send a telegram from FROM to TO.
- * Format text to send using printf-style FORMAT and optional
+ * Send a telegram from @from to @to.
+ * Format text to send using printf-style @format and optional
  * arguments.  It is plain ASCII.
  * If running from the update, telegram type is TEL_UPDATE.
- * Else if FROM is a deity, type is TEL_BULLETIN.
+ * Else if @from is a deity, type is TEL_BULLETIN.
  * Else it is TEL_NORM.
  * Return 0 on success, -1 on error.
  */
@@ -101,9 +94,9 @@ wu(natid from, natid to, char *format, ...)
 }
 
 /*
- * Send a telegram from FROM to TO.
- * MESSAGE is the text to send, in UTF-8.
- * TYPE is the telegram type.
+ * Send a telegram from @from to @to.
+ * @message is the text to send, in UTF-8.
+ * @type is the telegram type.
  * Return 0 on success, -1 on error.
  */
 int
@@ -117,14 +110,16 @@ typed_wu(natid from, natid to, char *message, int type)
     char box[1024];
     struct player *other;
 
-    if (type == TEL_ANNOUNCE)
+    if (type == TEL_ANNOUNCE) {
 	strcpy(box, annfil);
-    else
+	np = NULL;
+    } else {
 	mailbox(box, to);
-
-    if (type != TEL_ANNOUNCE)
-	if (!(np = getnatp(to)) || np->nat_stat < STAT_SANCT)
+	np = getnatp(to);
+	if (!np || np->nat_stat < STAT_SANCT)
 	    return -1;
+    }
+
 #if !defined(_WIN32)
     if ((fd = open(box, O_WRONLY | O_APPEND, 0)) < 0) {
 #else
@@ -138,6 +133,7 @@ typed_wu(natid from, natid to, char *message, int type)
     tel.tel_from = from;
     (void)time(&tel.tel_date);
     len = strlen(message);
+    CANT_HAPPEN(len && message[len - 1] != '\n');
     tel.tel_length = len;
     tel.tel_type = type;
     tel.tel_cont = !telegram_is_new(to, &tel);
@@ -159,7 +155,7 @@ typed_wu(natid from, natid to, char *message, int type)
 	for (to = 0; NULL != (np = getnatp(to)); to++) {
 	    if (np->nat_stat < STAT_SANCT)
 		continue;
-	    if (!player->god && (getrejects(from, np) & REJ_ANNO))
+	    if (!nat_accepts(to, from, REJ_ANNO))
 		continue;
 	    if (!np->nat_ann || !tel.tel_cont) {
 		np->nat_ann++;