don't emit usage to stderr

Only write error output to stderr, not help und usage information.
This allows now

  ./iw | less

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>

diff --git a/iw.c b/iw.c
index d0d5286fd24d4fe9fc6c99f5e2186b2dae14bedc..2525492e18446a982f081f6ff4438417237037c2 100644 (file)
--- a/iw.c
+++ b/iw.c
@@ -103,24 +103,24 @@ static void __usage_cmd(struct cmd *cmd, char *indent, bool full)
 {
        const char *start, *lend, *end;
 
-       fprintf(stderr, "%s", indent);
+       printf("%s", indent);
 
        switch (cmd->idby) {
        case CIB_NONE:
                break;
        case CIB_PHY:
-               fprintf(stderr, "phy <phyname> ");
+               printf("phy <phyname> ");
                break;
        case CIB_NETDEV:
-               fprintf(stderr, "dev <devname> ");
+               printf("dev <devname> ");
                break;
        }
        if (cmd->section)
-               fprintf(stderr, "%s ", cmd->section);
-       fprintf(stderr, "%s", cmd->name);
+               printf("%s ", cmd->section);
+       printf("%s", cmd->name);
        if (cmd->args)
-               fprintf(stderr, " %s", cmd->args);
-       fprintf(stderr, "\n");
+               printf(" %s", cmd->args);
+       printf("\n");
 
        if (!full || !cmd->help)
                return;
@@ -129,7 +129,7 @@ static void __usage_cmd(struct cmd *cmd, char *indent, bool full)
        if (strlen(indent))
                indent = "\t\t";
        else
-               fprintf(stderr, "\n");
+               printf("\n");
 
        /* print line by line */
        start = cmd->help;
@@ -138,18 +138,18 @@ static void __usage_cmd(struct cmd *cmd, char *indent, bool full)
                lend = strchr(start, '\n');
                if (!lend)
                        lend = end;
-               fprintf(stderr, "%s", indent);
-               fprintf(stderr, "%.*s\n", (int)(lend - start), start);
+               printf("%s", indent);
+               printf("%.*s\n", (int)(lend - start), start);
                start = lend + 1;
        } while (end != lend);
 
-       fprintf(stderr, "\n");
+       printf("\n");
 }
 
 static void usage_options(void)
 {
-       fprintf(stderr, "Options:\n");
-       fprintf(stderr, "\t--debug\t\tenable netlink debugging\n");
+       printf("Options:\n");
+       printf("\t--debug\t\tenable netlink debugging\n");
 }
 
 static const char *argv0;
@@ -158,17 +158,17 @@ static void usage(bool full)
 {
        struct cmd *cmd;
 
-       fprintf(stderr, "Usage:\t%s [options] command\n", argv0);
+       printf("Usage:\t%s [options] command\n", argv0);
        usage_options();
-       fprintf(stderr, "\t--version\tshow version (%s)\n", iw_version);
-       fprintf(stderr, "Commands:\n");
+       printf("\t--version\tshow version (%s)\n", iw_version);
+       printf("Commands:\n");
        for (cmd = &__start___cmd; cmd < &__stop___cmd;
             cmd = (struct cmd *)((char *)cmd + cmd_size)) {
                if (!cmd->handler || cmd->hidden)
                        continue;
                __usage_cmd(cmd, "\t", full);
        }
-       fprintf(stderr, "\nYou can omit the 'phy' or 'dev' if "
+       printf("\nYou can omit the 'phy' or 'dev' if "
                        "the identification is unique,\n"
                        "e.g. \"iw wlan0 info\" or \"iw phy0 info\". "
                        "(Don't when scripting.)\n\n"
@@ -188,7 +188,7 @@ TOPLEVEL(help, NULL, 0, 0, CIB_NONE, print_help,
 
 static void usage_cmd(struct cmd *cmd)
 {
-       fprintf(stderr, "Usage:\t%s [options] ", argv0);
+       printf("Usage:\t%s [options] ", argv0);
        __usage_cmd(cmd, "", true);
        usage_options();
 }