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

List:       kde-commits
Subject:    kdebase/kioslave/smb
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-02-22 19:57:22
Message-ID: 20040222195722.CEB4C9959 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

don't stress libsmbclient with .. in urls
CCMAIL: 63133-done@bugs.kde.org


  M +1 -1      kio_smb_auth.cpp   1.25
  M +10 -12    kio_smb_browse.cpp   1.31
  M +2 -2      kio_smb_internal.cpp   1.19


--- kdebase/kioslave/smb/kio_smb_auth.cpp  #1.24:1.25
@@ -149,5 +149,5 @@ bool SMBSlave::auth_initialize_smbc()
         int debug_level = 0;
 #ifndef NDEBUG
-        debug_level = 100;
+//        debug_level = 100;
 #endif
 

--- kdebase/kioslave/smb/kio_smb_browse.cpp  #1.30:1.31
@@ -45,5 +45,5 @@ int SMBSlave::cache_stat(const SMBUrl &u
 {
     int result = smbc_stat( url.toSmbcUrl(), st);
-    kdDebug(KIO_SMB) << "smbc_stat " << url.prettyUrl() << " " << errno << " " << result << endl;
+    kdDebug(KIO_SMB) << "smbc_stat " << url.url() << " " << errno << " " << result << endl;
     return result;
 }
@@ -140,4 +140,5 @@ void SMBSlave::stat( const KURL& kurl )
     if (url != kurl)
     {
+        kdDebug() << "redirection " << url << endl;
         redirection(url);
         return;
@@ -186,6 +187,6 @@ void SMBSlave::stat( const KURL& kurl )
 //===========================================================================
 // TODO: complete checking
-KURL SMBSlave::checkURL(const KURL& kurl) const {
-
+KURL SMBSlave::checkURL(const KURL& kurl) const
+{
     kdDebug(KIO_SMB) << "checkURL " << kurl << endl;
     QString surl = kurl.url();
@@ -216,10 +217,11 @@ KURL SMBSlave::checkURL(const KURL& kurl
         return url;
     }
+
     // no emtpy path
-    QString path = kurl.path();
-    if (path.isEmpty())
-    {
         KURL url(kurl);
+
+    if (url.path().isEmpty())
         url.setPath("/");
+
         kdDebug() << "checkURL return3 " << url << endl;
         return url;
@@ -224,8 +226,4 @@ KURL SMBSlave::checkURL(const KURL& kurl
         kdDebug() << "checkURL return3 " << url << endl;
         return url;
-    }
-
-    kdDebug() << "checkURL return3 " << kurl << endl;
-    return kurl;
 }
 

--- kdebase/kioslave/smb/kio_smb_internal.cpp  #1.18:1.19
@@ -42,6 +42,4 @@
 //===========================================================================
 
-void updateCache() {}
-
 //-----------------------------------------------------------------------
 SMBUrl::SMBUrl()
@@ -79,4 +77,6 @@ void SMBUrl::updateCache()
   //-----------------------------------------------------------------------
 {
+    cleanPath();
+
     // SMB URLs are UTF-8 encoded
     kdDebug(KIO_SMB) << "updateCache " << KURL::path() << endl;


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