RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   23-Nov-2007 14:06:19
  Branch: HEAD                             Handle: 2007112313061800

  Modified files:
    rpm/scripts             rpm2cpio

  Log:
    separate extractor

  Summary:
    Revision    Changes     Path
    1.5         +3  -2      rpm/scripts/rpm2cpio
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/scripts/rpm2cpio
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 rpm2cpio
  --- rpm/scripts/rpm2cpio	13 Nov 2007 21:29:53 -0000	1.4
  +++ rpm/scripts/rpm2cpio	23 Nov 2007 13:06:18 -0000	1.5
  @@ -22,8 +22,9 @@
   
   hdrsize=`expr 8 + 16 \* $il + $dl`
   o=`expr $o + $hdrsize`
  +EXTRACTOR="dd if=$pkg ibs=$o skip=1"
   
  -COMPRESSION=`(dd if=$pkg ibs=$o skip=1 |file -) 2>/dev/null`
  +COMPRESSION=`($EXTRACTOR |file -) 2>/dev/null`
   if echo $COMPRESSION |grep -q gzip; then
   	DECOMPRESSOR=gunzip
   elif echo $COMPRESSION |grep -q bzip2; then
  @@ -45,4 +46,4 @@
   	esac
   fi
   
  -dd if=$pkg ibs=$o skip=1 2>/dev/null | $DECOMPRESSOR
  +$EXTRACTOR 2>/dev/null | $DECOMPRESSOR
  @@ .