Only remove .listing if it has been created.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f59ecfe20385811cdc6ed8d1abc22d3bf16129a..a8da28de67b4893de2bedc602d8490e018842cf2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-22  Rabin Vincent  <rabin@rab.in>
+
+       * ftp.c (ftp_get_listing): Only remove .listing if it has been
+       created. 
+
 2008-04-22  Alain Guibert  <alguibert+bts@free.fr>
 
        * test.h (mu_run_test): Move declaration before statements, for

diff --git a/src/ftp.c b/src/ftp.c
index 0321032168487d2eff9b66a13de03595b531ae4a..5a9ecc6a694969a054c1c33560bbfc913b623f20 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1325,16 +1325,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"), 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"), lf);
+        }
     }
+  else
+    *f = NULL;
   xfree (lf);
   con->cmd &= ~DO_LIST;
   return err;