Update copyright notice

[empserver] / src / lib / commands / rea.c

diff --git a/src/lib/commands/rea.c b/src/lib/commands/rea.c
index 94ba14d4218104fa0361bb5a0fb684cd4d85b1cf..57d70413bd7c78f05aeeb92c297dd0e6ee56992c 100644 (file)
--- a/src/lib/commands/rea.c
+++ b/src/lib/commands/rea.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -39,6 +39,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
+#include "chance.h"
 #include "commands.h"
 #include "match.h"
 #include "misc.h"
@@ -59,7 +60,7 @@ rea(void)
     char mbox_buf[256];                /* Maximum path length */
     struct telstr tgm;
     FILE *telfp;
-    int teles;
+    int teles, need_hdr;
     char buf[1024];
     char *kind;
     int n, res;
@@ -68,7 +69,7 @@ rea(void)
     time_t now;
     time_t then;
     time_t delta;
-    int may_delete = 1; /* may messages be deleted? */
+    int may_delete = 1;
 
     now = time(NULL);
 
@@ -94,11 +95,12 @@ rea(void)
        mbox = mailbox(mbox_buf, num);
     }
 
-    if (!(telfp = fopen(mbox, "rb+"))) {
+    if (!(telfp = fopen(mbox, "rb"))) {
        logerror("telegram file %s", mbox);
        return RET_FAIL;
     }
     teles = 0;
+    need_hdr = 1;
     for (;;) {
        res = tel_read_header(telfp, mbox, &tgm);
     more:
@@ -115,7 +117,7 @@ rea(void)
        }
        if (!teles && *kind == 'a')
            pr("\nAnnouncements since %s", ctime(&then));
-       if (!teles || !tgm.tel_cont) {
+       if (need_hdr || !tgm.tel_cont) {
            pr("\n> ");
            pr("%s ", telnames[tgm.tel_type]);
            if ((tgm.tel_type == TEL_NORM) ||
@@ -125,12 +127,15 @@ rea(void)
            pr("  dated %s", ctime(&tgm.tel_date));
        }
        teles++;
+       need_hdr = 0;
        res = tel_read_body(telfp, mbox, &tgm, print_sink, NULL);
        if (res < 0)
            break;
     }
-    if (res < 0)
+    if (res < 0) {
        pr("\n> Mailbox corrupt, tell the deity.\n");
+       may_delete = 0;
+    }
 
     if (*kind == 'a')
        np->nat_ann = 0;
@@ -167,6 +172,7 @@ rea(void)
                res = tel_read_header(telfp, mbox, &tgm);
                if (res != 0) {
                    pr("Wait a sec!  A new %s has arrived...\n", kind);
+                   need_hdr = 1;
                    goto more;
                }
                /* Here, we just re-open the file for "w" only,
@@ -187,7 +193,7 @@ rea(void)
 }
 
 /*
- * Print first telegram in file FNAME.
+ * Print first telegram in file @fname.
  */
 int
 show_first_tel(char *fname)