Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / llist.c

diff --git a/libbb/llist.c b/libbb/llist.c
index ce7dadd..032e9fa 100644 (file)
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -4,68 +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 GPLv2 or later, see file LICENSE in this source tree.
  */
-#include <stdlib.h>
+
 #include "libbb.h"
 
-#ifdef L_llist_add_to
 /* Add data to the start of the linked list.  */
-extern llist_t *llist_add_to(llist_t *old_head, char *new_item)
+void FAST_FUNC llist_add_to(llist_t **old_head, void *data)
 {
-       llist_t *new_head;
-
-       new_head = xmalloc(sizeof(llist_t));
-       new_head->data = new_item;
-       new_head->link = old_head;
+       llist_t *new_head = xmalloc(sizeof(llist_t));
 
-       return (new_head);
+       new_head->data = data;
+       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.  */
-extern llist_t *llist_add_to_end(llist_t *list_head, char *data)
+void FAST_FUNC llist_add_to_end(llist_t **list_head, void *data)
 {
-       llist_t *new_item;
+       while (*list_head)
+               list_head = &(*list_head)->link;
+       *list_head = xzalloc(sizeof(llist_t));
+       (*list_head)->data = data;
+       /*(*list_head)->link = NULL;*/
+}
 
-       new_item = xmalloc(sizeof(llist_t));
-       new_item->data = data;
-       new_item->link = NULL;
+/* Remove first element from the list and return it */
+void* FAST_FUNC llist_pop(llist_t **head)
+{
+       void *data = NULL;
+       llist_t *temp = *head;
 
-       if (list_head == NULL) {
-               list_head = new_item;
-       } else {
-               llist_t *tail = list_head;
-               while (tail->link)
-                       tail = tail->link;
-               tail->link = new_item;
+       if (temp) {
+               data = temp->data;
+               *head = temp->link;
+               free(temp);
        }
-       return list_head;
+       return data;
 }
-#endif
 
-#ifdef L_llist_free_one
-/* Free the current list element and advance to the next entry in the list.
- * Returns a pointer to the next element.  */
-extern llist_t *llist_free_one(llist_t *elm)
+/* Unlink arbitrary given element from the list */
+void FAST_FUNC llist_unlink(llist_t **head, llist_t *elm)
 {
-       llist_t *next = elm ? elm->link : NULL;
-#if ENABLE_DMALLOC /* avoid warnings from dmalloc's error-free-null option */
-       if (elm)
-#endif
-               free(elm);
-       elm = next;
-       return elm;
+       if (!elm)
+               return;
+       while (*head) {
+               if (*head == elm) {
+                       *head = (*head)->link;
+                       break;
+               }
+               head = &(*head)->link;
+       }
 }
-#endif
 
-#ifdef L_llist_free
-/* Recursively free all elements in the linked list.  */
-extern void llist_free(llist_t *elm)
+/* Recursively free all elements in the linked list.  If freeit != NULL
+ * call it on each datum in the list */
+void FAST_FUNC llist_free(llist_t *elm, void (*freeit)(void *data))
 {
-       while ((elm = llist_free_one(elm)));
+       while (elm) {
+               void *data = llist_pop(&elm);
+
+               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