Fix ipptool -P output (some was going to stdout...)
diff --git a/CHANGES.md b/CHANGES.md
index 95a42bf..9ce2ecf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.5 - 2017-08-29
+CHANGES - 2.2.5 - 2017-08-31
============================
CHANGES IN CUPS V2.2.5
@@ -53,6 +53,7 @@
(rdar://33688003)
- Fixed the localization fallback code on macOS (rdar://33583699)
- The `ipptool` program now offers an option to validate response headers.
+- The `ipptool` program's `-P` option did not work correctly.
CHANGES IN CUPS V2.2.4
diff --git a/test/ipptool.c b/test/ipptool.c
index 005800b..2df9900 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -4866,13 +4866,13 @@
if ((s[1] & 0xc0) != 0x80)
{
- cupsFilePutChar(cupsFileStdout(), '?');
+ cupsFilePutChar(outfile, '?');
s ++;
}
else
{
- cupsFilePutChar(cupsFileStdout(), *s++);
- cupsFilePutChar(cupsFileStdout(), *s);
+ cupsFilePutChar(outfile, *s++);
+ cupsFilePutChar(outfile, *s);
}
}
else if ((*s & 0xf0) == 0xe0)
@@ -4883,14 +4883,14 @@
if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80)
{
- cupsFilePutChar(cupsFileStdout(), '?');
+ cupsFilePutChar(outfile, '?');
s += 2;
}
else
{
- cupsFilePutChar(cupsFileStdout(), *s++);
- cupsFilePutChar(cupsFileStdout(), *s++);
- cupsFilePutChar(cupsFileStdout(), *s);
+ cupsFilePutChar(outfile, *s++);
+ cupsFilePutChar(outfile, *s++);
+ cupsFilePutChar(outfile, *s);
}
}
else if ((*s & 0xf8) == 0xf0)
@@ -4902,15 +4902,15 @@
if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80 ||
(s[3] & 0xc0) != 0x80)
{
- cupsFilePutChar(cupsFileStdout(), '?');
+ cupsFilePutChar(outfile, '?');
s += 3;
}
else
{
- cupsFilePutChar(cupsFileStdout(), *s++);
- cupsFilePutChar(cupsFileStdout(), *s++);
- cupsFilePutChar(cupsFileStdout(), *s++);
- cupsFilePutChar(cupsFileStdout(), *s);
+ cupsFilePutChar(outfile, *s++);
+ cupsFilePutChar(outfile, *s++);
+ cupsFilePutChar(outfile, *s++);
+ cupsFilePutChar(outfile, *s);
}
}
else if ((*s & 0x80) || (*s < ' ' && !isspace(*s & 255)))
@@ -4919,10 +4919,10 @@
* Invalid control character...
*/
- cupsFilePutChar(cupsFileStdout(), '?');
+ cupsFilePutChar(outfile, '?');
}
else
- cupsFilePutChar(cupsFileStdout(), *s);
+ cupsFilePutChar(outfile, *s);
s ++;
}