Altered previous truncation fix and added OLC setting for the HUH message.

src/cedit.c

@@ -141,6 +141,7 @@ static void cedit_setup(struct descriptor_data *d)
 
   /* Allocate space for the strings. */
   OLC_CONFIG(d)->play.OK       = str_udup(CONFIG_OK);
+  OLC_CONFIG(d)->play.HUH      = str_udup(CONFIG_HUH);
   OLC_CONFIG(d)->play.NOPERSON = str_udup(CONFIG_NOPERSON);
   OLC_CONFIG(d)->play.NOEFFECT = str_udup(CONFIG_NOEFFECT);
 
@@ -246,6 +247,10 @@ static void cedit_save_internally(struct descriptor_data *d)
     free(CONFIG_OK);
   CONFIG_OK       = str_udup(OLC_CONFIG(d)->play.OK);
 
+  if (CONFIG_HUH)
+    free(CONFIG_HUH);
+  CONFIG_HUH      = str_udup(OLC_CONFIG(d)->play.HUH);
+
   if (CONFIG_NOPERSON)
     free(CONFIG_NOPERSON);
   CONFIG_NOPERSON = str_udup(OLC_CONFIG(d)->play.NOPERSON);
@@ -385,6 +390,12 @@ int save_config( IDXTYPE nowhere )
   fprintf(fl, "* Text sent to players when OK is all that is needed.\n"
               "ok = %s\n\n", buf);
 
+  strcpy(buf, CONFIG_HUH);
+  strip_cr(buf);
+
+  fprintf(fl, "* Text sent to players for an unrecognized command.\n"
+              "huh = %s\n\n", buf);
+
   strcpy(buf, CONFIG_NOPERSON);
   strip_cr(buf);
 
@@ -624,12 +635,13 @@ static void cedit_disp_game_play_options(struct descriptor_data *d)
         "%sR%s) Diagonal Directions         : %s%s\r\n"
         "%sS%s) Mortals Level To Immortal   : %s%s\r\n"
 	"%s1%s) OK Message Text         : %s%s"
-        "%s2%s) NOPERSON Message Text   : %s%s"
+	"%s2%s) HUH Message Text        : %s%s"
-        "%s3%s) NOEFFECT Message Text   : %s%s"
+        "%s3%s) NOPERSON Message Text   : %s%s"
-        "%s4%s) Map/Automap Option      : %s%s\r\n"
+        "%s4%s) NOEFFECT Message Text   : %s%s"
-        "%s5%s) Default map size        : %s%d\r\n"
+        "%s5%s) Map/Automap Option      : %s%s\r\n"
-        "%s6%s) Default minimap size    : %s%d\r\n"
+        "%s6%s) Default map size        : %s%d\r\n"
-        "%s7%s) Scripts on PC's         : %s%s\r\n"
+        "%s7%s) Default minimap size    : %s%d\r\n"
+        "%s8%s) Scripts on PC's         : %s%s\r\n"
         "%sQ%s) Exit To The Main Menu\r\n"
         "Enter your choice : ",
         grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->play.pk_allowed),
@@ -653,6 +665,7 @@ static void cedit_disp_game_play_options(struct descriptor_data *d)
         grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->play.no_mort_to_immort),
 
         grn, nrm, cyn, OLC_CONFIG(d)->play.OK,
+        grn, nrm, cyn, OLC_CONFIG(d)->play.HUH,
         grn, nrm, cyn, OLC_CONFIG(d)->play.NOPERSON,
         grn, nrm, cyn, OLC_CONFIG(d)->play.NOEFFECT,
         grn, nrm, cyn, m_opt == 0 ? "Off" : (m_opt == 1 ? "On" : (m_opt == 2 ? "Imm-Only" : "Invalid!")),
@@ -974,16 +987,21 @@ void cedit_parse(struct descriptor_data *d, char *arg)
           return;
 
         case '2':
+          write_to_output(d, "Enter the HUH message : ");
+          OLC_MODE(d) = CEDIT_HUH;
+          return;
+
+        case '3':
           write_to_output(d, "Enter the NOPERSON message : ");
           OLC_MODE(d) = CEDIT_NOPERSON;
           return;
 
-        case '3':
+        case '4':
           write_to_output(d, "Enter the NOEFFECT message : ");
           OLC_MODE(d) = CEDIT_NOEFFECT;
           return;
 
-        case '4':
+        case '5':
           write_to_output(d, "1) Disable maps\r\n");
           write_to_output(d, "2) Enable Maps\r\n");
           write_to_output(d, "3) Maps for Immortals only\r\n");
@@ -991,16 +1009,16 @@ void cedit_parse(struct descriptor_data *d, char *arg)
           OLC_MODE(d) = CEDIT_MAP_OPTION;
           return;
 
-        case '5':
+        case '6':
           write_to_output(d, "Enter default map size (1-12) : ");
           OLC_MODE(d) = CEDIT_MAP_SIZE;
           return;
 
-        case '6':
+        case '7':
           write_to_output(d, "Enter default mini-map size (1-12) : ");
           OLC_MODE(d) = CEDIT_MINIMAP_SIZE;
           return;
-        case '7':
+        case '8':
           TOGGLE_VAR(OLC_CONFIG(d)->play.script_players);
           break;
 
@@ -1406,6 +1424,18 @@ void cedit_parse(struct descriptor_data *d, char *arg)
       cedit_disp_game_play_options(d);
       break;
 
+    case CEDIT_HUH:
+      if (!genolc_checkstring(d, arg))
+        break;
+
+      if (OLC_CONFIG(d)->play.HUH)
+        free(OLC_CONFIG(d)->play.HUH);
+
+      OLC_CONFIG(d)->play.HUH = str_udupnl(arg);
+
+      cedit_disp_game_play_options(d);
+      break;
+
     case CEDIT_NOPERSON:
       if (!genolc_checkstring(d, arg))
         break;

src/config.c

@@ -87,6 +87,7 @@ int load_into_inventory = YES;
 
 /* "okay" etc. */
 const char *OK = "Okay.\r\n";
+const char *HUH = "Huh!?!\r\n";
 const char *NOPERSON = "No one by that name here.\r\n";
 const char *NOEFFECT = "Nothing seems to happen.\r\n";
 

src/config.h

@@ -31,6 +31,7 @@ extern int idle_max_level;
 extern int dts_are_dumps;
 extern int load_into_inventory;
 extern const char *OK;
+extern const char *HUH;
 extern const char *NOPERSON;
 extern const char *NOEFFECT;
 extern int track_through_doors;

src/db.c

@@ -3788,6 +3788,7 @@ static void load_default_config( void )
   CONFIG_DTS_ARE_DUMPS	        = dts_are_dumps;
   CONFIG_LOAD_INVENTORY         = load_into_inventory;
   CONFIG_OK			= strdup(OK);
+  CONFIG_HUH			= strdup(HUH);
   CONFIG_NOPERSON	        = strdup(NOPERSON);
   CONFIG_NOEFFECT	        = strdup(NOEFFECT);
   CONFIG_TRACK_T_DOORS          = track_through_doors;
@@ -3944,6 +3945,13 @@ void load_config( void )
       case 'h':
         if (!str_cmp(tag, "holler_move_cost"))
           CONFIG_HOLLER_MOVE_COST = num;
+        else if (!str_cmp(tag, "huh")) {
+          char tmp[READ_SIZE];
+          if (CONFIG_HUH)
+            free(CONFIG_HUH);
+          snprintf(tmp, sizeof(tmp), "%s\r\n", line);
+          CONFIG_HUH = strdup(tmp);
+        }
         break;
 
       case 'i':

src/dg_mobcmd.c

@@ -56,7 +56,7 @@ ACMD(do_masound)
 
     if (!MOB_OR_IMPL(ch))
     {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -94,7 +94,7 @@ ACMD(do_mkill)
     char_data *victim;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -148,7 +148,7 @@ ACMD(do_mjunk)
     obj_data *obj_next;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -195,7 +195,7 @@ ACMD(do_mechoaround)
     char *p;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -231,7 +231,7 @@ ACMD(do_msend)
     char *p;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -265,7 +265,7 @@ ACMD(do_mecho)
     char *p;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -290,7 +290,7 @@ ACMD(do_mzoneecho)
         
     if (!MOB_OR_IMPL(ch))
     {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
     msg = any_one_arg(argument, room_number);
@@ -322,7 +322,7 @@ ACMD(do_mload)
     int pos;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -423,7 +423,7 @@ ACMD(do_mpurge)
   obj_data  *obj;
 
   if (!MOB_OR_IMPL(ch)) {
-    send_to_char(ch, "Huh?!?\r\n");
+    send_to_char(ch, "%s", CONFIG_HUH);
     return;
   }
 
@@ -490,7 +490,7 @@ ACMD(do_mgoto)
     room_rnum location;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -524,7 +524,7 @@ ACMD(do_mat)
     room_rnum location, original;
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -564,7 +564,7 @@ ACMD(do_mteleport)
   char_data *vict, *next_ch;
 
   if (!MOB_OR_IMPL(ch)) {
-    send_to_char(ch, "Huh?!?\r\n");
+    send_to_char(ch, "%s", CONFIG_HUH);
     return;
   }
 
@@ -625,7 +625,7 @@ ACMD(do_mdamage) {
   char_data *vict;
 
   if (!MOB_OR_IMPL(ch)) {
-    send_to_char(ch, "Huh?!?\r\n");
+    send_to_char(ch, "%s", CONFIG_HUH);
     return;
   }
 
@@ -660,7 +660,7 @@ ACMD(do_mforce)
     char arg[MAX_INPUT_LENGTH];
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -721,7 +721,7 @@ ACMD(do_mhunt)
     char arg[MAX_INPUT_LENGTH];
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -763,7 +763,7 @@ ACMD(do_mremember)
     char arg[MAX_INPUT_LENGTH];
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -814,7 +814,7 @@ ACMD(do_mforget)
     char arg[MAX_INPUT_LENGTH];
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -873,7 +873,7 @@ ACMD(do_mtransform)
   int pos;
 
   if (!MOB_OR_IMPL(ch)) {
-    send_to_char(ch, "Huh?!?\r\n");
+    send_to_char(ch, "%s", CONFIG_HUH);
     return;
   }
 
@@ -986,7 +986,7 @@ ACMD(do_mdoor)
     };
 
     if (!MOB_OR_IMPL(ch)) {
-        send_to_char(ch, "Huh?!?\r\n");
+        send_to_char(ch, "%s", CONFIG_HUH);
         return;
     }
 
@@ -1074,7 +1074,7 @@ ACMD(do_mfollow)
   struct follow_type *j, *k;
 
   if (!MOB_OR_IMPL(ch)) {
-    send_to_char(ch, "Huh?!?\r\n");
+    send_to_char(ch, "%s", CONFIG_HUH);
     return;
   }
 
@@ -1145,7 +1145,7 @@ ACMD(do_mrecho)
     char start[MAX_INPUT_LENGTH], finish[MAX_INPUT_LENGTH], *msg;
 
     if (!MOB_OR_IMPL(ch)) {
-      send_to_char(ch, "Huh?!?\r\n");
+      send_to_char(ch, "%s", CONFIG_HUH);
       return;
     }
     msg = two_arguments(argument, start, finish);

src/genolc.c

@@ -82,11 +82,13 @@ char *str_udupnl(const char *txt)
 {
   char *str = NULL, undef[] = "undefined";
   const char *ptr = NULL;
+  size_t n;
 
   ptr = (txt && *txt) ? txt : undef;
-  CREATE(str, char, strlen(ptr) + 3);
+  n = strlen(ptr) + 3;
 
-  strlcpy(str, ptr, strlen(str));
+  CREATE(str, char, n);
+  strlcpy(str, ptr, n);
   strcat(str, "\r\n");
 
   return str;

src/interpreter.c

@@ -528,7 +528,7 @@ void command_interpreter(struct char_data *ch, char *argument)
 
   if (*complete_cmd_info[cmd].command == '\n') {
     int found = 0;
-    send_to_char(ch, "Huh!?!\r\n");
+    send_to_char(ch, "%s", CONFIG_HUH);
 
     for (cmd = 0; *cmd_info[cmd].command != '\n'; cmd++)
     {

src/oasis.h

@@ -331,14 +331,15 @@ extern const char *nrm, *grn, *cyn, *yel;
 #define CEDIT_ROOM_NUMBERS_MENU		6
 #define CEDIT_AUTOWIZ_OPTIONS_MENU	7
 #define CEDIT_OK			8
-#define CEDIT_NOPERSON			9
+#define CEDIT_HUH			9
-#define CEDIT_NOEFFECT			10
+#define CEDIT_NOPERSON			10
-#define CEDIT_DFLT_IP			11
+#define CEDIT_NOEFFECT			11
-#define CEDIT_DFLT_DIR			12
+#define CEDIT_DFLT_IP			12
-#define CEDIT_LOGNAME			13
+#define CEDIT_DFLT_DIR			13
-#define CEDIT_MENU			14
+#define CEDIT_LOGNAME			14
-#define CEDIT_WELC_MESSG		15
+#define CEDIT_MENU			15
-#define CEDIT_START_MESSG		16
+#define CEDIT_WELC_MESSG		16
+#define CEDIT_START_MESSG		17
 
 /* Numerical responses. */
 #define CEDIT_NUMERICAL_RESPONSE	20

src/oasis_delete.c

@@ -74,6 +74,9 @@ int free_strings(void *data, int type)
       if (config->play.OK)
         free(config->play.OK);
 
+      if (config->play.HUH)
+        free(config->play.HUH);
+
       if (config->play.NOPERSON)
         free(config->play.NOPERSON);
 

src/quest.c

@@ -658,9 +658,7 @@ void quest_stat(struct char_data *ch, char argument[MAX_STRING_LENGTH])
   char buf[MAX_STRING_LENGTH];
   char targetname[MAX_STRING_LENGTH];
 
-  if (GET_LEVEL(ch) < LVL_IMMORT)
+  if (!*argument)
-    send_to_char(ch, "Huh!?!\r\n");
-  else if (!*argument)
     send_to_char(ch, "%s\r\n", quest_imm_usage);
   else if ((rnum = real_quest(atoi(argument))) == NOTHING )
     send_to_char(ch, "That quest does not exist.\r\n");

src/structs.h

@@ -1322,6 +1322,7 @@ struct game_data
   int script_players;     /**< Is attaching scripts to players allowed? */
 
   char *OK;       /**< When player receives 'Okay.' text.    */
+  char *HUH;      /**< 'Huh!?!'                              */ 
   char *NOPERSON; /**< 'No one by that name here.'           */
   char *NOEFFECT; /**< 'Nothing seems to happen.'            */
 };

src/utils.h

@@ -970,8 +970,10 @@ do                                                              \
 #define CONFIG_TRACK_T_DOORS    config_info.play.track_through_doors
 /** Get the permission to level up from mortal to immortal. */
 #define CONFIG_NO_MORT_TO_IMMORT config_info.play.no_mort_to_immort
-/** Get the 'OK' message. */
+/** Get the OK message. */
 #define CONFIG_OK               config_info.play.OK
+/** Get the HUH message. */
+#define CONFIG_HUH              config_info.play.HUH
 /** Get the NOPERSON message. */
 #define CONFIG_NOPERSON         config_info.play.NOPERSON
 /** Get the NOEFFECT message. */