[srvx-commits] CVS: services/src helpserv.c,1.35,1.36

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv31663/src

Modified Files:
	helpserv.c 
Log Message:
compile fixes


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** helpserv.c	23 Sep 2002 00:19:08 -0000	1.35
--- helpserv.c	24 Sep 2002 19:21:42 -0000	1.36
***************
*** 50,53 ****
--- 50,54 ----
  #include "helpserv.h"
  #include "log.h"
+ #include "modcmd.h"
  #include "nickserv.h"
  #include "opserv.h"
***************
*** 878,884 ****
  
  /* Handle a control command from an IRC operator */
! MODCMD_FUNC(cmd_helpserv) {
      struct helpserv_bot *hs = NULL;
!     struct helpserv_cmd *cmd;
      const int from_opserv = 1; /* for helpserv_notice */
      char botnick[NICKLEN+1]; /* in case command is unregister */
--- 879,885 ----
  
  /* Handle a control command from an IRC operator */
! static MODCMD_FUNC(cmd_helpserv) {
      struct helpserv_bot *hs = NULL;
!     struct helpserv_cmd *subcmd;
      const int from_opserv = 1; /* for helpserv_notice */
      char botnick[NICKLEN+1]; /* in case command is unregister */
***************
*** 895,914 ****
      }
  
!     if (!(cmd = dict_find(helpserv_func_dict, argv[1], NULL))) {
          helpserv_notice(user, MSG_COMMAND_UNKNOWN, argv[1]);
          return 0;
      }
  
!     if (!cmd->func) {
          helpserv_notice(user, HSMSG_INTERNAL_COMMAND, argv[1]);
          return 0;
      }
  
!     if ((cmd->flags & CMD_NEED_BOT) && ((argc < 3) || !(hs = dict_find(helpserv_bots_dict, argv[2], NULL)))) {
          helpserv_notice(user, HSMSG_INVALID_BOT);
          return 0;
      }
  
!     if (cmd->flags & CMD_NEVER_FROM_OPSERV) {
          helpserv_notice(user, HSMSG_NO_USE_OPSERV);
          return 0;
--- 896,915 ----
      }
  
!     if (!(subcmd = dict_find(helpserv_func_dict, argv[1], NULL))) {
          helpserv_notice(user, MSG_COMMAND_UNKNOWN, argv[1]);
          return 0;
      }
  
!     if (!subcmd->func) {
          helpserv_notice(user, HSMSG_INTERNAL_COMMAND, argv[1]);
          return 0;
      }
  
!     if ((subcmd->flags & CMD_NEED_BOT) && ((argc < 3) || !(hs = dict_find(helpserv_bots_dict, argv[2], NULL)))) {
          helpserv_notice(user, HSMSG_INVALID_BOT);
          return 0;
      }
  
!     if (subcmd->flags & CMD_NEVER_FROM_OPSERV) {
          helpserv_notice(user, HSMSG_NO_USE_OPSERV);
          return 0;
***************
*** 918,930 ****
          argv[2] = argv[1];
          strcpy(botnick, hs->helpserv->nick);
!         retval = cmd->func(user, hs, 1, argc-2, argv+2);
      } else {
          strcpy(botnick, "No bot");
!         retval = cmd->func(user, hs, 1, argc-1, argv+1);
      }
  
!     if (retval && !(cmd->flags & CMD_IGNORE_EVENT)) {
          char *cmd_text = unsplit_string(argv+1, argc-1, NULL);
!         log(HS_LOG, LOG_INFO, "%s[%s] (%s): %s%s\n", user->nick, user->handle_info->handle, botnick, cmd_text, (cmd->flags & (CMD_NOT_OVERRIDE|CMD_FROM_OPSERV_ONLY) ? "" : " (override)"));
      }
  
--- 919,931 ----
          argv[2] = argv[1];
          strcpy(botnick, hs->helpserv->nick);
!         retval = subcmd->func(user, hs, 1, argc-2, argv+2);
      } else {
          strcpy(botnick, "No bot");
!         retval = subcmd->func(user, hs, 1, argc-1, argv+1);
      }
  
!     if (retval && !(subcmd->flags & CMD_IGNORE_EVENT)) {
          char *cmd_text = unsplit_string(argv+1, argc-1, NULL);
!         log(HS_LOG, LOG_INFO, "%s[%s] (%s): %s%s\n", user->nick, user->handle_info->handle, botnick, cmd_text, (subcmd->flags & (CMD_NOT_OVERRIDE|CMD_FROM_OPSERV_ONLY) ? "" : " (override)"));
      }