From 69b2baec3ef04593743839b1f6c9f430de305a84 Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 31 Mar 2002 15:57:05 +0000 Subject: [PATCH] kill unused stuff in ftp protocol. --- .../patch-konq-embed_dropin_kio_kio_ftp_cpp | 41 +++++-------------- .../patch-konq-embed_dropin_kio_kio_ftp_h | 22 +++++----- 2 files changed, 22 insertions(+), 41 deletions(-) diff --git a/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_cpp b/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_cpp index 974a25c4b1a..c57acd11819 100644 --- a/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_cpp +++ b/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espie Exp $ +$OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.3 2002/03/31 15:57:05 espie Exp $ --- konq-embed/dropin/kio/kio_ftp.cpp.orig Sat Mar 30 21:19:45 2002 -+++ konq-embed/dropin/kio/kio_ftp.cpp Sat Mar 30 22:54:47 2002 -@@ -0,0 +1,2272 @@ ++++ konq-embed/dropin/kio/kio_ftp.cpp Sun Mar 31 17:43:09 2002 +@@ -0,0 +1,2253 @@ +/* This file is part of the KDE libraries + Copyright (C) 2000 David Faure + @@ -21,7 +21,7 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espi + Boston, MA 02111-1307, USA. +*/ + -+// $Id: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espie Exp $ ++// $Id: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.3 2002/03/31 15:57:05 espie Exp $ + +#include "kio_ftp.h" + @@ -71,32 +71,6 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espi + +using namespace KIO; + -+#if 0 -+extern "C" { int kdemain(int argc, char **argv); } -+ -+int kdemain( int argc, char **argv ) -+{ -+ KLocale::setMainCatalogue("kdelibs"); -+ KInstance instance( "kio_ftp" ); -+ ( void ) KGlobal::locale(); -+ -+ kdDebug(7102) << "Starting " << getpid() << endl; -+ -+ if (argc != 4) -+ { -+ fprintf(stderr, "Usage: kio_ftp protocol domain-socket1 domain-socket2\n"); -+ exit(-1); -+ } -+ -+ Ftp slave(argv[2], argv[3]); -+ slave.dispatchLoop(); -+ -+ kdDebug(7102) << "Done" << endl; -+ return 0; -+} -+#endif -+ -+ +Ftp::Ftp( const QCString &pool, const QCString &app ) + : SlaveBase( "ftp", pool, app ) +{ @@ -1054,6 +1028,7 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espi + return true; +} + ++#if 0 +void Ftp::mkdir( const KURL & url, int permissions ) +{ + QString path = url.path(); @@ -1582,6 +1557,7 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espi + kdDebug(7102) << "Got slave_status host = " << (m_host.ascii() ? m_host.ascii() : "[None]") << " [" << (m_bLoggedOn ? "Connected" : "Not connected") << "]" << endl; + slaveStatus( m_host, m_bLoggedOn ); +} ++#endif + +bool Ftp::ftpOpenDir( const QString & path ) +{ @@ -2027,6 +2003,7 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espi +} +*/ + ++#if 0 +void Ftp::put( const KURL& dest_url, int permissions, bool overwrite, bool resume ) +{ + QString dest_orig = dest_url.path(); @@ -2176,6 +2153,7 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espi + // We have done our job => finish + finished(); +} ++#endif + + +/* @@ -2224,10 +2202,13 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_cpp,v 1.2 2002/03/30 22:02:13 espi + return n; +} + ++#if 0 +size_t Ftp::ftpWrite(void *buffer, long len) +{ + return( KSocks::self()->write( sData, buffer, len ) ); +} ++#endif ++ +void Ftp::getDir( const KURL& url) +{ + QByteArray header_buffer; diff --git a/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_h b/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_h index 45c944ead5b..19a61e72c0f 100644 --- a/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_h +++ b/www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.2 2002/03/30 22:02:13 espie Exp $ +$OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.3 2002/03/31 15:57:05 espie Exp $ --- konq-embed/dropin/kio/kio_ftp.h.orig Sat Mar 30 21:19:45 2002 -+++ konq-embed/dropin/kio/kio_ftp.h Sat Mar 30 22:26:55 2002 ++++ konq-embed/dropin/kio/kio_ftp.h Sun Mar 31 17:42:53 2002 @@ -0,0 +1,278 @@ +/* This file is part of the KDE libraries + Copyright (C) 2000 David Faure @@ -21,7 +21,7 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.2 2002/03/30 22:02:13 espie + Boston, MA 02111-1307, USA. +*/ + -+// $Id: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.2 2002/03/30 22:02:13 espie Exp $ ++// $Id: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.3 2002/03/31 15:57:05 espie Exp $ + +#ifndef __ftp_h__ +#define __ftp_h__ @@ -83,19 +83,19 @@ $OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.2 2002/03/30 22:02:13 espie + */ + virtual void closeConnection(); + -+ virtual void stat( const KURL &url ); ++ //virtual void stat( const KURL &url ); + -+ virtual void listDir( const KURL & url ); -+ virtual void mkdir( const KURL & url, int permissions ); -+ virtual void rename( const KURL & src, const KURL & dst, bool overwrite ); -+ virtual void del( const KURL & url, bool isfile ); -+ virtual void chmod( const KURL & url, int permissions ); ++ //virtual void listDir( const KURL & url ); ++ //virtual void mkdir( const KURL & url, int permissions ); ++ //virtual void rename( const KURL & src, const KURL & dst, bool overwrite ); ++ //virtual void del( const KURL & url, bool isfile ); ++ //virtual void chmod( const KURL & url, int permissions ); + + virtual void get( const KURL& url ); -+ virtual void put( const KURL& url, int permissions, bool overwrite, bool resume); ++ //virtual void put( const KURL& url, int permissions, bool overwrite, bool resume); + //virtual void mimetype( const KURL& url ); + -+ virtual void slave_status(); ++ //virtual void slave_status(); + + // unsupported, AFAIK + // virtual void copy( const KURL &src, const KURL &dest, int permissions, bool overwrite );