version 1.57, 2017/07/31 16:14:10 |
version 1.58, 2018/08/18 16:44:55 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 621 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
Line 621 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
{ |
{ |
char *cp; |
char *cp; |
char buf[2]; |
char buf[2]; |
size_t sz, psz, ssz, d, padl; |
size_t sz, ssz, d, padl; |
int i; |
int i; |
|
|
/* |
/* |
Line 636 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
Line 636 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
buf[0] = opts->decimal; |
buf[0] = opts->decimal; |
buf[1] = '\0'; |
buf[1] = '\0'; |
|
|
psz = term_strlen(tp, buf); |
|
|
|
if ((cp = strrchr(dp->string, opts->decimal)) != NULL) { |
if ((cp = strrchr(dp->string, opts->decimal)) != NULL) { |
for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { |
for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { |
buf[0] = dp->string[i]; |
buf[0] = dp->string[i]; |
ssz += term_strlen(tp, buf); |
ssz += term_strlen(tp, buf); |
} |
} |
d = ssz + psz; |
d = ssz; |
} else |
} else |
d = sz + psz; |
d = sz; |
|
|
if (col->decimal > d && col->width > sz) { |
if (col->decimal > d && col->width > sz) { |
padl = col->decimal - d; |
padl = col->decimal - d; |