[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/karchiver
From:       Eric Coquelle <eric.coquelle () gmail ! com>
Date:       2006-09-11 21:58:55
Message-ID: 1158011935.152661.6350.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 583273 by coquelle:

Fixed extraction of rar files using rar v3.60


 M  +12 -11    crar.cpp  


--- trunk/kdenonbeta/karchiver/crar.cpp #583272:583273
@@ -154,21 +154,23 @@
   int mm=strdate.mid(strdate.find("-")+1, 2).toInt();
   name=m_line1;
 	
-        i=name.findRev('/');
-	if(i!=-1)
-	{
-		path=name.left(i+1);
-	 	name=name.remove(0,i+1);
-		if(name=="")name="..";
-	}
-	else
-		path="";
+  i=name.findRev('/');
+  if(i!=-1)
+  {
+    path=name.left(i+1);
+    name=name.remove(0,i+1);
+    if(name=="")name="..";
+  }
+  else
+    path="";
    //Remove the * of the begining of the path (if password protected)
     if(path.startsWith("*"))
     {
       path=path.remove(0,1);
       passwordrequired=true;
     }
+    else if(path.startsWith(" "))
+      path=path.remove(0,1);
     if(name.startsWith("*"))
       name=name.remove(0,1);
       
@@ -293,8 +295,6 @@
   progressbar->reset();
 
   processextract.clearArguments();
-  //if(!archivePassword.isEmpty())
-  //  decompressorname="rar"; //unrar has some troubles with password protected \
archives  processextract << decompressorname;
   processextract << "x";
   processextract << "-y";
@@ -315,6 +315,7 @@
   processextract << "-o+";
 
   processextract << archiveName;
+  processextract << "-d"+extractpath;
 
   if((extractall!=EXTRACTONE)&&(extractall!=EXTRACTONE_AND_BLOCK)&&(!checkFiles(extractpath, \
extractall)))  {


[prev in list] [next in list] [prev in thread] [next in thread]