From 64be5fd35a1e677ee7557a0067f035793acc6cfa Mon Sep 17 00:00:00 2001 From: Bart House Date: Tue, 25 Dec 2018 13:05:43 -0800 Subject: [PATCH] lock -> g.lock --- sys/be/bemain.c | 8 ++++---- sys/mac/macunix.c | 10 +++++----- sys/share/pcmain.c | 14 +++++++------- sys/share/pcunix.c | 14 +++++++------- sys/unix/unixunix.c | 22 +++++++++++----------- sys/vms/vmsunix.c | 26 +++++++++++++------------- sys/wince/winhack.c | 14 +++++++------- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/sys/be/bemain.c b/sys/be/bemain.c index 8b9c1f108..869f6c302 100644 --- a/sys/be/bemain.c +++ b/sys/be/bemain.c @@ -236,10 +236,10 @@ getlock(void) { int fd; - Sprintf(lock, "%d%s", getuid(), g.plname); - regularize(lock); - set_levelfile_name(lock, 0); - fd = creat(lock, FCMASK); + Sprintf(g.lock, "%d%s", getuid(), g.plname); + regularize(g.lock); + set_levelfile_name(g.lock, 0); + fd = creat(g.lock, FCMASK); if (fd == -1) { error("cannot creat lock file."); } else { diff --git a/sys/mac/macunix.c b/sys/mac/macunix.c index 9eceacc03..ab078c204 100644 --- a/sys/mac/macunix.c +++ b/sys/mac/macunix.c @@ -24,16 +24,16 @@ getlock(void) int fd; int pid = getpid(); /* Process ID */ - Sprintf(lock, "%d%s", getuid(), g.plname); - set_levelfile_name(lock, 0); + Sprintf(g.lock, "%d%s", getuid(), g.plname); + set_levelfile_name(g.lock, 0); - if ((fd = open(lock, O_RDWR | O_EXCL | O_CREAT, LEVL_TYPE)) == -1) { - raw_printf("Could not lock the game %s.", lock); + if ((fd = open(g.lock, O_RDWR | O_EXCL | O_CREAT, LEVL_TYPE)) == -1) { + raw_printf("Could not lock the game %s.", g.lock); panic("Another game in progress?"); } if (write(fd, (char *) &pid, sizeof(pid)) != sizeof(pid)) { - raw_printf("Could not lock the game %s.", lock); + raw_printf("Could not lock the game %s.", g.lock); panic("Disk locked?"); } close(fd); diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c index a86283fde..c3c05d703 100644 --- a/sys/share/pcmain.c +++ b/sys/share/pcmain.c @@ -421,22 +421,22 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/ * overwritten without confirmation when a user starts up * another game with the same player name. */ - Strcpy(lock, g.plname); - regularize(lock); + Strcpy(g.lock, g.plname); + regularize(g.lock); getlock(); #else /* What follows is !PC_LOCKING */ #ifdef AMIGA /* We'll put the bones & levels in the user specified directory \ -jhsa */ - Strcat(lock, g.plname); - Strcat(lock, ".99"); + Strcat(g.lock, g.plname); + Strcat(g.lock, ".99"); #else #ifndef MFLOPPY /* I'm not sure what, if anything, is left here, but MFLOPPY has * conflicts with set_lock_and_bones() in files.c. */ - Strcpy(lock, g.plname); - Strcat(lock, ".99"); - regularize(lock); /* is this necessary? */ + Strcpy(g.lock, g.plname); + Strcat(g.lock, ".99"); + regularize(g.lock); /* is this necessary? */ /* not compatible with full path a la AMIGA */ #endif #endif diff --git a/sys/share/pcunix.c b/sys/share/pcunix.c index 064d57d57..8956ba3bc 100644 --- a/sys/share/pcunix.c +++ b/sys/share/pcunix.c @@ -85,14 +85,14 @@ eraseoldlocks() */ for (i = 1; i <= MAXDUNGEON * MAXLEVEL + 1; i++) { /* try to remove all */ - set_levelfile_name(lock, i); - (void) unlink(fqname(lock, LEVELPREFIX, 0)); + set_levelfile_name(g.lock, i); + (void) unlink(fqname(g.lock, LEVELPREFIX, 0)); } - set_levelfile_name(lock, 0); + set_levelfile_name(g.lock, 0); #ifdef HOLD_LOCKFILE_OPEN really_close(); #endif - if (unlink(fqname(lock, LEVELPREFIX, 0))) + if (unlink(fqname(g.lock, LEVELPREFIX, 0))) return 0; /* cannot remove it */ return (1); /* success! */ } @@ -117,9 +117,9 @@ getlock() } /* regularize(lock); */ /* already done in pcmain */ - Sprintf(tbuf, "%s", fqname(lock, LEVELPREFIX, 0)); - set_levelfile_name(lock, 0); - fq_lock = fqname(lock, LEVELPREFIX, 1); + Sprintf(tbuf, "%s", fqname(g.lock, LEVELPREFIX, 0)); + set_levelfile_name(g.lock, 0); + fq_lock = fqname(g.lock, LEVELPREFIX, 1); if ((fd = open(fq_lock, 0)) == -1) { if (errno == ENOENT) goto gotlock; /* no such file */ diff --git a/sys/unix/unixunix.c b/sys/unix/unixunix.c index 126fab629..546c9a185 100644 --- a/sys/unix/unixunix.c +++ b/sys/unix/unixunix.c @@ -82,11 +82,11 @@ eraseoldlocks() */ for (i = 1; i <= MAXDUNGEON * MAXLEVEL + 1; i++) { /* try to remove all */ - set_levelfile_name(lock, i); - (void) unlink(fqname(lock, LEVELPREFIX, 0)); + set_levelfile_name(g.lock, i); + (void) unlink(fqname(g.lock, LEVELPREFIX, 0)); } - set_levelfile_name(lock, 0); - if (unlink(fqname(lock, LEVELPREFIX, 0))) + set_levelfile_name(g.lock, 0); + if (unlink(fqname(g.lock, LEVELPREFIX, 0))) return 0; /* cannot remove it */ return 1; /* success! */ } @@ -116,22 +116,22 @@ getlock() error("%s", ""); } - /* default value of lock[] is "1lock" where '1' gets changed to + /* default value of g.lock[] is "1lock" where '1' gets changed to 'a','b',&c below; override the default and use if we aren't restricting the number of simultaneous games */ if (!g.locknum) - Sprintf(lock, "%u%s", (unsigned) getuid(), g.plname); + Sprintf(g.lock, "%u%s", (unsigned) getuid(), g.plname); - regularize(lock); - set_levelfile_name(lock, 0); + regularize(g.lock); + set_levelfile_name(g.lock, 0); if (g.locknum) { if (g.locknum > 25) g.locknum = 25; do { - lock[0] = 'a' + i++; - fq_lock = fqname(lock, LEVELPREFIX, 0); + g.lock[0] = 'a' + i++; + fq_lock = fqname(g.lock, LEVELPREFIX, 0); if ((fd = open(fq_lock, 0)) == -1) { if (errno == ENOENT) @@ -150,7 +150,7 @@ getlock() unlock_file(HLOCK); error("Too many hacks running now."); } else { - fq_lock = fqname(lock, LEVELPREFIX, 0); + fq_lock = fqname(g.lock, LEVELPREFIX, 0); if ((fd = open(fq_lock, 0)) == -1) { if (errno == ENOENT) goto gotlock; /* no such file */ diff --git a/sys/vms/vmsunix.c b/sys/vms/vmsunix.c index d79d2aa91..81e71efeb 100644 --- a/sys/vms/vmsunix.c +++ b/sys/vms/vmsunix.c @@ -77,11 +77,11 @@ int fd; */ for (i = 1; i <= MAXDUNGEON * MAXLEVEL + 1; i++) { /* try to remove all */ - set_levelfile_name(lock, i); - (void) delete (lock); + set_levelfile_name(g.lock, i); + (void) delete (g.lock); } - set_levelfile_name(lock, 0); - if (delete (lock)) + set_levelfile_name(g.lock, 0); + if (delete (g.lock)) return 0; /* cannot remove it */ return 1; /* success! */ } @@ -106,27 +106,27 @@ getlock() error("Quitting."); } - /* default value of lock[] is "1lock" where '1' gets changed to + /* default value of g.lock[] is "1lock" where '1' gets changed to 'a','b',&c below; override the default and use if we aren't restricting the number of simultaneous games */ if (!g.locknum) - Sprintf(lock, "_%u%s", (unsigned) getuid(), plname); + Sprintf(g.lock, "_%u%s", (unsigned) getuid(), plname); - regularize(lock); - set_levelfile_name(lock, 0); + regularize(g.lock); + set_levelfile_name(g.lock, 0); if (g.locknum > 25) g.locknum = 25; do { if (g.locknum) - lock[0] = 'a' + i++; + g.lock[0] = 'a' + i++; - if ((fd = open(lock, 0, 0)) == -1) { + if ((fd = open(g.lock, 0, 0)) == -1) { if (errno == ENOENT) goto gotlock; /* no such file */ - perror(lock); + perror(g.lock); unlock_file(HLOCK); - error("Cannot open %s", lock); + error("Cannot open %s", g.lock); } if (veryold(fd)) /* if true, this closes fd and unlinks lock */ @@ -139,7 +139,7 @@ getlock() : "There is a game in progress under your name."); gotlock: - fd = creat(lock, FCMASK); + fd = creat(g.lock, FCMASK); unlock_file(HLOCK); if (fd == -1) { error("cannot creat lock file."); diff --git a/sys/wince/winhack.c b/sys/wince/winhack.c index c062c6622..bca6d5937 100644 --- a/sys/wince/winhack.c +++ b/sys/wince/winhack.c @@ -167,11 +167,11 @@ eraseoldlocks() */ for (i = 1; i <= MAXDUNGEON * MAXLEVEL + 1; i++) { /* try to remove all */ - set_levelfile_name(lock, i); - (void) unlink(fqname(lock, LEVELPREFIX, 0)); + set_levelfile_name(g.lock, i); + (void) unlink(fqname(g.lock, LEVELPREFIX, 0)); } - set_levelfile_name(lock, 0); - if (unlink(fqname(lock, LEVELPREFIX, 0))) + set_levelfile_name(g.lock, 0); + if (unlink(fqname(g.lock, LEVELPREFIX, 0))) return 0; /* cannot remove it */ return (1); /* success! */ } @@ -187,9 +187,9 @@ getlock() int choice; /* regularize(lock); */ /* already done in pcmain */ - Sprintf(tbuf, "%s", fqname(lock, LEVELPREFIX, 0)); - set_levelfile_name(lock, 0); - fq_lock = fqname(lock, LEVELPREFIX, 1); + Sprintf(tbuf, "%s", fqname(g.lock, LEVELPREFIX, 0)); + set_levelfile_name(g.lock, 0); + fq_lock = fqname(g.lock, LEVELPREFIX, 1); f = CreateFile(NH_A2W(fq_lock, wbuf, BUFSZ), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);