(wrgamesdef): Generate EMPDIR instead of EMPPATH(). Change callers of

EMPPATH() to use EMPDIR.  This avoids triggering MSVC bugs, and drops
support for traditional, pre-ISO cpp.  Closes #753935.
(gamedir, lostfil, playerbin, updatebin): Unused, remove.

diff --git a/src/doconfig/doconfig.c b/src/doconfig/doconfig.c
index 6a733d9fe4369403ec1d14e0cf59a01c865c64a9..45032826efd6939e16e4aca51db9b69447e730f8 100644 (file)
--- a/src/doconfig/doconfig.c
+++ b/src/doconfig/doconfig.c
@@ -84,7 +84,7 @@ main()
 
     if (access(EP, 0)) {
        printf("making directory %s\n", EP);
-       if (mkdir(EP, 493)) {
+       if (mkdir(EP, 0755)) {
            printf("mkdir failed on %s, exiting.\n", EP);
            exit(-1);
        }
@@ -92,7 +92,7 @@ main()
     sprintf(buf, "%s/data", EP);
     if (access(buf, 0)) {
        printf("making directory %s\n", buf);
-       if (mkdir(buf, 493)) {
+       if (mkdir(buf, 0755)) {
            printf("mkdir failed on %s, exiting.\n", buf);
            exit(-1);
        }
@@ -218,20 +218,10 @@ wrgamesdef(char *filename)
     fprintf(fp, " */\n\n");
     fprintf(fp, "#ifndef _GAMESDEF_H_\n");
     fprintf(fp, "#define _GAMESDEF_H_\n\n");
-    fprintf(fp, "#if !defined(_WIN32)\n");
-    fprintf(fp, "#ifdef __STDC__\n");
-    fprintf(fp, "#define EMPPATH(xyz) \"%s/\" #xyz /* ANSI C */\n", EP);
-    fprintf(fp, "#else\n");
-    fprintf(fp, "#define EMPPATH(xyz) \"%s/xyz\" /* traditional */\n", EP);
-    fprintf(fp, "#endif /* __STDC__ */\n");
-    fprintf(fp, "#else\n");
-    fprintf(fp, "#define EMPPATH(xyz) \"%s\\\\\" #xyz /* ANSI C */\n",
-           path);
-    fprintf(fp, "#endif /* _WIN32 */\n\n");
+    fprintf(fp, "#define EMPDIR \"%s\"\n", EP);
     fprintf(fp, "#define PRVNAM \"%s\"\n", PV);
     fprintf(fp, "#define PRVLOG \"%s\"\n", EM);
-    fprintf(fp,
-           "#define GET_SOURCE \"using:\\n    ftp://ftp.wolfpackempire.com/pub/empire/server or \\n    http://www.wolfpackempire.com/\"\n");
+    fprintf(fp, "#define GET_SOURCE \"using:\\n    ftp://ftp.wolfpackempire.com/pub/empire/server or \\n    http://www.wolfpackempire.com/\"\n");
     fprintf(fp, "#define EMP_HOST \"%s\"\n", IP);
     fprintf(fp, "#define EMP_PORT \"%d\"\n\n", PN);
     fprintf(fp, "#define MAXNOC %d\n\n", MC);

diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index 20773e1cb8c4cf047292a4473ae0ca79edb269d4..fb0c34122be57003480e9b442ad6bc912b63537e 100644 (file)
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -62,7 +62,7 @@ extern char *strdup();
 #endif /* NOSTRDUP */
 
 /* All the configurable variables ... */
-extern s_char *infodir, *datadir, *gamedir, *loginport, *privname,
+extern s_char *infodir, *datadir, *loginport, *privname,
     *privlog;
 
 extern double buil_tower_bt, buil_tower_bc;

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index da76d041bedbd8e1bf6a4960c6583fca5472971f..cceb00b06b00edb2bb4ff17a310c42e6ff8def5c 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -54,53 +54,47 @@
 #include "gamesdef.h"
 #include "commodity.h"
 
-#if !defined(_WIN32)
-#define FILEPATH(p) EMPPATH(data/p)
-#else
-#define FILEPATH(p) EMPPATH(data\\p)
-#endif
-
 struct empfile empfile[] = {
-    {"sect", FILEPATH(sector), EFF_COM | EFF_XY | EFF_OWNER,
+    {"sect", EMPDIR "/data/sector", EFF_COM | EFF_XY | EFF_OWNER,
      0, sizeof(struct sctstr),
      0, 0, 0, {fldoff(sctstr, sct_nv), fldoff(sctstr, sct_vtype[0]),
               fldoff(sctstr, sct_vamt[0])}, MAXSCTV,
      -1, -1, 0, 0, 0, 0, 0},
-    {"ship", FILEPATH(ship), EFF_COM | EFF_XY | EFF_OWNER | EFF_GROUP,
+    {"ship", EMPDIR "/data/ship", EFF_COM | EFF_XY | EFF_OWNER | EFF_GROUP,
      0, sizeof(struct shpstr),
      0, 0, 0, {fldoff(shpstr, shp_nv), fldoff(shpstr, shp_vtype[0]),
               fldoff(shpstr, shp_vamt[0])}, MAXSHPV,
      -1, -1, 0, 0, 0, 0, 0},
-    {"plane", FILEPATH(plane), EFF_XY | EFF_OWNER | EFF_GROUP,
+    {"plane", EMPDIR "/data/plane", EFF_XY | EFF_OWNER | EFF_GROUP,
      0, sizeof(struct plnstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"land", FILEPATH(land), EFF_COM | EFF_XY | EFF_OWNER | EFF_GROUP,
+    {"land", EMPDIR "/data/land", EFF_COM | EFF_XY | EFF_OWNER | EFF_GROUP,
      0, sizeof(struct lndstr),
      0, 0, 0, {fldoff(lndstr, lnd_nv), fldoff(lndstr, lnd_vtype[0]),
               fldoff(lndstr, lnd_vamt[0])}, MAXLNDV,
      -1, -1, 0, 0, 0, 0, 0},
-    {"nuke", FILEPATH(nuke), EFF_XY | EFF_OWNER, 0, sizeof(struct nukstr),
+    {"nuke", EMPDIR "/data/nuke", EFF_XY | EFF_OWNER, 0, sizeof(struct nukstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"news", FILEPATH(news), 0,
+    {"news", EMPDIR "/data/news", 0,
      0, sizeof(struct nwsstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"treaty", FILEPATH(treaty), 0, 0, sizeof(struct trtstr),
+    {"treaty", EMPDIR "/data/treaty", 0, 0, sizeof(struct trtstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"trade", FILEPATH(trade), 0, 0, sizeof(struct trdstr),
+    {"trade", EMPDIR "/data/trade", 0, 0, sizeof(struct trdstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"pow", FILEPATH(power), 0, 0, sizeof(struct powstr),
+    {"pow", EMPDIR "/data/power", 0, 0, sizeof(struct powstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"nat", FILEPATH(nation), 0, 0, sizeof(struct natstr),
+    {"nat", EMPDIR "/data/nation", 0, 0, sizeof(struct natstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"loan", FILEPATH(loan), 0,
+    {"loan", EMPDIR "/data/loan", 0,
      0, sizeof(struct lonstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"map", FILEPATH(map), 0, 0, DEF_WORLD_X * DEF_WORLD_Y / 2,
+    {"map", EMPDIR "/data/map", 0, 0, DEF_WORLD_X * DEF_WORLD_Y / 2,
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"bmap", FILEPATH(bmap), 0, 0, DEF_WORLD_X * DEF_WORLD_Y / 2,
+    {"bmap", EMPDIR "/data/bmap", 0, 0, DEF_WORLD_X * DEF_WORLD_Y / 2,
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"commodity", FILEPATH(commodity), 0, 0, sizeof(struct comstr),
+    {"commodity", EMPDIR "/data/commodity", 0, 0, sizeof(struct comstr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0},
-    {"lost", FILEPATH(lostitems), 0, 0, sizeof(struct loststr),
+    {"lost", EMPDIR "/data/lostitems", 0, 0, sizeof(struct loststr),
      0, 0, 0, {0, 0, 0}, 0, -1, -1, 0, 0, 0, 0, 0}
 };

diff --git a/src/lib/global/path.c b/src/lib/global/path.c
index a9394b0fbfa5fce818c994b7b7ad655dc2aa73ba..85c30700fd968401af2db2a01d91cf8b447ead8e 100644 (file)
--- a/src/lib/global/path.c
+++ b/src/lib/global/path.c
@@ -35,37 +35,18 @@
 #include "gamesdef.h"
 #include "misc.h"
 
-#if !defined(_WIN32)
-#define FILEPATH(p) EMPPATH(data/p)
-#else
-#define FILEPATH(p) EMPPATH(data\\p)
-#endif
+s_char *infodir = EMPDIR "/info.nr";
+s_char *datadir = EMPDIR "/data";
+s_char *teldir = EMPDIR "/data/tel";
 
-s_char *gamedir = EMPPATH(.);
-s_char *infodir = EMPPATH(info.nr);
-s_char *datadir = EMPPATH(data);
-s_char *teldir = FILEPATH(tel);
+s_char *upfil  = EMPDIR "/data/up";
+s_char *downfil = EMPDIR "/data/down";
+s_char *disablefil = EMPDIR "/data/disable";
+s_char *telfil = EMPDIR "/data/tel/tel";
+s_char *annfil = EMPDIR "/data/ann";
+s_char *commfil = EMPDIR "/data/comm";
+s_char *banfil = EMPDIR "/data/ban";
+s_char *authfil = EMPDIR "/data/auth";
+s_char *timestampfil = EMPDIR "/data/timestamp";
 
-s_char *upfil = FILEPATH(up);
-s_char *downfil = FILEPATH(down);
-s_char *disablefil = FILEPATH(disable);
-#if !defined(_WIN32)
-s_char *telfil = FILEPATH(tel / tel);
-#else
-s_char *telfil = FILEPATH(tel \\ tel);
-#endif
-s_char *annfil = FILEPATH(ann);
-s_char *commfil = FILEPATH(comm);
-s_char *banfil = FILEPATH(ban);
-s_char *authfil = FILEPATH(auth);
-s_char *timestampfil = FILEPATH(timestamp);
-s_char *lostfil = FILEPATH(lostitems);
-
-#if !defined(_WIN32)
-s_char *playerbin = EMPPATH(bin / emp_player);
-s_char *updatebin = EMPPATH(bin / emp_update);
-#else
-s_char *playerbin = EMPPATH(bin \\ emp_player);
-s_char *updatebin = EMPPATH(bin \\ emp_update);
-#endif
 s_char *loginport = EMP_PORT;