X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flists.c;h=6faf311a74f767207c0f2c622cde44e72a924280;hb=5c6875d7686e1b4dbf1a82b6d159bd5f18da4a52;hp=63c16b0da1ed268af0a7f42bd6e49fe22a13da1a;hpb=ae5ebfb9f0dc1b628a5eebbb39615b3483fe05db;p=ngircd-alex.git

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index 63c16b0d..6faf311a 100644
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -60,13 +60,13 @@ Lists_GetMask(const struct list_elem *e)
  * Get optional "reason" text stored in list element.
  *
  * @param list_elem List element.
- * @return Pointer to "reason" text or NULL.
+ * @return Pointer to "reason" text or empty string ("").
  */
 GLOBAL const char *
 Lists_GetReason(const struct list_elem *e)
 {
 	assert(e != NULL);
-	return e->reason;
+	return e->reason ? e->reason : "";
 }
 
 /**
@@ -126,8 +126,15 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil,
 	assert(h != NULL);
 	assert(Mask != NULL);
 
-	if (Lists_CheckDupeMask(h, Mask))
+	e = Lists_CheckDupeMask(h, Mask);
+	if (e) {
+		e->valid_until = ValidUntil;
+		if (Reason) {
+			free(e->reason);
+			e->reason = strdup(Reason);
+		}
 		return true;
+	}
 
 	e = Lists_GetFirst(h);
 
@@ -140,10 +147,8 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil,
 
 	strlcpy(newelem->mask, Mask, sizeof(newelem->mask));
 	if (Reason) {
-		newelem->reason = malloc(strlen(Reason) + 1);
-		if (newelem->reason)
-			strlcpy(newelem->reason, Reason, strlen(Reason) + 1);
-		else
+		newelem->reason = strdup(Reason);
+		if (!newelem->reason)
 			Log(LOG_EMERG,
 			    "Can't allocate memory for new list reason text!");
 	}
@@ -240,17 +245,17 @@ Lists_Free(struct list_head *head)
  * @param Mask IRC mask to test.
  * @return true if mask is already stored in the list, false otherwise.
  */
-GLOBAL bool
+GLOBAL struct list_elem *
 Lists_CheckDupeMask(const struct list_head *h, const char *Mask )
 {
 	struct list_elem *e;
 	e = h->first;
 	while (e) {
 		if (strcasecmp(e->mask, Mask) == 0)
-			return true;
+			return e;
 		e = e->next;
 	}
-	return false;
+	return NULL;
 }
 
 /**
@@ -278,7 +283,7 @@ Lists_MakeMask(const char *Pattern)
 		excl = NULL;
 
 	if (!at && !excl) {
-		/* Neither "!" nor "@" found: use string as nick name */
+		/* Neither "!" nor "@" found: use string as nickname */
 		strlcpy(TheMask, Pattern, sizeof(TheMask) - 5);
 		strlcat(TheMask, "!*@*", sizeof(TheMask));
 		return TheMask;
@@ -313,16 +318,27 @@ Lists_MakeMask(const char *Pattern)
  * @return true if client is listed, false if not.
  */
 bool
-Lists_Check( struct list_head *h, CLIENT *Client)
+Lists_Check(struct list_head *h, CLIENT *Client)
+{
+	return Lists_CheckReason(h, Client) != NULL;
+}
+
+/**
+ * Check if a client is listed in a list and return the "reason".
+ *
+ * @param h List head.
+ * @param Client Client to check.
+ * @return true if client is listed, false if not.
+ */
+char *
+Lists_CheckReason(struct list_head *h, CLIENT *Client)
 {
 	struct list_elem *e, *last, *next;
-	time_t now;
 
 	assert(h != NULL);
 
 	e = h->first;
 	last = NULL;
-	now = time(NULL);
 
 	while (e) {
 		next = e->next;
@@ -333,13 +349,13 @@ Lists_Check( struct list_head *h, CLIENT *Client)
 					 e->mask);
 				Lists_Unlink(h, last, e);
 			}
-			return true;
+			return e->reason ? e->reason : "";
 		}
 		last = e;
 		e = next;
 	}
 
-	return false;
+	return NULL;
 }
 
 /**
@@ -380,4 +396,26 @@ Lists_Expire(struct list_head *h, const char *ListName)
 	}
 }
 
+/**
+ * Return the number of entries of a list.
+ *
+ * @param h List head.
+ * @return Number of items.
+ */
+GLOBAL unsigned long
+Lists_Count(struct list_head *h)
+{
+	struct list_elem *e;
+	unsigned long count = 0;
+
+	assert(h != NULL);
+
+	e = h->first;
+	while (e) {
+		count++;
+		e = e->next;
+	}
+	return count;
+}
+
 /* -eof- */