[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-05-08 14:35:52
Message-ID: 20040508143552.71BB7237D () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

some more debug output - don't trigger an assert in KRun because we call
finished() in stat() without giving any other output :)


  M +6 -5      kio_smb_browse.cpp   1.39
  M +6 -1      kio_smb_dir.cpp   1.11


--- kdebase/kioslave/smb/kio_smb_browse.cpp  #1.38:1.39
@@ -133,5 +133,5 @@ bool SMBSlave::browse_stat_path(const SM
 void SMBSlave::stat( const KURL& kurl )
 {
-    kdDebug(KIO_SMB) << "SMBSlave::stat on"<< endl;
+    kdDebug(KIO_SMB) << "SMBSlave::stat on "<< kurl.url() << endl;
     // make a valid URL
     KURL url = checkURL(kurl);
@@ -159,4 +159,5 @@ void SMBSlave::stat( const KURL& kurl )
     case SMBURLTYPE_UNKNOWN:
         error(ERR_MALFORMED_URL,m_current_url.prettyURL());
+        finished();
         return;
 
@@ -231,12 +232,12 @@ KURL SMBSlave::checkURL(const KURL& kurl
 void SMBSlave::reportError(const SMBUrl &url)
 {
+    kdDebug() << "reportError " << url.url() << " " << perror << endl;
     switch(errno)
     {
-    case EBUSY:
-        break;  //hmmm, otherwise the whole dir isn't listed (caused e.g. by pagefile.sys), aleXXX
     case ENOENT:
-        if (url.getType() == SMBURLTYPE_ENTIRE_NETWORK) {
+        if (url.getType() == SMBURLTYPE_ENTIRE_NETWORK)
             error( ERR_SLAVE_DEFINED, i18n("Unable to find any workgroups in your local network."));
-        }
+        else
+            error( ERR_DOES_NOT_EXIST, url.prettyURL());
         break;
     case ENOMEDIUM:

--- kdebase/kioslave/smb/kio_smb_dir.cpp  #1.10:1.11
@@ -290,4 +290,5 @@ void SMBSlave::rename( const KURL& ksrc,
             kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_DIR_ALREADY_EXIST" << endl;
             error( KIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL());
+            finished();
             return;
         }
@@ -296,9 +297,12 @@ void SMBSlave::rename( const KURL& ksrc,
             kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_FILE_ALREADY_EXIST" << endl;
             error( KIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL());
+            finished();
             return;
         }
     }
+    kdDebug(KIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl() << endl;
     if(smbc_rename(src.toSmbcUrl(), dst.toSmbcUrl())!=0)
     {
+        kdDebug(KIO_SMB ) << "failed " << perror << endl;
       switch(errno)
       {
@@ -335,4 +339,5 @@ void SMBSlave::rename( const KURL& ksrc,
     }
 
+    kdDebug(KIO_SMB ) << "everything fine\n";
     finished();
 }


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