36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
|
From d499887c9261fdab4d03ea29316ea5e8fc646bd3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Festi <ffesti@redhat.com>
|
||
|
|
Date: Fri, 1 Jul 2022 14:49:09 +0200
|
||
|
|
Subject: [PATCH] rpm2cpio.sh: strip null bytes with tr
|
||
|
|
|
||
|
|
to avoid warnings
|
||
|
|
---
|
||
|
|
scripts/rpm2cpio.sh | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh
|
||
|
|
index f77d5f8..59e8bc5 100755
|
||
|
|
--- a/scripts/rpm2cpio.sh
|
||
|
|
+++ b/scripts/rpm2cpio.sh
|
||
|
|
@@ -43,7 +43,7 @@ calcsize() {
|
||
|
|
offset=$(($offset + $rsize))
|
||
|
|
}
|
||
|
|
|
||
|
|
-case "$(_dd 0 bs=8 count=1)" in
|
||
|
|
+case "$(_dd 0 bs=8 count=1 | tr -d '\0')" in
|
||
|
|
"$(printf '\355\253\356\333')"*) ;; # '\xed\xab\xee\xdb'
|
||
|
|
*) fatal "File doesn't look like rpm: $pkg" ;;
|
||
|
|
esac
|
||
|
|
@@ -54,7 +54,7 @@ sigsize=$rsize
|
||
|
|
calcsize $(($offset + (8 - ($sigsize % 8)) % 8))
|
||
|
|
hdrsize=$rsize
|
||
|
|
|
||
|
|
-case "$(_dd $offset bs=3 count=1)" in
|
||
|
|
+case "$(_dd $offset bs=3 count=1 | tr -d '\0')" in
|
||
|
|
"$(printf '\102\132')"*) _dd $offset | bunzip2 ;; # '\x42\x5a'
|
||
|
|
"$(printf '\037\213')"*) _dd $offset | gunzip ;; # '\x1f\x8b'
|
||
|
|
"$(printf '\375\067')"*) _dd $offset | xzcat ;; # '\xfd\x37'
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|