[srvx-commits] CVS: services/src modcmd.c,1.5,1.6

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

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

Modified Files:
	modcmd.c 
Log Message:
fix some more command aliasing bugs


Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** modcmd.c	31 Jul 2002 03:42:12 -0000	1.5
--- modcmd.c	1 Aug 2002 03:16:10 -0000	1.6
***************
*** 562,566 ****
          return svccmd_send_help(user, bot, cmd);
      } else {
!         /* TODO: fall back to a default helpfile (or module helpfile) instead */
          send_message(user, bot, MSG_TOPIC_UNKNOWN);
          return 0;
--- 562,566 ----
          return svccmd_send_help(user, bot, cmd);
      } else {
!         /* TODO: try to send from the default helpfile (or default module's helpfile) instead */
          send_message(user, bot, MSG_TOPIC_UNKNOWN);
          return 0;
***************
*** 1032,1036 ****
  
  static void
! modcmd_db_load_service(struct service *service, const char *cmdname, dict_t obj) {
      struct svccmd *svccmd;
      struct module *module;
--- 1032,1036 ----
  
  static void
! modcmd_db_load_command(struct service *service, const char *cmdname, dict_t obj) {
      struct svccmd *svccmd;
      struct module *module;
***************
*** 1086,1090 ****
  
          expn = calloc(1, sizeof(*expn) + (slist->used-1)*sizeof(expn->argv[0]));
!         expn->base = svccmd;
          for (nn=0; nn<slist->used; ++nn) expn->argv[nn] = strdup(slist->list[nn]);
          expn->argc = nn;
--- 1086,1090 ----
  
          expn = calloc(1, sizeof(*expn) + (slist->used-1)*sizeof(expn->argv[0]));
!         expn->base = modcmd->defaults;
          for (nn=0; nn<slist->used; ++nn) expn->argv[nn] = strdup(slist->list[nn]);
          expn->argc = nn;
***************
*** 1158,1162 ****
                          continue;
                      }
!                     modcmd_db_load_service(service, iter_key(it2), rd2->d.object);
                  }
              }
--- 1158,1162 ----
                          continue;
                      }
!                     modcmd_db_load_command(service, iter_key(it2), rd2->d.object);
                  }
              }