* Removed some useless tcl functions

svn: 198

src/mod/channels.mod/tclchan.c

@@ -3,715 +3,6 @@
  *
  */
 
-static int tcl_killban STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " ban");
-  if (u_delban(NULL, argv[1], 1) > 0) {
-    for (chan = chanset; chan; chan = chan->next)
-      add_mode(chan, '-', 'b', argv[1]);
-    Tcl_AppendResult(irp, "1", NULL);
-  } else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_killchanban STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(3, 3, " channel ban");
-  chan = findchan_by_dname(argv[1]);
-  if (!chan) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (u_delban(chan, argv[2], 1) > 0) {
-    add_mode(chan, '-', 'b', argv[2]);
-    Tcl_AppendResult(irp, "1", NULL);
-  } else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_killexempt STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " exempt");
-  if (u_delexempt(NULL,argv[1],1) > 0) {
-    for (chan = chanset; chan; chan = chan->next)
-      add_mode(chan, '-', 'e', argv[1]);
-    Tcl_AppendResult(irp, "1", NULL);
-  } else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_killchanexempt STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(3, 3, " channel exempt");
-  chan = findchan_by_dname(argv[1]);
-  if (!chan) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (u_delexempt(chan, argv[2],1) > 0) {
-    add_mode(chan, '-', 'e', argv[2]);
-    Tcl_AppendResult(irp, "1", NULL);
-  } else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_killinvite STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " invite");
-  if (u_delinvite(NULL,argv[1],1) > 0) {
-    for (chan = chanset; chan; chan = chan->next)
-      add_mode(chan, '-', 'I', argv[1]);
-    Tcl_AppendResult(irp, "1", NULL);
-  } else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_killchaninvite STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(3, 3, " channel invite");
-  chan = findchan_by_dname(argv[1]);
-  if (!chan) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (u_delinvite(chan, argv[2],1) > 0) {
-    add_mode(chan, '-', 'I', argv[2]);
-    Tcl_AppendResult(irp, "1", NULL);
-   } else
-     Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_stick STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " ban ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_setsticky_ban(chan, argv[1], !strncmp(argv[0], "un", 2) ? 0 : 1))
-      ok = 1;
-  }
-  if (!ok && u_setsticky_ban(NULL, argv[1],
-      !strncmp(argv[0], "un", 2) ? 0 : 1))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_stickinvite STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " ban ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_setsticky_invite(chan, argv[1], !strncmp(argv[0], "un", 2) ? 0 : 1))
-      ok = 1;
-  }
-  if (!ok && u_setsticky_invite(NULL, argv[1],
-      !strncmp(argv[0], "un", 2) ? 0 : 1))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_stickexempt STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " ban ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_setsticky_exempt(chan, argv[1], !strncmp(argv[0], "un", 2) ? 0 : 1))
-      ok = 1;
-  }
-  if (!ok && u_setsticky_exempt(NULL, argv[1],
-      !strncmp(argv[0], "un", 2) ? 0 : 1))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_isban STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " ban ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_equals_mask(chan->bans, argv[1]))
-      ok = 1;
-  }
-  if (u_equals_mask(global_bans, argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_isexempt STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " exempt ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_equals_mask(chan->exempts, argv[1]))
-      ok = 1;
-  }
-  if (u_equals_mask(global_exempts,argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_isinvite STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " invite ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_equals_mask(chan->invites, argv[1]))
-      ok = 1;
-  }
-  if (u_equals_mask(global_invites,argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-
-static int tcl_isbansticky STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " ban ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_sticky_mask(chan->bans, argv[1]))
-      ok = 1;
-  }
-  if (u_sticky_mask(global_bans, argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_isexemptsticky STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " exempt ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_sticky_mask(chan->exempts, argv[1]))
-      ok = 1;
-  }
-  if (u_sticky_mask(global_exempts,argv[1]))
-    ok = 1;
-  if (ok)
-       Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_isinvitesticky STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " invite ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (!chan) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_sticky_mask(chan->invites, argv[1]))
-      ok = 1;
-  }
-  if (u_sticky_mask(global_invites,argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-       Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_ispermban STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " ban ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_equals_mask(chan->bans, argv[1]) == 2)
-      ok = 1;
-  }
-  if (u_equals_mask(global_bans, argv[1]) == 2)
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_ispermexempt STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " exempt ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_equals_mask(chan->exempts, argv[1]) == 2)
-      ok = 1;
-  }
-  if (u_equals_mask(global_exempts,argv[1]) == 2)
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-   else
-     Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_isperminvite STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " invite ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_equals_mask(chan->invites, argv[1]) == 2)
-      ok = 1;
-  }
-  if (u_equals_mask(global_invites,argv[1]) == 2)
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_matchban STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " user!nick@host ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_match_mask(chan->bans, argv[1]))
-      ok = 1;
-  }
-  if (u_match_mask(global_bans, argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_matchexempt STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " user!nick@host ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_match_mask(chan->exempts, argv[1]))
-      ok = 1;
-  }
-  if (u_match_mask(global_exempts,argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_matchinvite STDVAR
-{
-  struct chanset_t *chan;
-  int ok = 0;
-
-  BADARGS(2, 3, " user!nick@host ?channel?");
-  if (argc == 3) {
-    chan = findchan_by_dname(argv[2]);
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-    if (u_match_mask(chan->invites, argv[1]))
-      ok = 1;
-  }
-  if (u_match_mask(global_invites,argv[1]))
-    ok = 1;
-  if (ok)
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_newchanban STDVAR
-{
-  time_t expire_time;
-  struct chanset_t *chan;
-  char ban[161], cmt[MASKREASON_LEN], from[HANDLEN + 1];
-  int sticky = 0;
-  module_entry *me;
-
-  BADARGS(5, 7, " channel ban creator comment ?lifetime? ?options?");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (argc == 7) {
-    if (!egg_strcasecmp(argv[6], "none"));
-    else if (!egg_strcasecmp(argv[6], "sticky"))
-      sticky = 1;
-    else {
-      Tcl_AppendResult(irp, "invalid option ", argv[6], " (must be one of: ",
-		       "sticky, none)", NULL);
-      return TCL_ERROR;
-    }
-  }
-  strncpyz(ban, argv[2], sizeof ban);
-  strncpyz(from, argv[3], sizeof from);
-  strncpyz(cmt, argv[4], sizeof cmt);
-  if (argc == 5) {
-    if (chan->ban_time == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (60 * chan->ban_time);
-  }
-  else {
-    if (atoi(argv[5]) == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (atoi(argv[5]) * 60);
-  }
-  if (u_addban(chan, ban, from, cmt, expire_time, sticky))
-    if ((me = module_find("irc", 0, 0)))
-      (me->funcs[IRC_CHECK_THIS_BAN])(chan, ban, sticky);
-  return TCL_OK;
-}
-
-static int tcl_newban STDVAR
-{
-  time_t expire_time;
-  struct chanset_t *chan;
-  char ban[UHOSTLEN], cmt[MASKREASON_LEN], from[HANDLEN + 1];
-  int sticky = 0;
-  module_entry *me;
-
-  BADARGS(4, 6, " ban creator comment ?lifetime? ?options?");
-  if (argc == 6) {
-    if (!egg_strcasecmp(argv[5], "none"));
-    else if (!egg_strcasecmp(argv[5], "sticky"))
-      sticky = 1;
-    else {
-      Tcl_AppendResult(irp, "invalid option ", argv[5], " (must be one of: ",
-		       "sticky, none)", NULL);
-      return TCL_ERROR;
-    }
-  }
-  strncpyz(ban, argv[1], sizeof ban);
-  strncpyz(from, argv[2], sizeof from);
-  strncpyz(cmt, argv[3], sizeof cmt);
-  if (argc == 4) {
-    if (global_ban_time == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (60 * global_ban_time);
-  }
-  else {
-    if (atoi(argv[4]) == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (atoi(argv[4]) * 60);
-  }
-  if (u_addban(NULL, ban, from, cmt, expire_time, sticky))
-    if ((me = module_find("irc", 0, 0)))
-      for (chan = chanset; chan != NULL; chan = chan->next)
-	(me->funcs[IRC_CHECK_THIS_BAN])(chan, ban, sticky);
-  return TCL_OK;
-}
-
-static int tcl_newchanexempt STDVAR
-{
-  time_t expire_time;
-  struct chanset_t *chan;
-  char exempt[161], cmt[MASKREASON_LEN], from[HANDLEN + 1];
-  int sticky = 0;
-
-  BADARGS(5, 7, " channel exempt creator comment ?lifetime? ?options?");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (argc == 7) {
-    if (!egg_strcasecmp(argv[6], "none"));
-    else if (!egg_strcasecmp(argv[6], "sticky"))
-      sticky = 1;
-    else {
-      Tcl_AppendResult(irp, "invalid option ", argv[6], " (must be one of: ",
-		       "sticky, none)", NULL);
-      return TCL_ERROR;
-    }
-  }
-  strncpyz(exempt, argv[2], sizeof exempt);
-  strncpyz(from, argv[3], sizeof from);
-  strncpyz(cmt, argv[4], sizeof cmt);
-  if (argc == 5) {
-    if (chan->exempt_time == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (60 * chan->exempt_time);
-  }
-  else {
-    if (atoi(argv[5]) == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (atoi(argv[5]) * 60);
-  }
-  if (u_addexempt(chan, exempt, from, cmt, expire_time,sticky))
-      add_mode(chan, '+', 'e', exempt);
-  return TCL_OK;
-}
-
-static int tcl_newexempt STDVAR
-{
-  time_t expire_time;
-  struct chanset_t *chan;
-  char exempt[UHOSTLEN], cmt[MASKREASON_LEN], from[HANDLEN + 1];
-  int sticky = 0;
-
-  BADARGS(4, 6, " exempt creator comment ?lifetime? ?options?");
-  if (argc == 6) {
-    if (!egg_strcasecmp(argv[5], "none"));
-    else if (!egg_strcasecmp(argv[5], "sticky"))
-      sticky = 1;
-    else {
-      Tcl_AppendResult(irp, "invalid option ", argv[5], " (must be one of: ",
-		       "sticky, none)", NULL);
-      return TCL_ERROR;
-    }
-  }
-  strncpyz(exempt, argv[1], sizeof exempt);
-  strncpyz(from, argv[2], sizeof from);
-  strncpyz(cmt, argv[3], sizeof cmt);
-  if (argc == 4) {
-    if (global_exempt_time == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (60 * global_exempt_time);
-  }
-  else {
-    if (atoi(argv[4]) == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (atoi(argv[4]) * 60);
-  }
-  u_addexempt(NULL,exempt, from, cmt, expire_time,sticky);
-  for (chan = chanset; chan; chan = chan->next)
-      add_mode(chan, '+', 'e', exempt);
-  return TCL_OK;
-}
-
-static int tcl_newchaninvite STDVAR
-{
-  time_t expire_time;
-  struct chanset_t *chan;
-  char invite[161], cmt[MASKREASON_LEN], from[HANDLEN + 1];
-  int sticky = 0;
-
-  BADARGS(5, 7, " channel invite creator comment ?lifetime? ?options?");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (argc == 7) {
-    if (!egg_strcasecmp(argv[6], "none"));
-    else if (!egg_strcasecmp(argv[6], "sticky"))
-      sticky = 1;
-    else {
-      Tcl_AppendResult(irp, "invalid option ", argv[6], " (must be one of: ",
-		       "sticky, none)", NULL);
-      return TCL_ERROR;
-    }
-  }
-  strncpyz(invite, argv[2], sizeof invite);
-  strncpyz(from, argv[3], sizeof from);
-  strncpyz(cmt, argv[4], sizeof cmt);
-  if (argc == 5) {
-    if (chan->invite_time == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (60 * chan->invite_time);
-  }
-  else {
-    if (atoi(argv[5]) == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (atoi(argv[5]) * 60);
-  }
-  if (u_addinvite(chan, invite, from, cmt, expire_time,sticky))
-      add_mode(chan, '+', 'I', invite);
-  return TCL_OK;
-}
-
-static int tcl_newinvite STDVAR
-{
-  time_t expire_time;
-  struct chanset_t *chan;
-  char invite[UHOSTLEN], cmt[MASKREASON_LEN], from[HANDLEN + 1];
-  int sticky = 0;
-
-  BADARGS(4, 6, " invite creator comment ?lifetime? ?options?");
-  if (argc == 6) {
-    if (!egg_strcasecmp(argv[5], "none"));
-    else if (!egg_strcasecmp(argv[5], "sticky"))
-      sticky = 1;
-    else {
-      Tcl_AppendResult(irp, "invalid option ", argv[5], " (must be one of: ",
-		       "sticky, none)", NULL);
-      return TCL_ERROR;
-    }
-  }
-  strncpyz(invite, argv[1], sizeof invite);
-  strncpyz(from, argv[2], sizeof from);
-  strncpyz(cmt, argv[3], sizeof cmt);
-  if (argc == 4) {
-    if (global_invite_time == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (60 * global_invite_time);
-  }
-  else {
-    if (atoi(argv[4]) == 0)
-      expire_time = 0L;
-    else
-      expire_time = now + (atoi(argv[4]) * 60);
-  }
-  u_addinvite(NULL,invite, from, cmt, expire_time,sticky);
-  for (chan = chanset; chan; chan = chan->next)
-      add_mode(chan, '+', 'I', invite);
-  return TCL_OK;
-}
 
 static int tcl_channel_info(Tcl_Interp * irp, struct chanset_t *chan)
 {
@@ -980,7 +271,6 @@ static int tcl_channel_get(Tcl_Interp * irp, struct chanset_t *chan, char *setti
   return(TCL_OK);
 }
 
-
 static int tcl_channel STDVAR
 {
   struct chanset_t *chan;
@@ -1559,20 +849,6 @@ static int tcl_validchan STDVAR
   return TCL_OK;
 }
 
-static int tcl_isdynamic STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel");
-  chan = findchan_by_dname(argv[1]);
-  if (chan != NULL) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
 static int tcl_getchaninfo STDVAR
 {
   char s[161];
@@ -1605,97 +881,6 @@ static int tcl_setchaninfo STDVAR
   return TCL_OK;
 }
 
-static int tcl_setlaston STDVAR
-{
-  time_t t = now;
-  struct userrec *u;
-
-  BADARGS(2, 4, " handle ?channel? ?timestamp?");
-  u = get_user_by_handle(userlist, argv[1]);
-  if (!u) {
-    Tcl_AppendResult(irp, "No such user: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (argc == 4)
-    t = (time_t) atoi(argv[3]);
-  if (argc == 3 && ((argv[2][0] != '#') && (argv[2][0] != '&')))
-    t = (time_t) atoi(argv[2]);
-  if (argc == 2 || (argc == 3 && ((argv[2][0] != '#') && (argv[2][0] != '&'))))
-    set_handle_laston("*", u, t);
-  else
-    set_handle_laston(argv[2], u, t);
-  return TCL_OK;
-}
-
-static int tcl_addchanrec STDVAR
-{
-  struct userrec *u;
-
-  BADARGS(3, 3, " handle channel");
-  u = get_user_by_handle(userlist, argv[1]);
-  if (!u) {
-    Tcl_AppendResult(irp, "0", NULL);
-    return TCL_OK;
-  }
-  if (!findchan_by_dname(argv[2])) {
-    Tcl_AppendResult(irp, "0", NULL);
-    return TCL_OK;
-  }
-  if (get_chanrec(u, argv[2]) != NULL) {
-    Tcl_AppendResult(irp, "0", NULL);
-    return TCL_OK;
-  }
-  add_chanrec(u, argv[2]);
-  Tcl_AppendResult(irp, "1", NULL);
-  return TCL_OK;
-}
-
-static int tcl_delchanrec STDVAR
-{
-  struct userrec *u;
-
-  BADARGS(3, 3, " handle channel");
-  u = get_user_by_handle(userlist, argv[1]);
-  if (!u) {
-    Tcl_AppendResult(irp, "0", NULL);
-    return TCL_OK;
-  }
-  if (get_chanrec(u, argv[2]) == NULL) {
-    Tcl_AppendResult(irp, "0", NULL);
-    return TCL_OK;
-  }
-  del_chanrec(u, argv[2]);
-  Tcl_AppendResult(irp, "1", NULL);
-  return TCL_OK;
-}
-
-static int tcl_haschanrec STDVAR
-{
-  struct userrec *u;
-  struct chanset_t *chan;
-  struct chanuserrec *chanrec;
-
-  BADARGS(3, 3, " handle channel");
-
-  chan = findchan_by_dname(argv[2]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  u = get_user_by_handle(userlist, argv[1]);
-  if (!u) {
-    Tcl_AppendResult(irp, "No such user: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  chanrec = get_chanrec(u, chan->dname);
-  if (chanrec) {
-    Tcl_AppendResult(irp, "1", NULL);
-    return TCL_OK;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
 static void init_masklist(masklist *m)
 {
   m->mask = (char *)nmalloc(1);
@@ -1962,51 +1147,16 @@ static int tcl_deludef STDVAR
 
 static tcl_cmds channels_cmds[] =
 {
-  {"killban",		tcl_killban},
-  {"killchanban",	tcl_killchanban},
-  {"isbansticky",	tcl_isbansticky},
-  {"isban",		tcl_isban},
-  {"ispermban",		tcl_ispermban},
-  {"matchban",		tcl_matchban},
-  {"newchanban",	tcl_newchanban},
-  {"newban",		tcl_newban},
-  {"killexempt",	tcl_killexempt},
-  {"killchanexempt",	tcl_killchanexempt},
-  {"isexemptsticky",	tcl_isexemptsticky},
-  {"isexempt",		tcl_isexempt},
-  {"ispermexempt",	tcl_ispermexempt},
-  {"matchexempt",	tcl_matchexempt},
-  {"newchanexempt",	tcl_newchanexempt},
-  {"newexempt",		tcl_newexempt},
-  {"killinvite",	tcl_killinvite},
-  {"killchaninvite",	tcl_killchaninvite},
-  {"isinvitesticky",	tcl_isinvitesticky},
-  {"isinvite",		tcl_isinvite},
-  {"isperminvite",	tcl_isperminvite},
-  {"matchinvite",	tcl_matchinvite},
-  {"newchaninvite",	tcl_newchaninvite},
-  {"newinvite",		tcl_newinvite},
   {"channel",		tcl_channel},
   {"channels",		tcl_channels},
   {"exemptlist",	tcl_exemptlist},
   {"invitelist",	tcl_invitelist},
   {"banlist",		tcl_banlist},
   {"validchan",		tcl_validchan},
-  {"isdynamic",		tcl_isdynamic},
   {"getchaninfo",	tcl_getchaninfo},
   {"setchaninfo",	tcl_setchaninfo},
-  {"setlaston",		tcl_setlaston},
-  {"addchanrec",	tcl_addchanrec},
-  {"delchanrec",	tcl_delchanrec},
-  {"stick",		tcl_stick},
-  {"unstick",		tcl_stick},
-  {"stickinvite",	tcl_stickinvite},
-  {"unstickinvite",	tcl_stickinvite},
-  {"stickexempt",	tcl_stickexempt},
-  {"unstickexempt",	tcl_stickexempt},
   {"setudef",		tcl_setudef},
   {"renudef",		tcl_renudef},
   {"deludef",		tcl_deludef},
-  {"haschanrec",	tcl_haschanrec},
   {NULL,		NULL}
 };

src/mod/ctcp.mod/ctcp.c

@@ -67,30 +67,6 @@ char *strtolower(char *s)
   return p2;
 }
 
-/* HAH
-char *underscoredots(char *s) // amazingly silly function...
-{
-  int size = strlen(s) + 1;
-  char *p, *p2;
-
-Context;
-  p = nmalloc(size);
-  p2 = nmalloc(size);
-  strcpy(p, s);
-  while (p && *p) {
-    if (!strncmp(p, ".", 1)) {
-      size += 2;
-Context;
-      p2 = nrealloc(p2, size);
-      strcat(p2, STR("\037.\037"));
-    } else
-      strncat(p2, p, 1);
-    p++;
-  }
-  return p2;
-}
-*/
-
 void scriptchanged()
 {
   char tmp[200],
@@ -284,28 +260,25 @@ void scriptchanged()
       sprintf(ctcpversion, STR("%s\002/\002%s: BitchX-%s \002[\002cypress\002]\002 v01i%s"), cloak_os, cloak_osver, cloak_bxver, theme);
       break;
     case 5:
-//      p = underscoredots(cloak_osver);
-//      sprintf(tmp, STR("%s %s"), cloak_os, p);
-//      nfree(p);
-      sprintf(tmp, STR("%s"), cloak_os);
+      p = replace(cloak_osver, ".", "\037.\037");
+      sprintf(tmp, STR("%s %s"), cloak_os, p);
+      nfree(p);
       p = strtolower(tmp);
       sprintf(ctcpversion, STR("\037.\037.cypress\037.\03701i%s %s\037(\037%s\037)\037 bitchx\037/\037%s"),theme, p, cloak_host, cloak_bxver);
       nfree(p);
       break;
     case 6:
-//      p = underscoredots(cloak_osver);
-//      sprintf(tmp, STR("%s %s"), cloak_os, p);
-//      nfree(p);
-      sprintf(tmp, STR("%s"), cloak_os);
+      p = replace(cloak_osver, ".", "\037.\037");
+      sprintf(tmp, STR("%s %s"), cloak_os, p);
+      nfree(p);
       p = strtolower(tmp);
       sprintf(ctcpversion, STR("cypress\002.\00201i%s\037(\037bitchx\002.\002%s\037)\037\002.\002. %s\037(\037%s\037)\037"),theme, cloak_bxver, p, cloak_host);
       nfree(p);
       break;
     case 7:
-//      p = underscoredots(cloak_osver);
-//      sprintf(tmp, STR("%s %s"), cloak_os, p);
-//      nfree(p);
-      sprintf(tmp, STR("%s"), cloak_os);
+      p = replace(cloak_osver, ".", "\037.\037");
+      sprintf(tmp, STR("%s %s"), cloak_os, p);
+      nfree(p);
       p = strtolower(tmp);
       sprintf(ctcpversion, STR("\037.\037.cypress\037.\03701i%s - bitchx\037.\037%s\002/\002%s"), theme, cloak_bxver, p);
       nfree(p);

src/mod/irc.mod/tclirc.c

@@ -4,545 +4,6 @@
  *
  */
 
-/* Streamlined by answer.
- */
-static int tcl_chanlist STDVAR
-{
-  char nuh[1024];
-  int f;
-  memberlist *m;
-  struct chanset_t *chan;
-  struct flag_record plus = {FR_CHAN | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0},
- 		     minus = {FR_CHAN | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0},
-		     user = {FR_CHAN | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0};
-
-  BADARGS(2, 3, " channel ?flags?");
-  chan = findchan_by_dname(argv[1]);
-  if (!chan) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (argc == 2) {
-    /* No flag restrictions so just whiz it thru quick */
-    for (m = chan->channel.member; m && m->nick[0]; m = m->next)
-      Tcl_AppendElement(irp, m->nick);
-    return TCL_OK;
-  }
-  break_down_flags(argv[2], &plus, &minus);
-  f = (minus.global || minus.udef_global ||
-       minus.chan || minus.udef_chan || minus.bot);
-  /* Return empty set if asked for flags but flags don't exist */
-  if (!plus.global && !plus.udef_global &&
-      !plus.chan && !plus.udef_chan && !plus.bot && !f)
-    return TCL_OK;
-  minus.match = plus.match ^ (FR_AND | FR_OR);
-
-  for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
-    if (!m->user) {
-      egg_snprintf(nuh, sizeof nuh, "%s!%s", m->nick, m->userhost); 
-      m->user = get_user_by_host(nuh);
-    }
-    get_user_flagrec(m->user, &user, argv[1]);
-    user.match = plus.match;
-    if (flagrec_eq(&plus, &user)) {
-      if (!f || !flagrec_eq(&minus, &user))
-	Tcl_AppendElement(irp, m->nick);
-    }
-  }
-  return TCL_OK;
-}
-
-static int tcl_botisop STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-
-  BADARGS(1, 2, " ?channel?");
-  if (argc > 1) {
-    chan = findchan_by_dname(argv[1]);
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[1], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-   
-  while (chan && (thechan == NULL || thechan == chan)) {
-    if (me_op(chan)) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_ischanjuped STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  if (channel_juped(chan))
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_botisvoice STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-  memberlist *mx;
-
-  BADARGS(1, 2, " ?channel?");
-  if (argc > 1) {
-    chan = findchan_by_dname(argv[1]);
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[1], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-    
-  while (chan && (thechan == NULL || thechan == chan)) {
-    if ((mx = ismember(chan, botname)) && chan_hasvoice(mx)) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_botonchan STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-
-  BADARGS(1, 2, " ?channel?");
-  if (argc > 1) {
-    chan = findchan_by_dname(argv[1]);
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[1], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-
-  while (chan && (thechan == NULL || thechan == chan)) {
-    if (ismember(chan, botname)) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL); 
-  return TCL_OK;
-}
-
-static int tcl_isop STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-  memberlist *mx;
-      
-  BADARGS(2, 3, " nick ?channel?");
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-  
-  while (chan && (thechan == NULL || thechan == chan)) {
-    if ((mx = ismember(chan, argv[1])) && chan_hasop(mx)) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_isvoice STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-  memberlist *mx;
-
-  BADARGS(2, 3, " nick ?channel?");
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-    
-  while (chan && (thechan == NULL || thechan == chan)) {
-    if ((mx = ismember(chan, argv[1])) && chan_hasvoice(mx)) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_wasop STDVAR
-{
-  struct chanset_t *chan;
-  memberlist *mx;
-
-  BADARGS(3, 3, " nick channel");
-  chan = findchan_by_dname(argv[2]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  if ((mx = ismember(chan, argv[1])) && chan_wasop(mx))
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_onchan STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-
-  BADARGS(2, 3, " nickname ?channel?");
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);
-    thechan = chan;
-    if (!thechan) { 
-      Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-
-  while (chan && (thechan == NULL || thechan == chan)) {
-    if (ismember(chan, argv[1])) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_handonchan STDVAR
-{
-  char nuh[1024];
-  struct chanset_t *chan, *thechan = NULL;
-  memberlist *m;
-
-  BADARGS(2, 3, " handle ?channel?");
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-
-  while (chan && (thechan == NULL || thechan == chan)) {
-    for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
-      if (!m->user) {
-	egg_snprintf(nuh, sizeof nuh, "%s!%s", m->nick, m->userhost);
-	m->user = get_user_by_host(nuh);
-      }
-      if (m->user && !rfc_casecmp(m->user->handle, argv[1])) {
-	Tcl_AppendResult(irp, "1", NULL);
-	return TCL_OK;
-      }
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_ischanban STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(3, 3, " ban channel");
-  chan = findchan_by_dname(argv[2]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  if (ischanban(chan, argv[1]))
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_ischanexempt STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(3, 3, " exempt channel");
-  chan = findchan_by_dname(argv[2]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  if (ischanexempt(chan, argv[1]))
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_ischaninvite STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(3, 3, " invite channel");
-  chan = findchan_by_dname(argv[2]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  if (ischaninvite(chan, argv[1]))
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_getchanhost STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-  memberlist *m;
-
-  BADARGS(2, 3, " nickname ?channel?");	/* drummer */
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else 
-    chan = chanset;
-
-  while (chan && (thechan == NULL || thechan == chan)) {
-    m = ismember(chan, argv[1]);
-    if (m) {
-      Tcl_AppendResult(irp, m->userhost, NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  return TCL_OK;
-}
-
-static int tcl_onchansplit STDVAR
-{
-  struct chanset_t *chan, *thechan = NULL;
-  memberlist *m;
-
-  BADARGS(2, 3, " nickname ?channel?");
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);   
-    thechan = chan;
-    if (!thechan) {
-      Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else
-   chan = chanset;
-  
-  while (chan && (thechan == NULL || thechan == chan)) {
-    m = ismember(chan, argv[1]);
-    if (m && chan_issplit(m)) {
-      Tcl_AppendResult(irp, "1", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static int tcl_maskhost STDVAR
-{
-  char new[121];
-  BADARGS(2, 2, " nick!user@host");
-  maskhost(argv[1], new);
-  Tcl_AppendResult(irp, new, NULL);
-  return TCL_OK;
-}
-
-static int tcl_getchanidle STDVAR
-{
-  memberlist *m;
-  struct chanset_t *chan;
-  char s[20];
-  int x;
-
-  BADARGS(3, 3, " nickname channel");
-  if (!(chan = findchan_by_dname(argv[2]))) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  m = ismember(chan, argv[1]);
-  if (m) {
-    x = (now - (m->last)) / 60;
-    simple_sprintf(s, "%d", x);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  }
-  Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
-static inline int tcl_chanmasks(masklist *m, Tcl_Interp *irp)
-{
-  char work[20], *p;
-#if (((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) || (TCL_MAJOR_VERSION > 8))
-  CONST char *list[3];
-#else
-  char *list[3];
-#endif
-
-  for (; m && m->mask && m->mask[0]; m = m->next) {
-    list[0] = m->mask;
-    list[1] = m->who;
-    simple_sprintf(work, "%d", now - m->timer);
-    list[2] = work;
-    p = Tcl_Merge(3, list);
-    Tcl_AppendElement(irp, p);
-    Tcl_Free((char *) p);
-  }
-  return TCL_OK;
-}
-
-static int tcl_chanbans STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  return tcl_chanmasks(chan->channel.ban, irp);
-}
-
-static int tcl_chanexempts STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  return tcl_chanmasks(chan->channel.exempt, irp);
-}
-
-static int tcl_chaninvites STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "illegal channel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  return tcl_chanmasks(chan->channel.invite, irp);
-}
-
-static int tcl_getchanmode STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel");
-  chan = findchan_by_dname(argv[1]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
-    return TCL_ERROR;
-  }
-  Tcl_AppendResult(irp, getchanmode(chan), NULL);
-  return TCL_OK;
-}
-
-static int tcl_getchanjoin STDVAR
-{
-  struct chanset_t *chan;
-  char s[21];
-  memberlist *m;
-
-  BADARGS(3, 3, " nick channel");
-  chan = findchan_by_dname(argv[2]);
-  if (chan == NULL) {
-    Tcl_AppendResult(irp, "invalid cahnnel: ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  m = ismember(chan, argv[1]);
-  if (m == NULL) {
-    Tcl_AppendResult(irp, argv[1], " is not on ", argv[2], NULL);
-    return TCL_ERROR;
-  }
-  sprintf(s, "%lu", m->joined);
-  Tcl_AppendResult(irp, s, NULL);
-  return TCL_OK;
-}
-
-static int tcl_channame2dname STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel-name");
-  chan = findchan(argv[1]);
-  if (chan) {
-      Tcl_AppendResult(irp, chan->dname, NULL);
-      return TCL_OK;
-  } else {
-      Tcl_AppendResult(irp, "invalid channel-name: ", argv[1], NULL);
-      return TCL_ERROR;
-  }
-}
-
-static int tcl_chandname2name STDVAR
-{
-  struct chanset_t *chan;
-
-  BADARGS(2, 2, " channel-dname");
-  chan = findchan_by_dname(argv[1]);
-  if (chan) {
-      Tcl_AppendResult(irp, chan->name, NULL);
-      return TCL_OK;
-  } else {
-      Tcl_AppendResult(irp, "invalid channel-dname: ", argv[1], NULL);
-      return TCL_ERROR;
-  }
-}
 
 /* flushmode <chan> */
 static int tcl_flushmode STDVAR
@@ -653,72 +114,6 @@ static int tcl_topic STDVAR
   return TCL_OK;
 }
 
-static int tcl_hand2nick STDVAR
-{
-  char nuh[1024];
-  memberlist *m;
-  struct chanset_t *chan, *thechan = NULL;
-
-  BADARGS(2, 3, " handle ?channel?");	/* drummer */
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);
-    thechan = chan;
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else
-    chan = chanset;
-
-  while (chan && (thechan == NULL || thechan == chan)) {
-    for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
-      if (!m->user && !m->tried_getuser) {
-	egg_snprintf(nuh, sizeof nuh, "%s!%s", m->nick, m->userhost);
-        m->tried_getuser = 1;
-	m->user = get_user_by_host(nuh);
-      }
-      if (m->user && !rfc_casecmp(m->user->handle, argv[1])) {
-	  Tcl_AppendResult(irp, m->nick, NULL);
-	  return TCL_OK;
-	}
-      }
-    chan = chan->next;
-  }
-  return TCL_OK;
-}
-
-static int tcl_nick2hand STDVAR
-{
-  char nuh[1024];
-  memberlist *m;
-  struct chanset_t *chan, *thechan = NULL;
-
-  BADARGS(2, 3, " nick ?channel?");	/* drummer */
-  if (argc > 2) {
-    chan = findchan_by_dname(argv[2]);
-    thechan = chan;
-    if (chan == NULL) {
-      Tcl_AppendResult(irp, "invalid channel: ", argv[2], NULL);
-      return TCL_ERROR;
-    }
-  } else
-    chan = chanset;
-
-  while (chan && (thechan == NULL || thechan == chan)) {
-    m = ismember(chan, argv[1]);
-    if (m) {
-      if (!m->user) {
-        egg_snprintf(nuh, sizeof nuh, "%s!%s", m->nick, m->userhost);
-        m->user = get_user_by_host(nuh);
-      }
-      Tcl_AppendResult(irp, m->user ? m->user->handle : "*", NULL);
-      return TCL_OK;
-    }
-    chan = chan->next;
-  }
-  return TCL_OK;
-}
-
 /* Sends an optimal number of kicks per command (as defined by kick_method)
  * to the server, simialer to kick_all.
  */
@@ -784,29 +179,6 @@ static int tcl_putkick STDVAR
 
 static tcl_cmds tclchan_cmds[] =
 {
-  {"chanlist",		tcl_chanlist},
-  {"botisop",		tcl_botisop},
-  {"botisvoice",	tcl_botisvoice},
-  {"isop",		tcl_isop},
-  {"wasop",		tcl_wasop},
-  {"isvoice",		tcl_isvoice},
-  {"onchan",		tcl_onchan},
-  {"handonchan",	tcl_handonchan},
-  {"ischanban",		tcl_ischanban},
-  {"ischanexempt",	tcl_ischanexempt},
-  {"ischaninvite",	tcl_ischaninvite},
-  {"ischanjuped",	tcl_ischanjuped},
-  {"getchanhost",	tcl_getchanhost},
-  {"onchansplit",	tcl_onchansplit},
-  {"maskhost",		tcl_maskhost},
-  {"getchanidle",	tcl_getchanidle},
-  {"chanbans",		tcl_chanbans},
-  {"chanexempts",	tcl_chanexempts},
-  {"chaninvites",	tcl_chaninvites},
-  {"hand2nick",		tcl_hand2nick},
-  {"nick2hand",		tcl_nick2hand},
-  {"getchanmode",	tcl_getchanmode},
-  {"getchanjoin",	tcl_getchanjoin},
   {"flushmode",		tcl_flushmode},
   {"pushmode",		tcl_pushmode},
   {"resetbans",		tcl_resetbans},
@@ -814,11 +186,8 @@ static tcl_cmds tclchan_cmds[] =
   {"resetinvites",	tcl_resetinvites},
   {"resetchan",		tcl_resetchan},
   {"topic",		tcl_topic},
-  {"botonchan",		tcl_botonchan},
   {"putkick",		tcl_putkick},
-  {"channame2dname",	tcl_channame2dname},
-  {"chandname2name",	tcl_chandname2name},
   {NULL,		NULL}
 };
 
-#endif
+#endif /* LEAF */

src/mod/notes.mod/notes.c

@@ -184,124 +184,6 @@ static void expire_notes()
     putlog(LOG_MISC, "*", NOTES_EXPIRED, tot, tot == 1 ? "" : "s");
 }
 
-/* Add note to notefile.
- */
-static int tcl_storenote STDVAR
-{
-  FILE *f;
-  int idx;
-  char u[20], *f1, *to = NULL, work[1024];
-  struct userrec *ur;
-  struct userrec *ur2;
-
-  BADARGS(5, 5, " from to msg idx");
-  idx = findanyidx(atoi(argv[4]));
-  ur = get_user_by_handle(userlist, argv[2]);
-  if (ur && allow_fwd && (f1 = get_user(&USERENTRY_FWD, ur))) {
-    char fwd[161], fwd2[161], *f2, *p, *q, *r;
-    int ok = 1;
-    /* User is valid & has a valid forwarding address */
-     strcpy(fwd, f1);		/* Only 40 bytes are stored in the userfile */
-     p = strchr(fwd, '@');
-    if (p && !egg_strcasecmp(p + 1, botnetnick)) {
-      *p = 0;
-      if (!egg_strcasecmp(fwd, argv[2]))
-	/* They're forwarding to themselves on the same bot, llama's */
-	ok = 0;
-      strcpy(fwd2, fwd);
-      splitc(fwd2, fwd2, '@');
-      /* Get the user record of the user that we're forwarding to locally */
-      ur2 = get_user_by_handle(userlist, fwd2);
-      if (!ur2)
-	ok = 0;
-      if ((f2 = get_user(&USERENTRY_FWD, ur2))) {
-	strcpy(fwd2, f2);
-	splitc(fwd2, fwd2, '@');
-	if (!egg_strcasecmp(fwd2, argv[2]))
-	/* They're forwarding to someone who forwards back to them! */
-	ok = 0;
-      }
-      p = NULL;
-    }
-    if ((argv[1][0] != '@') && ((argv[3][0] == '<') || (argv[3][0] == '>')))
-       ok = 0;			/* Probablly fake pre 1.3 hax0r */
-
-    if (ok && (!p || in_chain(p + 1))) {
-      if (p)
-	p++;
-      q = argv[3];
-      while (ok && q && (q = strchr(q, '<'))) {
-	q++;
-	if ((r = strchr(q, ' '))) {
-	  *r = 0;
-	  if (!egg_strcasecmp(fwd, q))
-	    ok = 0;
-	  *r = ' ';
-	}
-      }
-      if (ok) {
-	if (p && strchr(argv[1], '@')) {
-	  simple_sprintf(work, "<%s@%s >%s %s", argv[2], botnetnick,
-			 argv[1], argv[3]);
-	  simple_sprintf(u, "@%s", botnetnick);
-	  p = u;
-	} else {
-	  simple_sprintf(work, "<%s@%s %s", argv[2], botnetnick,
-			 argv[3]);
-	  p = argv[1];
-	}
-      }
-    } else
-      ok = 0;
-    if (ok) {
-      if ((add_note(fwd, p, work, idx, 0) == NOTE_OK) && (idx >= 0))
-	dprintf(idx, NOTES_FORWARD_NOTONLINE, f1);
-      Tcl_AppendResult(irp, f1, NULL);
-      to = NULL;
-    } else {
-      strcpy(work, argv[3]);
-      to = argv[2];
-    }
-  } else
-    to = argv[2];
-  if (to) {
-    if (notefile[0] == 0) {
-      if (idx >= 0)
-	dprintf(idx, "%s\n", NOTES_UNSUPPORTED);
-    } else if (num_notes(to) >= maxnotes) {
-      if (idx >= 0)
-	dprintf(idx, "%s\n", NOTES_NOTES2MANY);
-    } else {			/* Time to unpack it meaningfully */
-      f = fopen(notefile, "a");
-      if (f == NULL)
-	f = fopen(notefile, "w");
-      if (f == NULL) {
-	if (idx >= 0)
-	  dprintf(idx, "%s\n", NOTES_NOTEFILE_FAILED);
-	putlog(LOG_MISC, "*", "%s", NOTES_NOTEFILE_UNREACHABLE);
-      } else {
-	char *p, *blah = argv[3], *from = argv[1];
-	int l = 0;
-
-	chmod(notefile, userfile_perm);	/* Use userfile permissions. */
-	while ((blah[0] == '<') || (blah[0] == '>')) {
-	  p = newsplit(&blah);
-	  if (*p == '<')
-	    l += simple_sprintf(work + l, "via %s, ", p + 1);
-	  else if (argv[1][0] == '@')
-	    from = p + 1;
-	}
-	fprintf(f, "%s %s %lu %s%s\n", to, from, now,
-		l ? work : "", blah);
-	fclose(f);
-	if (idx >= 0)
-	  dprintf(idx, "%s.\n", NOTES_STORED_MESSAGE);
-      }
-    }
-  }
-  return TCL_OK;
-}
-
 /* Convert a string like "2-4;8;16-"
  * in an array {2, 4, 8, 8, 16, maxnotes, -1}
  */
@@ -350,92 +232,6 @@ static int notes_in(int dl[], int in)
   return 0;
 }
 
-static int tcl_erasenotes STDVAR
-{
-  FILE *f, *g;
-  char s[601], *to, *s1;
-  int read, erased;
-  int nl[128];			/* Is it enough ? */
-
-  BADARGS(3, 3, " handle noteslist#");
-  if (!get_user_by_handle(userlist, argv[1])) {
-    Tcl_AppendResult(irp, "-1", NULL);
-    return TCL_OK;
-  }
-  if (!notefile[0]) {
-    Tcl_AppendResult(irp, "-2", NULL);
-    return TCL_OK;
-  }
-  f = fopen(notefile, "r");
-  if (f == NULL) {
-    Tcl_AppendResult(irp, "-2", NULL);
-    return TCL_OK;
-  }
-  sprintf(s, "%s~new", notefile);
-  g = fopen(s, "w");
-  if (g == NULL) {
-    fclose(f);
-    Tcl_AppendResult(irp, "-2", NULL);
-    return TCL_OK;
-  }
-  chmod(s, userfile_perm);	/* Use userfile permissions. */
-  read = 0;
-  erased = 0;
-  notes_parse(nl, (argv[2][0] == 0) ? "-" : argv[2]);
-  while (!feof(f)) {
-    fgets(s, 600, f);
-    if (s[strlen(s) - 1] == '\n')
-      s[strlen(s) - 1] = 0;
-    if (!feof(f)) {
-      rmspace(s);
-      if ((s[0]) && (s[0] != '#') && (s[0] != ';')) {	/* Not comment */
-	s1 = s;
-	to = newsplit(&s1);
-	if (!egg_strcasecmp(to, argv[1])) {
-	  read++;
-	  if (!notes_in(nl, read)) {
-	    fprintf(g, "%s %s\n", to, s1);
-	  } else {
-	    erased++;
-	  }
-	} else {
-	  fprintf(g, "%s %s\n", to, s1);
-	}
-      }
-    }
-  }
-  sprintf(s, "%d", erased);
-  Tcl_AppendResult(irp, s, NULL);
-  fclose(f);
-  fclose(g);
-  unlink(notefile);
-  sprintf(s, "%s~new", notefile);
-  movefile(s, notefile);
-  return TCL_OK;
-}
-
-static int tcl_listnotes STDVAR
-{
-  int i, numnotes;
-  int ln[128];			/* Is it enough? */
-  char s[8];
-
-  BADARGS(3, 3, " handle noteslist#");
-  if (!get_user_by_handle(userlist, argv[1])) {
-    Tcl_AppendResult(irp, "-1", NULL);
-    return TCL_OK;
-  }
-  numnotes = num_notes(argv[1]);
-  notes_parse(ln, argv[2]);
-  for (i = 1; i <= numnotes; i++) {
-    if (notes_in(ln, i)) {
-      sprintf(s, "%d", i);
-      Tcl_AppendElement(irp, s);
-    }
-  }
-  return TCL_OK;
-}
-
 /*
  * srd="+" : index
  * srd="-" : read all msgs
@@ -640,73 +436,6 @@ static void notes_del(char *hand, char *nick, char *sdl, int idx)
   }
 }
 
-static int tcl_notes STDVAR
-{
-  FILE *f;
-  char s[601], *to, *from, *dt, *s1;
-  int count, read, nl[128];	/* Is it enough? */
-  char *p;
-#if (((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) || (TCL_MAJOR_VERSION > 8))
-  CONST char *list[3];
-#else
-  char *list[3];
-#endif
-
-  BADARGS(2, 3, " handle ?noteslist#?");
-  if (!get_user_by_handle(userlist, argv[1])) {
-    Tcl_AppendResult(irp, "-1", NULL);
-    return TCL_OK;
-  }
-  if (argc == 2) {
-    sprintf(s, "%d", num_notes(argv[1]));
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  }
-  if (!notefile[0]) {
-    Tcl_AppendResult(irp, "-2", NULL);
-    return TCL_OK;
-  }
-  f = fopen(notefile, "r");
-  if (f == NULL) {
-    Tcl_AppendResult(irp, "-2", NULL);
-    return TCL_OK;
-  }
-  count = 0;
-  read = 0;
-  notes_parse(nl, (argv[2][0] == 0) ? "-" : argv[2]);
-  while (!feof(f)) {
-    fgets(s, 600, f);
-    if (s[strlen(s) - 1] == '\n')
-      s[strlen(s) - 1] = 0;
-    if (!feof(f)) {
-      rmspace(s);
-      if ((s[0]) && (s[0] != '#') && (s[0] != ';')) {	/* Not comment */
-	s1 = s;
-	to = newsplit(&s1);
-	if (!egg_strcasecmp(to, argv[1])) {
-	  read++;
-	  if (notes_in(nl, read)) {
-	    count++;
-	    from = newsplit(&s1);
-	    dt = newsplit(&s1);
-	    list[0] = from;
-	    list[1] = dt;
-	    list[2] = s1;
-	    p = Tcl_Merge(3, list);
-	    Tcl_AppendElement(irp, p);
-	    Tcl_Free((char *) p);
-	  }
-	}
-      }
-    }
-  }
-  if (count == 0)
-    Tcl_AppendResult(irp, "0", NULL);
-  fclose(f);
-  return TCL_OK;
-}
-
-
 /* notes <pass> <func>
  */
 static int msg_notes(char *nick, char *host, struct userrec *u, char *par)
@@ -1115,15 +844,6 @@ static tcl_strings notes_strings[] =
   {NULL,		NULL,			0,	0}
 };
 
-static tcl_cmds notes_tcls[] =
-{
-  {"notes",		tcl_notes},
-  {"erasenotes",	tcl_erasenotes},
-  {"listnotes",		tcl_listnotes},
-  {"storenote",		tcl_storenote},
-  {NULL,		NULL}
-};
-
 static int notes_irc_setup(char *mod)
 {
   p_tcl_bind_list H_temp;
@@ -1186,7 +906,6 @@ char *notes_start(Function * global_funcs)
   add_hook(HOOK_MATCH_NOTEREJ, (Function) match_note_ignore);
   add_tcl_ints(notes_ints);
   add_tcl_strings(notes_strings);
-  add_tcl_commands(notes_tcls);
   add_builtins_dcc(H_dcc, notes_cmds);
   add_builtins(H_chon, notes_chon);
   add_builtins(H_away, notes_away);

src/mod/server.mod/tclserv.c

@@ -4,16 +4,6 @@
  *
  */
 
-static int tcl_isbotnick STDVAR
-{
-  BADARGS(2, 2, " nick");
-  if (match_my_nick(argv[1]))
-    Tcl_AppendResult(irp, "1", NULL);
-  else
-    Tcl_AppendResult(irp, "0", NULL);
-  return TCL_OK;
-}
-
 static int tcl_putquick STDVAR
 {
   char s[511], *p;
@@ -92,143 +82,8 @@ static int tcl_puthelp STDVAR
   return TCL_OK;
 }
 
-static int tcl_jump STDVAR
-{
-  BADARGS(1, 4, " ?server? ?port? ?pass?");
-  if (argc >= 2) {
-    strncpyz(newserver, argv[1], sizeof newserver);
-    if (argc >= 3)
-      newserverport = atoi(argv[2]);
-    else
-      newserverport = default_port;
-    if (argc == 4)
-      strncpyz(newserverpass, argv[3], sizeof newserverpass);
-  }
-  cycle_time = 0;
-  nuke_server("changing servers\n");
-  return TCL_OK;
-}
-
-static int tcl_clearqueue STDVAR
-{
-  struct msgq *q, *qq;
-  int msgs;
-  char s[20];
-
-  msgs = 0;
-  BADARGS(2,2, " queue");
-  if (!strcmp(argv[1],"all")) {
-    msgs = (int) (modeq.tot + mq.tot + hq.tot);
-    for (q = modeq.head; q; q = qq) { 
-      qq = q->next;
-      nfree(q->msg);
-      nfree(q);
-    }
-    for (q = mq.head; q; q = qq) {
-      qq = q->next;
-      nfree(q->msg);
-      nfree(q);
-    }
-    for (q = hq.head; q; q = qq) {
-      qq = q->next;
-      nfree(q->msg);
-      nfree(q);
-    }
-    modeq.tot = mq.tot = hq.tot = modeq.warned = mq.warned = hq.warned = 0;
-    mq.head = hq.head = modeq.head = mq.last = hq.last = modeq.last = 0;
-    double_warned = 0;
-    burst = 0;
-    simple_sprintf(s, "%d", msgs);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  } else if (!strncmp(argv[1],"serv", 4)) {
-    msgs = mq.tot;
-    for (q = mq.head; q; q = qq) {
-      qq = q->next;
-      nfree(q->msg);
-      nfree(q);
-    }
-    mq.tot = mq.warned = 0;
-    mq.head = mq.last = 0;
-    if (modeq.tot == 0)
-      burst = 0;
-    double_warned = 0;
-    mq.tot = mq.warned = 0;
-    mq.head = mq.last = 0;
-    simple_sprintf(s, "%d", msgs);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  } else if (!strcmp(argv[1],"mode")) {
-    msgs = modeq.tot;
-    for (q = modeq.head; q; q = qq) { 
-      qq = q->next;
-      nfree(q->msg);
-      nfree(q);
-    }
-    if (mq.tot == 0)
-      burst = 0;
-    double_warned = 0;
-    modeq.tot = modeq.warned = 0;
-    modeq.head = modeq.last = 0;
-    simple_sprintf(s, "%d", msgs);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  } else if (!strcmp(argv[1],"help")) {
-    msgs = hq.tot;
-    for (q = hq.head; q; q = qq) {
-      qq = q->next;
-      nfree(q->msg);
-      nfree(q);
-    }
-    double_warned = 0;
-    hq.tot = hq.warned = 0;
-    hq.head = hq.last = 0;
-    simple_sprintf(s, "%d", msgs);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  }
-  Tcl_AppendResult(irp, "bad option: must be mode, server, help, or all",
-                   NULL);
-  return TCL_ERROR;
-}
-
-static int tcl_queuesize STDVAR
-{
-  char s[20];
-  int x;
-
-  BADARGS(1, 2, " ?queue?");
-  if (argc == 1) {
-    x = (int) (modeq.tot + hq.tot + mq.tot);
-    simple_sprintf(s, "%d", x);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  } else if (!strncmp(argv[1], "serv", 4)) {
-    x = (int) (mq.tot);
-    simple_sprintf(s, "%d", x);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  } else if (!strcmp(argv[1], "mode")) {
-    x = (int) (modeq.tot);
-    simple_sprintf(s, "%d", x);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  } else if (!strcmp(argv[1], "help")) {
-    x = (int) (hq.tot);
-    simple_sprintf(s, "%d", x);
-    Tcl_AppendResult(irp, s, NULL);
-    return TCL_OK;
-  }
-  Tcl_AppendResult(irp, "bad option: must be mode, server, or help", NULL);
-  return TCL_ERROR;
-}
-
 static tcl_cmds my_tcl_cmds[] =
 {
-  {"jump",		tcl_jump},
-  {"isbotnick",		tcl_isbotnick},
-  {"clearqueue",	tcl_clearqueue},
-  {"queuesize",		tcl_queuesize},
   {"puthelp",		tcl_puthelp},
   {"putserv",		tcl_putserv},
   {"putquick",		tcl_putquick},

src/mod/transfer.mod/transfer.c

@@ -528,122 +528,6 @@ static void fileq_cancel(int idx, char *par)
       send_next_file(dcc[idx].nick);
 }
 
-static int tcl_getfileq STDVAR
-{
-  char *s = NULL;
-  fileq_t *q;
-
-  BADARGS(2, 2, " handle");
-  for (q = fileq; q; q = q->next) {
-    if (!egg_strcasecmp(q->nick, argv[1])) {
-      s = nrealloc(s, strlen(q->to) + strlen(q->dir) + strlen(q->file) + 4);
-      if (q->dir[0] == '*')
-	sprintf(s, "%s %s/%s", q->to, &q->dir[1], q->file);
-      else
-	sprintf(s, "%s /%s%s%s", q->to, q->dir, q->dir[0] ? "/" : "", q->file);
-      Tcl_AppendElement(irp, s);
-    }
-  }
-  if (s)
-    nfree(s);
-  return TCL_OK;
-}
-
-
-/*
- *    Misc Tcl functions
- */
-
-static int tcl_dccsend STDVAR
-{
-  char s[10], *sys, *nfn;
-  int i;
-  FILE *f;
-
-  BADARGS(3, 3, " filename ircnick");
-  f = fopen(argv[1], "r");
-  if (f == NULL) {
-    /* File not found */
-    Tcl_AppendResult(irp, "3", NULL);
-    return TCL_OK;
-  }
-  fclose(f);
-  nfn = strrchr(argv[1], '/');
-  if (nfn == NULL)
-    nfn = argv[1];
-  else
-    nfn++;
-  if (at_limit(argv[2])) {
-    /* Queue that mother */
-    if (nfn == argv[1])
-      queue_file("*", nfn, "(script)", argv[2]);
-    else {
-      nfn--;
-      *nfn = 0;
-      nfn++;
-      sys = nmalloc(strlen(argv[1]) + 2);
-      sprintf(sys, "*%s", argv[1]);
-      queue_file(sys, nfn, "(script)", argv[2]);
-      nfree(sys);
-    }
-    Tcl_AppendResult(irp, "4", NULL);
-    return TCL_OK;
-  }
-  if (copy_to_tmp) {
-    sys = nmalloc(strlen(tempdir) + strlen(nfn) + 1);
-    sprintf(sys, "%s%s", tempdir, nfn);
-    f = fopen(sys, "r");
-    if (f) {
-      fclose(f);
-      Tcl_AppendResult(irp, "5", NULL);
-      return TCL_OK;
-    } else
-      copyfile(argv[1], sys);
-  } else {
-    sys = nmalloc(strlen(argv[1]) + 1);
-    strcpy(sys, argv[1]);
-  }
-  i = raw_dcc_send(sys, argv[2], "*", argv[1]);
-  if (i > 0)
-    wipe_tmp_filename(sys, -1);
-  egg_snprintf(s, sizeof s, "%d", i);
-  Tcl_AppendResult(irp, s, NULL);
-  nfree(sys);
-  return TCL_OK;
-}
-
-static int tcl_getfilesendtime STDVAR
-{
-  int	sock, i;
-  char	s[15];
-
-  BADARGS(2, 2, " idx");
-  /* Btw, what the tcl interface refers to as `idx' is the socket number
-     for the C part. */
-  sock = atoi(argv[1]);
-
-  for (i = 0; i < dcc_total; i++)
-    if (dcc[i].sock == sock) {
-      if (dcc[i].type == &DCC_SEND || dcc[i].type == &DCC_GET) {
-	egg_snprintf(s, sizeof s, "%lu", dcc[i].u.xfer->start_time);
-	Tcl_AppendResult(irp, s, NULL);
-      } else
-	Tcl_AppendResult(irp, "-2", NULL);  /* Not a valid file transfer,
-					       honey. */
-      return TCL_OK;
-    }
-  Tcl_AppendResult(irp, "-1", NULL);	/* No matching entry found.	*/
-  return TCL_OK;
-}
-
-static tcl_cmds mytcls[] =
-{
-  {"dccsend",		tcl_dccsend},
-  {"getfileq",		tcl_getfileq},
-  {"getfilesendtime", 	tcl_getfilesendtime},
-  {NULL,		NULL}
-};
-
 
 /*
  *    DCC routines
@@ -1642,16 +1526,6 @@ static int raw_dcc_send(char *filename, char *nick, char *from, char *dir)
   return raw_dcc_resend_send(filename, nick, from, dir, 0);
 }
 
-static tcl_ints myints[] =
-{
-  {"max-dloads",	&dcc_limit},
-  {"dcc-block",		&dcc_block},
-  {"copy-to-tmp",	&copy_to_tmp},
-  {"xfer-timeout",	&wait_dcc_xfer},
-  {NULL,		NULL}
-};
-
-
 /*
  *    fstat functions
  */
@@ -2072,8 +1946,6 @@ char *transfer_start(Function *global_funcs)
     return "This module requires update module 0.0 or later.";
   }
 
-  add_tcl_commands(mytcls);
-  add_tcl_ints(myints);
   add_builtins(H_load, transfer_load);
   server_transfer_setup(NULL);
   H_rcvd = add_bind_table("rcvd", HT_STACKABLE, builtin_sentrcvd);

src/mod/update.mod/update.c

@@ -505,15 +505,11 @@ static Function update_table[] =
   (Function) update_report,
   /* 4 - 7 */
   (Function) finish_update,
-  (Function) 0,
-  (Function) 0,
-#ifdef LEAF
-  (Function) 0
-#else
-  (Function) 0,
+#ifdef HUB
   (Function) & bupdating
-#endif
-  /* 8 - 11 */
+#else
+  (Function) 0
+#endif /* HUB */
 };
 
 char *update_start(Function *global_funcs)
@@ -541,8 +537,6 @@ char *update_start(Function *global_funcs)
   add_hook(HOOK_SHAREUPDATEIN, (Function) updatein_mod);
   def_dcc_bot_kill = DCC_BOT.kill;
   DCC_BOT.kill = cancel_user_xfer;
-  //uff_init();
-  //uff_addtable(internal_uff_table);
   return NULL;
 }
 

src/mod/update.mod/update.h

@@ -33,12 +33,8 @@ typedef struct {
 #ifndef MAKING_update
 /* 4 - 7 */
 #define finish_update ((void (*) (int))update_funcs[4])
-//#define dump_resync ((void (*) (int))update_funcs[5])
-//#define uff_addtable ((void (*) (uff_table_t *))update_funcs[6])
-//#define uff_deltable ((void (*) (uff_table_t *))update_funcs[7])
-/* 8 - 11 */
 #ifdef HUB
-#define bupdating (*(int*)update_funcs[8])
+#define bupdating (*(int*)update_funcs[5])
 #endif /* HUB */
 #endif				/* !MAKING_update */