head 1.4; access; symbols pkgsrc-2017Q2:1.3.0.98 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.96 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.94 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.92 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.90 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.88 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.86 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.84 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.82 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.80 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.78 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.76 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.74 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.72 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.70 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.68 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.66 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.64 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.62 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.60 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.58 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.56 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.54 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.52 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.50 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.48 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.46 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.44 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.42 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.40 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.36 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.34 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.32 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.4 date 2017.08.01.17.12.50; author wiz; state dead; branches; next 1.3; commitid pyCT74AquynF5x1A; 1.3 date 2005.11.08.15.40.28; author tv; state Exp; branches; next 1.2; 1.2 date 2002.09.17.15.33.05; author dillo; state dead; branches; next 1.1; 1.1 date 2001.12.10.16.05.27; author dillo; state Exp; branches; next ; desc @@ 1.4 log @cftp is a dead project with major bugs. Remove. @ text @$NetBSD: patch-aa,v 1.3 2005/11/08 15:40:28 tv Exp $ --- sftp.c.orig 2002-09-16 08:42:42.000000000 -0400 +++ sftp.c @@@@ -28,6 +28,7 @@@@ #ifdef USE_SFTP #include +#include #include #include #include @ 1.3 log @Include for fd_set. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 0.12: preliminary support for sftp (requires ssh protocol version 2) print estimated remaining time for down- and uploads @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2001/12/10 16:05:27 dillo Exp $ d3 4 a6 84 --- ftp.c 2001/09/11 18:13:09 1.57 +++ ftp.c 2001/10/05 13:13:49 1.58 @@@@ -956,7 +956,8 @@@@ ftp_cat(FILE *fin, FILE *fout, long start, long size, int upload) { char buf[4096], buf2[8192], *p; - int nread, nwritten, err, trail_cr; + int nread, nwritten, err, trail_cr, errno_copy; + enum { ERR_NONE, ERR_FIN, ERR_FOUT } error_cause; int old_alarm; long got; struct itimerval itv; @@@@ -983,6 +984,7 @@@@ ret=fcntl(fileno(fout), F_SETFL, flags); } + error_cause = ERR_NONE; trail_cr = 0; do_read = 1; for (;;) { @@@@ -993,7 +995,6 @@@@ ret=select(fileno(fin)+1, &fds, NULL, NULL, NULL); if (ret != -1 && FD_ISSET(fileno(fin), &fds)) { - errno = 0; if ((nread=fread(buf, 1, 4096, fin)) > 0) { do_read = 0; nwritten = 0; @@@@ -1009,8 +1010,13 @@@@ &trail_cr); } } - else if (errno != EAGAIN) + else { + if (nread < 0 && errno != EAGAIN) { + errno_copy = errno; + error_cause = ERR_FIN; + } break; + } } } else { @@@@ -1018,10 +1024,12 @@@@ ret=select(fileno(fin)+1, &fds, NULL, NULL, NULL); if (ret != -1 && FD_ISSET(fileno(fin), &fds)) { - errno = 0; if ((err=fwrite(p+nwritten, 1, nread-nwritten, - fout)) < 0 && errno != EAGAIN) + fout)) < 0 && errno != EAGAIN) { + errno_copy = errno; + error_cause = ERR_FOUT; break; + } nwritten += err; got += err; @@@@ -1046,17 +1054,17 @@@@ _ftp_transfer_stats_cleanup(&trstat); - if (ferror(fin) || sig_intr) { - errno = 0; + if (error_cause || sig_intr) { sig_intr = 0; - ftp_abort(fin); - return -1; - } - else if (ferror(fout)) { - err = errno; - errno = 0; ftp_abort(fin); - disp_status("write error: %s", strerror(err)); + switch (error_cause) { + case ERR_FIN: + disp_status("read error: %s", strerror(errno_copy)); + break; + case ERR_FOUT: + disp_status("write error: %s", strerror(errno_copy)); + break; + } return -1; } d8 5 @ 1.1 log @add fix from cftp cvs (ftp.c, revision 1.58): (ftp_cat): rewrite error detection/reporting: don't rely on ferror(), only consult errno in case of error. This fixes download problems on -current. Bump version to 0.11nb1. @ text @d1 1 a1 1 $NetBSD$ @