sbase

suckless unix tools
git clone git://git.2f30.org/sbase.git
Log | Files | Refs | README | LICENSE

commit 56b9a26de9835bd1f778a142d3c8aa8710b81525
parent c4e5354a32a311b0a0636ff7223d914ef7926c36
Author: Jakob Kramer <jakob.kramer@gmx.de>
Date:   Sat May  3 18:34:51 +0200

sort: don't repeat skipping columns logic

Diffstat:
sort.c | 33++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/sort.c b/sort.c @@ -29,6 +29,7 @@ static int linecmp(const char **, const char **); static char *next_nonblank(char *); static char *next_blank(char *); static int parse_keydef(struct keydef *, char *); +static char *skip_columns(char *, size_t); static char *columns(char *, const struct keydef *); static bool rflag = false; @@ -194,6 +195,20 @@ next_blank(char *s) } static char * +skip_columns(char *s, size_t n) +{ + size_t i; + + for(i = 0; i < n; i++) { + if(i != 0) + s = next_blank(s); + s = next_nonblank(s); + } + + return s; +} + +static char * columns(char *line, const struct keydef *kd) { char *rest; @@ -201,31 +216,23 @@ columns(char *line, const struct keydef *kd) char *res; unsigned int i; - rest = line; - for(i = 0; i < kd->start_column; i++) { - if(i != 0) - rest = next_blank(rest); - rest = next_nonblank(rest); - } + rest = skip_columns(line, kd->start_column); for(i = 1; i < kd->start_char && *rest && !isblank(*rest); i++) rest++; start = rest; if(kd->end_column) { - rest = line; - for(i = 0; i < kd->end_column; i++) { - if(i != 0) - rest = next_blank(rest); - rest = next_nonblank(rest); - } + rest = skip_columns(line, kd->end_column); if(kd->end_char) for(i = 1; i < kd->end_char && *rest && !isblank(*rest); i++) rest++; else rest = next_blank(rest); end = rest - 1; - } else + } else { end = rest + strlen(rest); + } + if((res = strndup(start, end - start)) == NULL) enprintf(2, "strndup:"); return res;