summaryrefslogtreecommitdiffstats
path: root/tdeioslave/smb
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/smb')
-rw-r--r--tdeioslave/smb/tdeio_smb.cpp2
-rw-r--r--tdeioslave/smb/tdeio_smb.h8
-rw-r--r--tdeioslave/smb/tdeio_smb_auth.cpp20
-rw-r--r--tdeioslave/smb/tdeio_smb_browse.cpp36
-rw-r--r--tdeioslave/smb/tdeio_smb_dir.cpp38
-rw-r--r--tdeioslave/smb/tdeio_smb_file.cpp34
-rw-r--r--tdeioslave/smb/tdeio_smb_internal.cpp2
-rw-r--r--tdeioslave/smb/tdeio_smb_internal.h4
-rw-r--r--tdeioslave/smb/tdeio_smb_mount.cpp10
9 files changed, 77 insertions, 77 deletions
diff --git a/tdeioslave/smb/tdeio_smb.cpp b/tdeioslave/smb/tdeio_smb.cpp
index 8ee270256..28c54b3ac 100644
--- a/tdeioslave/smb/tdeio_smb.cpp
+++ b/tdeioslave/smb/tdeio_smb.cpp
@@ -62,7 +62,7 @@ int KDE_EXPORT kdemain( int argc, char **argv )
TDEInstance instance( "tdeio_smb" );
if( argc != 4 )
{
- kdDebug(KIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2"
+ kdDebug(TDEIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2"
<< endl;
return -1;
}
diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h
index b2566cb5f..a81728d5d 100644
--- a/tdeioslave/smb/tdeio_smb.h
+++ b/tdeioslave/smb/tdeio_smb.h
@@ -33,8 +33,8 @@
/////////////////////////////////////////////////////////////////////////////
-#ifndef KIO_SMB_H_INCLUDED
-#define KIO_SMB_H_INCLUDED
+#ifndef TDEIO_SMB_H_INCLUDED
+#define TDEIO_SMB_H_INCLUDED
//-------------
// QT includes
@@ -84,7 +84,7 @@ extern "C"
#include "tdeio_smb_internal.h"
#define MAX_XFER_BUF_SIZE 16348
-#define KIO_SMB 7106
+#define TDEIO_SMB 7106
using namespace TDEIO;
class TDEProcess;
@@ -298,4 +298,4 @@ int kdemain( int argc, char **argv );
}
-#endif //#endif KIO_SMB_H_INCLUDED
+#endif //#endif TDEIO_SMB_H_INCLUDED
diff --git a/tdeioslave/smb/tdeio_smb_auth.cpp b/tdeioslave/smb/tdeio_smb_auth.cpp
index ebc15c1c6..87dd8c026 100644
--- a/tdeioslave/smb/tdeio_smb_auth.cpp
+++ b/tdeioslave/smb/tdeio_smb_auth.cpp
@@ -61,10 +61,10 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
SMBUrlType t = m_current_url.getType();
if( t == SMBURLTYPE_ENTIRE_NETWORK )
{
- kdDebug(KIO_SMB) << "we don't really need to authenticate for this top level url, returning" << endl;
+ kdDebug(TDEIO_SMB) << "we don't really need to authenticate for this top level url, returning" << endl;
return;
}
- kdDebug(KIO_SMB) << "AAAAAAAAAAAAAA auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup
+ kdDebug(TDEIO_SMB) << "AAAAAAAAAAAAAA auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup
<< " server=" << server << ", share=" << share << endl;
TQString s_server = TQString::fromUtf8(server);
@@ -85,7 +85,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
info.password = s_password;
info.verifyPath = true;
- kdDebug(KIO_SMB) << "libsmb-auth-callback URL:" << info.url << endl;
+ kdDebug(TDEIO_SMB) << "libsmb-auth-callback URL:" << info.url << endl;
if ( !checkCachedAuthentication( info ) )
{
@@ -103,7 +103,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
}
} else
- kdDebug(KIO_SMB) << "got password through cache" << endl;
+ kdDebug(TDEIO_SMB) << "got password through cache" << endl;
strncpy(username, info.username.utf8(), unmaxlen - 1);
strncpy(password, info.password.utf8(), pwmaxlen - 1);
@@ -111,7 +111,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
bool SMBSlave::checkPassword(SMBUrl &url)
{
- kdDebug(KIO_SMB) << "checkPassword for " << url << endl;
+ kdDebug(TDEIO_SMB) << "checkPassword for " << url << endl;
TDEIO::AuthInfo info;
info.url = KURL("smb:///");
@@ -139,15 +139,15 @@ bool SMBSlave::checkPassword(SMBUrl &url)
.arg( share );
info.username = url.user();
- kdDebug(KIO_SMB) << "call openPassDlg for " << info.url << endl;
+ kdDebug(TDEIO_SMB) << "call openPassDlg for " << info.url << endl;
if ( openPassDlg(info) ) {
- kdDebug(KIO_SMB) << "openPassDlg returned " << info.username << endl;
+ kdDebug(TDEIO_SMB) << "openPassDlg returned " << info.username << endl;
url.setUser(info.username);
url.setPass(info.password);
return true;
}
- kdDebug(KIO_SMB) << "no value from openPassDlg\n";
+ kdDebug(TDEIO_SMB) << "no value from openPassDlg\n";
return false;
}
@@ -159,10 +159,10 @@ bool SMBSlave::auth_initialize_smbc()
{
SMBCCTX *smb_context = NULL;
- kdDebug(KIO_SMB) << "auth_initialize_smbc " << endl;
+ kdDebug(TDEIO_SMB) << "auth_initialize_smbc " << endl;
if(m_initialized_smbc == false)
{
- kdDebug(KIO_SMB) << "smbc_init call" << endl;
+ kdDebug(TDEIO_SMB) << "smbc_init call" << endl;
KSimpleConfig cfg( "tdeioslaverc", true );
cfg.setGroup( "SMB" );
diff --git a/tdeioslave/smb/tdeio_smb_browse.cpp b/tdeioslave/smb/tdeio_smb_browse.cpp
index c8d39b8f8..e6113d16e 100644
--- a/tdeioslave/smb/tdeio_smb_browse.cpp
+++ b/tdeioslave/smb/tdeio_smb_browse.cpp
@@ -46,8 +46,8 @@ using namespace TDEIO;
int SMBSlave::cache_stat(const SMBUrl &url, struct stat* st )
{
int result = smbc_stat( url.toSmbcUrl(), st);
- kdDebug(KIO_SMB) << "smbc_stat " << url << " " << errno << " " << result << endl;
- kdDebug(KIO_SMB) << "size " << (TDEIO::filesize_t)st->st_size << endl;
+ kdDebug(TDEIO_SMB) << "smbc_stat " << url << " " << errno << " " << result << endl;
+ kdDebug(TDEIO_SMB) << "size " << (TDEIO::filesize_t)st->st_size << endl;
return result;
}
@@ -63,7 +63,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
{
if(!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode))
{
- kdDebug(KIO_SMB)<<"SMBSlave::browse_stat_path mode: "<<st.st_mode<<endl;
+ kdDebug(TDEIO_SMB)<<"SMBSlave::browse_stat_path mode: "<<st.st_mode<<endl;
warning(i18n("%1:\n"
"Unknown file type, neither directory or file.").arg(url.prettyURL()));
return false;
@@ -125,7 +125,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
} else if (errno == ENOENT || errno == ENOTDIR) {
warning(i18n("File does not exist: %1").arg(url.url()));
}
- kdDebug(KIO_SMB) << "SMBSlave::browse_stat_path ERROR!!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::browse_stat_path ERROR!!"<< endl;
return false;
}
@@ -135,7 +135,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
//===========================================================================
void SMBSlave::stat( const KURL& kurl )
{
- kdDebug(KIO_SMB) << "SMBSlave::stat on "<< kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::stat on "<< kurl << endl;
// make a valid URL
KURL url = checkURL(kurl);
@@ -175,12 +175,12 @@ void SMBSlave::stat( const KURL& kurl )
if (browse_stat_path(m_current_url, udsentry, false))
break;
else {
- kdDebug(KIO_SMB) << "SMBSlave::stat ERROR!!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::stat ERROR!!"<< endl;
finished();
return;
}
default:
- kdDebug(KIO_SMB) << "SMBSlave::stat UNKNOWN " << url << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::stat UNKNOWN " << url << endl;
finished();
return;
}
@@ -193,7 +193,7 @@ void SMBSlave::stat( const KURL& kurl )
// TODO: complete checking
KURL SMBSlave::checkURL(const KURL& kurl) const
{
- kdDebug(KIO_SMB) << "checkURL " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "checkURL " << kurl << endl;
TQString surl = kurl.url();
if (surl.startsWith("smb:/")) {
if (surl.length() == 5) // just the above
@@ -201,7 +201,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
if (surl.at(5) != '/') {
surl = "smb://" + surl.mid(5);
- kdDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl;
+ kdDebug(TDEIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl;
return KURL(surl);
}
}
@@ -218,7 +218,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
} else {
url.setUser(userinfo);
}
- kdDebug(KIO_SMB) << "checkURL return2 " << url << endl;
+ kdDebug(TDEIO_SMB) << "checkURL return2 " << url << endl;
return url;
}
@@ -228,13 +228,13 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
if (url.path().isEmpty())
url.setPath("/");
- kdDebug(KIO_SMB) << "checkURL return3 " << url << endl;
+ kdDebug(TDEIO_SMB) << "checkURL return3 " << url << endl;
return url;
}
void SMBSlave::reportError(const SMBUrl &url)
{
- kdDebug(KIO_SMB) << "reportError " << url << " " << perror << endl;
+ kdDebug(TDEIO_SMB) << "reportError " << url << " " << perror << endl;
switch(errno)
{
case ENOENT:
@@ -312,7 +312,7 @@ void SMBSlave::reportError(const SMBUrl &url)
//===========================================================================
void SMBSlave::listDir( const KURL& kurl )
{
- kdDebug(KIO_SMB) << "SMBSlave::listDir on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::listDir on " << kurl << endl;
// check (correct) URL
KURL url = checkURL(kurl);
@@ -332,11 +332,11 @@ void SMBSlave::listDir( const KURL& kurl )
UDSAtom atom;
dirfd = smbc_opendir( m_current_url.toSmbcUrl() );
- kdDebug(KIO_SMB) << "SMBSlave::listDir open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::listDir open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd << endl;
if(dirfd >= 0)
{
do {
- kdDebug(KIO_SMB) << "smbc_readdir " << endl;
+ kdDebug(TDEIO_SMB) << "smbc_readdir " << endl;
dirp = smbc_readdir(dirfd);
if(dirp == 0)
break;
@@ -355,7 +355,7 @@ void SMBSlave::listDir( const KURL& kurl )
} else
atom.m_str = dirpName;
- kdDebug(KIO_SMB) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type << endl;
+ kdDebug(TDEIO_SMB) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type << endl;
udsentry.append( atom );
if (atom.m_str.upper()=="IPC$" || atom.m_str=="." || atom.m_str == ".." ||
@@ -405,7 +405,7 @@ void SMBSlave::listDir( const KURL& kurl )
// when libsmbclient knows
// atom.m_str = TQString("smb://%1?WORKGROUP=%2").arg(dirpName).arg(workgroup.upper());
- kdDebug(KIO_SMB) << "list item " << atom.m_str << endl;
+ kdDebug(TDEIO_SMB) << "list item " << atom.m_str << endl;
udsentry.append(atom);
atom.m_uds = TDEIO::UDS_MIME_TYPE;
@@ -444,7 +444,7 @@ void SMBSlave::listDir( const KURL& kurl )
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::listDir SMBC_UNKNOWN :" << dirpName << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::listDir SMBC_UNKNOWN :" << dirpName << endl;
// TODO: we don't handle SMBC_IPC_SHARE, SMBC_PRINTER_SHARE
// SMBC_LINK, SMBC_COMMS_SHARE
//SlaveBase::error(ERR_INTERNAL, TEXT_UNSUPPORTED_FILE_TYPE);
diff --git a/tdeioslave/smb/tdeio_smb_dir.cpp b/tdeioslave/smb/tdeio_smb_dir.cpp
index e27420336..1e707e14e 100644
--- a/tdeioslave/smb/tdeio_smb_dir.cpp
+++ b/tdeioslave/smb/tdeio_smb_dir.cpp
@@ -51,7 +51,7 @@ void SMBSlave::copy( const KURL& ksrc,
TDEIO::filesize_t processed_size = 0;
unsigned char buf[MAX_XFER_BUF_SIZE];
- kdDebug(KIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst << endl;
// setup urls
src = ksrc;
@@ -152,7 +152,7 @@ void SMBSlave::copy( const KURL& ksrc,
n = smbc_write(dstfd, buf, n);
if(n == -1)
{
- kdDebug(KIO_SMB) << "SMBSlave::copy copy now TDEIO::ERR_COULD_NOT_WRITE" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::copy copy now TDEIO::ERR_COULD_NOT_WRITE" << endl;
error( TDEIO::ERR_COULD_NOT_WRITE, dst.prettyURL());
break;
}
@@ -199,13 +199,13 @@ void SMBSlave::copy( const KURL& ksrc,
//===========================================================================
void SMBSlave::del( const KURL &kurl, bool isfile)
{
- kdDebug(KIO_SMB) << "SMBSlave::del on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::del on " << kurl << endl;
m_current_url = kurl;
if(isfile)
{
// Delete file
- kdDebug(KIO_SMB) << "SMBSlave:: unlink " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave:: unlink " << kurl << endl;
if(smbc_unlink(m_current_url.toSmbcUrl()) == -1)
{
switch(errno)
@@ -220,7 +220,7 @@ void SMBSlave::del( const KURL &kurl, bool isfile)
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave:: rmdir " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave:: rmdir " << kurl << endl;
// Delete directory
if(smbc_rmdir(m_current_url.toSmbcUrl()) == -1)
{
@@ -234,7 +234,7 @@ void SMBSlave::del( const KURL &kurl, bool isfile)
//===========================================================================
void SMBSlave::mkdir( const KURL &kurl, int permissions )
{
- kdDebug(KIO_SMB) << "SMBSlave::mkdir on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::mkdir on " << kurl << endl;
m_current_url = kurl;
if(smbc_mkdir(m_current_url.toSmbcUrl(), 0777) != 0)
@@ -253,7 +253,7 @@ void SMBSlave::mkdir( const KURL &kurl, int permissions )
}
} else
reportError(kurl);
- kdDebug(KIO_SMB) << "SMBSlave::mkdir exit with error " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::mkdir exit with error " << kurl << endl;
}
else
{
@@ -275,35 +275,35 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite )
SMBUrl src;
SMBUrl dst;
- kdDebug(KIO_SMB) << "SMBSlave::rename, old name = " << ksrc << ", new name = " << kdest << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename, old name = " << ksrc << ", new name = " << kdest << endl;
src = ksrc;
dst = kdest;
// Check to se if the destination exists
- kdDebug(KIO_SMB) << "SMBSlave::rename stat dst" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename stat dst" << endl;
if(cache_stat(dst, &st) != -1)
{
if(S_ISDIR(st.st_mode))
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DIR_ALREADY_EXIST" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_DIR_ALREADY_EXIST" << endl;
error( TDEIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL());
finished();
return;
}
if(!overwrite)
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_FILE_ALREADY_EXIST" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_FILE_ALREADY_EXIST" << endl;
error( TDEIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL());
finished();
return;
}
}
- kdDebug(KIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl() << endl;
+ kdDebug(TDEIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl() << endl;
if(smbc_rename(src.toSmbcUrl(), dst.toSmbcUrl())!=0)
{
- kdDebug(KIO_SMB ) << "failed " << perror << endl;
+ kdDebug(TDEIO_SMB ) << "failed " << perror << endl;
switch(errno)
{
case ENOENT:
@@ -311,12 +311,12 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite )
{
if(errno == EACCES)
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
error(TDEIO::ERR_ACCESS_DENIED, src.prettyURL());
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DOES_NOT_EXIST" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_DOES_NOT_EXIST" << endl;
error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
}
}
@@ -324,21 +324,21 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite )
case EACCES:
case EPERM:
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
error( TDEIO::ERR_ACCESS_DENIED, dst.prettyURL() );
break;
default:
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_CANNOT_RENAME" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_CANNOT_RENAME" << endl;
error( TDEIO::ERR_CANNOT_RENAME, src.prettyURL() );
}
- kdDebug(KIO_SMB) << "SMBSlave::rename exit with error" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename exit with error" << endl;
return;
}
- kdDebug(KIO_SMB ) << "everything fine\n";
+ kdDebug(TDEIO_SMB ) << "everything fine\n";
finished();
}
diff --git a/tdeioslave/smb/tdeio_smb_file.cpp b/tdeioslave/smb/tdeio_smb_file.cpp
index a6c010526..2152c7469 100644
--- a/tdeioslave/smb/tdeio_smb_file.cpp
+++ b/tdeioslave/smb/tdeio_smb_file.cpp
@@ -48,7 +48,7 @@ void SMBSlave::get( const KURL& kurl )
TQByteArray filedata;
SMBUrl url;
- kdDebug(KIO_SMB) << "SMBSlave::get on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::get on " << kurl << endl;
// check (correct) URL
KURL kvurl = checkURL(kurl);
@@ -163,7 +163,7 @@ void SMBSlave::put( const KURL& kurl,
mode_t mode;
TQByteArray filedata;
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl << endl;
exists = (cache_stat(m_current_url, &st) != -1 );
@@ -171,12 +171,12 @@ void SMBSlave::put( const KURL& kurl,
{
if (S_ISDIR(st.st_mode))
{
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already isdir !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" already isdir !!"<< endl;
error( TDEIO::ERR_DIR_ALREADY_EXIST, m_current_url.prettyURL());
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already exist !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" already exist !!"<< endl;
error( TDEIO::ERR_FILE_ALREADY_EXIST, m_current_url.prettyURL());
}
return;
@@ -184,7 +184,7 @@ void SMBSlave::put( const KURL& kurl,
if (exists && !resume && overwrite)
{
- kdDebug(KIO_SMB) << "SMBSlave::put exists try to remove " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put exists try to remove " << m_current_url.toSmbcUrl()<< endl;
// remove(m_current_url.url().local8Bit());
}
@@ -192,7 +192,7 @@ void SMBSlave::put( const KURL& kurl,
if (resume)
{
// append if resuming
- kdDebug(KIO_SMB) << "SMBSlave::put resume " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put resume " << m_current_url.toSmbcUrl()<< endl;
filefd = smbc_open(m_current_url.toSmbcUrl(), O_RDWR, 0 );
smbc_lseek(filefd, 0, SEEK_END);
}
@@ -207,7 +207,7 @@ void SMBSlave::put( const KURL& kurl,
mode = 600;//0666;
}
- kdDebug(KIO_SMB) << "SMBSlave::put NO resume " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put NO resume " << m_current_url.toSmbcUrl()<< endl;
filefd = smbc_open(m_current_url.toSmbcUrl(), O_CREAT | O_TRUNC | O_WRONLY, mode);
}
@@ -215,12 +215,12 @@ void SMBSlave::put( const KURL& kurl,
{
if ( errno == EACCES )
{
- kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" access denied !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" access denied !!"<< endl;
error( TDEIO::ERR_WRITE_ACCESS_DENIED, m_current_url.prettyURL());
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" can not open for writing !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" can not open for writing !!"<< endl;
error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, m_current_url.prettyURL());
}
finished();
@@ -230,33 +230,33 @@ void SMBSlave::put( const KURL& kurl,
// Loop until we got 0 (end of data)
while(1)
{
- kdDebug(KIO_SMB) << "SMBSlave::put request data "<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put request data "<< endl;
dataReq(); // Request for data
- kdDebug(KIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
if (readData(filedata) <= 0)
{
- kdDebug(KIO_SMB) << "readData <= 0" << endl;
+ kdDebug(TDEIO_SMB) << "readData <= 0" << endl;
break;
}
- kdDebug(KIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
buf = filedata.data();
bufsize = filedata.size();
int size = smbc_write(filefd, buf, bufsize);
if ( size < 0)
{
- kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" could not write !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" could not write !!"<< endl;
error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL());
finished();
return;
}
- kdDebug(KIO_SMB ) << "wrote " << size << endl;
+ kdDebug(TDEIO_SMB ) << "wrote " << size << endl;
}
- kdDebug(KIO_SMB) << "SMBSlave::put close " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put close " << m_current_url.toSmbcUrl()<< endl;
if(smbc_close(filefd))
{
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" could not write !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" could not write !!"<< endl;
error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL());
finished();
return;
diff --git a/tdeioslave/smb/tdeio_smb_internal.cpp b/tdeioslave/smb/tdeio_smb_internal.cpp
index ebb91b30a..1b466e196 100644
--- a/tdeioslave/smb/tdeio_smb_internal.cpp
+++ b/tdeioslave/smb/tdeio_smb_internal.cpp
@@ -79,7 +79,7 @@ void SMBUrl::updateCache()
cleanPath();
// SMB URLs are UTF-8 encoded
- kdDebug(KIO_SMB) << "updateCache " << KURL::path() << endl;
+ kdDebug(TDEIO_SMB) << "updateCache " << KURL::path() << endl;
if (KURL::url() == "smb:/")
m_surl = "smb://";
else {
diff --git a/tdeioslave/smb/tdeio_smb_internal.h b/tdeioslave/smb/tdeio_smb_internal.h
index 3eeae43a7..d04736298 100644
--- a/tdeioslave/smb/tdeio_smb_internal.h
+++ b/tdeioslave/smb/tdeio_smb_internal.h
@@ -28,8 +28,8 @@
//
/////////////////////////////////////////////////////////////////////////////
-#ifndef KIO_SMB_INTERNAL_H_INCLUDED
-#define KIO_SMB_INTERNAL_H_INCLUDED
+#ifndef TDEIO_SMB_INTERNAL_H_INCLUDED
+#define TDEIO_SMB_INTERNAL_H_INCLUDED
#include <tdeio/authinfo.h>
diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index 0cf9775d0..0aef92698 100644
--- a/tdeioslave/smb/tdeio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -37,7 +37,7 @@ void SMBSlave::readStdErr(TDEProcess *, char *buffer, int buflen)
void SMBSlave::special( const TQByteArray & data)
{
- kdDebug(KIO_SMB)<<"Smb::special()"<<endl;
+ kdDebug(TDEIO_SMB)<<"Smb::special()"<<endl;
int tmp;
TQDataStream stream(data, IO_ReadOnly);
stream >> tmp;
@@ -56,12 +56,12 @@ void SMBSlave::special( const TQByteArray & data)
{
host=(*sl.at(0)).mid(2);
share=(*sl.at(1));
- kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl;
+ kdDebug(TDEIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl;
}
remotePath.replace('\\', '/'); // smbmounterplugin sends \\host/share
- kdDebug(KIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl;
+ kdDebug(TDEIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl;
if (tmp==3) {
if (!TDEStandardDirs::makeDir(mountPoint)) {
@@ -126,7 +126,7 @@ void SMBSlave::special( const TQByteArray & data)
return;
}
- kdDebug(KIO_SMB) << "mount exit " << proc.exitStatus() << endl
+ kdDebug(TDEIO_SMB) << "mount exit " << proc.exitStatus() << endl
<< "stdout:" << mybuf << endl << "stderr:" << mystderr << endl;
if (proc.exitStatus() != 0)
@@ -167,7 +167,7 @@ void SMBSlave::special( const TQByteArray & data)
return;
}
- kdDebug(KIO_SMB) << "smbumount exit " << proc.exitStatus() << endl
+ kdDebug(TDEIO_SMB) << "smbumount exit " << proc.exitStatus() << endl
<< "stdout:" << mybuf << endl << "stderr:" << mystderr << endl;
if (proc.exitStatus() != 0)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 17:43:14 +0000