security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

gpg: Send gpgcompose --help output to stdout, not stderr. 

* g10/gpgcompose.c (show_help): Send gpgcompose --help output to
stdout, not stderr.

Reported-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Neal H. Walfield 2017-06-11 14:10:46 +02:00
parent cb0484e076
commit 7aeac20f12
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
g10/gpgcompose.c
View File

@ -281,18 +281,18 @@ show_help (struct option options[])
{
const char *o = option[0] ? option : "ARG";
l = strlen (o);
fprintf (stderr, "%s", o);
fprintf (stdout, "%s", o);
}
if (! help)
{
fputc ('\n', stderr);
fputc ('\n', stdout);
continue;
}
if (option)
for (j = l; j < max_length + 2; j ++)
fputc (' ', stderr);
fputc (' ', stdout);
#define BOLD_START "\033[1m"
#define NORMAL_RESTORE "\033[0m"
@ -314,7 +314,7 @@ show_help (struct option options[])
if (! option)
{
fprintf (stderr, "\n%s\n", formatted);
printf ("\n%s\n", formatted);
break;
}
@ -330,10 +330,10 @@ show_help (struct option options[])
if (p != formatted)
for (j = 0; j < max_length + 2; j ++)
fputc (' ', stderr);
fputc (' ', stdout);
fwrite (p, l, 1, stderr);
fputc ('\n', stderr);
fwrite (p, l, 1, stdout);
fputc ('\n', stdout);
}
xfree (formatted);