From fccaa3629b89bcfcd2d9b4126255cd31e0f5e174 Mon Sep 17 00:00:00 2001
From: Mark Whitley <markw@lineo.com>
Date: Tue, 17 Apr 2001 18:56:18 +0000
Subject: Applied patch from I.Q. to add sort -u as a feature.

---
 sort.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'sort.c')

diff --git a/sort.c b/sort.c
index 5ecca8b8f..4f4979cc5 100644
--- a/sort.c
+++ b/sort.c
@@ -46,8 +46,11 @@ int sort_main(int argc, char **argv)
 #ifdef BB_FEATURE_SORT_REVERSE
 	int reverse = FALSE;
 #endif
+#ifdef BB_FEATURE_SORT_UNIQUE
+	int unique = FALSE;
+#endif
 
-	while ((opt = getopt(argc, argv, "nr")) != -1) {
+	while ((opt = getopt(argc, argv, "nru")) != -1) {
 		switch (opt) {
 			case 'n':
 				compare = compare_numeric;
@@ -56,6 +59,11 @@ int sort_main(int argc, char **argv)
 			case 'r':
 				reverse = TRUE;
 				break;
+#endif
+#ifdef BB_FEATURE_SORT_UNIQUE
+			case 'u':
+				unique = TRUE;
+				break;
 #endif
 			default:
 				show_usage();
@@ -81,12 +89,18 @@ int sort_main(int argc, char **argv)
 
 	/* print it */
 #ifdef BB_FEATURE_SORT_REVERSE
-	if (reverse)
-		for (i = nlines - 1; 0 <= i; i--)
-			puts(lines[i]);
-	else
+	if (reverse) {
+		for (i = --nlines; 0 <= i; i--)
+#ifdef BB_FEATURE_SORT_UNIQUE
+			if((!unique) || (i == nlines) || (strcmp(lines[i + 1], lines[i])))
+#endif
+				puts(lines[i]);
+	} else
+#endif
+		for (i = 0; i < nlines; i++)
+#ifdef BB_FEATURE_SORT_UNIQUE
+			if((!unique) || (!i) || (strcmp(lines[i - 1], lines[i])))
 #endif
-	for (i = 0; i < nlines; i++)
-		puts(lines[i]);
+				puts(lines[i]);
 	return EXIT_SUCCESS;
 }
-- 
cgit v1.2.3