+ Moved WITH-DATA-CONNECTION closer to call to LS to avoid stray connections in case of an error

+ Call surrounding exception handler in WITH-DATA-CONNECTION

+ Add arguments to two calls of escape proecures

scheme/ftpd/ftpd.scm

@@ -533,13 +533,13 @@
 		 condition reason)
 	    (replace-reply! 451
 			    (format #f "Internal error: ~S" reason))
-	    (exit)))
+	    (exit 'fick-dich-ins-knie)))
 	 ((ftpd-error? condition)
 	  ;; debug level because nearly every unsuccessful command ends
 	  ;; here (no args, can't change dir, etc.)
 	  (log (syslog-level debug)  
 	       "ftpd error occurred (maybe reason: ~S)-- escaping" (condition-stuff condition))
-	  (exit))
+	  (exit 'fick-dich-ins-knie))
 	 (else
 	  (more))))
       (lambda ()
@@ -972,8 +972,6 @@
   
 (define (handle-listing arg preset-flags)
   (ensure-authenticated-login)
-  (with-data-connection
-   (lambda ()
   (let ((args (split-arguments arg)))
     (call-with-values
      (lambda ()
@@ -1003,8 +1001,7 @@
            (log (syslog-level debug)
                 "sending file-listing for path ~S with flags ~A"
                 path all-flags)
-
-	      (generate-listing path all-flags)))))))))
+           (generate-listing path all-flags)))))))
 
 ; Note this doesn't call ENSURE-AUTHENTICATED-LOGIN or
 ; ENSURE-DATA-CONNECTION.
@@ -1026,6 +1023,8 @@
      (lambda ()
        (with-cwd*
 	(file-name-directory full-path)
+	(lambda ()
+          (with-data-connection
            (lambda ()
              (let ((nondir (file-name-nondirectory full-path)))
                (let-fluid
@@ -1037,7 +1036,7 @@
                         (if (string=? nondir "")
                             "."
                             nondir))
-		   (socket:outport (the-session-data-socket))))))))))))
+                       (socket:outport (the-session-data-socket))))))))))))))
 
 (define (handle-abor foo)
   (log-command (syslog-level info) "ABOR")
@@ -1215,7 +1214,8 @@
   (ensure-data-connection)
   (with-fatal-error-handler*
    (lambda (condition more)
-     (maybe-close-data-connection))
+     (maybe-close-data-connection)
+     (more))
    (lambda ()
      (thunk)
      (maybe-close-data-connection)