AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2025-01-22 05:32:42 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

util : fallback to plain ASCII drawing if locale is not UTF-8

Browse Source 
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
This commit is contained in:
Michal Schmidt 2012-11-02 17:35:30 +01:00
parent 0901758558
commit c339d9775d
4 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/login/sysfs-show.c
View File

@ -105,7 +105,8 @@ static int show_sysfs_one(
}
k = ellipsize(sysfs, n_columns, 20);
printf("%s%s %s\n", prefix, lookahead ? "\342\224\234" : "\342\224\224", k ? k : sysfs);
printf("%s%s %s\n", prefix, draw_special_char(lookahead ? DRAW_BOX_VERT_AND_RIGHT : DRAW_BOX_UP_AND_RIGHT),
k ? k : sysfs);
free(k);
if (asprintf(&l,
@ -117,7 +118,8 @@ static int show_sysfs_one(
}
k = ellipsize(l, n_columns, 70);
printf("%s%s %s\n", prefix, lookahead ? "\342\224\202" : " ", k ? k : l);
printf("%s%s %s\n", prefix, lookahead ? draw_special_char(DRAW_BOX_VERT) : " ",
k ? k : l);
free(k);
free(l);
@ -125,7 +127,7 @@ static int show_sysfs_one(
if (*item) {
char *p;
p = strappend(prefix, lookahead ? "\342\224\202 " : " ");
p = strjoin(prefix, lookahead ? draw_special_char(DRAW_BOX_VERT) : " ", " ", NULL);
show_sysfs_one(udev, seat, item, sysfs, p ? p : prefix, n_columns - 2);
free(p);
}

11
src/shared/cgroup-show.c
View File

@ -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, " ");

19
src/shared/util.c
View File

@ -6140,3 +6140,22 @@ bool is_locale_utf8(void) {
out:
return (bool)cached_answer;
}
const char *draw_special_char(DrawSpecialChar ch) {
static const char *draw_table[2][_DRAW_SPECIAL_CHAR_MAX] = {
/* UTF-8 */ {
[DRAW_BOX_VERT] = "\342\224\202", /* │ */
[DRAW_BOX_VERT_AND_RIGHT] = "\342\224\234", /* ├ */
[DRAW_BOX_UP_AND_RIGHT] = "\342\224\224", /* └ */
[DRAW_TRIANGULAR_BULLET] = "\342\200\243", /* ‣ */
},
/* ASCII fallback */ {
[DRAW_BOX_VERT] = "|",
[DRAW_BOX_VERT_AND_RIGHT] = "+",
[DRAW_BOX_UP_AND_RIGHT] = "\\",
[DRAW_TRIANGULAR_BULLET] = ">",
}
};
return draw_table[!is_locale_utf8()][ch];
}

9
src/shared/util.h
View File

@ -600,3 +600,12 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
void *arg);
bool is_locale_utf8(void);
typedef enum DrawSpecialChar {
DRAW_BOX_VERT,
DRAW_BOX_VERT_AND_RIGHT,
DRAW_BOX_UP_AND_RIGHT,
DRAW_TRIANGULAR_BULLET,
_DRAW_SPECIAL_CHAR_MAX
} DrawSpecialChar;
const char *draw_special_char(DrawSpecialChar ch);