]>
Commit | Line | Data |
---|---|---|
f7a54856 AM |
1 | Index: rpm2cpio |
2 | =================================================================== | |
3 | RCS file: /v/rpm/cvs/rpm/scripts/rpm2cpio,v | |
4 | retrieving revision 1.2 | |
5 | retrieving revision 1.2.2.1 | |
6 | diff -u -u -r1.2 -r1.2.2.1 | |
7 | --- rpm/scripts/rpm2cpio 25 May 2007 18:34:16 -0000 1.2 | |
8 | +++ rpm/scripts/rpm2cpio 10 Jun 2007 11:43:39 -0000 1.2.2.1 | |
9 | @@ -23,4 +23,14 @@ | |
10 | hdrsize=`expr 8 + 16 \* $il + $dl` | |
11 | o=`expr $o + $hdrsize` | |
12 | ||
13 | -dd if=$pkg ibs=$o skip=1 2>/dev/null | gunzip | |
14 | +comp=$(dd if="$pkg" ibs=$o skip=1 count=1 2>/dev/null \ | |
15 | + | dd bs=3 count=1 2> /dev/null) | |
16 | + | |
17 | +gz="$(echo -en '\037\0213')" | |
18 | +case "$comp" in | |
19 | + BZh) dd if="$pkg" ibs=$o skip=1 2>/dev/null | bunzip2 ;; | |
20 | + "$gz"*) dd if="$pkg" ibs=$o skip=1 2>/dev/null | gunzip ;; | |
21 | + # no magic in old lzma format, if unknown we assume that's lzma for now | |
22 | + *) dd if="$pkg" ibs=$o skip=1 2>/dev/null | lzma d -si -so ;; | |
23 | + #*) echo "Unrecognized rpm file: $pkg"; return 1 ;; | |
24 | +esac |