X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=util.c;h=cfe69a9b863e1d1a1b80825c506209b7dffc3f6c;hb=d447b5fbe067f469132cc8e02b583a55789ccb16;hp=8495a1c1f3be4a5983f3f0cc3f32f3cceb4f2b1e;hpb=96b1b9eac408004c68b01194c0f5ad269c3434a5;p=wmpus

diff --git a/util.c b/util.c
index 8495a1c..cfe69a9 100644
--- a/util.c
+++ b/util.c
@@ -1,9 +1,25 @@
+/*
+ * 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>
 #include <stdlib.h>
 #include <stdarg.h>
 
 #include "util.h"
 
+/* Doubly linked lists */
 list_t *list_insert(list_t *next, void *data)
 {
 	list_t *node = new0(list_t);
@@ -30,7 +46,7 @@ void list_insert_after(list_t *prev, void *data)
 list_t *list_append(list_t *head, void *data)
 {
 	list_t *last = head;
-	while (last->next)
+	while (last && last->next)
 		last = last->next;
 	list_t *node = new0(list_t);
 	node->data = data;
@@ -39,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;
 }
@@ -57,6 +75,13 @@ int list_length(list_t *node)
 	return len;
 }
 
+list_t *list_last(list_t *list)
+{
+	while (list && list->next)
+		list = list->next;
+	return list;
+}
+
 list_t *list_find(list_t *list, void *data)
 {
 	for (list_t *cur = list; cur; cur = cur->next)
@@ -66,6 +91,13 @@ list_t *list_find(list_t *list, void *data)
 }
 
 /* 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;