Import version as of 2010-08-02 for upload-ftp-v1.1.pl

diff --git a/upload-ftp-v1.1.pl b/upload-ftp-v1.1.pl
index 7ba545b7deff7ddcbf82898d436e4773e9705913..5c20d3ad05332be59b9b8876acf358075af052d2 100755 (executable)
--- a/upload-ftp-v1.1.pl
+++ b/upload-ftp-v1.1.pl
@@ -356,7 +356,6 @@ sub execute_commands {
 #
 sub scan_incoming {
   my @ret;
-
   my %possible;
   # Get list of all possible files from incoming dir.
   #
@@ -375,7 +374,6 @@ sub scan_incoming {
   closedir (INCOMING) || ftp_die("FATAL: closedir($incoming_dir) failed: $!");
   # No possible files found, so return before we call lsof
   return @ret unless %possible;
-
   # Determine if any of those possible files are open.  We find the
   # possible files before running lsof (partly) to avoid a race
   # condition.  (If we ran lsof on the whole directory first, a new file
@@ -675,7 +673,7 @@ sub read_directive_file {
     } elsif ($tainted_cmd =~ /^comment:?$/i) {  # case-insensitive, w or w/o the :
       # Comments are ok, we ignore them
     } else {
-      &fatal("unrecognized directive ($tainted_cmd)",1,$directive_file_contents);
+      &fatal("Invalid directive line:\n\n  $tainted_cmd $tainted_val",1,$directive_file_contents);
     }
   }