#include "exp.h"
#include "lists.h"
-#define MASK_LEN (2*CLIENT_HOST_LEN)
-
struct list_elem {
struct list_elem *next; /** pointer to next list element */
char mask[MASK_LEN]; /** IRC mask */
if (e) {
e->valid_until = ValidUntil;
if (Reason) {
- free(e->reason);
+ if (e->reason)
+ free(e->reason);
e->reason = strdup(Reason);
}
return true;
/**
* Generate a valid IRC mask from "any" string given.
*
- * Attention: This mask is only valid until the next call to Lists_MakeMask(),
- * because a single global buffer ist used! You have to copy the generated
- * mask to some sane location yourself!
- *
* @param Pattern Source string to generate an IRC mask for.
- * @return Pointer to global result buffer.
+ * @param mask Buffer to store the mask.
+ * @param len Size of the buffer.
*/
-GLOBAL const char *
-Lists_MakeMask(const char *Pattern)
+GLOBAL void
+Lists_MakeMask(const char *Pattern, char *mask, size_t len)
{
- static char TheMask[MASK_LEN];
char *excl, *at;
assert(Pattern != NULL);
if (!at && !excl) {
/* Neither "!" nor "@" found: use string as nickname */
- strlcpy(TheMask, Pattern, sizeof(TheMask) - 5);
- strlcat(TheMask, "!*@*", sizeof(TheMask));
- return TheMask;
- }
-
- if (!at && excl) {
+ strlcpy(mask, Pattern, len - 5);
+ strlcat(mask, "!*@*", len);
+ } else if (!at && excl) {
/* Domain part is missing */
- strlcpy(TheMask, Pattern, sizeof(TheMask) - 3);
- strlcat(TheMask, "@*", sizeof(TheMask));
- return TheMask;
- }
-
- if (at && !excl) {
+ strlcpy(mask, Pattern, len - 3);
+ strlcat(mask, "@*", len);
+ } else if (at && !excl) {
/* User name is missing */
*at = '\0'; at++;
- strlcpy(TheMask, Pattern, sizeof(TheMask) - 5);
- strlcat(TheMask, "!*@", sizeof(TheMask));
- strlcat(TheMask, at, sizeof(TheMask));
- return TheMask;
+ strlcpy(mask, Pattern, len - 5);
+ strlcat(mask, "!*@", len);
+ strlcat(mask, at, len);
+ } else {
+ /* All parts (nick, user and domain name) are given */
+ strlcpy(mask, Pattern, len);
}
-
- /* All parts (nick, user and domain name) are given */
- strlcpy(TheMask, Pattern, sizeof(TheMask));
- return TheMask;
} /* Lists_MakeMask */
/**
bool
Lists_Check(struct list_head *h, CLIENT *Client)
{
- return Lists_CheckReason(h, Client) != NULL;
+ return Lists_CheckReason(h, Client, NULL, 0);
}
/**
- * Check if a client is listed in a list and return the "reason".
+ * Check if a client is listed in a list and store the reason.
*
- * @param h List head.
+ * @param h List head.
* @param Client Client to check.
+ * @param reason Buffer to store the reason.
+ * @param len Size of the buffer if reason should be saved.
* @return true if client is listed, false if not.
*/
-char *
-Lists_CheckReason(struct list_head *h, CLIENT *Client)
+bool
+Lists_CheckReason(struct list_head *h, CLIENT *Client, char *reason, size_t len)
{
struct list_elem *e, *last, *next;
while (e) {
next = e->next;
if (Match(e->mask, Client_MaskCloaked(Client))) {
+ if (len && e->reason)
+ strlcpy(reason, e->reason, len);
if (e->valid_until == 1) {
/* Entry is valid only once, delete it */
LogDebug("Deleted \"%s\" from list (used).",
e->mask);
Lists_Unlink(h, last, e);
}
- return e->reason ? e->reason : "";
+ return true;
}
last = e;
e = next;
}
- return NULL;
+ return false;
}
/**