summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--coreutils/wc.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/coreutils/wc.c b/coreutils/wc.c
index fb81c0a8f..8e3b5bbf4 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -42,20 +42,29 @@ static char print_type = 0;
static void print_counts(const unsigned int lines, const unsigned int words,
const unsigned int chars, const unsigned int length, const char *name)
{
+ int output = 0;
+
if (print_type & print_lines) {
- printf("%7d ", lines);
+ printf("%7d", lines);
+ output++;
}
if (print_type & print_words) {
- printf("%7d ", words);
+ if (output++)
+ putchar(' ');
+ printf("%7d", words);
}
if (print_type & print_chars) {
- printf("%7d ", chars);
+ if (output++)
+ putchar(' ');
+ printf("%7d", chars);
}
if (print_type & print_length) {
- printf("%7d ", length);
+ if (output++)
+ putchar(' ');
+ printf("%7d", length);
}
if (*name) {
- printf("%s", name);
+ printf(" %s", name);
}
putchar('\n');
}