From: Rafi Y. <ya...@us...> - 2004-05-24 07:28:08
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9374/krusader/VFS Modified Files: krarchandler.cpp Log Message: Fixed a bzip2 and gzip uncompress bug Index: krarchandler.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krarchandler.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** krarchandler.cpp 20 Mar 2004 12:33:15 -0000 1.7 --- krarchandler.cpp 24 May 2004 07:27:49 -0000 1.8 *************** *** 184,189 **** else if ( type == "tarz" ) packer = KrServices::fullPathName( "tar" ) + " -xvzf"; else if ( type == "-tbz" ) packer = KrServices::fullPathName( "tar" ) + " -xjvf"; ! else if ( type == "gzip" ) packer = KrServices::fullPathName( "gzip" ) + " -d"; ! else if ( type == "zip2" ) packer = KrServices::fullPathName( "bzip2" ) + " -d"; else if ( type == "-rar" ) packer = KrServices::fullPathName( "unrar" ) + " x"; else if ( type == "-ace" ) packer = KrServices::fullPathName( "unace" ) + " x"; --- 184,189 ---- else if ( type == "tarz" ) packer = KrServices::fullPathName( "tar" ) + " -xvzf"; else if ( type == "-tbz" ) packer = KrServices::fullPathName( "tar" ) + " -xjvf"; ! else if ( type == "gzip" ) packer = KrServices::fullPathName( "gzip" ) + " -cd"; ! else if ( type == "zip2" ) packer = KrServices::fullPathName( "bzip2" ) + " -cdk"; else if ( type == "-rar" ) packer = KrServices::fullPathName( "unrar" ) + " x"; else if ( type == "-ace" ) packer = KrServices::fullPathName( "unace" ) + " x"; *************** *** 193,197 **** // unpack the files KShellProcess proc; ! proc << packer << + "\"" + archive + "\""; QString save = getcwd( 0, 0 ); chdir( dest.local8Bit() ); --- 193,203 ---- // unpack the files KShellProcess proc; ! proc << packer << " \"" + archive + "\""; ! if( type == "zip2" || type=="gzip" ){ ! QString arcname = archive.mid(archive.findRev("/")+1); ! if( arcname.contains(".") ) arcname = arcname.left(arcname.findRev(".")); ! proc << ">" << "\""+dest+"/"+arcname+"\""; ! } ! QString save = getcwd( 0, 0 ); chdir( dest.local8Bit() ); |