/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* emp_config.c: Allows config file to control server config. from a file
- *
+ *
* Known contributors to this file:
* Julian Onions, 1995
* Steve McClure, 1998-2000
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2011
*/
/*
#include <string.h>
#include <unistd.h>
-#include "file.h"
+#include "fnameat.h"
#include "misc.h"
#include "optlist.h"
#include "prototypes.h"
fclose(fp);
done:
- WORLD_X &= ~1; /* force even */
if (set_paths(file) < 0)
return -1;
{
struct keymatch *kp;
- if (command == 0 || *command == 0)
- return 0;
- for (kp = tbl; kp->km_key != 0; kp++) {
+ if (!command || !*command)
+ return NULL;
+ for (kp = tbl; kp->km_key; kp++) {
if (strcmp(kp->km_key, command) == 0)
return kp;
}
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)