Yes, that's correct.

See the attached patch.

-- 
James Cameron    mailto:quozl at us.netrek.org     http://quozl.netrek.org/
-------------- next part --------------

New patches:

[document getpath
quozl at us.netrek.org**20060901063830
 
 	* getpath.c: explain how it works.
 
] 
<
> {
hunk ./Vanilla/ntserv/getpath.c 14
 #include "struct.h"
 #include "data.h"
 
+/*
+
+getpath() initialises all the file name global variables, by
+concatenating one or more directory names and a file name to make a
+relative path to a file.
+
+The file name global variables are in data.c and data.h, but are not
+initialised there.  They are to be CamelCase.
+
+The file name macros are in defs.h.  They are to begin with N_.
+
+When adding a new file, you must edit each of data.c, data.h, and defs.h.
+
+When using a file from other code, you must include "data.h", and your
+main() must call getpath().
+
+*/
+
 void getpath()
 {
 #define MAXPATH 256
hunk ./Vanilla/ntserv/getpath.c 37
    char libdir[MAXPATH], sysconfdir[MAXPATH], localstatedir[MAXPATH];
 
+   /* define the directory names */
    snprintf(libdir, MAXPATH-1, "%s", LIBDIR);
    snprintf(sysconfdir, MAXPATH-1, "%s", SYSCONFDIR);
    snprintf(localstatedir, MAXPATH-1, "%s", LOCALSTATEDIR);
hunk ./Vanilla/ntserv/getpath.c 42
 
+   /* define the file names */
    sprintf(Global,"%s/%s",localstatedir,N_GLOBAL);
    sprintf(Scores,"%s/%s",localstatedir,N_SCORES);
    sprintf(PlFile,"%s/%s",localstatedir,N_PLFILE);
}

Context:

[fix army rescue on observ ghostbust, review
quozl at us.netrek.org**20060830112930
 
 	* daemonII.c: review of prior change, found a path that could lead to
 	  army rescue due to status change.  Fixed.
 
] 
[fix army rescue on observ ghostbust
quozl at us.netrek.org**20060830105148
 
 	* daemonII.c: avoid rescuing armies for observers.
 
] 
[Addendum to multi install instructions
williamb at its.caltech.edu**20060828182740
            * INSTALL: forgot to mention to rerun configure
 M ./Vanilla/INSTALL -1 +2
] 
[TAG 2006-08-29
quozl at us.netrek.org**20060829011619] 
Patch bundle hash:
9fbd99d5efc4ea1689fd2ad0f14e6a42dc89e0fd