From 1b6840e5acb99031f96544551b021acc74273738 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 17 Jul 2004 17:45:03 +0000 Subject: [PATCH] Update. 2004-07-17 Ulrich Drepper * iconv/iconv_prog.c (print_known_names): Make machine-readable output even less cluttered. --- ChangeLog | 5 +++++ iconv/iconv_prog.c | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46a4c2b..c1962a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-07-17 Ulrich Drepper + + * iconv/iconv_prog.c (print_known_names): Make machine-readable + output even less cluttered. + 2004-07-16 Steven Munroe [BZ #269] diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index af82325..26b3c24 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -770,7 +770,10 @@ print_known_names (void) add_known_names (modules); } - fputs (_("\ + 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\ the FROM and TO command line parameters. One coded character set can be\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) - puts (""); - } - else - twalk (printlist, do_print); + if (human_readable && column != 0) + puts (""); } -- 2.7.4