Fix an off by one error with zipstats processing

[irc/rqf/shadowircd.git] / src / kdparse.c

diff --git a/src/kdparse.c b/src/kdparse.c
index 7a150135723e37937bdf464097f6a719e89f9abe..3d82b71844532bdf70388338c90ea08bb0422ffd 100644 (file)
--- a/src/kdparse.c
+++ b/src/kdparse.c
@@ -25,14 +25,12 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "hostmask.h"
 #include "client.h"
-#include "irc_string.h"
-#include "memory.h"
+#include "match.h"
 #include "hash.h"
 
 /* conf_add_fields()
@@ -47,21 +45,21 @@ conf_add_fields(struct ConfItem *aconf,     const char *host_field,
                const char *operreason_field, const char *date_field)
 {
        if(host_field != NULL)
-               DupString(aconf->host, host_field);
+               aconf->host = rb_strdup(host_field);
        if(pass_field != NULL)
        {
                if(!EmptyString(date_field))
                {
-                       aconf->passwd = MyMalloc(strlen(pass_field) + strlen(date_field) + 4);
-                       ircsprintf(aconf->passwd, "%s (%s)", pass_field, date_field);
+                       aconf->passwd = rb_malloc(strlen(pass_field) + strlen(date_field) + 4);
+                       rb_sprintf(aconf->passwd, "%s (%s)", pass_field, date_field);
                }
                else
-                       DupString(aconf->passwd, pass_field);
+                       aconf->passwd = rb_strdup(pass_field);
        }
        if(user_field != NULL)
-               DupString(aconf->user, user_field);
+               aconf->user = rb_strdup(user_field);
        if(operreason_field != NULL)
-               DupString(aconf->spasswd, operreason_field);
+               aconf->spasswd = rb_strdup(operreason_field);
 }
 
 /*
@@ -112,7 +110,7 @@ parse_k_file(FILE * file)
                                user_field, operreason_field, date_field);
 
                if(aconf->host != NULL)
-                       add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf);
+                       add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
        }
 }
 
@@ -196,10 +194,10 @@ parse_x_file(FILE * file)
                aconf = make_conf();
                aconf->status = CONF_XLINE;
 
-               DupString(aconf->name, gecos_field);
-               DupString(aconf->passwd, reason_field);
+               aconf->name = rb_strdup(gecos_field);
+               aconf->passwd = rb_strdup(reason_field);
 
-               dlinkAddAlloc(aconf, &xline_conf_list);
+               rb_dlinkAddAlloc(aconf, &xline_conf_list);
        }
 }
 
@@ -237,8 +235,8 @@ parse_resv_file(FILE * file)
                        aconf->status = CONF_RESV_CHANNEL;
                        aconf->port = 0;
 
-                       DupString(aconf->name, host_field);
-                       DupString(aconf->passwd, reason_field);
+                       aconf->name = rb_strdup(host_field);
+                       aconf->passwd = rb_strdup(reason_field);
                        add_to_resv_hash(aconf->name, aconf);
                }
                else if(clean_resv_nick(host_field))
@@ -250,9 +248,9 @@ parse_resv_file(FILE * file)
                        aconf->status = CONF_RESV_NICK;
                        aconf->port = 0;
 
-                       DupString(aconf->name, host_field);
-                       DupString(aconf->passwd, reason_field);
-                       dlinkAddAlloc(aconf, &resv_conf_list);
+                       aconf->name = rb_strdup(host_field);
+                       aconf->passwd = rb_strdup(reason_field);
+                       rb_dlinkAddAlloc(aconf, &resv_conf_list);
                }
        }
 }