EXEC_PREFER_APPLETS support by Gabriel L. Somlo <somlo@cmu.edu>

[oweals/busybox.git] / libbb / llist.c

diff --git a/libbb/llist.c b/libbb/llist.c
index 13b974decd8cdcd9edc1f9661e7f43b57c43607b..63c77fa9ea422994291f711cfcec9eff6c0636b3 100644 (file)
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -7,49 +7,51 @@
  * 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.  */
-void llist_add_to(llist_t **old_head, void *data)
+void llist_add_to(llist_t ** old_head, void *data)
 {
        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.  */
-void llist_add_to_end(llist_t **list_head, void *data)
+void llist_add_to_end(llist_t ** list_head, void *data)
 {
        llist_t *new_item = xmalloc(sizeof(llist_t));
+
        new_item->data = data;
        new_item->link = NULL;
 
-       if (!*list_head) *list_head = new_item;
+       if (!*list_head)
+               *list_head = new_item;
        else {
                llist_t *tail = *list_head;
-               while (tail->link) tail = tail->link;
+
+               while (tail->link)
+                       tail = tail->link;
                tail->link = new_item;
        }
 }
-#endif
 
-#ifdef L_llist_pop
 /* Remove first element from the list and return it */
-void *llist_pop(llist_t **head)
+void *llist_pop(llist_t ** head)
 {
        void *data;
 
-       if(!*head) data = *head;
+       if (!*head)
+               data = *head;
        else {
                void *next = (*head)->link;
+
                data = (*head)->data;
                free(*head);
                *head = next;
@@ -57,16 +59,31 @@ 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))
+void 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. 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;
 }
-#endif