From cf7ca8d03152665e3dd1a5e8ef34d1d300413bdf Mon Sep 17 00:00:00 2001
From: pk910 <philipp@zoelle1.de>
Date: Sun, 25 Sep 2011 00:16:59 +0200
Subject: [PATCH] fixed modcmd override parameter parsing

---
 modcmd.c | 64 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/modcmd.c b/modcmd.c
index 61ebdc2..5476d5e 100644
--- a/modcmd.c
+++ b/modcmd.c
@@ -150,41 +150,47 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s
             }
             if(cbind->parameters) {
                 //userdefined parameters...
-                char *uarga[MAXNUMPARAMS];
-                char params[strlen(cbind->parameters)+1];
-                strcpy(params, cbind->parameters);
-                int uargpos = 0, argi, allargs = 0;
-                char *ppos = params;
-                char *prev_ppos = params;
-                while((ppos = strstr(ppos, " "))) {
-                    *ppos = '\0';
-                    if(prev_ppos[0] == '%') {
-                        prev_ppos++;
-                        if(prev_ppos[strlen(prev_ppos)-1] == '-') {
+                char *uargs[MAXNUMPARAMS];
+                int uargc = 0;
+                char *a,*b = cbind->parameters;
+                int allargs, argi;
+                do {
+                    a = strstr(b, " ");
+                    if(a) *a = '\0';
+                    if(b[0] == '%') {
+                        b++;
+                        if(b[strlen(b)-1] == '-') {
                             allargs = 1;
-                            prev_ppos[strlen(prev_ppos)-1] = '\0';
-                        } else
+                            b[strlen(b)-1] = '\0';
+                            argi = atoi(b);
+                            b[strlen(b)-1] = '-';
+                        } else {
                             allargs = 0;
-                        argi = atoi(prev_ppos);
+                            argi = atoi(b);
+                        }
                         if(argi > 0) {
-                            if(argi <= argc) continue;
-                            uarga[uargpos++] = argv[argi-1];
-                            if(allargs) {
-                                for(;argi < argc; argi++)
-                                    uarga[uargpos++] = argv[argi-1];
+                            if(argi <= argc) {
+                                uargs[uargc++] = argv[argi-1];
+                                if(allargs) {
+                                    for(argi++; argi <= argc; argi++)
+                                        uargs[uargc++] = argv[argi-1];
+                                }
                             }
-                        } else if(!strcmp(prev_ppos, "c"))
-                            uarga[uargpos++] = (chan ? chan->name : NULL);
-                        else if(!strcmp(prev_ppos, "n")) 
-                            uarga[uargpos++] = user->nick;
+                        } else if(!strcmp(b, "c")) {
+                            uargs[uargc++] = (chan ? chan->name : NULL);
+                        } else if(!strcmp(b, "n")) {
+                            uargs[uargc++] = user->nick;
+                        }
                     } else {
-                        uarga[uargpos++] = prev_ppos;
+                        uargs[uargc++] = b;
                     }
-                    ppos++;
-                    prev_ppos = ppos;
-                }
-                argv = uarga;
-                argc = uargpos;
+                    if(a) {
+                        *a = ' ';
+                        b = a+1;
+                    }
+                } while(a);
+                argv = uargs;
+                argc = uargc;
             }
             if(argc < cbind->func->paramcount) {
                 reply(tmp_text_client, user, "MODCMD_LESS_PARAM_COUNT");
-- 
2.20.1