X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fllist.c;h=8a74832ee3ff54e50d08c4e86f0c1daefbf0965e;hb=becd8c538cc689460dca83ecc92222969059c5f4;hp=842e8f7bbb20eb2ac67168f324f4c1979a54f451;hpb=cc848ddbf82500fd0d8c42c0e77b5c456805095b;p=oweals%2Fbusybox.git

diff --git a/libbb/llist.c b/libbb/llist.c
index 842e8f7bb..8a74832ee 100644
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -7,48 +7,36 @@
  * Copyright (C) 2005 Bernhard 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, char *new_item)
+void 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;
-
-	return (new_head);
+	llist_t *new_head = xmalloc(sizeof(llist_t));
+	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.  */
-llist_t *llist_add_to_end(llist_t *list_head, char *data)
+void llist_add_to_end(llist_t **list_head, void *data)
 {
-	llist_t *new_item;
-
-	new_item = xmalloc(sizeof(llist_t));
+	llist_t *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;
+	if (!*list_head) *list_head = new_item;
+	else {
+		llist_t *tail = *list_head;
+		while (tail->link) tail = tail->link;
 		tail->link = new_item;
 	}
-	return list_head;
 }
-#endif
 
-#ifdef L_llist_pop
 /* Remove first element from the list and return it */
 void *llist_pop(llist_t **head)
 {
@@ -64,9 +52,7 @@ void *llist_pop(llist_t **head)
 
 	return data;
 }
-#endif
 
-#ifdef L_llist_free
 /* 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))
@@ -76,4 +62,17 @@ void llist_free(llist_t *elm, void (*freeit)(void *data))
 		if (freeit) freeit(data);
 	}
 }
-#endif
+
+/* Reverse list order. Useful since getopt32 saves option params
+ * in reverse order */
+llist_t* rev_llist(llist_t *list)
+{
+	llist_t *new = NULL;
+	while (list) {
+		llist_t *next = list->link;
+		list->link = new;
+		new = list;
+		list = next;
+	}
+	return new;
+}