X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=util.c;h=30df76c28a39d2e25320226545be0bfc8253904b;hp=325c2a2b8ab397dfcd7fd360d3abf0d4a3109d7b;hb=HEAD;hpb=eefa2034ad0f5c2ef5eb478984cfc53a6a40c6b7

diff --git a/util.c b/util.c
index 325c2a2..30df76c 100644
--- a/util.c
+++ b/util.c
@@ -1,18 +1,16 @@
 /*
- * Copyright (C) 2011 Andy Spencer <andy753421@gmail.com>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2011, Andy Spencer <andy753421@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  */
 
 #include <stdio.h>
@@ -57,12 +55,14 @@ list_t *list_append(list_t *head, void *data)
 	return last ? head : node;
 }
 
-list_t *list_remove(list_t *head, list_t *node)
+list_t *list_remove(list_t *head, list_t *node, int freedata)
 {
 	list_t *next = node->next;
 	list_t *prev = node->prev;
 	if (next) next->prev = prev;
 	if (prev) prev->next = next;
+	if (freedata)
+		free(node->data);
 	free(node);
 	return head == node ? next : head;
 }
@@ -90,7 +90,49 @@ list_t *list_find(list_t *list, void *data)
 	return NULL;
 }
 
+list_t *list_sort(list_t *list, int rev, int (*func)(void *a, void*b))
+{
+	if (list == NULL || list->next == NULL)
+		return list;
+
+	/* Split list */
+	list_t *sides[2] = {NULL, NULL};
+	for (int i = 0; list; i=(i+1)%2) {
+		list_t *head = list;
+		list = list->next;
+		head->next = sides[i];
+		sides[i]   = head;
+	}
+
+	/* Sort sides */
+	sides[0] = list_sort(sides[0], !rev, func);
+	sides[1] = list_sort(sides[1], !rev, func);
+
+	/* Merge sides */
+	while (sides[0] || sides[1]) {
+		int i = sides[0] == NULL ? 1 :
+		        sides[1] == NULL ? 0 :
+			func(sides[0]->data,
+			     sides[1]->data) > 0 ? !!rev : !rev;
+		list_t *head = sides[i];
+		sides[i] = sides[i]->next;
+		head->next = list;
+		head->prev = NULL;
+		if (list)
+			list->prev = head;
+		list = head;
+	}
+	return list;
+}
+
 /* Misc */
+int str2num(char *str, int def)
+{
+	char *end = NULL;
+	int num = strtol(str, &end, 10);
+	return end && *end == '\0' ? num : def;
+}
+
 int error(char *fmt, ...)
 {
 	va_list ap;