colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: print_required_fields() - fix non-ASCII strings alignment in multiline

Browse Source
This commit is contained in:
Jiří Klimeš
2013-05-28 09:21:02 +02:00
parent e6870789b5
commit 7fe4345d0d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/src/utils.c
View File

@@ -697,7 +697,10 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[])
section_prefix ? "." : "", section_prefix ? "." : "",
_(field_values[idx].name_l10n), _(field_values[idx].name_l10n),
j); j);
printf ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT, tmp, *p ? *p : not_set_str); width1 = strlen (tmp);
width2 = nmc_string_screen_width (tmp, NULL);
printf ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT+width1-width2, tmp,
*p ? *p : not_set_str);
g_free (tmp); g_free (tmp);
} }
} else { } else {
@@ -709,7 +712,10 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[])
section_prefix ? hdr_name : "", section_prefix ? hdr_name : "",
section_prefix ? "." : "", section_prefix ? "." : "",
_(field_values[idx].name_l10n)); _(field_values[idx].name_l10n));
printf ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT, tmp, val ? val : not_set_str); width1 = strlen (tmp);
width2 = nmc_string_screen_width (tmp, NULL);
printf ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT+width1-width2, tmp,
val ? val : not_set_str);
g_free (tmp); g_free (tmp);
} }
} }