more beta

BETA_INFO was being used in win32 code but
it is only defined in version.c

src/version.c

@@ -14,14 +14,18 @@
 #include "patchlevel.h"
 #endif
 
-#define BETA_INFO " [beta16]"
+#define BETA_INFO "[beta16]"
 
 /* fill and return the given buffer with the nethack version string */
 char *
 getversionstring(buf)
 char *buf;
 {
-	return strcpy(buf, VERSION_ID);
+	 Strcpy(buf, VERSION_ID);
+#if defined(BETA) && defined(BETA_INFO)
+	 Sprintf(eos(buf), " %s", BETA_INFO);
+#endif
+	return buf;
 }
 
 int
@@ -29,12 +33,7 @@ doversion()
 {
 	char buf[BUFSZ];
 
-	pline("%s%s", getversionstring(buf),
-#if defined(BETA) && defined(BETA_INFO)
-		BETA_INFO);
-#else
-		"");
-#endif
+	pline("%s", getversionstring(buf));
 	return 0;
 }
 

win/win32/mhsplash.c

@@ -85,12 +85,6 @@ void mswin_display_splash_window (BOOL show_ver)
       char buf[BUFSZ];
 
   getversionstring(buf);
-  sprintf(eos(buf), "%s",
-#if defined(BETA) && defined(BETA_INFO)
-      BETA_INFO);
-#else
-      "");
-#endif
   SetWindowText(GetDlgItem(hWnd, IDC_EXTRAINFO), buf);
 
  } else {