fix #43519

diff --git a/ChangeLog.j b/ChangeLog.j
index e6d0896..6cf1eca 100644 (file)
--- a/ChangeLog.j
+++ b/ChangeLog.j
@@ -1,3 +1,6 @@
+       * \8e\9f\82Ì\96â\91è\82ð\8fC\90³
+         * unix\8cn\82Å\83r\83\8b\83h\81E\83v\83\8c\83C\82Å\82«\82È\82¢ (#43519)
+
 Sat Jan  1 2022  SHIRAKATA Kentaro  <argrath@ub32.org>
 
        * \8e\9f\82Ì\96â\91è\82ð\8fC\90³

diff --git a/util/makedefs.c b/util/makedefs.c
index 66fe961..62537af 100644 (file)
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -1559,33 +1559,16 @@ build_savebones_compat_string()
 #ifdef VERSION_COMPATIBILITY
     unsigned long uver = VERSION_COMPATIBILITY;
 #endif
-#if 0 /*JP*/
     Strcpy(save_bones_compat_buf,
            "save and bones files accepted from version");
-#else
-    Strcpy(save_bones_compat_buf,
-           "\8eg\82¦\82é\83Z\81[\83u\82Æ\8d\9c\83t\83@\83C\83\8b\82Í\83o\81[\83W\83\87\83\93");
-#endif
 #ifdef VERSION_COMPATIBILITY
-#if 0 /*JP*/
     Sprintf(eos(save_bones_compat_buf), "s %lu.%lu.%lu through %d.%d.%d",
             ((uver & 0xFF000000L) >> 24), ((uver & 0x00FF0000L) >> 16),
             ((uver & 0x0000FF00L) >> 8), VERSION_MAJOR, VERSION_MINOR,
             PATCHLEVEL);
 #else
-    Sprintf(eos(save_bones_compat_buf), "%lu.%lu.%lu\82©\82ç%d.%d.%d",
-            ((uver & 0xFF000000L) >> 24), ((uver & 0x00FF0000L) >> 16),
-            ((uver & 0x0000FF00L) >> 8), VERSION_MAJOR, VERSION_MINOR,
-            PATCHLEVEL);
-#endif
-#else
-#if 0 /*JP*/
     Sprintf(eos(save_bones_compat_buf), " %d.%d.%d only", VERSION_MAJOR,
             VERSION_MINOR, PATCHLEVEL);
-#else
-    Sprintf(eos(save_bones_compat_buf), "%d.%d.%d\82Ì\82Ý", VERSION_MAJOR,
-            VERSION_MINOR, PATCHLEVEL);
-#endif
 #endif
 }
 
@@ -1597,17 +1580,11 @@ static const char *build_opts[] = {
     "ANSI default terminal",
 #endif
 #ifdef TEXTCOLOR
-/*JP
     "color",
-*/
-    "\83J\83\89\81[",
 #endif
 #ifdef TTY_GRAPHICS
 #ifdef TTY_TILES_ESCCODES
-/*JP
     "console escape codes for tile hinting",
-*/
-    "\83^\83C\83\8b\82Ì\83q\83\93\83g\82Ì\82½\82ß\82Ì\83R\83\93\83\\81[\83\8b\83G\83X\83P\81[\83v\83R\81[\83h",
 #endif
 #endif
 #ifdef COM_COMPL
@@ -1624,28 +1601,16 @@ static const char *build_opts[] = {
 #endif
 #ifdef DLB
 #ifndef VERSION_IN_DLB_FILENAME
-/*JP
     "data librarian",
-*/
-    "\83f\81[\83^\83t\83@\83C\83\8b",
 #else
-/*JP
     "data librarian with a version-dependent name",
-*/
-    "\83o\81[\83W\83\87\83\93\88Ë\91¶\83t\83@\83C\83\8b\96¼\82ª\95t\82¢\82½\83f\81[\83^\83t\83@\83C\83\8b",
 #endif
 #endif
 #ifdef DUMPLOG
-/*JP
     "end-of-game dumplogs",
-*/
-    "\83Q\81[\83\80\8fI\97¹\8e\9e\83f\81[\83^\83_\83\93\83v",
 #endif
 #ifdef HOLD_LOCKFILE_OPEN
-/*JP
     "exclusive lock on level 0 file",
-*/
-    "\83\8c\83x\83\8b0\83t\83@\83C\83\8b\82Å\82Ì\94r\91¼\83\8d\83b\83N",
 #endif
 #if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__))
     "external program as a message handler",
@@ -1654,28 +1619,16 @@ static const char *build_opts[] = {
     "floppy drive support",
 #endif
 #ifdef INSURANCE
-/*JP
     "insurance files for recovering from crashes",
-*/
-    "\83N\83\89\83b\83V\83\85\82©\82ç\82Ì\95\9c\8b\8c\82Ì\82½\82ß\82Ì\95Û\8c¯\83t\83@\83C\83\8b",
 #endif
 #ifdef LOGFILE
-/*JP
     "log file",
-*/
-    "\83\8d\83O\83t\83@\83C\83\8b",
 #endif
 #ifdef XLOGFILE
-/*JP
     "extended log file",
-*/
-    "\8ag\92£\83\8d\83O\83t\83@\83C\83\8b",
 #endif
 #ifdef PANICLOG
-/*JP
     "errors and warnings log file",
-*/
-    "\83G\83\89\81[\82Æ\8cx\8d\90\82Ì\83\8d\83O\83t\83@\83C\83\8b",
 #endif
 #ifdef MAIL
     "mail daemon",
@@ -1684,10 +1637,7 @@ static const char *build_opts[] = {
     "MSDOS protected mode",
 #endif
 #ifdef NEWS
-/*JP
     "news file",
-*/
-    "\83j\83\85\81[\83X\83t\83@\83C\83\8b",
 #endif
 #ifdef OVERLAY
 #ifdef MOVERLAY
@@ -1701,116 +1651,62 @@ static const char *build_opts[] = {
 #endif
 #endif
     /* pattern matching method will be substituted by nethack at run time */
-/*JP
     "pattern matching via :PATMATCH:",
-*/
-    ":PATMATCH:\82É\82æ\82é\83p\83^\81[\83\93\83}\83b\83`\83\93\83O",
 #ifdef USE_ISAAC64
-/*JP
     "pseudo random numbers generated by ISAAC64",
-*/
-    "ISAAC64\82É\82æ\82é\8b^\8e\97\97\90\90\94",
 #ifdef DEV_RANDOM
 #ifdef NHSTDC
     /* include which specific one */
-/*JP
     "strong PRNG seed available from " DEV_RANDOM,
-*/
-    DEV_RANDOM "\82É\82æ\82é\8b­\97Í\82È\8b^\8e\97\97\90\90\94\82Ì\8eí",
 #else
-/*JP
     "strong PRNG seed available from DEV_RANDOM",
-*/
-    "DEV_RANDOM\82É\82æ\82é\8b­\97Í\82È\8b^\8e\97\97\90\90\94\82Ì\8eí",
 #endif
 #else
 #ifdef WIN32
-/*JP
     "strong PRNG seed available from CNG BCryptGenRandom()",
-*/
-    "CNG BCryptGenRandom()\82É\82æ\82é\8b­\97Í\82È\8b^\8e\97\97\90\90\94\82Ì\8eí",
 #endif
 #endif  /* DEV_RANDOM */    
 #else   /* ISAAC64 */
 #ifdef RANDOM
-/*JP
     "pseudo random numbers generated by random()",
-*/
-    "random()\82É\82æ\82é\8b^\8e\97\97\90\90\94",
 #else
-/*JP
     "pseudo random numbers generated by C rand()",
-*/
-    "C rand()\82É\82æ\82é\8b^\8e\97\97\90\90\94",
 #endif
 #endif
 #ifdef SELECTSAVED
-/*JP
     "restore saved games via menu",
-*/
-    "\83Z\81[\83u\83f\81[\83^\82Ì\83\81\83j\83\85\81[\91I\91ð",
 #endif
 #ifdef SCORE_ON_BOTL
-/*JP
     "score on status line",
-*/
-    "\83X\83e\81[\83^\83X\8ds\82Ì\83X\83R\83A\95\\8e¦",
 #endif
 #ifdef CLIPPING
-/*JP
     "screen clipping",
-*/
-    "\89æ\96Ê\82Ì\83N\83\8a\83b\83s\83\93\83O",
 #endif
 #ifdef NO_TERMS
 #ifdef MAC
-/*JP
     "screen control via mactty",
-*/
-    "mactty\82É\82æ\82é\89æ\96Ê\90§\8cä",
 #endif
 #ifdef SCREEN_BIOS
-/*JP
     "screen control via BIOS",
-*/
-    "BIOS\82É\82æ\82é\89æ\96Ê\90§\8cä",
 #endif
 #ifdef SCREEN_DJGPPFAST
-/*JP
     "screen control via DJGPP fast",
-*/
-    "DJGPP fast\82É\82æ\82é\89æ\96Ê\90§\8cä",
 #endif
 #ifdef SCREEN_VGA
-/*JP
     "screen control via VGA graphics",
-*/
-    "VGA\83O\83\89\83t\83B\83b\83N\82É\82æ\82é\89æ\96Ê\90§\8cä",
 #endif
 #ifdef WIN32CON
-/*JP
     "screen control via WIN32 console I/O",
-*/
-    "WIN32\83R\83\93\83\\81[\83\8bI/O\82É\82æ\82é\89æ\96Ê\90§\8cä",
 #endif
 #endif
 #ifdef SHELL
     "shell command",
 #endif
-/*JP
     "traditional status display",
-*/
-    "\93`\93\9d\93I\82È\83X\83e\81[\83^\83X\95\\8e¦",
 #ifdef STATUS_HILITES
-/*JP
     "status via windowport with highlighting",
-*/
-    "\83n\83C\83\89\83C\83g\95t\82«\82Ì\83E\83B\83\93\83h\83E\82É\82æ\82é\83X\83e\81[\83^\83X",
 #else
-/*JP
     "status via windowport without highlighting",
-*/
-    "\83n\83C\83\89\83C\83g\82È\82µ\82Ì\83E\83B\83\93\83h\83E\82É\82æ\82é\83X\83e\81[\83^\83X",
 #endif
 #ifdef SUSPEND
     "suspend command",
@@ -1838,10 +1734,7 @@ static const char *build_opts[] = {
     "timed wait for display effects",
 #endif
 #ifdef USER_SOUNDS
-/*JP
     "user sounds",
-*/
-    "\83T\83E\83\93\83h",
 #endif
 #ifdef PREFIXES_IN_USE
     "variable playground",
@@ -1856,16 +1749,10 @@ static const char *build_opts[] = {
     "run-length compression of map in save files",
 #endif
 #ifdef SYSCF
-/*JP
     "system configuration at run-time",
-*/
-    "\8eÀ\8ds\8e\9e\90Ý\92è\83t\83@\83C\83\8b",
 #endif
     save_bones_compat_buf,
-/*JP
     "and basic NetHack features"
-*/
-    "JNetHack\8aî\96{\8b@\94\"
 };
 
 struct win_info {
@@ -1885,18 +1772,12 @@ static struct win_info window_opts[] = {
 #else
       /* assume that one or more of IBMgraphics, DECgraphics, or MACgraphics
          can be enabled; we can't tell from here whether that is accurate */
-/*JP
       "traditional text with optional line-drawing"
-*/
-      "\93`\93\9d\93I\82È\83e\83L\83X\83g\95\\8e¦"
 #endif
     },
 #endif
 #ifdef CURSES_GRAPHICS
-/*JP
     { "curses", "terminal-based graphics" },
-*/
-    { "curses", "\92[\96\96\83x\81[\83X\83O\83\89\83t\83B\83b\83N" },
 #endif
 #ifdef X11_GRAPHICS
     { "X11", "X11" },
@@ -2029,10 +1910,7 @@ do_options()
 #endif
             );
 
-/*JP
     Fprintf(ofp, "\nOptions compiled into this edition:\n");
-*/
-    Fprintf(ofp, "\n\83R\83\93\83p\83C\83\8b\8e\9e\83I\83v\83V\83\87\83\93:\n");
     length = COLNO + 1; /* force 1st item onto new line */
     for (i = 0; i < SIZE(build_opts); i++) {
         opt_out_words(strcat(strcpy(buf, build_opts[i]),
@@ -2042,12 +1920,8 @@ do_options()
     Fprintf(ofp, "\n"); /* terminate last line of words */
 
     winsyscnt = SIZE(window_opts) - 1;
-#if 0 /*JP:T*/
     Fprintf(ofp, "\nSupported windowing system%s:\n",
             (winsyscnt > 1) ? "s" : "");
-#else
-    Fprintf(ofp, "\n\91Î\89\9e\83E\83B\83\93\83h\83E\83V\83X\83e\83\80:\n");
-#endif
     length = COLNO + 1; /* force 1st item onto new line */
     for (i = 0; i < winsyscnt; i++) {
         Sprintf(buf, "\"%s\"", window_opts[i].id);
@@ -2058,25 +1932,14 @@ do_options()
          * 2 : foo and bar  (note no period; comes from 'with default' below)
          * 3+: for, bar, and quux
          */
-#if 0 /*JP*/
         opt_out_words(strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */
                                   : (winsyscnt == 2 && i == 0) ? " and"
                                     : (i == winsyscnt - 2) ? ", and"
                                       : ","),
                       &length);
-#else
-        opt_out_words(strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */
-                                  : (winsyscnt == 2 && i == 0) ? ", "
-                                    : (i == winsyscnt - 2) ? ", "
-                                      : ","),
-                      &length);
-#endif
     }
     if (winsyscnt > 1) {
-/*JP
         Sprintf(buf, "with a default of \"%s\".", DEFAULT_WINDOW_SYS);
-*/
-        Sprintf(buf, "\83f\83t\83H\83\8b\83g\82Í\"%s\".", DEFAULT_WINDOW_SYS);
         opt_out_words(buf, &length);
     }
     Fprintf(ofp, "\n"); /* terminate last line of words */