nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Avoid unixisms. On MacOSX, we cannot assume that the user will use

Browse Source 
a command-line option to set their name. Normally they will type
a name if asked - but they won't be asked if we pull their username
as a name.
This commit is contained in:
warwick
2003-09-11 04:22:55 +00:00
parent 656fe3689d
commit a80481a5e7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/unixmain.c
+5
View File
@@ -478,6 +478,10 @@ whoami() {
*/ */
register char *s; register char *s;
#if defined(__APPLE__)
/* Unixisms just confuse the user */
(void) strncpy(plname, "player", sizeof(plname)-1);
#else
if (*plname) return FALSE; if (*plname) return FALSE;
if(/* !*plname && */ (s = nh_getenv("USER"))) if(/* !*plname && */ (s = nh_getenv("USER")))
(void) strncpy(plname, s, sizeof(plname)-1); (void) strncpy(plname, s, sizeof(plname)-1);
@@ -485,6 +489,7 @@ whoami() {
(void) strncpy(plname, s, sizeof(plname)-1); (void) strncpy(plname, s, sizeof(plname)-1);
if(!*plname && (s = getlogin())) if(!*plname && (s = getlogin()))
(void) strncpy(plname, s, sizeof(plname)-1); (void) strncpy(plname, s, sizeof(plname)-1);
#endif
return TRUE; return TRUE;
} }