92aa6cbd1c
zstd 1.3.5 OBS-URL: https://build.opensuse.org/request/show/620410 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=22
104 lines
3.3 KiB
Diff
104 lines
3.3 KiB
Diff
From 712a9fd9721c314f4b0238577d803b012845f6d2 Mon Sep 17 00:00:00 2001
|
|
From: "W. Felix Handte" <w@felixhandte.com>
|
|
Date: Fri, 29 Jun 2018 15:33:44 -0400
|
|
Subject: [PATCH 1/2] Allow Invoking `zstd --list` When `stdin` is not a `tty`
|
|
|
|
Also now returns an error when no inputs are given.
|
|
|
|
New proposed behavior:
|
|
|
|
```
|
|
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l; echo $?
|
|
No files given
|
|
1
|
|
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l Makefile.zst; echo $?
|
|
Frames Skips Compressed Uncompressed Ratio Check Filename
|
|
1 0 3.08 KB 10.92 KB 3.544 XXH64 Makefile.zst
|
|
0
|
|
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l <Makefile.zst; echo $?
|
|
zstd: --list does not support reading from standard input
|
|
No files given
|
|
1
|
|
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l Makefile.zst <Makefile.zst; echo $?
|
|
Frames Skips Compressed Uncompressed Ratio Check Filename
|
|
1 0 3.08 KB 10.92 KB 3.544 XXH64 Makefile.zst
|
|
0
|
|
felix@odin:~/prog/zstd (list-stdin-check)$
|
|
```
|
|
---
|
|
programs/fileio.c | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/programs/fileio.c b/programs/fileio.c
|
|
index 0175b316..b4eed28d 100644
|
|
--- a/programs/fileio.c
|
|
+++ b/programs/fileio.c
|
|
@@ -2017,21 +2017,25 @@ static int FIO_listFile(fileInfo_t* total, const char* inFileName, int displayLe
|
|
}
|
|
|
|
int FIO_listMultipleFiles(unsigned numFiles, const char** filenameTable, int displayLevel){
|
|
-
|
|
- if (!IS_CONSOLE(stdin)) {
|
|
- DISPLAYOUT("zstd: --list does not support reading from standard input\n");
|
|
- return 1;
|
|
+ unsigned u;
|
|
+ for (u=0; u<numFiles;u++) {
|
|
+ if (!strcmp (filenameTable[u], stdinmark)) {
|
|
+ DISPLAYOUT("zstd: --list does not support reading from standard input\n");
|
|
+ return 1;
|
|
+ }
|
|
}
|
|
|
|
if (numFiles == 0) {
|
|
+ if (!IS_CONSOLE(stdin)) {
|
|
+ DISPLAYOUT("zstd: --list does not support reading from standard input\n");
|
|
+ }
|
|
DISPLAYOUT("No files given\n");
|
|
- return 0;
|
|
+ return 1;
|
|
}
|
|
if (displayLevel <= 2) {
|
|
DISPLAYOUT("Frames Skips Compressed Uncompressed Ratio Check Filename\n");
|
|
}
|
|
{ int error = 0;
|
|
- unsigned u;
|
|
fileInfo_t total;
|
|
memset(&total, 0, sizeof(total));
|
|
total.usesCheck = 1;
|
|
--
|
|
2.16.4
|
|
|
|
From 8e7bdc18d62632adcee029b2f8f5013d11549dd7 Mon Sep 17 00:00:00 2001
|
|
From: "W. Felix Handte" <w@felixhandte.com>
|
|
Date: Fri, 29 Jun 2018 16:31:22 -0400
|
|
Subject: [PATCH 2/2] Fix Tests of `--list` Behavior with `stdin`
|
|
|
|
---
|
|
tests/playTests.sh | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/playTests.sh b/tests/playTests.sh
|
|
index 09a7377f..aa5535d5 100755
|
|
--- a/tests/playTests.sh
|
|
+++ b/tests/playTests.sh
|
|
@@ -731,8 +731,14 @@ $ECHO "\n===> zstd --list/-l error detection tests "
|
|
! $ZSTD -lv tmp1*
|
|
! $ZSTD --list -v tmp2 tmp12.zst
|
|
|
|
-$ECHO "\n===> zstd --list/-l exits 1 when stdin is piped in"
|
|
-! echo "piped STDIN" | $ZSTD --list
|
|
+$ECHO "\n===> zstd --list/-l errors when presented with stdin / no files"
|
|
+! $ZSTD -l
|
|
+! $ZSTD -l -
|
|
+! $ZSTD -l < tmp1.zst
|
|
+! $ZSTD -l - < tmp1.zst
|
|
+! $ZSTD -l - tmp1.zst
|
|
+! $ZSTD -l - tmp1.zst < tmp1.zst
|
|
+$ZSTD -l tmp1.zst < tmp1.zst # but doesn't error just because stdin is not a tty
|
|
|
|
$ECHO "\n===> zstd --list/-l test with null files "
|
|
./datagen -g0 > tmp5
|
|
--
|
|
2.16.4
|
|
|