Good morning,afternoon,evening.

>
> Certainly it can - could I get you to run a diff -c on it? That way it is
> much easier for me to integrate?
> 

I did it. Result is following but there are also some my own local testing
changes. Sorry. :-)


							Marek Nagy.



*** HTFTP.c	Wed Apr 29 17:29:56 1998
--- HTFTP.c.orig	Fri Mar 20 18:52:52 1998
***************
*** 409,417 ****
  	HTUnEscape(login);
  	StrAllocCopy(ctrl->uid, login);
      } else {						    /* Use anonymous */
-     
- /* I want to be prompted for user and password! (MN) */
- /*    
  	HTUserProfile * up = HTRequest_userProfile(request);
  	const char * mailaddress = HTUserProfile_email(up);
  	StrAllocCopy(ctrl->uid, "anonymous");
--- 409,414 ----
***************
*** 419,439 ****
  	    StrAllocCopy(ctrl->passwd, mailaddress);
  	else
  	    StrAllocCopy(ctrl->passwd, WWW_FTP_CLIENT);
- */
- /* Added by Marek Nagy. */
-       ctrl->uid=NULL;
-       ctrl->passwd=NULL;
-       printf("Uzivatel a heslo sa bude pytat!\n");
- /* End of adding. */
      }
  /* begin _GM_ */
  /* Note: libwww bug ID: GM6 */
      {
! /*	char tempParams[512];
  	sprintf(tempParams, "Username='%s', Password='%s'", ctrl->uid, ctrl->passwd);
  	HTRequest_addError(request, ERR_INFO, NO, HTERR_OK,
  			   tempParams, strlen(tempParams), "HTFTPParseURL");
! */  }
  /* end _GM_ */
      if (PROT_TRACE)
  	HTTrace("FTPParse.... uid `%s\' pw `%s\'\n",
--- 416,430 ----
  	    StrAllocCopy(ctrl->passwd, mailaddress);
  	else
  	    StrAllocCopy(ctrl->passwd, WWW_FTP_CLIENT);
      }
  /* begin _GM_ */
  /* Note: libwww bug ID: GM6 */
      {
! 	char tempParams[512];
  	sprintf(tempParams, "Username='%s', Password='%s'", ctrl->uid, ctrl->passwd);
  	HTRequest_addError(request, ERR_INFO, NO, HTERR_OK,
  			   tempParams, strlen(tempParams), "HTFTPParseURL");
!     }
  /* end _GM_ */
      if (PROT_TRACE)
  	HTTrace("FTPParse.... uid `%s\' pw `%s\'\n",
***************
*** 1353,1359 ****
      HTParentAnchor * anchor = HTRequest_anchor(request);
      char * url = HTAnchor_physical(anchor);
  
- 
      /*
      ** Initiate a new FTP ctrl and data structure and bind to request structure
      ** This is actually state FTP_BEGIN, but it can't be in the state
--- 1344,1349 ----
***************
*** 1372,1378 ****
      HTNet_setEventCallback(cnet, FTPEvent);
      HTNet_setEventParam(cnet, ctrl);
  
- 
      /* for now, the dnet comes back to the same place
      ** - vestigial from when the callback was from the request object
      */
--- 1362,1367 ----
***************
*** 1392,1400 ****
      HTParentAnchor * anchor = HTRequest_anchor(request);
      char * url = HTAnchor_physical(anchor);
  
-     HTHost *host = HTNet_host(cnet);
- 
- 
      if (type == HTEvent_CLOSE) {			      /* Interrupted */
  	if(HTRequest_isPostWeb(request)&&!HTRequest_isMainDestination(request))
  	    FTPCleanup(request, HT_IGNORE);
--- 1381,1386 ----
***************
*** 1413,1419 ****
  	      if (PROT_TRACE) HTTrace("FTP Event... now in state FTP_BEGIN\n");
  	      HTFTPParseURL(request, url, ctrl, data);
  
- 
  	      /* The following is added by Neil Griffin, GAIN Software */
  
  	      /*
--- 1399,1404 ----
***************
*** 1451,1459 ****
  
  	case FTP_NEED_CCON:
  	    if (PROT_TRACE) HTTrace("FTP Event... now in state FTP_NEED_CONN\n");
! 	    status = HTHost_connect(host, cnet, url, FTP_PORT);
! 	    host = HTNet_host(cnet);
  	    if (status == HT_OK) {
  
  		/*
  		** Check the protocol class to see if we have connected to a
--- 1436,1444 ----
  
  	case FTP_NEED_CCON:
  	    if (PROT_TRACE) HTTrace("FTP Event... now in state FTP_NEED_CONN\n");
! 	    status = HTDoConnect(cnet, url, FTP_PORT);
  	    if (status == HT_OK) {
+ 		HTHost * host = HTNet_host(cnet);
  
  		/*
  		** Check the protocol class to see if we have connected to a




***************************************************
* Euromath Support Center                         * 
* Department of Computer Science                  *
* Faculty of Mathematics and Physics              *
* Comenius University                             *
* Mlynska dolina                                  *
* 842 15 Bratislava                               *
* Slovak Republic                                 *
*                                                 *
* Tel: +421-7-654 26 635  Fax: +421-7-654 27 041  *
* e-mail: emt@fmph.uniba.sk                       *
* http://www.dcs.fmph.uniba.sk/~emt               *
**************************************************