diff --git a/smb/kio_smb.h b/smb/kio_smb.h --- a/smb/kio_smb.h +++ b/smb/kio_smb.h @@ -38,6 +38,8 @@ #include +#include "smb-logsettings.h" + //-------------- // KDE includes //-------------- @@ -81,9 +83,6 @@ #define MAX_XFER_BUF_SIZE 65534 -// Categorized logger -Q_DECLARE_LOGGING_CATEGORY(KIO_SMB) - using namespace KIO; //=========================================================================== diff --git a/smb/kio_smb.cpp b/smb/kio_smb.cpp --- a/smb/kio_smb.cpp +++ b/smb/kio_smb.cpp @@ -33,8 +33,6 @@ #include #include -#include "smb-logsettings.h" - // Pseudo plugin class to embed meta data class KIOPluginForMetaData : public QObject { @@ -57,10 +55,10 @@ static const QVersionNumber lastBrokenVer{4, 7, 6}; const QVersionNumber currentVer = QVersionNumber::fromString(smbc_version()); - qCDebug(KIO_SMB) << "Using libsmbclient library version" << currentVer; + qCDebug(KIO_SMB_LOG) << "Using libsmbclient library version" << currentVer; if (currentVer >= firstBrokenVer && currentVer <= lastBrokenVer) { - qCDebug(KIO_SMB) << "Detected broken libsmbclient version" << currentVer; + qCDebug(KIO_SMB_LOG) << "Detected broken libsmbclient version" << currentVer; return true; } @@ -106,7 +104,7 @@ QCoreApplication app(argc, argv); if( argc != 4 ) { - qCDebug(KIO_SMB) << "Usage: kio_smb protocol domain-socket1 domain-socket2"; + qCDebug(KIO_SMB_LOG) << "Usage: kio_smb protocol domain-socket1 domain-socket2"; return -1; } diff --git a/smb/kio_smb_auth.cpp b/smb/kio_smb_auth.cpp --- a/smb/kio_smb_auth.cpp +++ b/smb/kio_smb_auth.cpp @@ -71,10 +71,10 @@ SMBUrlType t = m_current_url.getType(); if( t == SMBURLTYPE_ENTIRE_NETWORK ) { - qCDebug(KIO_SMB) << "we don't really need to authenticate for this top level url, returning"; + qCDebug(KIO_SMB_LOG) << "we don't really need to authenticate for this top level url, returning"; return; } - qCDebug(KIO_SMB) << "auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup + qCDebug(KIO_SMB_LOG) << "auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup << " server=" << server << ", share=" << share; QString s_server = QString::fromUtf8(server); @@ -95,7 +95,7 @@ info.password = s_password; info.verifyPath = true; - qCDebug(KIO_SMB) << "libsmb-auth-callback URL:" << info.url; + qCDebug(KIO_SMB_LOG) << "libsmb-auth-callback URL:" << info.url; if ( !checkCachedAuthentication( info ) ) { @@ -113,15 +113,15 @@ } } else - qCDebug(KIO_SMB) << "got password through cache"; + qCDebug(KIO_SMB_LOG) << "got password through cache"; strncpy(username, info.username.toUtf8(), unmaxlen - 1); strncpy(password, info.password.toUtf8(), pwmaxlen - 1); } int SMBSlave::checkPassword(SMBUrl &url) { - qCDebug(KIO_SMB) << "checkPassword for " << url; + qCDebug(KIO_SMB_LOG) << "checkPassword for " << url; KIO::AuthInfo info; info.url = QUrl("smb:///"); @@ -150,22 +150,22 @@ share ); info.username = url.userName(); - qCDebug(KIO_SMB) << "call openPasswordDialog for " << info.url; + qCDebug(KIO_SMB_LOG) << "call openPasswordDialog for " << info.url; const int passwordDialogErrorCode = openPasswordDialogV2(info); if (passwordDialogErrorCode == KJob::NoError) { - qCDebug(KIO_SMB) << "openPasswordDialog returned " << info.username; + qCDebug(KIO_SMB_LOG) << "openPasswordDialog returned " << info.username; url.setUser(info.username); if (info.keepPassword) { - qCDebug(KIO_SMB) << "Caching info.username = " << info.username + qCDebug(KIO_SMB_LOG) << "Caching info.username = " << info.username << ", info.url = " << info.url.toDisplayString(); cacheAuthentication(info); } return KJob::NoError; } - qCDebug(KIO_SMB) << "no value from openPasswordDialog; error:" << passwordDialogErrorCode; + qCDebug(KIO_SMB_LOG) << "no value from openPasswordDialog; error:" << passwordDialogErrorCode; return passwordDialogErrorCode; } @@ -177,10 +177,10 @@ { SMBCCTX *smb_context = nullptr; - qCDebug(KIO_SMB) << "auth_initialize_smbc "; + qCDebug(KIO_SMB_LOG) << "auth_initialize_smbc "; if(m_initialized_smbc == false) { - qCDebug(KIO_SMB) << "smbc_init call"; + qCDebug(KIO_SMB_LOG) << "smbc_init call"; KConfig cfg( "kioslaverc", KConfig::SimpleConfig); int debug_level = cfg.group( "SMB" ).readEntry( "DebugLevel", 0 ); diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp --- a/smb/kio_smb_browse.cpp +++ b/smb/kio_smb_browse.cpp @@ -57,7 +57,7 @@ } else { cacheStatErr = errno; } - qCDebug(KIO_SMB) << "size " << (KIO::filesize_t)st->st_size; + qCDebug(KIO_SMB_LOG) << "size " << (KIO::filesize_t)st->st_size; return cacheStatErr; } @@ -71,7 +71,7 @@ { if(!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode)) { - qCDebug(KIO_SMB) << "mode: "<< st.st_mode; + qCDebug(KIO_SMB_LOG) << "mode: "<< st.st_mode; warning(i18n("%1:\n" "Unknown file type, neither directory or file.", url.toDisplayString())); return EINVAL; @@ -109,14 +109,14 @@ //=========================================================================== void SMBSlave::stat( const QUrl& kurl ) { - qCDebug(KIO_SMB) << kurl; + qCDebug(KIO_SMB_LOG) << kurl; // make a valid URL QUrl url = checkURL(kurl); // if URL is not valid we have to redirect to correct URL if (url != kurl) { - qCDebug(KIO_SMB) << "redirection " << url; + qCDebug(KIO_SMB_LOG) << "redirection " << url; redirection(url); finished(); return; @@ -166,14 +166,14 @@ } else if (ret != 0) { - qCDebug(KIO_SMB) << "stat() error" << ret << url; + qCDebug(KIO_SMB_LOG) << "stat() error" << ret << url; reportError(url, ret); return; } break; } default: - qCDebug(KIO_SMB) << "UNKNOWN " << url; + qCDebug(KIO_SMB_LOG) << "UNKNOWN " << url; finished(); return; } @@ -186,16 +186,16 @@ // TODO: complete checking QUrl SMBSlave::checkURL(const QUrl& kurl) const { - qCDebug(KIO_SMB) << "checkURL " << kurl; + qCDebug(KIO_SMB_LOG) << "checkURL " << kurl; QString surl = kurl.url(); //transform any links in the form smb:/ into smb:// if (surl.startsWith(QLatin1String("smb:/"))) { if (surl.length() == 5) { return QUrl("smb://"); } if (surl.at(5) != '/') { surl = "smb://" + surl.mid(5); - qCDebug(KIO_SMB) << "checkURL return1 " << surl << " " << QUrl(surl); + qCDebug(KIO_SMB_LOG) << "checkURL return1 " << surl << " " << QUrl(surl); return QUrl(surl); } } @@ -215,7 +215,7 @@ } else { url.setUserName(userinfo); } - qCDebug(KIO_SMB) << "checkURL return2 " << url; + qCDebug(KIO_SMB_LOG) << "checkURL return2 " << url; return url; } @@ -225,13 +225,13 @@ if (url.path().isEmpty()) url.setPath("/"); - qCDebug(KIO_SMB) << "checkURL return3 " << url; + qCDebug(KIO_SMB_LOG) << "checkURL return3 " << url; return url; } SMBSlave::SMBError SMBSlave::errnumToKioError(const SMBUrl &url, const int errNum) { - qCDebug(KIO_SMB) << "errNum" << errNum; + qCDebug(KIO_SMB_LOG) << "errNum" << errNum; switch(errNum) { @@ -313,7 +313,7 @@ //=========================================================================== void SMBSlave::listDir( const QUrl& kurl ) { - qCDebug(KIO_SMB) << kurl; + qCDebug(KIO_SMB_LOG) << kurl; int errNum = 0; // check (correct) URL @@ -340,12 +340,12 @@ errNum = errno; } - qCDebug(KIO_SMB) << "open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd; + qCDebug(KIO_SMB_LOG) << "open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd; if(dirfd >= 0) { uint direntCount = 0; do { - qCDebug(KIO_SMB) << "smbc_readdir "; + qCDebug(KIO_SMB_LOG) << "smbc_readdir "; dirp = smbc_readdir(dirfd); if(dirp == nullptr) break; @@ -366,13 +366,13 @@ } else udsName = dirpName; - qCDebug(KIO_SMB) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type; + qCDebug(KIO_SMB_LOG) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type; udsentry.fastInsert( KIO::UDSEntry::UDS_NAME, udsName ); // Mark all administrative shares, e.g ADMIN$, as hidden. #197903 if (dirpName.endsWith(QLatin1Char('$'))) { - //qCDebug(KIO_SMB) << dirpName << "marked as hidden"; + //qCDebug(KIO_SMB_LOG) << dirpName << "marked as hidden"; udsentry.fastInsert(KIO::UDSEntry::UDS_HIDDEN, 1); } @@ -423,7 +423,7 @@ // when libsmbclient knows // u = QString("smb://%1?WORKGROUP=%2").arg(dirpName).arg(workgroup.toUpper()); - qCDebug(KIO_SMB) << "list item " << u; + qCDebug(KIO_SMB_LOG) << "list item " << u; udsentry.fastInsert(KIO::UDSEntry::UDS_URL, u.url()); udsentry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("application/x-smb-server")); @@ -454,7 +454,7 @@ } else { - qCDebug(KIO_SMB) << "SMBC_UNKNOWN :" << dirpName; + qCDebug(KIO_SMB_LOG) << "SMBC_UNKNOWN :" << dirpName; // TODO: we don't handle SMBC_IPC_SHARE, SMBC_PRINTER_SHARE // SMBC_LINK, SMBC_COMMS_SHARE //SlaveBase::error(ERR_INTERNAL, TEXT_UNSUPPORTED_FILE_TYPE); @@ -540,7 +540,7 @@ KDNSSD::ServiceBrowser browser(QStringLiteral("_smb._tcp")); connect(&browser, &KDNSSD::ServiceBrowser::serviceAdded, this, [&services](KDNSSD::RemoteService::Ptr service){ - qCDebug(KIO_SMB) << "DNSSD added:" + qCDebug(KIO_SMB_LOG) << "DNSSD added:" << service->serviceName() << service->type() << service->domain() @@ -563,7 +563,7 @@ }); connect(&browser, &KDNSSD::ServiceBrowser::serviceRemoved, this, [&services](KDNSSD::RemoteService::Ptr service){ - qCDebug(KIO_SMB) << "DNSSD removed:" + qCDebug(KIO_SMB_LOG) << "DNSSD removed:" << service->serviceName() << service->type() << service->domain() @@ -580,7 +580,7 @@ for (auto it = services.begin(); it != services.end(); ++it) { auto service = *it; if (!service->resolve()) { - qCWarning(KIO_SMB) << "Failed to resolve DNSSD service" + qCWarning(KIO_SMB_LOG) << "Failed to resolve DNSSD service" << service->serviceName(); it = services.erase(it); } @@ -626,7 +626,7 @@ void SMBSlave::fileSystemFreeSpace(const QUrl& url) { - qCDebug(KIO_SMB) << url; + qCDebug(KIO_SMB_LOG) << url; // Avoid crashing in smbc_fstatvfs below when // requesting free space for smb:// which doesn't diff --git a/smb/kio_smb_dir.cpp b/smb/kio_smb_dir.cpp --- a/smb/kio_smb_dir.cpp +++ b/smb/kio_smb_dir.cpp @@ -68,7 +68,7 @@ KIO::filesize_t processed_size = 0; unsigned char buf[MAX_XFER_BUF_SIZE]; - qCDebug(KIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst; + qCDebug(KIO_SMB_LOG) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst; // setup urls src = ksrc; @@ -184,7 +184,7 @@ n = smbc_write(dstfd, buf, n); if(n == -1) { - qCDebug(KIO_SMB) << "SMBSlave::copy copy now KIO::ERR_CANNOT_WRITE"; + qCDebug(KIO_SMB_LOG) << "SMBSlave::copy copy now KIO::ERR_CANNOT_WRITE"; error( KIO::ERR_CANNOT_WRITE, dst.toDisplayString()); break; } @@ -230,7 +230,7 @@ void SMBSlave::smbCopyGet(const QUrl& ksrc, const QUrl& kdst, int permissions, KIO::JobFlags flags) { - qCDebug(KIO_SMB) << "src = " << ksrc << ", dest = " << kdst; + qCDebug(KIO_SMB_LOG) << "src = " << ksrc << ", dest = " << kdst; // check if destination is ok ... const QString dstFile = kdst.toLocalFile(); @@ -288,7 +288,7 @@ } if (!file.open(mode)) { - qCDebug(KIO_SMB) << "could not write to" << dstFile; + qCDebug(KIO_SMB_LOG) << "could not write to" << dstFile; switch (file.error()) { case QFile::OpenError: if (bResume) { @@ -335,7 +335,7 @@ } else { errNum = 0; if (bResume) { - qCDebug(KIO_SMB) << "seeking to size" << partInfo.size(); + qCDebug(KIO_SMB_LOG) << "seeking to size" << partInfo.size(); off_t offset = smbc_lseek(srcfd, partInfo.size(), SEEK_SET); if (offset == -1) { error(KIO::ERR_CANNOT_SEEK, src.toDisplayString()); @@ -372,7 +372,7 @@ const qint64 bytesWritten = file.write(buf, bytesRead); if (bytesWritten == -1) { - qCDebug(KIO_SMB) << "copy now KIO::ERR_CANNOT_WRITE"; + qCDebug(KIO_SMB_LOG) << "copy now KIO::ERR_CANNOT_WRITE"; error( KIO::ERR_CANNOT_WRITE, kdst.toDisplayString()); isErr = true; break; @@ -405,15 +405,15 @@ QFile::remove(dstFile); } if (!QFile::rename(sPart, dstFile)) { - qCDebug(KIO_SMB) << "failed to rename" << sPart << "to" << dstFile; + qCDebug(KIO_SMB_LOG) << "failed to rename" << sPart << "to" << dstFile; error(ERR_CANNOT_RENAME_PARTIAL, sPart); return; } } // Restore the mtime on the file. const QString mtimeStr = metaData("modified"); - qCDebug(KIO_SMB) << "modified:" << mtimeStr; + qCDebug(KIO_SMB_LOG) << "modified:" << mtimeStr; if (!mtimeStr.isEmpty()) { QDateTime dt = QDateTime::fromString(mtimeStr, Qt::ISODate); if (dt.isValid()) { @@ -429,7 +429,7 @@ void SMBSlave::smbCopyPut(const QUrl& ksrc, const QUrl& kdst, int permissions, KIO::JobFlags flags) { - qCDebug(KIO_SMB) << "src = " << ksrc << ", dest = " << kdst; + qCDebug(KIO_SMB_LOG) << "src = " << ksrc << ", dest = " << kdst; QFile srcFile (ksrc.toLocalFile()); const QFileInfo srcInfo (srcFile); @@ -445,7 +445,7 @@ } if (!srcFile.open(QFile::ReadOnly)) { - qCDebug(KIO_SMB) << "could not read from" << ksrc; + qCDebug(KIO_SMB_LOG) << "could not read from" << ksrc; switch (srcFile.error()) { case QFile::PermissionsError: error(KIO::ERR_WRITE_ACCESS_DENIED, ksrc.toDisplayString()); @@ -494,7 +494,7 @@ if (bResume) { // append if resuming - qCDebug(KIO_SMB) << "resume" << dstUrl; + qCDebug(KIO_SMB_LOG) << "resume" << dstUrl; dstfd = smbc_open(dstUrl.toSmbcUrl(), O_RDWR, 0 ); if (dstfd < 0) { errNum = errno; @@ -516,20 +516,20 @@ mode = permissions | S_IRUSR | S_IWUSR; } - qCDebug(KIO_SMB) << "NO resume" << dstUrl; + qCDebug(KIO_SMB_LOG) << "NO resume" << dstUrl; dstfd = smbc_open(dstUrl.toSmbcUrl(), O_CREAT | O_TRUNC | O_WRONLY, mode); if (dstfd < 0) { errNum = errno; } } if (dstfd < 0) { if (errNum == EACCES) { - qCDebug(KIO_SMB) << "access denied"; + qCDebug(KIO_SMB_LOG) << "access denied"; error( KIO::ERR_WRITE_ACCESS_DENIED, dstUrl.toDisplayString()); } else { - qCDebug(KIO_SMB) << "can not open for writing"; + qCDebug(KIO_SMB_LOG) << "can not open for writing"; error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, dstUrl.toDisplayString()); } return; @@ -568,7 +568,7 @@ // FINISHED if (smbc_close(dstfd) < 0) { - qCDebug(KIO_SMB) << dstUrl << "could not write"; + qCDebug(KIO_SMB_LOG) << dstUrl << "could not write"; error( KIO::ERR_CANNOT_WRITE, dstUrl.toDisplayString()); return; } @@ -589,7 +589,7 @@ if (bMarkPartial) { smbc_unlink(dstOrigUrl.toSmbcUrl()); if (smbc_rename(dstUrl.toSmbcUrl(), dstOrigUrl.toSmbcUrl()) < 0) { - qCDebug(KIO_SMB) << "failed to rename" << dstUrl << "to" << dstOrigUrl << "->" << strerror(errno); + qCDebug(KIO_SMB_LOG) << "failed to rename" << dstUrl << "to" << dstOrigUrl << "->" << strerror(errno); error(ERR_CANNOT_RENAME_PARTIAL, dstUrl.toDisplayString()); return; } @@ -616,15 +616,15 @@ //=========================================================================== void SMBSlave::del( const QUrl &kurl, bool isfile) { - qCDebug(KIO_SMB) << kurl; + qCDebug(KIO_SMB_LOG) << kurl; m_current_url = kurl; int errNum = 0; int retVal = 0; if(isfile) { // Delete file - qCDebug(KIO_SMB) << "Deleting file" << kurl; + qCDebug(KIO_SMB_LOG) << "Deleting file" << kurl; retVal = smbc_unlink(m_current_url.toSmbcUrl()); if ( retVal < 0 ){ errNum = errno; @@ -634,7 +634,7 @@ } else { - qCDebug(KIO_SMB) << "Deleting directory" << kurl; + qCDebug(KIO_SMB_LOG) << "Deleting directory" << kurl; // Delete directory retVal = smbc_rmdir(m_current_url.toSmbcUrl()); if( retVal < 0 ) { @@ -657,7 +657,7 @@ //=========================================================================== void SMBSlave::mkdir( const QUrl &kurl, int permissions ) { - qCDebug(KIO_SMB) << kurl; + qCDebug(KIO_SMB_LOG) << kurl; int errNum = 0; int retVal = 0; m_current_url = kurl; @@ -686,7 +686,7 @@ { reportError(kurl, errNum); } - qCDebug(KIO_SMB) << "exit with error " << kurl; + qCDebug(KIO_SMB_LOG) << "exit with error " << kurl; } else // success { @@ -709,31 +709,31 @@ int errNum = 0; int retVal = 0; - qCDebug(KIO_SMB) << "old name = " << ksrc << ", new name = " << kdest; + qCDebug(KIO_SMB_LOG) << "old name = " << ksrc << ", new name = " << kdest; src = ksrc; dst = kdest; // Check to se if the destination exists - qCDebug(KIO_SMB) << "stat dst"; + qCDebug(KIO_SMB_LOG) << "stat dst"; errNum = cache_stat(dst, &st); if( errNum == 0 ) { if(S_ISDIR(st.st_mode)) { - qCDebug(KIO_SMB) << "KIO::ERR_DIR_ALREADY_EXIST"; + qCDebug(KIO_SMB_LOG) << "KIO::ERR_DIR_ALREADY_EXIST"; error( KIO::ERR_DIR_ALREADY_EXIST, dst.toDisplayString()); return; } if(!(flags & KIO::Overwrite)) { - qCDebug(KIO_SMB) << "KIO::ERR_FILE_ALREADY_EXIST"; + qCDebug(KIO_SMB_LOG) << "KIO::ERR_FILE_ALREADY_EXIST"; error( KIO::ERR_FILE_ALREADY_EXIST, dst.toDisplayString()); return; } } - qCDebug(KIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl(); + qCDebug(KIO_SMB_LOG) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl(); retVal = smbc_rename(src.toSmbcUrl(), dst.toSmbcUrl()); if( retVal < 0 ){ errNum = errno; @@ -743,42 +743,42 @@ if( retVal < 0 ) { - qCDebug(KIO_SMB ) << "failed "; + qCDebug(KIO_SMB_LOG) << "failed "; switch(errNum) { case ENOENT: errNum = cache_stat(src, &st); if( errNum != 0 ) { if(errNum == EACCES) { - qCDebug(KIO_SMB) << "KIO::ERR_ACCESS_DENIED"; + qCDebug(KIO_SMB_LOG) << "KIO::ERR_ACCESS_DENIED"; error(KIO::ERR_ACCESS_DENIED, src.toDisplayString()); } else { - qCDebug(KIO_SMB) << "KIO::ERR_DOES_NOT_EXIST"; + qCDebug(KIO_SMB_LOG) << "KIO::ERR_DOES_NOT_EXIST"; error(KIO::ERR_DOES_NOT_EXIST, src.toDisplayString()); } } break; case EACCES: case EPERM: - qCDebug(KIO_SMB) << "KIO::ERR_ACCESS_DENIED"; + qCDebug(KIO_SMB_LOG) << "KIO::ERR_ACCESS_DENIED"; error( KIO::ERR_ACCESS_DENIED, dst.toDisplayString() ); break; default: - qCDebug(KIO_SMB) << "KIO::ERR_CANNOT_RENAME"; + qCDebug(KIO_SMB_LOG) << "KIO::ERR_CANNOT_RENAME"; error( KIO::ERR_CANNOT_RENAME, src.toDisplayString() ); } - qCDebug(KIO_SMB) << "exit with error"; + qCDebug(KIO_SMB_LOG) << "exit with error"; return; } - qCDebug(KIO_SMB ) << "everything fine\n"; + qCDebug(KIO_SMB_LOG) << "everything fine\n"; finished(); } diff --git a/smb/kio_smb_file.cpp b/smb/kio_smb_file.cpp --- a/smb/kio_smb_file.cpp +++ b/smb/kio_smb_file.cpp @@ -52,7 +52,7 @@ QByteArray filedata; SMBUrl url; - qCDebug(KIO_SMB) << kurl; + qCDebug(KIO_SMB_LOG) << kurl; // check (correct) URL QUrl kvurl = checkURL(kurl); @@ -141,7 +141,7 @@ void SMBSlave::open( const QUrl& kurl, QIODevice::OpenMode mode) { int errNum = 0; - qCDebug(KIO_SMB) << kurl; + qCDebug(KIO_SMB_LOG) << kurl; // check (correct) URL QUrl kvurl = checkURL(kurl); @@ -256,7 +256,7 @@ if(bytesRead < 0) { - qCDebug(KIO_SMB) << "Could not read " << m_openUrl; + qCDebug(KIO_SMB_LOG) << "Could not read " << m_openUrl; error( KIO::ERR_CANNOT_READ, m_openUrl.toDisplayString()); closeWithoutFinish(); return; @@ -276,7 +276,7 @@ ssize_t size = smbc_write(m_openFd, buf.data(), buf.size()); if (size < 0) { - qCDebug(KIO_SMB) << "Could not write to " << m_openUrl; + qCDebug(KIO_SMB_LOG) << "Could not write to " << m_openUrl; error( KIO::ERR_CANNOT_WRITE, m_openUrl.toDisplayString()); closeWithoutFinish(); return; @@ -292,7 +292,7 @@ error(KIO::ERR_CANNOT_SEEK, m_openUrl.path()); closeWithoutFinish(); } else { - qCDebug( KIO_SMB ) << "res" << res; + qCDebug(KIO_SMB_LOG) << "res" << res; position( res ); } } @@ -326,36 +326,36 @@ mode_t mode; QByteArray filedata; - qCDebug(KIO_SMB) << kurl; + qCDebug(KIO_SMB_LOG) << kurl; errNum = cache_stat(m_current_url, &st); exists = (errNum == 0); if ( exists && !(flags & KIO::Overwrite) && !(flags & KIO::Resume)) { if (S_ISDIR(st.st_mode)) { - qCDebug(KIO_SMB) << kurl <<" already isdir !!"; + qCDebug(KIO_SMB_LOG) << kurl <<" already isdir !!"; error( KIO::ERR_DIR_ALREADY_EXIST, m_current_url.toDisplayString()); } else { - qCDebug(KIO_SMB) << kurl <<" already exist !!"; + qCDebug(KIO_SMB_LOG) << kurl <<" already exist !!"; error( KIO::ERR_FILE_ALREADY_EXIST, m_current_url.toDisplayString()); } return; } if (exists && !(flags & KIO::Resume) && (flags & KIO::Overwrite)) { - qCDebug(KIO_SMB) << "exists try to remove " << m_current_url.toSmbcUrl(); + qCDebug(KIO_SMB_LOG) << "exists try to remove " << m_current_url.toSmbcUrl(); // remove(m_current_url.url().toLocal8Bit()); } if (flags & KIO::Resume) { // append if resuming - qCDebug(KIO_SMB) << "resume " << m_current_url.toSmbcUrl(); + qCDebug(KIO_SMB_LOG) << "resume " << m_current_url.toSmbcUrl(); filefd = smbc_open(m_current_url.toSmbcUrl(), O_RDWR, 0 ); if (filefd < 0) { errNum = errno; @@ -381,7 +381,7 @@ mode = 600;//0666; } - qCDebug(KIO_SMB) << "NO resume " << m_current_url.toSmbcUrl(); + qCDebug(KIO_SMB_LOG) << "NO resume " << m_current_url.toSmbcUrl(); filefd = smbc_open(m_current_url.toSmbcUrl(), O_CREAT | O_TRUNC | O_WRONLY, mode); if (filefd < 0) { errNum = errno; @@ -394,46 +394,46 @@ { if ( errNum == EACCES ) { - qCDebug(KIO_SMB) << "error " << kurl <<" access denied !!"; + qCDebug(KIO_SMB_LOG) << "error " << kurl <<" access denied !!"; error( KIO::ERR_WRITE_ACCESS_DENIED, m_current_url.toDisplayString()); } else { - qCDebug(KIO_SMB) << "error " << kurl <<" can not open for writing !!"; + qCDebug(KIO_SMB_LOG) << "error " << kurl <<" can not open for writing !!"; error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, m_current_url.toDisplayString()); } return; } // Loop until we got 0 (end of data) while(1) { - qCDebug(KIO_SMB) << "request data "; + qCDebug(KIO_SMB_LOG) << "request data "; dataReq(); // Request for data - qCDebug(KIO_SMB) << "write " << m_current_url.toSmbcUrl(); + qCDebug(KIO_SMB_LOG) << "write " << m_current_url.toSmbcUrl(); if (readData(filedata) <= 0) { - qCDebug(KIO_SMB) << "readData <= 0"; + qCDebug(KIO_SMB_LOG) << "readData <= 0"; break; } - qCDebug(KIO_SMB) << "write " << m_current_url.toSmbcUrl(); + qCDebug(KIO_SMB_LOG) << "write " << m_current_url.toSmbcUrl(); buf = filedata.data(); bufsize = filedata.size(); ssize_t size = smbc_write(filefd, buf, bufsize); if ( size < 0) { - qCDebug(KIO_SMB) << "error " << kurl << "could not write !!"; + qCDebug(KIO_SMB_LOG) << "error " << kurl << "could not write !!"; error( KIO::ERR_CANNOT_WRITE, m_current_url.toDisplayString()); return; } - qCDebug(KIO_SMB ) << "wrote " << size; + qCDebug(KIO_SMB_LOG) << "wrote " << size; } - qCDebug(KIO_SMB) << "close " << m_current_url.toSmbcUrl(); + qCDebug(KIO_SMB_LOG) << "close " << m_current_url.toSmbcUrl(); if(smbc_close(filefd) < 0) { - qCDebug(KIO_SMB) << kurl << "could not write !!"; + qCDebug(KIO_SMB_LOG) << kurl << "could not write !!"; error( KIO::ERR_CANNOT_WRITE, m_current_url.toDisplayString()); return; } diff --git a/smb/kio_smb_internal.cpp b/smb/kio_smb_internal.cpp --- a/smb/kio_smb_internal.cpp +++ b/smb/kio_smb_internal.cpp @@ -93,7 +93,7 @@ QUrl::setPath(QDir::cleanPath(path())); // SMB URLs are UTF-8 encoded - qCDebug(KIO_SMB) << "updateCache " << QUrl::path(); + qCDebug(KIO_SMB_LOG) << "updateCache " << QUrl::path(); if ( QUrl::url() == "smb:/" ) m_surl = "smb://"; diff --git a/smb/kio_smb_mount.cpp b/smb/kio_smb_mount.cpp --- a/smb/kio_smb_mount.cpp +++ b/smb/kio_smb_mount.cpp @@ -30,7 +30,7 @@ void SMBSlave::special( const QByteArray & data) { - qCDebug(KIO_SMB)<<"Smb::special()"; + qCDebug(KIO_SMB_LOG)<<"Smb::special()"; int tmp; QDataStream stream(data); stream >> tmp; @@ -49,12 +49,12 @@ { host=sl.at(0).mid(2); share=sl.at(1); - qCDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"; + qCDebug(KIO_SMB_LOG)<<"special() host -"<< host <<"- share -" << share <<"-"; } remotePath.replace('\\', '/'); // smbmounterplugin sends \\host/share - qCDebug(KIO_SMB) << "mounting: " << remotePath.toLocal8Bit() << " to " << mountPoint.toLocal8Bit(); + qCDebug(KIO_SMB_LOG) << "mounting: " << remotePath.toLocal8Bit() << " to " << mountPoint.toLocal8Bit(); if (tmp==3) { if (!QDir().mkpath(mountPoint)) { @@ -115,7 +115,7 @@ QString mybuf = QString::fromLocal8Bit(proc.readAllStandardOutput()); QString mystderr = QString::fromLocal8Bit(proc.readAllStandardError()); - qCDebug(KIO_SMB) << "mount exit " << proc.exitCode() + qCDebug(KIO_SMB_LOG) << "mount exit " << proc.exitCode() << "stdout:" << mybuf << "\nstderr:" << mystderr; if (proc.exitCode() != 0) @@ -151,7 +151,7 @@ QString mybuf = QString::fromLocal8Bit(proc.readAllStandardOutput()); QString mystderr = QString::fromLocal8Bit(proc.readAllStandardError()); - qCDebug(KIO_SMB) << "smbumount exit " << proc.exitCode() + qCDebug(KIO_SMB_LOG) << "smbumount exit " << proc.exitCode() << "stdout:" << mybuf << "\nstderr:" << mystderr; if (proc.exitCode() != 0) diff --git a/smb/kio_smb_win.cpp b/smb/kio_smb_win.cpp --- a/smb/kio_smb_win.cpp +++ b/smb/kio_smb_win.cpp @@ -72,7 +72,7 @@ KComponentData componentData("kio_smb"); if( argc != 4 ) { - qCDebug(KIO_SMB) << "Usage: kio_smb protocol domain-socket1 domain-socket2" + qCDebug(KIO_SMB_LOG) << "Usage: kio_smb protocol domain-socket1 domain-socket2" << endl; return -1; }