#R667: a bug in character naming

- strip out '?' and several others.
- this means that people specifying character names
  fred? and fred* will collide. Oh well.

diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c
index 77a2df053dbc325dd3fb32149948ed733df93f8d..36b6ef1589c54fe1583922e9fa642b3afcc19f5e 100644 (file)
--- a/sys/share/pcmain.c
+++ b/sys/share/pcmain.c
@@ -287,12 +287,13 @@ char *argv[];
        /* Obtain the name of the logged on user and incorporate
         * it into the name. */
        Sprintf(lock, "%s-%s",get_username(0),plname);
+       regularize(lock);
 # else
        Strcpy(lock,plname);
        regularize(lock);
 # endif
        getlock();
-#else   /* PC_LOCKING */
+#else   /* What follows is !PC_LOCKING */
 # ifdef AMIGA /* We'll put the bones & levels in the user specified directory -jhsa */
        Strcat(lock,plname);
        Strcat(lock,".99");

diff --git a/sys/winnt/winnt.c b/sys/winnt/winnt.c
index 8af3c4573a0f69adaadf4323a147b706cc37bb75..d9d0d4b06b93859ab114947f4a2e384a2689c27b 100644 (file)
--- a/sys/winnt/winnt.c
+++ b/sys/winnt/winnt.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)winnt.c     3.4     1997/04/12               */
+/*     SCCS Id: @(#)winnt.c     3.4     2002/03/23               */
 /* Copyright (c) NetHack PC Development Team 1993, 1994 */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -151,10 +151,7 @@ def_kbhit()
 }
 
 /* 
- * Windows NT version >= 3.5x and above supports long file names,
- * even on FAT volumes (VFAT), so no need for nt_regularize.
- * Windows NT 3.1 could not do long file names except on NTFS,
- * so nt_regularize was required.
+ * Strip out troublesome file system characters.
  */
 
 void