2004-07-17  Ulrich Drepper  <drepper@redhat.com>

	* iconv/iconv_prog.c (print_known_names): Make machine-readable
	output even less cluttered.
This commit is contained in:
Ulrich Drepper 2004-07-17 17:45:03 +00:00
parent 77d60040fe
commit 1b6840e5ac
2 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,8 @@
2004-07-17 Ulrich Drepper <drepper@redhat.com>
* iconv/iconv_prog.c (print_known_names): Make machine-readable
output even less cluttered.
2004-07-16 Steven Munroe <sjmunroe@us.ibm.com>
[BZ #269]

View File

@ -770,6 +770,9 @@ print_known_names (void)
add_known_names (modules);
}
bool human_readable = isatty (fileno (stdout));
if (human_readable)
fputs (_("\
The following list contain all the coded character sets known. This does\n\
not necessarily mean that all combinations of these names can be used for\n\
@ -778,13 +781,8 @@ listed with several different names (aliases).\n\n "), stdout);
/* Now print the collected names. */
column = 2;
if (isatty (fileno (stdout)))
{
twalk (printlist, do_print_human);
twalk (printlist, human_readable ? do_print_human : do_print);
if (column != 0)
if (human_readable && column != 0)
puts ("");
}
else
twalk (printlist, do_print);
}