Support negative trim values (#{=-10:pane_title}) to trim from the end,

suggested by Kevin Brubeck Unhammer.
This commit is contained in:
nicm
2016-01-31 09:54:46 +00:00
parent 225a384dbb
commit 8028560f82
2 changed files with 15 additions and 7 deletions

View File

@ -684,7 +684,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
char *copy, *copy0, *endptr, *ptr, *found, *new, *value;
char *from = NULL, *to = NULL;
size_t valuelen, newlen, fromlen, tolen, used;
u_long limit = 0;
long limit = 0;
int modifiers = 0, brackets;
/* Make a copy of the key. */
@ -696,8 +696,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
switch (copy[0]) {
case '=':
errno = 0;
limit = strtoul(copy + 1, &endptr, 10);
if (errno == ERANGE && limit == ULONG_MAX)
limit = strtol(copy + 1, &endptr, 10);
if (errno == ERANGE && (limit == LONG_MIN || limit == LONG_MAX))
break;
if (*endptr != ':')
break;
@ -813,10 +813,14 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
}
/* Truncate the value if needed. */
if (limit != 0) {
if (limit > 0) {
new = utf8_trimcstr(value, limit);
free(value);
value = new;
} else if (limit < 0) {
new = utf8_rtrimcstr(value, -limit);
free(value);
value = new;
}
/* Expand the buffer and copy in the value. */