diff options
| author |   Lori Hikichi <lori.hikichi@broadcom.com> | 2020-02-18 11:14:22 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-19 11:23:33 +0000 |
| commit | a40a93e81766513cf710e713093ab74c6ec936c3 (patch) | |
| tree | b3c1b40cccac6f12dd2265856efb9a6ff53f447a | |
| parent | f495e1f771b60d2db11ffa351adf56ba664fe7e1 (diff) | |
| download | openembedded-core-contrib-a40a93e81766513cf710e713093ab74c6ec936c3.tar.gz | |
rpm2cpio.sh: fix to handle newline character
This script is attempting to read binary data from an rpm file.
If any of the bytes it is attempt to read is the binary value 0xa
(i.e. a newline) then the script does not properly deal with this
special case. Due to the behavior of command substitution, instead of
fetching the value 0xa, the script makes an error and get the value 0
instead.
The fix and the following explantion was taken from this post...
https://unix.stackexchange.com/questions/10801/
how-to-use-bash-script-to-read-binary-file-content
Command substitution $(…) strips final newlines in the command output.
There's a fairly easy workaround. Make sure the output ends in a
character other than a newline, then strip that one character.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | scripts/rpm2cpio.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh index 876c53c5d9..7cd771bbe7 100755 --- a/scripts/rpm2cpio.sh +++ b/scripts/rpm2cpio.sh @@ -22,7 +22,8 @@ calcsize() { i=0 while [ $i -lt 8 ]; do - b="$(_dd $(($offset + $i)) bs=1 count=1)" + b=$(_dd $(($offset + $i)) bs=1 count=1; echo X) + b=${b%X} [ -z "$b" ] && b="0" || b="$(exec printf '%u\n' "'$b")" |