tyler.durden
/
dgamelaunch
mirror of https://github.com/paxed/dgamelaunch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lockfile is global, not per-game variable 

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@352 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Pasi Kallinen 2007-03-31 21:29:45 +00:00
parent 89825b1ca4
commit d5636ad844
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.y
View File

@ -165,8 +165,8 @@ KeyPair: KeyType '=' TYPE_VALUE {
break; break;
case TYPE_PATH_LOCKFILE: case TYPE_PATH_LOCKFILE:
if (myconfig[ncnf]->lockfile) free (myconfig[ncnf]->lockfile); if (globalconfig.lockfile) free (globalconfig.lockfile);
myconfig[ncnf]->lockfile = strdup($3); globalconfig.lockfile = strdup($3);
break; break;
case TYPE_PATH_PASSWD: case TYPE_PATH_PASSWD:

6
dgamelaunch.c
View File

@ -1101,7 +1101,7 @@ readfile (int nolock)
if (!nolock) if (!nolock)
{ {
fpl = fopen (myconfig[0]->lockfile, "r"); fpl = fopen (globalconfig.lockfile, "r");
if (!fpl) if (!fpl)
graceful_exit (106); graceful_exit (106);
if (fcntl (fileno (fpl), F_SETLKW, &fl) == -1) if (fcntl (fileno (fpl), F_SETLKW, &fl) == -1)
@ -1314,7 +1314,7 @@ writefile (int requirenew)
sigaddset(&toblock, SIGTERM); sigaddset(&toblock, SIGTERM);
sigprocmask(SIG_BLOCK, &toblock, &oldmask); sigprocmask(SIG_BLOCK, &toblock, &oldmask);
fpl = fopen (myconfig[0]->lockfile, "r+"); fpl = fopen (globalconfig.lockfile, "r+");
if (!fpl) if (!fpl)
{ {
sigprocmask(SIG_SETMASK, &oldmask, NULL); sigprocmask(SIG_SETMASK, &oldmask, NULL);
@ -1971,7 +1971,7 @@ main (int argc, char** argv)
printf("gamepath:'%s'\n", myconfig[userchoice]->game_path); printf("gamepath:'%s'\n", myconfig[userchoice]->game_path);
printf("game:'%s'\n", myconfig[userchoice]->game_name); printf("game:'%s'\n", myconfig[userchoice]->game_name);
printf("dglroot:'%s'\n", globalconfig.dglroot); printf("dglroot:'%s'\n", globalconfig.dglroot);
printf("lockfile:'%s'\n", myconfig[userchoice]->lockfile); printf("lockfile:'%s'\n", globalconfig.lockfile);
printf("passwd:'%s'\n", globalconfig.passwd); printf("passwd:'%s'\n", globalconfig.passwd);
printf("banner:'%s'\n", globalconfig.banner); printf("banner:'%s'\n", globalconfig.banner);
printf("rcfile:'%s'\n", myconfig[userchoice]->rcfile); printf("rcfile:'%s'\n", myconfig[userchoice]->rcfile);

2
dgamelaunch.h
View File

@ -46,7 +46,6 @@ struct dg_config
char* game_path; char* game_path;
char* game_name; char* game_name;
char* chdir; char* chdir;
char* lockfile;
char* rcfile; char* rcfile;
char* spool; char* spool;
char* savefilefmt; char* savefilefmt;
@ -68,6 +67,7 @@ struct dg_globalconfig
uid_t shed_uid; uid_t shed_uid;
gid_t shed_gid; gid_t shed_gid;
char* passwd; char* passwd;
char* lockfile;
}; };
/* Global variables */ /* Global variables */

5
dgl-common.c
View File

@ -23,7 +23,7 @@ struct dg_config defconfig = {
/* game_name = */ "NetHack", /* game_name = */ "NetHack",
/* chdir = */ NULL, /* chdir = */ NULL,
/* dglroot = *//* "/dgldir/",*/ /* dglroot = *//* "/dgldir/",*/
/* lockfile = */ "/dgl-lock", /* lockfile = */ /*"/dgl-lock",*/
/* passwd = */ /*"/dgl-login",*/ /* passwd = */ /*"/dgl-login",*/
/* banner = */ /*"/dgl-banner",*/ /* banner = */ /*"/dgl-banner",*/
/* rcfile = */ NULL, /*"/dgl-default-rcfile",*/ /* rcfile = */ NULL, /*"/dgl-default-rcfile",*/
@ -328,7 +328,6 @@ create_config ()
if (!myconfig[tmp]->game_name) myconfig[tmp]->game_name = defconfig.game_name; if (!myconfig[tmp]->game_name) myconfig[tmp]->game_name = defconfig.game_name;
if (!myconfig[tmp]->rcfile) myconfig[tmp]->rcfile = defconfig.rcfile; if (!myconfig[tmp]->rcfile) myconfig[tmp]->rcfile = defconfig.rcfile;
if (!myconfig[tmp]->spool) myconfig[tmp]->spool = defconfig.spool; if (!myconfig[tmp]->spool) myconfig[tmp]->spool = defconfig.spool;
if (!myconfig[tmp]->lockfile) myconfig[tmp]->lockfile = defconfig.lockfile;
if (!myconfig[tmp]->savefilefmt) myconfig[tmp]->savefilefmt = defconfig.savefilefmt; if (!myconfig[tmp]->savefilefmt) myconfig[tmp]->savefilefmt = defconfig.savefilefmt;
if (!myconfig[tmp]->inprogressdir) myconfig[tmp]->inprogressdir = defconfig.inprogressdir; if (!myconfig[tmp]->inprogressdir) myconfig[tmp]->inprogressdir = defconfig.inprogressdir;
@ -342,7 +341,7 @@ create_config ()
if (!globalconfig.banner) globalconfig.banner = "/dgl-banner"; if (!globalconfig.banner) globalconfig.banner = "/dgl-banner";
if (!globalconfig.passwd) globalconfig.passwd = "/dgl-login"; if (!globalconfig.passwd) globalconfig.passwd = "/dgl-login";
if (!globalconfig.lockfile) globalconfig.lockfile = "/dgl-lock";
if (!globalconfig.shed_user && globalconfig.shed_uid == (uid_t)-1) if (!globalconfig.shed_user && globalconfig.shed_uid == (uid_t)-1)
{ {
struct passwd *pw; struct passwd *pw;