*** nanoftp/old	Sat Oct 27 12:38:32 2001
--- nanoftp	Sat Oct 27 12:57:06 2001
***************
*** 756,762 ****
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) return(res);
--- 756,762 ----
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) return(res);
***************
*** 781,787 ****
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) return(res);
--- 781,787 ----
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) return(res);
***************
*** 808,814 ****
      sprintf(buf, "QUIT\r\n");
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      return(0);
--- 808,814 ----
      sprintf(buf, "QUIT\r\n");
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, "%s", buf); /* Just to be consistent, even though we know it can't have a % in it */
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      return(0);
***************
*** 930,936 ****
              buf[sizeof(buf) - 1] = 0;
              len = strlen(buf);
  #ifdef DEBUG_FTP
! 	    xmlGenericError(xmlGenericErrorContext, buf);
  #endif
  	    res = send(ctxt->controlFd, buf, len, 0);
  	    if (res < 0) {
--- 930,936 ----
              buf[sizeof(buf) - 1] = 0;
              len = strlen(buf);
  #ifdef DEBUG_FTP
! 	    xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
  	    res = send(ctxt->controlFd, buf, len, 0);
  	    if (res < 0) {
***************
*** 951,957 ****
                      buf[sizeof(buf) - 1] = 0;
                      len = strlen(buf);
  #ifdef DEBUG_FTP
! 		    xmlGenericError(xmlGenericErrorContext, buf);
  #endif
  		    res = send(ctxt->controlFd, buf, len, 0);
  		    if (res < 0) {
--- 951,957 ----
                      buf[sizeof(buf) - 1] = 0;
                      len = strlen(buf);
  #ifdef DEBUG_FTP
! 		    xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
  		    res = send(ctxt->controlFd, buf, len, 0);
  		    if (res < 0) {
***************
*** 991,997 ****
                  buf[sizeof(buf) - 1] = 0;
                  len = strlen(buf);
  #ifdef DEBUG_FTP
! 		xmlGenericError(xmlGenericErrorContext, buf);
  #endif
  		res = send(ctxt->controlFd, buf, len, 0);
  		if (res < 0) {
--- 991,997 ----
                  buf[sizeof(buf) - 1] = 0;
                  len = strlen(buf);
  #ifdef DEBUG_FTP
! 		xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
  		res = send(ctxt->controlFd, buf, len, 0);
  		if (res < 0) {
***************
*** 1021,1027 ****
                  buf[sizeof(buf) - 1] = 0;
                  len = strlen(buf);
  #ifdef DEBUG_FTP
! 		xmlGenericError(xmlGenericErrorContext, buf);
  #endif
  		res = send(ctxt->controlFd, buf, len, 0);
  		if (res < 0) {
--- 1021,1027 ----
                  buf[sizeof(buf) - 1] = 0;
                  len = strlen(buf);
  #ifdef DEBUG_FTP
! 		xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
  		res = send(ctxt->controlFd, buf, len, 0);
  		if (res < 0) {
***************
*** 1042,1048 ****
                  buf[sizeof(buf) - 1] = 0;
                  len = strlen(buf);
  #ifdef DEBUG_FTP
! 		xmlGenericError(xmlGenericErrorContext, buf);
  #endif
  		res = send(ctxt->controlFd, buf, len, 0);
  		if (res < 0) {
--- 1042,1048 ----
                  buf[sizeof(buf) - 1] = 0;
                  len = strlen(buf);
  #ifdef DEBUG_FTP
! 		xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
  		res = send(ctxt->controlFd, buf, len, 0);
  		if (res < 0) {
***************
*** 1180,1186 ****
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) return(res);
--- 1180,1186 ----
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) return(res);
***************
*** 1230,1236 ****
  	sprintf(buf, "PASV\r\n");
          len = strlen(buf);
  #ifdef DEBUG_FTP
! 	xmlGenericError(xmlGenericErrorContext, buf);
  #endif
  	res = send(ctxt->controlFd, buf, len, 0);
  	if (res < 0) {
--- 1230,1236 ----
  	sprintf(buf, "PASV\r\n");
          len = strlen(buf);
  #ifdef DEBUG_FTP
! 	xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
  	res = send(ctxt->controlFd, buf, len, 0);
  	if (res < 0) {
***************
*** 1296,1302 ****
          buf[sizeof(buf) - 1] = 0;
          len = strlen(buf);
  #ifdef DEBUG_FTP
! 	xmlGenericError(xmlGenericErrorContext, buf);
  #endif
  
  	res = send(ctxt->controlFd, buf, len, 0);
--- 1296,1302 ----
          buf[sizeof(buf) - 1] = 0;
          len = strlen(buf);
  #ifdef DEBUG_FTP
! 	xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
  
  	res = send(ctxt->controlFd, buf, len, 0);
***************
*** 1530,1536 ****
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) {
--- 1530,1536 ----
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) {
***************
*** 1624,1630 ****
      sprintf(buf, "TYPE I\r\n");
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) {
--- 1624,1630 ----
      sprintf(buf, "TYPE I\r\n");
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) {
***************
*** 1643,1649 ****
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) {
--- 1643,1649 ----
      buf[sizeof(buf) - 1] = 0;
      len = strlen(buf);
  #ifdef DEBUG_FTP
!     xmlGenericError(xmlGenericErrorContext, "%s", buf);
  #endif
      res = send(ctxt->controlFd, buf, len, 0);
      if (res < 0) {