qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
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> 2004-07-16 Steven Munroe <sjmunroe@us.ibm.com>
[BZ #269] [BZ #269]

12
iconv/iconv_prog.c
View File

@ -770,6 +770,9 @@ print_known_names (void)
add_known_names (modules); add_known_names (modules);
} }
bool human_readable = isatty (fileno (stdout));
if (human_readable)
fputs (_("\ fputs (_("\
The following list contain all the coded character sets known. This does\n\ 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\ 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. */ /* Now print the collected names. */
column = 2; column = 2;
if (isatty (fileno (stdout))) twalk (printlist, human_readable ? do_print_human : do_print);
{
twalk (printlist, do_print_human);
if (column != 0) if (human_readable && column != 0)
puts (""); puts ("");
} }
else
twalk (printlist, do_print);
}