Factor out code to read mailboxes, and make read more robust

[empserver] / src / lib / player / player.c

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 73e40c4ce4a9bbf53f503031be3aac4e2b0da76d..3852c1161e3c74cc75a79f9c86081fa81b243e72 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -53,6 +53,7 @@
 
 static int command(void);
 static int status(void);
+static int print_sink(char *, size_t, void *);
 
 struct player *player;
 
@@ -120,11 +121,14 @@ command(void)
 {
     char *redir;               /* UTF-8 */
     char scanspace[1024];
+    time_t now;
 
     if (getcommand(player->combuf) < 0)
        return 0;
 
-    if (!may_play_now(getnatp(player->cnum), time(NULL), 1))
+    now = time(NULL);
+    update_timeused(now);
+    if (!may_play_now(getnatp(player->cnum), now, 1))
        return 0;
 
     if (parse(player->combuf, scanspace, player->argp, player->comtail,
@@ -171,6 +175,7 @@ status(void)
        pr("You are no longer broke!\n");
 
     time(&player->curup);
+    update_timeused(player->curup);
     if (!may_play_now(natp, player->curup, 0))
        return 0;
     if (player->btused) {
@@ -253,38 +258,40 @@ execute(void)
 int
 show_motd(void)
 {
-    FILE *motd_fp;
+    show_first_tel(motdfil);
+    return RET_OK;
+}
+
+/*
+ * Print first telegram in file FNAME.
+ */
+int
+show_first_tel(char *fname)
+{
+    FILE *fp;
     struct telstr tgm;
-    char buf[MAXTELSIZE + 1];  /* UTF-8 */
 
-    if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
+    if ((fp = fopen(fname, "rb")) == NULL) {
        if (errno == ENOENT)
-           return RET_OK;
+           return 0;
        else {
-           pr ("Could not open motd.\n");
-           logerror("Could not open motd (%s).\n", motdfil);
-           return RET_FAIL;
+           logerror("Could not open %s.\n", fname);
+           return -1;
        }
     }
-    if (fread(&tgm, sizeof(tgm), 1, motd_fp) != 1) {
-       logerror("bad header on login message (motdfil)");
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    if (tgm.tel_length >= (long)sizeof(buf)) {
-       logerror("text length (%ld) is too long for login message (motdfil)", tgm.tel_length);
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    if (fread(buf, tgm.tel_length, 1, motd_fp) != 1) {
-       logerror("bad length %ld on login message", tgm.tel_length);
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    buf[tgm.tel_length] = 0;
-    uprnf(buf);
-    fclose(motd_fp);
-    return RET_OK;
+    if (tel_read_header(fp, fname, &tgm) < 0)
+       return -1;
+    if (tel_read_body(fp, fname, &tgm, print_sink, NULL) < 0)
+       return -1;
+    fclose(fp);
+    return 0;
+}
+
+static int
+print_sink(char *chunk, size_t sz, void *arg)
+{
+    uprnf(chunk);
+    return 0;
 }
 
 int