Move show_first_tel() from player.c to rea.c

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

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 7227115788c846e4130118a784f9a767fcc82996..4666d179ed7465ad20cc960623c775cb66471ac3 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -35,8 +35,6 @@
 
 #include <config.h>
 
-#include <errno.h>
-#include <stdio.h>
 #include "com.h"
 #include "empio.h"
 #include "empthread.h"
@@ -257,37 +255,7 @@ execute(void)
 int
 show_motd(void)
 {
-    FILE *motd_fp;
-    struct telstr tgm;
-    char buf[MAXTELSIZE + 1];  /* UTF-8 */
-
-    if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
-       if (errno == ENOENT)
-           return RET_OK;
-       else {
-           pr ("Could not open motd.\n");
-           logerror("Could not open motd (%s).\n", motdfil);
-           return RET_FAIL;
-       }
-    }
-    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);
+    show_first_tel(motdfil);
     return RET_OK;
 }