From 1646fcc5bdb71dc4d27204de88da952d95d5902c Mon Sep 17 00:00:00 2001 From: Sergej Pupykin Date: Tue, 10 Jul 2007 23:36:15 -0400 Subject: Use mbstowcs instead of strlen where applicable Signed-off-by: Dan McGee --- src/pacman/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index a0829e64..80a191d9 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -167,7 +167,7 @@ void indentprint(const char *str, int indent) if(p == NULL || *p == ' ') continue; next = strchr(p, ' '); if(next == NULL) { - next = p + strlen(p); + next = p + mbstowcs(NULL, p, 0); } len = next - p; if(len > (getcols() - cidx - 1)) { @@ -283,13 +283,13 @@ void list_display(const char *title, const alpm_list_t *list) const alpm_list_t *i; int cols, len; - len = strlen(title); + len = mbstowcs(NULL, title, 0); printf("%s ", title); if(list) { for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); - int s = strlen(str) + 2; + int s = mbstowcs(NULL, str, 0) + 2; int maxcols = getcols(); if(s + cols >= maxcols) { int i; -- cgit v1.2.3