diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2012-11-02 17:35:30 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2012-11-02 17:39:52 +0100 |
| commit | c339d9775d1df19fdbbafc57486f7cd51af6b7fb (patch) | |
| tree | e0689a930c57e861641308340165d9f7431ab24e /src/shared/cgroup-show.c | |
| parent | 0901758558506273c0b7553dc3cae587f2b94290 (diff) | |
util : fallback to plain ASCII drawing if locale is not UTF-8
When printing cgroup and sysfs hierarchies, avoid using UTF-8 box drawing
characters if the locale is not UTF-8.
https://bugzilla.redhat.com/show_bug.cgi?id=871153
Diffstat (limited to 'src/shared/cgroup-show.c')
| -rw-r--r-- | src/shared/cgroup-show.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c index 2ffed8b739..69fe7fc96d 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -88,7 +88,8 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi printf("%s%s %*lu %s\n", prefix, - extra ? "\342\200\243" : ((more || i < n_pids-1) ? "\342\224\234" : "\342\224\224"), + draw_special_char(extra ? DRAW_TRIANGULAR_BULLET : + ((more || i < n_pids-1) ? DRAW_BOX_VERT_AND_RIGHT : DRAW_BOX_UP_AND_RIGHT)), pid_width, (unsigned long) pids[i], strna(t)); @@ -207,10 +208,11 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns } if (last) { - printf("%s\342\224\234 %s\n", prefix, path_get_file_name(last)); + printf("%s%s %s\n", prefix, draw_special_char(DRAW_BOX_VERT_AND_RIGHT), + path_get_file_name(last)); if (!p1) { - p1 = strappend(prefix, "\342\224\202 "); + p1 = strjoin(prefix, draw_special_char(DRAW_BOX_VERT), " ", NULL); if (!p1) { free(k); r = -ENOMEM; @@ -232,7 +234,8 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns show_cgroup_one_by_path(path, prefix, n_columns, !!last, kernel_threads); if (last) { - printf("%s\342\224\224 %s\n", prefix, path_get_file_name(last)); + printf("%s%s %s\n", prefix, draw_special_char(DRAW_BOX_UP_AND_RIGHT), + path_get_file_name(last)); if (!p2) { p2 = strappend(prefix, " "); |