Changes needed in various ports due to globals changes.

This commit is contained in:
Bart House
2018-12-24 14:47:51 -08:00
parent 62e1a45b60
commit e5e906dc3b
33 changed files with 112 additions and 112 deletions

View File

@@ -132,14 +132,14 @@ whoami(void)
*/
char *s;
if (*plname)
if (*g.plname)
return;
if (s = nh_getenv("USER")) {
(void) strncpy(plname, s, sizeof(plname) - 1);
(void) strncpy(g.plname, s, sizeof(g.plname) - 1);
return;
}
if (s = nh_getenv("LOGNAME")) {
(void) strncpy(plname, s, sizeof(plname) - 1);
(void) strncpy(g.plname, s, sizeof(g.plname) - 1);
return;
}
}
@@ -177,11 +177,11 @@ process_options(int argc, char **argv)
#endif
case 'u':
if (argv[0][2])
(void) strncpy(plname, argv[0] + 2, sizeof(plname) - 1);
(void) strncpy(g.plname, argv[0] + 2, sizeof(g.plname) - 1);
else if (argc > 1) {
argc--;
argv++;
(void) strncpy(plname, argv[0], sizeof(plname) - 1);
(void) strncpy(g.plname, argv[0], sizeof(g.plname) - 1);
} else
raw_print("Player name expected after -u");
break;
@@ -236,7 +236,7 @@ getlock(void)
{
int fd;
Sprintf(lock, "%d%s", getuid(), plname);
Sprintf(lock, "%d%s", getuid(), g.plname);
regularize(lock);
set_levelfile_name(lock, 0);
fd = creat(lock, FCMASK);