From e1dd3bfa4a9fb789b03c1857786d58c45b0b2901 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Sat, 7 Jan 1995 16:38:08 +0000
Subject: [PATCH] (decode_switches): For --help, print usage to stdout.
---
main.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/main.c b/main.c
index eca72985..18d5d7b9 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
/* Argument parsing and main program of GNU Make.
-Copyright (C) 1988, 89, 90, 91, 94 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 90, 91, 94, 1995 Free Software Foundation, Inc.
This file is part of GNU Make.
GNU Make is free software; you can redistribute it and/or modify
@@ -1367,13 +1367,16 @@ positive integral argument",
if (!env && (bad || print_usage_flag))
{
/* Print a nice usage message. */
+ FILE *usageto;
if (print_version_flag)
print_version ();
- fprintf (stderr, "Usage: %s [options] [target] ...\n", program);
+ usageto = bad ? stderr : stdout;
- fputs ("Options:\n", stderr);
+ fprintf (usageto, "Usage: %s [options] [target] ...\n", program);
+
+ fputs ("Options:\n", usageto);
for (cs = switches; cs->c != '\0'; ++cs)
{
char buf[1024], shortarg[50], longarg[50], *p;
@@ -1444,11 +1447,11 @@ positive integral argument",
line with the description, leaving at least two spaces.
Print it on its own line instead. */
{
- fprintf (stderr, "%s\n", buf);
+ fprintf (usageto, "%s\n", buf);
buf[0] = '\0';
}
- fprintf (stderr, "%*s%s.\n",
+ fprintf (usageto, "%*s%s.\n",
- DESCRIPTION_COLUMN,
buf, cs->description);
}