X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fftp.c;h=873556aaeb9b2c4b0ebf9c3d60670281e45cceaa;hp=8159a2d9ac3ee280c38ae9cafdadc615ee09e31f;hb=0716c335a0d38c09ade6f05be17bffa0d586b3da;hpb=0c4b349c5a2945a1f27556871876c5cd2b1958e0

diff --git a/src/ftp.c b/src/ftp.c
index 8159a2d9..873556aa 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -319,14 +319,14 @@ getftp (struct url *u, long *len, long restval, ccon *con)
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
 	case FTPSRVERR:
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("Error in server greeting.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -334,21 +334,21 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET,
 		   _("Write failed, closing control connection.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
 	case FTPLOGREFUSED:
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("The server refuses login.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return FTPLOGREFUSED;
 	  break;
 	case FTPLOGINC:
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("Login incorrect.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return FTPLOGINC;
 	  break;
@@ -372,7 +372,7 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -403,7 +403,7 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -457,7 +457,7 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -465,7 +465,7 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET,
 		   _("Write failed, closing control connection.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -474,7 +474,7 @@ Error in server response, closing control connection.\n"));
 	  logprintf (LOG_NOTQUIET,
 		     _("Unknown type `%c', closing control connection.\n"),
 		     type_char);
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	case FTPOK:
@@ -572,7 +572,7 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	      xclose (csock);
+	      fd_close (csock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -580,7 +580,7 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logputs (LOG_NOTQUIET,
 		       _("Write failed, closing control connection.\n"));
-	      xclose (csock);
+	      fd_close (csock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -588,7 +588,7 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logprintf (LOG_NOTQUIET, _("No such directory `%s'.\n\n"),
 			 u->dir);
-	      xclose (csock);
+	      fd_close (csock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -623,7 +623,7 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -653,7 +653,7 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	      xclose (csock);
+	      fd_close (csock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -661,7 +661,7 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logputs (LOG_NOTQUIET,
 		       _("Write failed, closing control connection.\n"));
-	      xclose (csock);
+	      fd_close (csock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -689,7 +689,7 @@ Error in server response, closing control connection.\n"));
 	      if (dtsock < 0)
 		{
 		  int save_errno = errno;
-		  xclose (csock);
+		  fd_close (csock);
 		  rbuf_uninitialize (&con->rbuf);
 		  logprintf (LOG_VERBOSE, _("couldn't connect to %s port %hu: %s\n"),
 			     pretty_print_address (&passive_addr), passive_port,
@@ -715,9 +715,9 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	      xclose (csock);
-	      xclose (dtsock);
-	      xclose (local_sock);
+	      fd_close (csock);
+	      fd_close (dtsock);
+	      fd_close (local_sock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -725,18 +725,18 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logputs (LOG_NOTQUIET,
 		       _("Write failed, closing control connection.\n"));
-	      xclose (csock);
-	      xclose (dtsock);
-	      xclose (local_sock);
+	      fd_close (csock);
+	      fd_close (dtsock);
+	      fd_close (local_sock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
 	    case CONSOCKERR:
 	      logputs (LOG_VERBOSE, "\n");
 	      logprintf (LOG_NOTQUIET, "socket: %s\n", strerror (errno));
-	      xclose (csock);
-	      xclose (dtsock);
-	      xclose (local_sock);
+	      fd_close (csock);
+	      fd_close (dtsock);
+	      fd_close (local_sock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -744,15 +744,15 @@ Error in server response, closing control connection.\n"));
 	      logputs (LOG_VERBOSE, "\n");
 	      logprintf (LOG_NOTQUIET, _("Bind error (%s).\n"),
 			 strerror (errno));
-	      xclose (dtsock);
+	      fd_close (dtsock);
 	      return err;
 	      break;
 	    case FTPPORTERR:
 	      logputs (LOG_VERBOSE, "\n");
 	      logputs (LOG_NOTQUIET, _("Invalid PORT.\n"));
-	      xclose (csock);
-	      xclose (dtsock);
-	      xclose (local_sock);
+	      fd_close (csock);
+	      fd_close (dtsock);
+	      fd_close (local_sock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return err;
 	      break;
@@ -782,9 +782,9 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (csock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -792,9 +792,9 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET,
 		   _("Write failed, closing control connection.\n"));
-	  xclose (csock);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (csock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -807,9 +807,9 @@ Error in server response, closing control connection.\n"));
 	      logprintf (LOG_NOTQUIET,
 			 _("\nREST failed; will not truncate `%s'.\n"),
 			 con->target);
-	      xclose (csock);
-	      xclose (dtsock);
-	      xclose (local_sock);
+	      fd_close (csock);
+	      fd_close (dtsock);
+	      fd_close (local_sock);
 	      rbuf_uninitialize (&con->rbuf);
 	      return CONTNOTSUPPORTED;
 	    }
@@ -835,9 +835,9 @@ Error in server response, closing control connection.\n"));
 	 request.  */
       if (opt.spider)
 	{
-	  xclose (csock);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (csock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return RETRFINISHED;
 	}
@@ -860,9 +860,9 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (csock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -870,17 +870,17 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET,
 		   _("Write failed, closing control connection.\n"));
-	  xclose (csock);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (csock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
 	case FTPNSFOD:
 	  logputs (LOG_VERBOSE, "\n");
 	  logprintf (LOG_NOTQUIET, _("No such file `%s'.\n\n"), u->file);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  return err;
 	  break;
 	case FTPOK:
@@ -911,9 +911,9 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET, _("\
 Error in server response, closing control connection.\n"));
-	  xclose (csock);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (csock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -921,9 +921,9 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logputs (LOG_NOTQUIET,
 		   _("Write failed, closing control connection.\n"));
-	  xclose (csock);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (csock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  rbuf_uninitialize (&con->rbuf);
 	  return err;
 	  break;
@@ -931,8 +931,8 @@ Error in server response, closing control connection.\n"));
 	  logputs (LOG_VERBOSE, "\n");
 	  logprintf (LOG_NOTQUIET, _("No such file or directory `%s'.\n\n"),
 		     ".");
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  return err;
 	  break;
 	case FTPOK:
@@ -986,10 +986,10 @@ Error in server response, closing control connection.\n"));
       if (!fp)
 	{
 	  logprintf (LOG_NOTQUIET, "%s: %s\n", con->target, strerror (errno));
-	  xclose (csock);
+	  fd_close (csock);
 	  rbuf_uninitialize (&con->rbuf);
-	  xclose (dtsock);
-	  xclose (local_sock);
+	  fd_close (dtsock);
+	  fd_close (local_sock);
 	  return FOPENERR;
 	}
     }
@@ -1036,8 +1036,8 @@ Error in server response, closing control connection.\n"));
   tms = time_str (NULL);
   tmrate = retr_rate (*len - restval, con->dltime, 0);
   /* Close data connection socket.  */
-  xclose (dtsock);
-  xclose (local_sock);
+  fd_close (dtsock);
+  fd_close (local_sock);
   /* Close the local file.  */
   {
     /* Close or flush the file.  We have to be careful to check for
@@ -1057,7 +1057,7 @@ Error in server response, closing control connection.\n"));
     {
       logprintf (LOG_NOTQUIET, _("%s: %s, closing control connection.\n"),
 		 con->target, strerror (errno));
-      xclose (csock);
+      fd_close (csock);
       rbuf_uninitialize (&con->rbuf);
       return FWRITEERR;
     }
@@ -1085,7 +1085,7 @@ Error in server response, closing control connection.\n"));
 	 return FTPRETRINT, since there is a possibility that the
 	 whole file was retrieved nevertheless (but that is for
 	 ftp_loop_internal to decide).  */
-      xclose (csock);
+      fd_close (csock);
       rbuf_uninitialize (&con->rbuf);
       return FTPRETRINT;
     } /* err != FTPOK */
@@ -1114,7 +1114,7 @@ Error in server response, closing control connection.\n"));
     {
       /* I should probably send 'QUIT' and check for a reply, but this
 	 is faster.  #### Is it OK, though?  */
-      xclose (csock);
+      fd_close (csock);
       rbuf_uninitialize (&con->rbuf);
     }
   /* If it was a listing, and opt.server_response is true,
@@ -1294,7 +1294,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
 
       if (con->st & ON_YOUR_OWN)
 	{
-	  xclose (RBUF_FD (&con->rbuf));
+	  fd_close (RBUF_FD (&con->rbuf));
 	  rbuf_uninitialize (&con->rbuf);
 	}
       if (!opt.spider)
@@ -1356,7 +1356,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
 
   if (rbuf_initialized_p (&con->rbuf) && (con->st & ON_YOUR_OWN))
     {
-      xclose (RBUF_FD (&con->rbuf));
+      fd_close (RBUF_FD (&con->rbuf));
       rbuf_uninitialize (&con->rbuf);
     }
   return TRYLIMEXC;
@@ -1917,7 +1917,7 @@ ftp_loop (struct url *u, int *dt, struct url *proxy)
     *dt |= RETROKF;
   /* If a connection was left, quench it.  */
   if (rbuf_initialized_p (&con.rbuf))
-    xclose (RBUF_FD (&con.rbuf));
+    fd_close (RBUF_FD (&con.rbuf));
   xfree_null (con.id);
   con.id = NULL;
   xfree_null (con.target);