From 31f925f50413118a16a16632d7d86cfed1783602 Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 7 Nov 2012 21:02:43 +0000 Subject: - First pass of conf parser stabilization/cleanup git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1646 82007160-df01-0410-b94d-b575c5fd34c7 --- modules/m_accept.c | 6 +++--- modules/m_challenge.c | 2 +- modules/m_dline.c | 8 ++++---- modules/m_gline.c | 6 +++--- modules/m_kline.c | 12 ++++++------ modules/m_list.c | 3 +-- modules/m_pass.c | 9 +++------ modules/m_xline.c | 4 ++-- 8 files changed, 23 insertions(+), 27 deletions(-) (limited to 'modules') diff --git a/modules/m_accept.c b/modules/m_accept.c index 3fff6c1..7bd338b 100644 --- a/modules/m_accept.c +++ b/modules/m_accept.c @@ -95,9 +95,9 @@ add_accept(const struct split_nuh_item *nuh, struct Client *source_p) { struct split_nuh_item *accept_p = MyMalloc(sizeof(*accept_p)); - DupString(accept_p->nickptr, nuh->nickptr); - DupString(accept_p->userptr, nuh->userptr); - DupString(accept_p->hostptr, nuh->hostptr); + accept_p->nickptr = xstrdup(nuh->nickptr); + accept_p->userptr = xstrdup(nuh->userptr); + accept_p->hostptr = xstrdup(nuh->hostptr); dlinkAdd(accept_p, &accept_p->node, &source_p->localClient->acceptlist); diff --git a/modules/m_challenge.c b/modules/m_challenge.c index 7293e7b..926eb4d 100644 --- a/modules/m_challenge.c +++ b/modules/m_challenge.c @@ -147,7 +147,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, sendto_one(source_p, form_str(RPL_RSACHALLENGE), me.name, source_p->name, challenge); - DupString(source_p->localClient->auth_oper, conf->name); + source_p->localClient->auth_oper = xstrdup(conf->name); MyFree(challenge); } diff --git a/modules/m_dline.c b/modules/m_dline.c index d61bf16..7bc2070 100644 --- a/modules/m_dline.c +++ b/modules/m_dline.c @@ -257,7 +257,7 @@ mo_dline(struct Client *client_p, struct Client *source_p, return; conf = conf_make(CONF_DLINE); - DupString(conf->host, dlhost); + conf->host = xstrdup(dlhost); if (tkline_time != 0) snprintf(buffer, sizeof(buffer), "Temporary D-line %d min. - %s (%s)", @@ -265,7 +265,7 @@ mo_dline(struct Client *client_p, struct Client *source_p, else snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date); - DupString(conf->reason, buffer); + conf->reason = xstrdup(buffer); apply_dline(source_p, conf, tkline_time); rehashed_klines = 1; } @@ -376,7 +376,7 @@ ms_dline(struct Client *client_p, struct Client *source_p, return; conf = conf_make(CONF_DLINE); - DupString(conf->host, dlhost); + conf->host = xstrdup(dlhost); if (tkline_time != 0) snprintf(buffer, sizeof(buffer), "Temporary D-line %d min. - %s (%s)", @@ -384,7 +384,7 @@ ms_dline(struct Client *client_p, struct Client *source_p, else snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date); - DupString(conf->reason, buffer); + conf->reason = xstrdup(buffer); apply_dline(source_p, conf, tkline_time); rehashed_klines = 1; } diff --git a/modules/m_gline.c b/modules/m_gline.c index ecc96d9..13d6be2 100644 --- a/modules/m_gline.c +++ b/modules/m_gline.c @@ -65,9 +65,9 @@ set_local_gline(const struct Client *source_p, const char *user, struct MaskItem *conf = conf_make(CONF_GLINE); snprintf(buffer, sizeof(buffer), "%s (%s)", reason, smalldate(CurrentTime)); - DupString(conf->reason, buffer); - DupString(conf->user, user); - DupString(conf->host, host); + conf->reason = xstrdup(buffer); + conf->user = xstrdup(user); + conf->host = xstrdup(host); conf->setat = CurrentTime; conf->hold = CurrentTime + ConfigFileEntry.gline_time; diff --git a/modules/m_kline.c b/modules/m_kline.c index d4a646a..7e15935 100644 --- a/modules/m_kline.c +++ b/modules/m_kline.c @@ -119,8 +119,8 @@ mo_kline(struct Client *client_p, struct Client *source_p, current_date = smalldate(cur_time); conf = conf_make(CONF_KLINE); - DupString(conf->host, host); - DupString(conf->user, user); + conf->host = xstrdup(host); + conf->user = xstrdup(user); if (tkline_time != 0) snprintf(buffer, sizeof(buffer), "Temporary K-line %d min. - %s (%s)", @@ -128,7 +128,7 @@ mo_kline(struct Client *client_p, struct Client *source_p, else snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date); - DupString(conf->reason, buffer); + conf->reason = xstrdup(buffer); m_kline_add_kline(source_p, conf, tkline_time); } @@ -166,8 +166,8 @@ me_kline(struct Client *client_p, struct Client *source_p, return; conf = conf_make(CONF_KLINE); - DupString(conf->host, khost); - DupString(conf->user, kuser); + conf->host = xstrdup(khost); + conf->user = xstrdup(kuser); if (tkline_time != 0) snprintf(buffer, sizeof(buffer), "Temporary K-line %d min. - %s (%s)", @@ -175,7 +175,7 @@ me_kline(struct Client *client_p, struct Client *source_p, else snprintf(buffer, sizeof(buffer), "%s (%s)", kreason, current_date); - DupString(conf->reason, buffer); + conf->reason = xstrdup(buffer); m_kline_add_kline(source_p, conf, tkline_time); } } diff --git a/modules/m_list.c b/modules/m_list.c index c35fd3b..a6ede84 100644 --- a/modules/m_list.c +++ b/modules/m_list.c @@ -133,8 +133,7 @@ do_list(struct Client *source_p, int parc, char *parv[]) errors = 1; if (!errors) { - char *s; - DupString(s, opt); + char *s = xstrdup(opt); dlinkAdd(s, make_dlink_node(), list); } } diff --git a/modules/m_pass.c b/modules/m_pass.c index be78c7c..230dcd5 100644 --- a/modules/m_pass.c +++ b/modules/m_pass.c @@ -32,6 +32,7 @@ #include "modules.h" #include "s_serv.h" #include "s_user.h" +#include "s_misc.h" /* @@ -47,11 +48,9 @@ static void mr_pass(struct Client *client_p, struct Client *source_p, int parc, char *parv[]) { - char *password = parv[1]; - assert(client_p == source_p); - if (EmptyString(password)) + if (EmptyString(parv[1])) { sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, source_p->name[0] ? source_p->name : "*", "PASS"); @@ -59,9 +58,7 @@ mr_pass(struct Client *client_p, struct Client *source_p, } MyFree(source_p->localClient->passwd); - if (strlen(password) > PASSWDLEN) - password[PASSWDLEN] = '\0'; - DupString(source_p->localClient->passwd, password); + source_p->localClient->passwd = xstrndup(parv[1], IRCD_MIN(strlen(parv[1]), PASSWDLEN)); if (parc > 2) { diff --git a/modules/m_xline.c b/modules/m_xline.c index dfdaaeb..5e079a8 100644 --- a/modules/m_xline.c +++ b/modules/m_xline.c @@ -332,8 +332,8 @@ write_xline(struct Client *source_p, char *gecos, char *reason, conf = conf_make(CONF_XLINE); collapse(gecos); - DupString(conf->name, gecos); - DupString(conf->reason, reason); + conf->name = xstrdup(gecos); + conf->reason = xstrdup(reason); cur_time = CurrentTime; current_date = smalldate(cur_time); conf->setat = CurrentTime; -- cgit