Update copyright notice

[empserver] / src / lib / common / emp_config.c

diff --git a/src/lib/common/emp_config.c b/src/lib/common/emp_config.c
index 11ffb62d9bded96def5fc7efa409e6492db54f96..fa9fb4f59203424557bf132ad5ce166a78732a6a 100644 (file)
--- a/src/lib/common/emp_config.c
+++ b/src/lib/common/emp_config.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
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Julian Onions, 1995
  *     Steve McClure, 1998-2000
- *     Markus Armbruster, 2004-2009
+ *     Markus Armbruster, 2004-2011
  */
 
 /*
@@ -50,7 +50,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "file.h"
 #include "misc.h"
 #include "optlist.h"
 #include "prototypes.h"
@@ -139,7 +138,6 @@ emp_config(char *file)
     fclose(fp);
 
 done:
-    WORLD_X &= ~1;             /* force even */
     if (set_paths(file) < 0)
        return -1;
 
@@ -178,6 +176,8 @@ set_paths(char *econfig)
     if (p[0] != '/') {
        fprintf(stderr, "Can't get current working directory (%s)\n",
                strerror(errno));
+       if (p != econfig)
+           free(p);
        return -1;
     }
     if (p == econfig)