philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup userhostbase. Use strlcat rather than strmcat. Rename some variables.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@419 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-10-26 15:03:12 +00:00
parent 9d562a6225
commit 0cf0cf1ec4
1 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/who.c
View File

@@ -780,28 +780,23 @@ BUILT_IN_COMMAND(usripcmd)
void BX_userhostbase(char *args, void (*line) (UserhostItem *, char *, char *), int userhost, char *format, ...) void BX_userhostbase(char *args, void (*line) (UserhostItem *, char *, char *), int userhost, char *format, ...)
{ {
int total = 0, int total = 0, userhost_cmd = 0, server_query_reqd = 0;
userhost_cmd = 0; char *nick, *ptr, *next_ptr, *body = NULL;
int server_query_reqd = 0; va_list ap;
char *nick; char buffer[BIG_BUFFER_SIZE];
char buffer[BIG_BUFFER_SIZE + 1]; char text[BIG_BUFFER_SIZE];
char buf_data[BIG_BUFFER_SIZE + 1];
char *ptr,
*next_ptr,
*body = NULL;
if (from_server <= -1 || !is_server_connected(from_server)) if (from_server < 0 || !is_server_connected(from_server))
return; return;
if (format) if (format)
{ {
va_list args; va_start(ap, format);
va_start(args, format); vsnprintf(text, sizeof text, format, ap);
vsnprintf(buf_data, BIG_BUFFER_SIZE, format, args); va_end(ap);
va_end(args);
} }
else else
*buf_data = 0; *text = 0;
*buffer = 0; *buffer = 0;
while ((nick = next_arg(args, &args)) != NULL) while ((nick = next_arg(args, &args)) != NULL)
@@ -813,15 +808,15 @@ void BX_userhostbase(char *args, void (*line) (UserhostItem *, char *, char *),
server_query_reqd++; server_query_reqd++;
if (*buffer) if (*buffer)
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof buffer);
strmcat(buffer, nick, BIG_BUFFER_SIZE); strlcat(buffer, nick, sizeof buffer);
} }
else if (!my_strnicmp(nick, "-cmd", 2)) else if (!my_strnicmp(nick, "-cmd", 2))
{ {
if (!total) if (!total)
{ {
say("%s -cmd with no nicks specified", (userhost == 1) ? "USERHOST":(userhost == 0)?"USERIP":"USRIP"); say("%s -cmd with no nicks specified", userhost == 1 ? "USERHOST" : userhost == 0 ? "USERIP" : "USRIP");
return; return;
} }
@@ -842,37 +837,34 @@ void BX_userhostbase(char *args, void (*line) (UserhostItem *, char *, char *),
if (!userhost_cmd && !total) if (!userhost_cmd && !total)
{ {
server_query_reqd++; server_query_reqd++;
strlcpy(buffer, get_server_nickname(from_server), BIG_BUFFER_SIZE); strlcpy(buffer, get_server_nickname(from_server), sizeof buffer);
} }
ptr = buffer; ptr = buffer;
if (server_query_reqd || (!line && !userhost_cmd)) if (server_query_reqd || (!line && !userhost_cmd))
{ {
ptr = buffer;
while (ptr && *ptr) while (ptr && *ptr)
{ {
UserhostEntry *new_u = get_new_userhost_entry(); UserhostEntry *new_uh = get_new_userhost_entry();
move_to_abs_word(ptr, &next_ptr, 5); move_to_abs_word(ptr, &next_ptr, 5);
if (next_ptr && *next_ptr && next_ptr > ptr) if (next_ptr && *next_ptr && next_ptr > ptr)
next_ptr[-1] = 0; next_ptr[-1] = 0;
new_u->userhost_asked = m_strdup(ptr); new_uh->userhost_asked = m_strdup(ptr);
send_to_server("%s %s", (userhost == 1) ? "USERHOST" : (!userhost)?"USERIP":"USRIP", new_u->userhost_asked); send_to_server("%s %s", userhost == 1 ? "USERHOST" : !userhost ? "USERIP" : "USRIP", new_uh->userhost_asked);
if (userhost_cmd) if (userhost_cmd)
new_u->text = m_strdup(body); new_uh->text = m_strdup(body);
else if (*buf_data) else if (*text)
new_u->text = m_strdup(buf_data); new_uh->text = m_strdup(text);
if (line) if (line)
new_u->func = line; new_uh->func = line;
else if (userhost_cmd) else if (userhost_cmd)
new_u->func = userhost_cmd_returned; new_uh->func = userhost_cmd_returned;
else else
new_u->func = NULL; new_uh->func = NULL;
ptr = next_ptr; ptr = next_ptr;
} }
@@ -881,12 +873,11 @@ void BX_userhostbase(char *args, void (*line) (UserhostItem *, char *, char *),
{ {
while (ptr && *ptr) while (ptr && *ptr)
{ {
char *nick = next_arg(ptr, &ptr); const char *old_uh = fetch_userhost(from_server, nick);
const char *ouh = fetch_userhost(from_server, nick); char *uh, *nick = next_arg(ptr, &ptr);
char *uh;
UserhostItem item = { 0 }; UserhostItem item = { 0 };
uh = LOCAL_COPY(ouh); uh = LOCAL_COPY(old_uh);
item.nick = nick; item.nick = nick;
item.oper = 0; item.oper = 0;
item.connected = 1; item.connected = 1;
@@ -899,11 +890,11 @@ void BX_userhostbase(char *args, void (*line) (UserhostItem *, char *, char *),
item.host = "<UNKNOWN>"; item.host = "<UNKNOWN>";
if (line) if (line)
line(&item, nick, body ? body : *buf_data ? buf_data : NULL); line(&item, nick, body ? body : *text ? text : NULL);
else if (userhost_cmd) else if (userhost_cmd)
userhost_cmd_returned(&item, nick, body); userhost_cmd_returned(&item, nick, body);
else else
yell("Yowza! I dont know what to do here!"); yell("Yowza! I don't know what to do here!");
} }
} }
} }