X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fllist.c;h=51b1ce6c99c979dc9741818fffd64ab341f4598d;hb=d7171c114028815df4e92f9c26875f1d60c6af2a;hp=dd80436c659f2c702fdcb8f2d4ef1b32bd05cd98;hpb=5edc10275ec86f6ce6af97a8e2e5eeccb3a2e8cb;p=oweals%2Fbusybox.git

diff --git a/libbb/llist.c b/libbb/llist.c
index dd80436c6..51b1ce6c9 100644
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -4,76 +4,95 @@
  *
  * Copyright (C) 2003 Glenn McGrath
  * Copyright (C) 2005 Vladimir Oleynik
- * Copyright (C) 2005 Bernhard Fischer
+ * Copyright (C) 2005 Bernhard Reutner-Fischer
  * Copyright (C) 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
-#include <stdlib.h>
+
 #include "libbb.h"
 
-#ifdef L_llist_add_to
 /* Add data to the start of the linked list.  */
-llist_t *llist_add_to(llist_t *old_head, void *data)
+void FAST_FUNC llist_add_to(llist_t **old_head, void *data)
 {
-	llist_t *new_head;
+	llist_t *new_head = xmalloc(sizeof(llist_t));
 
-	new_head = xmalloc(sizeof(llist_t));
 	new_head->data = data;
-	new_head->link = old_head;
-
-	return (new_head);
+	new_head->link = *old_head;
+	*old_head = new_head;
 }
-#endif
 
-#ifdef L_llist_add_to_end
 /* Add data to the end of the linked list.  */
-llist_t *llist_add_to_end(llist_t *list_head, void *data)
+void FAST_FUNC llist_add_to_end(llist_t **list_head, void *data)
 {
-	llist_t *new_item;
-
-	new_item = xmalloc(sizeof(llist_t));
-	new_item->data = data;
-	new_item->link = NULL;
-
-	if (list_head == NULL) {
-		list_head = new_item;
-	} else {
-		llist_t *tail = list_head;
-		while (tail->link)
-			tail = tail->link;
-		tail->link = new_item;
-	}
-	return list_head;
+	while (*list_head)
+		list_head = &(*list_head)->link;
+	*list_head = xzalloc(sizeof(llist_t));
+	(*list_head)->data = data;
+	/*(*list_head)->link = NULL;*/
 }
-#endif
 
-#ifdef L_llist_pop
 /* Remove first element from the list and return it */
-void *llist_pop(llist_t **head)
+void* FAST_FUNC llist_pop(llist_t **head)
 {
-	void *data;
+	void *data = NULL;
+	llist_t *temp = *head;
 
-	if(!*head) data = *head;
-	else {
-		void *next = (*head)->link;
-		data = (*head)->data;
-		free(*head);
-		*head = next;
+	if (temp) {
+		data = temp->data;
+		*head = temp->link;
+		free(temp);
 	}
-
 	return data;
 }
-#endif
 
-#ifdef L_llist_free
+/* Unlink arbitrary given element from the list */
+void FAST_FUNC llist_unlink(llist_t **head, llist_t *elm)
+{
+	if (!elm)
+		return;
+	while (*head) {
+		if (*head == elm) {
+			*head = (*head)->link;
+			break;
+		}
+		head = &(*head)->link;
+	}
+}
+
 /* Recursively free all elements in the linked list.  If freeit != NULL
  * call it on each datum in the list */
-void llist_free(llist_t *elm, void (*freeit)(void *data))
+void FAST_FUNC llist_free(llist_t *elm, void (*freeit) (void *data))
 {
 	while (elm) {
 		void *data = llist_pop(&elm);
-		if (freeit) freeit(data);
+
+		if (freeit)
+			freeit(data);
+	}
+}
+
+/* Reverse list order. */
+llist_t* FAST_FUNC llist_rev(llist_t *list)
+{
+	llist_t *rev = NULL;
+
+	while (list) {
+		llist_t *next = list->link;
+
+		list->link = rev;
+		rev = list;
+		list = next;
+	}
+	return rev;
+}
+
+llist_t* FAST_FUNC llist_find_str(llist_t *list, const char *str)
+{
+	while (list) {
+		if (strcmp(list->data, str) == 0)
+			break;
+		list = list->link;
 	}
+	return list;
 }
-#endif