Merge quote module stuff with current mainline.

[wget] / src / ftp.c

diff --git a/src/ftp.c b/src/ftp.c
index 59ba1c1669a6907a130e325e3ead32e30e9e77ae..0ecc6bcb1dafbb417ed12922f75b3f433e83a812 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1330,16 +1330,18 @@ ftp_get_listing (struct url *u, ccon *con, struct fileinfo **f)
   con->target = old_target;
 
   if (err == RETROK)
-    *f = ftp_parse_ls (lf, con->rs);
-  else
-    *f = NULL;
-  if (opt.remove_listing)
     {
-      if (unlink (lf))
-        logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
-      else
-        logprintf (LOG_VERBOSE, _("Removed %s.\n"), quote (lf));
+      *f = ftp_parse_ls (lf, con->rs);
+      if (opt.remove_listing)
+        {
+          if (unlink (lf))
+            logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
+          else
+            logprintf (LOG_VERBOSE, _("Removed %s.\n"), quote (lf));
+        }
     }
+  else
+    *f = NULL;
   xfree (lf);
   con->cmd &= ~DO_LIST;
   return err;