Simplify code in cut(1)
Thanks Roberto and Rob for your input on this.
This commit is contained in:
parent
f559b71488
commit
486d22fc48
12
cut.c
12
cut.c
|
@ -60,16 +60,8 @@ parselist(char *str)
|
||||||
if(!(r = malloc(n * sizeof(Range))))
|
if(!(r = malloc(n * sizeof(Range))))
|
||||||
eprintf("malloc:");
|
eprintf("malloc:");
|
||||||
for(s = str; n; n--, s++) {
|
for(s = str; n; n--, s++) {
|
||||||
if (*s == '-')
|
r->min = (*s == '-') ? 1 : strtoul(s, &s, 10);
|
||||||
r->min = 1;
|
r->max = (*s == '-') ? strtoul(s + 1, &s, 10) : r->min;
|
||||||
else
|
|
||||||
r->min = strtoul(s, &s, 10);
|
|
||||||
if (*s == '-') {
|
|
||||||
s++;
|
|
||||||
r->max = strtoul(s, &s, 10);
|
|
||||||
} else {
|
|
||||||
r->max = r->min;
|
|
||||||
}
|
|
||||||
r->next = NULL;
|
r->next = NULL;
|
||||||
if(!r->min || (r->max && r->max < r->min) || (*s && *s != ','))
|
if(!r->min || (r->max && r->max < r->min) || (*s && *s != ','))
|
||||||
eprintf("cut: bad list value\n");
|
eprintf("cut: bad list value\n");
|
||||||
|
|
Loading…
Reference in New Issue
Block a user