[PATCH 5/8] sort: don't evaluate if clause

From: Jakob Kramer <jakob.kramer_AT_gmx.de>
Date: Sat, 3 May 2014 19:06:20 +0200

this fixes that you could specify a key
definition like "-k 1.2.3", which is incorrect.

---
 sort.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sort.c b/sort.c
index 3614853..63b9509 100644
--- a/sort.c
+++ b/sort.c
_AT_@ -103,7 +103,7 @@ addkeydef(char *def)
 	if(!head)
 		head = node;
 	if(parse_keydef(&node->keydef, def))
-		enprintf(2, "parse_keydef:");
+		enprintf(2, "faulty key definition\n");
 	if(curr)
 		curr->next = node;
 	node->next = NULL;
_AT_@ -155,6 +155,7 @@ static int
 parse_keydef(struct keydef *kd, char *s)
 {
 	char *rest = s;
+
 	kd->start_column = 1;
 	kd->start_char = 1;
 	/* 0 means end of line */
_AT_@ -170,9 +171,9 @@ parse_keydef(struct keydef *kd, char *s)
 		kd->end_column = strtoul(rest+1, &rest, 10);
 		if(kd->end_column < kd->start_column)
 			enprintf(2, ",%u is too small\n", kd->end_column);
+		if(*rest == '.')
+			kd->end_char = strtoul(rest+1, &rest, 10);
 	}
-	if(*rest == '.')
-		kd->end_char = strtoul(rest+1, &rest, 10);
 	if(*rest != '\0')
 		return -1;
 	return 0;
-- 
1.8.5.1
--/04w6evG8XlLl3ft
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0006-sort-add-b-flag-don-t-use-it-as-default.patch"

Received on Mon Sep 17 2001 - 00:00:00 CEST