Update copyright notice

[empserver] / src / util / files.c

diff --git a/src/util/files.c b/src/util/files.c
index c76d6d4f6b63ff2c43c152d2b7e13977a95b4ed6..a2ae277cf5eba860309969dd9489c1e8dd125b6b 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.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-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,29 +30,19 @@
  *     Thomas Ruschak
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2010
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
 
 #include <errno.h>
-#include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include "file.h"
-#include "game.h"
-#include "land.h"
-#include "misc.h"
 #include "nat.h"
-#include "nuke.h"
 #include "optlist.h"
-#include "plane.h"
-#include "power.h"
 #include "prototypes.h"
-#include "sect.h"
-#include "ship.h"
 #include "tel.h"
-#include "trade.h"
 #include "version.h"
 
 static void
@@ -71,7 +61,6 @@ int
 main(int argc, char *argv[])
 {
     char buf[255];
-    char *filename;
     struct natstr nat;
     int i;
     int opt;
@@ -110,12 +99,13 @@ main(int argc, char *argv[])
     empfile_fixup();
 
     if (mkdir(gamedir, S_IRWXU | S_IRWXG) < 0 && errno != EEXIST) {
-       perror(gamedir);
-       printf("Can't make game directory\n");
+       fprintf(stderr, "Can't make game directory %s (%s)\n",
+               gamedir, strerror(errno));
        exit(1);
     }
     if (chdir(gamedir)) {
-       fprintf(stderr, "Can't chdir to %s (%s)\n", gamedir, strerror(errno));
+       fprintf(stderr, "Can't chdir to %s (%s)\n",
+               gamedir, strerror(errno));
        exit(EXIT_FAILURE);
     }
 
@@ -134,25 +124,21 @@ main(int argc, char *argv[])
            exit(1);
     }
 
-    ef_read(EF_NATION, 0, &nat);
-    strcpy(nat.nat_cnam, "POGO");
-    strcpy(nat.nat_pnam, "peter");
-    nat.nat_stat = STAT_GOD;
-    nat.nat_btu = 255;
-    nat.nat_money = 123456789;
-    nat.nat_flags |= NF_FLASH;
-    ef_write(EF_NATION, 0, &nat);
-    printf("All praise to %s!\n", nat.nat_cnam);
     if (mkdir(teldir, S_IRWXU | S_IRWXG) < 0 && errno != EEXIST) {
-       perror(teldir);
-       printf("Can't make telegram directory\n");
+       fprintf(stderr, "Can't make telegram directory %s (%s)\n",
+               teldir, strerror(errno));
        exit(1);
     }
     for (i = 0; i < MAXNOC; i++) {
-       filename = mailbox(buf, i);
-       close(creat(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP));
+       if (mailbox_create(mailbox(buf, i)) < 0)
+           exit(1);
     }
-    close(creat(annfil, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP));
+    if (mailbox_create(annfil) < 0)
+       exit(1);
+
+    nat_reset(&nat, 0, "POGO", "peter", STAT_GOD);
+    putnat(&nat);
+    printf("All praise to %s!\n", nat.nat_cnam);
 
     for (i = 0; i < EF_MAX; i++) {
        if (!EF_IS_GAME_STATE(i))