version 1.42, 2017/06/27 18:23:29 |
version 1.43, 2018/08/18 16:44:52 |
|
|
/* $OpenBSD$ */ |
/* $OpenBSD$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011,2014,2015,2017,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 |
|
|
const struct tbl_opts *opts, const struct tbl_dat *dp) |
const struct tbl_opts *opts, const struct tbl_dat *dp) |
{ |
{ |
int i; |
int i; |
size_t sz, psz, ssz, d; |
size_t sz, ssz, d; |
const char *str; |
const char *str; |
char *cp; |
char *cp; |
char buf[2]; |
char buf[2]; |
|
|
buf[0] = opts->decimal; |
buf[0] = opts->decimal; |
buf[1] = '\0'; |
buf[1] = '\0'; |
|
|
psz = (*tbl->slen)(buf, tbl->arg); |
|
|
|
if (NULL != (cp = strrchr(str, opts->decimal))) { |
if (NULL != (cp = strrchr(str, opts->decimal))) { |
buf[1] = '\0'; |
buf[1] = '\0'; |
for (ssz = 0, i = 0; cp != &str[i]; i++) { |
for (ssz = 0, i = 0; cp != &str[i]; i++) { |
buf[0] = str[i]; |
buf[0] = str[i]; |
ssz += (*tbl->slen)(buf, tbl->arg); |
ssz += (*tbl->slen)(buf, tbl->arg); |
} |
} |
d = ssz + psz; |
d = ssz; |
} else |
} else |
d = sz + psz; |
d = sz; |
|
|
/* Adjust the settings for this column. */ |
/* Adjust the settings for this column. */ |
|
|