Commit befbadce authored by Michael Sweet's avatar Michael Sweet

Fix ipptool -P output (some was going to stdout...)

parent 7b0a28e3
CHANGES - 2.2.5 - 2017-08-29
CHANGES - 2.2.5 - 2017-08-31
============================
CHANGES IN CUPS V2.2.5
......@@ -53,6 +53,7 @@ CHANGES IN CUPS V2.2.5
(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
......
......@@ -4866,13 +4866,13 @@ print_xml_string(cups_file_t *outfile, /* I - Output file */
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 @@ print_xml_string(cups_file_t *outfile, /* I - Output file */
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 @@ print_xml_string(cups_file_t *outfile, /* I - Output file */
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 @@ print_xml_string(cups_file_t *outfile, /* I - Output file */
* Invalid control character...
*/
cupsFilePutChar(cupsFileStdout(), '?');
cupsFilePutChar(outfile, '?');
}
else
cupsFilePutChar(cupsFileStdout(), *s);
cupsFilePutChar(outfile, *s);
s ++;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment