* Cleanup some HANDLEN usage

src/cmds.c

@@ -960,7 +960,7 @@ static void cmd_boot(int idx, char *par)
   if (strchr(who, '@') != NULL) {
     char whonick[HANDLEN + 1];
 
-    splitcn(whonick, who, '@', HANDLEN + 1);
+    splitcn(whonick, who, '@', sizeof(whonick));
     if (!strcasecmp(who, conf.bot->nick)) {
       cmd_boot(idx, whonick);
       return;

src/conf.c

@@ -902,7 +902,7 @@ fill_conf_bot(bool fatal)
   /* This first clause should actually be obsolete */
   if (!used_B && conf.bots && conf.bots->nick) {
     mynick = strdup(conf.bots->nick);
-    strlcpy(origbotnick, conf.bots->nick, HANDLEN + 1);
+    strlcpy(origbotnick, conf.bots->nick, sizeof(origbotnick));
   } else
     mynick = strldup(origbotnick, HANDLEN);
 

src/main.c

@@ -358,8 +358,8 @@ static void dtx_arg(int& argc, char *argv[])
         exit(0);
       case 'B':
         used_B = 1;
-        strlcpy(origbotname, optarg, HANDLEN + 1);
-        strlcpy(origbotnick, optarg, HANDLEN + 1);
+        strlcpy(origbotname, optarg, sizeof(origbotname));
+        strlcpy(origbotnick, optarg, sizeof(origbotnick));
         break;
       case 'H':
         printf("SHA1 (%s): %s\n", optarg, SHA1(optarg));
@@ -448,8 +448,8 @@ static void dtx_arg(int& argc, char *argv[])
 
   if ((argc - (optind - 1)) == 2) {
     used_B = 1;
-    strlcpy(origbotname, argv[optind], HANDLEN + 1);
-    strlcpy(origbotnick, argv[optind], HANDLEN + 1);
+    strlcpy(origbotname, argv[optind], sizeof(origbotname));
+    strlcpy(origbotnick, argv[optind], sizeof(origbotnick));
     /* Trim off .conf */
     p = strchr(origbotname, '.');
     if (p) {

src/misc.c

@@ -1000,7 +1000,7 @@ int bot_aggressive_to(struct userrec *u)
     }
   }
 
-  char mypval[HANDLEN + 4] = "", botpval[HANDLEN + 4] = "";
+  char mypval[HANDLEN + 3 + 1] = "", botpval[HANDLEN + 3 + 1] = "";
 
   link_pref_val(u, botpval);
   link_pref_val(conf.bot->u, mypval);

src/mod/irc.mod/cmdsirc.c

@@ -1863,7 +1863,6 @@ static void cmd_deluser(int idx, char *par)
     char buf[HANDLEN + 1] = "";
 
     strlcpy(buf, u->handle, sizeof buf);
-    buf[HANDLEN] = 0;
     if (deluser(u->handle)) {
       dprintf(idx, "Deleted %s.\n", buf); /* ?!?! :) */
       putlog(LOG_CMDS, "*", "#%s# deluser %s [%s]", dcc[idx].nick, nick, buf);

src/mod/share.mod/share.c

@@ -876,8 +876,8 @@ share_pls_ignore(int idx, char *par)
     if (strchr(from, 'p'))
       expire_time = 0;
     from = newsplit(&par);
-    if (strlen(from) > HANDLEN + 1)
-      from[HANDLEN + 1] = 0;
+    if (strlen(from) > HANDLEN)
+      from[HANDLEN] = 0;
     par[65] = 0;
     if (conf.bot->hub)
       putlog(LOG_CMDS, "@", "%s: ignore %s (%s: %s)", dcc[idx].nick, ign, from, par);