Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kioslave: drop experimental chown feature of curl slave

Browse source 
curl mentions it (https://curl.se/libcurl/c/CURLOPT_QUOTE.html) but the RFC
for the protocol (https://datatracker.ietf.org/doc/html/rfc959) does not,
the old ftp slave did not implement it either. that leaves only put to be
implemented for the slave to be complete (rename is optional)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-18 07:01:12 +02:00
parent ac3921d0c8
commit 403cb77854
2 changed files with 3 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
kioslave/curl/kio_curl.cpp
View file

@ -575,66 +575,6 @@ void CurlProtocol::chmod(const KUrl &url, int permissions)
finished(); finished();
} }
#if defined(KIO_ENABLE_EXPERIMENTAL)
void CurlProtocol::chown(const KUrl &url, const QString &owner, const QString &group)
{
kDebug(7103) << "Chown URL" << url.prettyUrl() << owner << group;
KUrl chownurl(url);
chownurl.adjustPath(KUrl::RemoveTrailingSlash);
QString chownfilename = chownurl.fileName();
if (chownfilename.isEmpty()) {
// must be the root directory
chownfilename = QLatin1String(".");
}
kDebug(7103) << "Actual chown URL" << chownurl << "filename" << chownfilename;
if (redirectUrl(chownurl)) {
return;
}
if (!setupCurl(chownurl)) {
return;
}
if (!m_isftp && !m_issftp) {
// only for FTP or SFTP
error(KIO::ERR_INTERNAL, url.prettyUrl());
return;
}
const QByteArray chownfilenamebytes = remoteEncoding()->encode(chownfilename);
m_curlquotes = curl_slist_append(m_curlquotes, QByteArray("CHOWN ") + owner.toAscii() + " " + chownfilenamebytes);
m_curlquotes = curl_slist_append(m_curlquotes, QByteArray("CHGRP ") + group.toAscii() + " " + chownfilenamebytes);
CURLcode curlresult = curl_easy_setopt(m_curl, CURLOPT_QUOTE, m_curlquotes);
if (curlresult != CURLE_OK) {
KIO_CURL_ERROR(curlresult);
return;
}
KUrl redirecturl;
curlresult = performCurl(chownurl, &redirecturl);
kDebug(7103) << "Chown result" << curlresult;
if (curlresult != CURLE_OK) {
if (curlresult == CURLE_QUOTE_ERROR) {
error(KIO::ERR_CANNOT_CHOWN, url.prettyUrl());
return;
}
const KIO::Error kioerror = curlToKIOError(curlresult, m_curl);
error(kioerror, url.prettyUrl());
return;
}
if (redirecturl.isValid()) {
redirection(redirecturl);
finished();
return;
}
finished();
}
#endif // KIO_ENABLE_EXPERIMENTAL
void CurlProtocol::mkdir(const KUrl &url, int permissions) void CurlProtocol::mkdir(const KUrl &url, int permissions)
{ {
kDebug(7103) << "Mkdir URL" << url.prettyUrl() << permissions; kDebug(7103) << "Mkdir URL" << url.prettyUrl() << permissions;
@ -697,7 +637,7 @@ void CurlProtocol::mkdir(const KUrl &url, int permissions)
void CurlProtocol::del(const KUrl &url, bool isfile) void CurlProtocol::del(const KUrl &url, bool isfile)
{ {
kDebug(7103) << "Del URL" << url.prettyUrl() << isfile; kDebug(7103) << "Delete URL" << url.prettyUrl() << isfile;
KUrl delurl(url); KUrl delurl(url);
QString delfilename = delurl.path(); QString delfilename = delurl.path();
@ -707,7 +647,7 @@ void CurlProtocol::del(const KUrl &url, bool isfile)
// must be the root directory // must be the root directory
delfilename = QLatin1String("."); delfilename = QLatin1String(".");
} }
kDebug(7103) << "Actual del URL" << delurl << "filename" << delfilename; kDebug(7103) << "Actual Delete URL" << delurl << "filename" << delfilename;
if (redirectUrl(delurl)) { if (redirectUrl(delurl)) {
return; return;
@ -737,7 +677,7 @@ void CurlProtocol::del(const KUrl &url, bool isfile)
KUrl redirecturl; KUrl redirecturl;
curlresult = performCurl(delurl, &redirecturl); curlresult = performCurl(delurl, &redirecturl);
kDebug(7103) << "Del result" << curlresult; kDebug(7103) << "Delete result" << curlresult;
if (curlresult != CURLE_OK) { if (curlresult != CURLE_OK) {
if (curlresult == CURLE_QUOTE_ERROR) { if (curlresult == CURLE_QUOTE_ERROR) {
error(KIO::ERR_CANNOT_DELETE, url.prettyUrl()); error(KIO::ERR_CANNOT_DELETE, url.prettyUrl());

5
kioslave/curl/kio_curl.h
View file

@ -24,8 +24,6 @@
#include <curl/curl.h> #include <curl/curl.h>
// #define KIO_ENABLE_EXPERIMENTAL
class CurlProtocol : public KIO::SlaveBase class CurlProtocol : public KIO::SlaveBase
{ {
public: public:
@ -36,9 +34,6 @@ public:
void listDir(const KUrl &url) final; void listDir(const KUrl &url) final;
void get(const KUrl &url) final; void get(const KUrl &url) final;
void chmod(const KUrl &url, int permissions) final; void chmod(const KUrl &url, int permissions) final;
#if defined(KIO_ENABLE_EXPERIMENTAL)
void chown(const KUrl &url, const QString &owner, const QString &group) final;
#endif
void mkdir(const KUrl &url, int permissions) final; void mkdir(const KUrl &url, int permissions) final;
void del(const KUrl &url, bool isfile) final; void del(const KUrl &url, bool isfile) final;