Added support for fall back replacements in command bindings

diff --git a/ChangeLog b/ChangeLog
index cb013fad344e29ef5b92887dd7773afbcd2b4b44..d3137cdb34708f654984bb734ec8691b84eceb1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 /***********************************************************************
 X3 ChangeLog
 
+2010-05-21  Matthew Beeching  <jobe@mdbnet.co.uk>
+
+       * src/modcmd.c: Added support for fall back replacements in
+       command bindings. For example if you specify $1n instead of $1,
+       then the users nick will be used if param 1 is not supplied.
+
 2010-05-14  Matthew Beeching  <jobe@mdbnet.co.uk>
 
        * src/nickserv.c: Fix for NickServ NICKINFO using the wrong

diff --git a/src/modcmd.c b/src/modcmd.c
index 4103a3c302effb15fda7ea0bf9e8f92a7134f128..f523c257c90c9078b99b715052a9ba579a52a196 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -596,9 +596,10 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
 static int
 svccmd_expand_alias(struct svccmd *cmd, struct userNode *user, unsigned int old_argc, char *old_argv[], char *new_argv[]) {
     unsigned int ii, new_argc;
-    char *arg;
+    char *arg, *altarg;
 
     for (ii=new_argc=0; ii<cmd->alias.used; ++ii) {
+        altarg = NULL;
         arg = cmd->alias.list[ii];
         if (arg[0] != '$') {
             new_argv[new_argc++] = arg;
@@ -613,6 +614,19 @@ svccmd_expand_alias(struct svccmd *cmd, struct userNode *user, unsigned int old_
             lbound = strtoul(arg+1, &end_num, 10);
             switch (end_num[0]) {
             case 0: ubound = lbound; break;
+            case 'a':
+                altarg = (user && user->handle_info) ? user->handle_info->handle : "(account)";
+                break;
+            case 'n':
+                altarg = user ? user->nick : "(nick)";
+                break;
+            case 'm':
+#ifdef WITH_PROTOCOL_P10
+                altarg = user ? user->numeric : "(numnick)";
+#else
+                altarg = "(This ircd protocol has no numnicks!)";
+#endif
+                break;
             case '-':
                 if (end_num[1] == 0) {
                     ubound = old_argc - 1;
@@ -626,6 +640,22 @@ svccmd_expand_alias(struct svccmd *cmd, struct userNode *user, unsigned int old_
                 log_module(MAIN_LOG, LOG_ERROR, "Alias expansion parse error in %s (near %s; %s.%s arg %d).", arg, end_num, cmd->parent->bot->nick, cmd->name, ii);
                 return 0;
             }
+            if (altarg != NULL) {
+                if (end_num[1] != 0) {
+                    if ((end_num[1] == '-') && (end_num[2] == 0))
+                        ubound = old_argc - 1;
+                    else if ((end_num[1] == '-') && (isdigit(end_num[2])))
+                        ubound = strtoul(end_num+2, NULL, 10);
+                    else {
+                        log_module(MAIN_LOG, LOG_ERROR, "Alias expansion parse error in %s (near %s; %s.%s arg %d).", arg, end_num, cmd->parent->bot->nick, cmd->name, ii);
+                        return 0;
+                    }
+                } else {
+                    ubound = lbound;
+                }
+                if (lbound >= old_argc)
+                    new_argv[new_argc++] = altarg;
+            }
             if (ubound >= old_argc)
                 ubound = old_argc - 1;
             if (lbound < old_argc)
@@ -1126,6 +1156,15 @@ check_alias_args(char *argv[], unsigned int argc) {
             switch (end_num[0]) {
             case 0:
                 continue;
+            case 'a':
+            case 'n':
+            case 'm':
+                if (end_num[1] == 0)
+                    continue;
+                else if (end_num[1] == '-')
+                    end_num++;
+                else
+                    return arg;
             case '-':
                 if (end_num[1] == 0)
                     continue;