Index: src/lib/sort.c
===================================================================
--- src/lib/sort.c	(revision 315658278d687936226e1093e482b272fcfe7720)
+++ src/lib/sort.c	(revision 8e3fb24c05938bbc6c146ee7ec4c8052313c678d)
@@ -1,2 +1,30 @@
+/*
+ * Copyright (C) 2005 Sergey Bondari
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include <mm/heap.h>
 #include <memstr.h>
@@ -5,58 +33,52 @@
 
 void qsort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b)) {
+	if (n > 4) {
+		int i = 0, j = n - 1;
+		void * tmp = (void *) malloc(e_size);
+		void * pivot = (void *) malloc(e_size);
 
-    if (n > 4) {
-        int i = 0, j = n - 1;
-        void * tmp = (void *) malloc(e_size);
-        void * pivot = (void *) malloc(e_size);
+		memcpy(pivot, data, e_size);
 
-        memcpy(pivot, data, e_size);
+		while (1) {
+			while ((cmp(data + i * e_size, pivot) < 0) && i < n) i++;
+			while ((cmp(data + j * e_size, pivot) >=0) && j > 0) j--;
+			if (i<j) {
+				memcpy(tmp, data + i * e_size, e_size);
+				memcpy(data + i * e_size, data + j * e_size, e_size);
+				memcpy(data + j * e_size, tmp, e_size);
+			} else {
+				break;
+			}
+		}
 
-        while (1) {
-            while ((cmp(data + i * e_size, pivot) < 0) && i < n) i++;
-            while ((cmp(data + j * e_size, pivot) >=0) && j > 0) j--;
+		free(tmp);
+		free(pivot);
 
-            if (i<j) {
-                memcpy(tmp, data + i * e_size, e_size);
-                memcpy(data + i * e_size, data + j * e_size, e_size);
-                memcpy(data + j * e_size, tmp, e_size);
-            } else {
-                break;
-            }
-        }
-
-        free(tmp);
-        free(pivot);
-
-        qsort(data, j + 1, e_size, cmp);
-        qsort(data + (j + 1) * e_size, n - j - 1, e_size, cmp);
-
-    } else {
-        bubblesort(data, n, e_size, cmp);
-    }
-
-
+		qsort(data, j + 1, e_size, cmp);
+		qsort(data + (j + 1) * e_size, n - j - 1, e_size, cmp);
+	} else {
+		bubblesort(data, n, e_size, cmp);
+	}
 }
 
 
 void bubblesort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b)) {
-    bool done = false;
-    void * p;
-    void * slot = (void *) malloc(e_size);
+	bool done = false;
+	void * p;
+	void * slot = (void *) malloc(e_size);
 
-    while (!done) {
-        done = true;
-        for (p = data; p < data + e_size * (n - 1); p = p + e_size) {
-            if (cmp(p, p + e_size) == 1) {
-                memcpy(slot, p, e_size);
-                memcpy(p, p + e_size, e_size);
-                memcpy(p + e_size, slot, e_size);
-                done = false;
-            }
-        }
-
-    }
-
-    free(slot);
+	while (!done) {
+		done = true;
+		for (p = data; p < data + e_size * (n - 1); p = p + e_size) {
+			if (cmp(p, p + e_size) == 1) {
+				memcpy(slot, p, e_size);
+				memcpy(p, p + e_size, e_size);
+				memcpy(p + e_size, slot, e_size);
+				done = false;
+			}
+		}
+	}
+	
+	free(slot);
 }
 
@@ -65,17 +87,17 @@
  */
 int int_cmp(void * a, void * b) {
-    return (* (int *) a > * (int*)b) ? 1 : (*(int *)a < * (int *)b) ? -1 : 0;
+	return (* (int *) a > * (int*)b) ? 1 : (*(int *)a < * (int *)b) ? -1 : 0;
 }
 
 int __u8_cmp(void * a, void * b) {
-    return (* (__u8 *) a > * (__u8 *)b) ? 1 : (*(__u8 *)a < * (__u8 *)b) ? -1 : 0;
+	return (* (__u8 *) a > * (__u8 *)b) ? 1 : (*(__u8 *)a < * (__u8 *)b) ? -1 : 0;
 }
 
 int __u16_cmp(void * a, void * b) {
-    return (* (__u16 *) a > * (__u16 *)b) ? 1 : (*(__u16 *)a < * (__u16 *)b) ? -1 : 0;
+	return (* (__u16 *) a > * (__u16 *)b) ? 1 : (*(__u16 *)a < * (__u16 *)b) ? -1 : 0;
 }
 
 int __u32_cmp(void * a, void * b) {
-    return (* (__u32 *) a > * (__u32 *)b) ? 1 : (*(__u32 *)a < * (__u32 *)b) ? -1 : 0;
+	return (* (__u32 *) a > * (__u32 *)b) ? 1 : (*(__u32 *)a < * (__u32 *)b) ? -1 : 0;
 }