source: npl/system/netkit-ftp/patches/09-netkit-ftp-0.17-vsftp165083.patch @ 26ffad7

netkit-ftp-0.17/ftp/ftp.c

@@ -582 +582 @@
         volatile long long bytes = 0, hashbytes = HASHBYTES;
         char buf[BUFSIZ], *bufp;
         const char *volatile lmode;
+        int old_code_l;
 
         if (verbose && printnames) {
                 if (local && *local != '-')
@@ -799 +800 @@
         (void) fclose(dout);
         /* closes data as well, so discard it */
         data = -1;
-        (void) getreply(0);
+        old_code_l = code;
+        (void) getreply(0);
+
+        /* Following "if" will avoid a bug #165083 in ftp-server */
+        /* It can be later removed.                              */
+        if (old_code_l == 150 && code == 150 && cpend == 1
+            && sunique == 1 && cin !=  NULL && fileno (cin) >=  0 ) {
+                #include <sys/poll.h>
+                struct pollfd  fds_events_l [2] ;
+                int rc;
+
+                fds_events_l [0] .fd = fileno (cin);
+                fds_events_l [0] .events = POLLIN | POLLERR | POLLHUP;
+           
+                rc = poll (fds_events_l, 1, 5000);
+                switch (rc) {
+                case  1:
+                        (void) getreply (0);
+                        break;
+                case  0:
+                        fprintf (stderr, "ftp: no answer from ftp-server "
+                                         "(more than 5 sec).\n");
+                        break;
+                case -1:
+                        perror("ftp: poll");
+                        break;
+                }
+        }
+
         (void) signal(SIGINT, oldintr);
         if (oldintp)
                 (void) signal(SIGPIPE, oldintp);