PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-23 04:42:06 +01:00
Code Issues Releases Wiki Activity

Fix SOP armor command

Browse source
This commit is contained in:
Paul Schaub 2021-07-01 18:44:57 +02:00
parent c234e38ae2
commit b76172f97a
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pgpainless-sop/src/main/java/org/pgpainless/sop/commands/Armor.java
View file

@ -51,12 +51,17 @@ public class Armor implements Runnable {
@Override @Override
public void run() { public void run() {
try (PushbackInputStream pbIn = new PushbackInputStream(System.in); try (PushbackInputStream pbIn = new PushbackInputStream(System.in, BEGIN_ARMOR.length);
ArmoredOutputStream armoredOutputStream = ArmoredOutputStreamFactory.get(System.out)) { ArmoredOutputStream armoredOutputStream = ArmoredOutputStreamFactory.get(System.out)) {
byte[] start = new byte[14];
int read = pbIn.read(start); // take a peek
pbIn.unread(read); byte[] firstBytes = new byte[BEGIN_ARMOR.length];
if (Arrays.equals(BEGIN_ARMOR, start) && !allowNested) { int readByteCount = pbIn.read(firstBytes);
if (readByteCount != -1) {
pbIn.unread(firstBytes, 0, readByteCount);
}
if (Arrays.equals(BEGIN_ARMOR, firstBytes) && !allowNested) {
Streams.pipeAll(pbIn, System.out); Streams.pipeAll(pbIn, System.out);
} else { } else {
Streams.pipeAll(pbIn, armoredOutputStream); Streams.pipeAll(pbIn, armoredOutputStream);