diff options
| author | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-05-30 05:51:47 +0000 |
|---|---|---|
| committer | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-05-30 05:51:47 +0000 |
| commit | 6c06b4e2aa2a28d1f0bbd29ecdce35aaaf600ce8 (patch) | |
| tree | e1331adb5d216f2b3fa6baa6491752348d2e5f10 /libexec/ftpd | |
| parent | a2f0036ac41fe46dd47d6339982567f19437ade9 (diff) | |
Notes
Diffstat (limited to 'libexec/ftpd')
| -rw-r--r-- | libexec/ftpd/Makefile | 2 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index ba6cb99cd55d..adcc9198f807 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -7,7 +7,7 @@ SRCS= ftpd.c ftpcmd.c logwtmp.c popen.c skey-stuff.c CFLAGS+=-DSETPROCTITLE -DSKEY -DSTATS LDADD= -lskey -lmd -lcrypt -DPADD= ${LIBSKEY} ${LIBMD} ${LIBCRYPT} +DPADD= ${LIBSKEY} ${LIBMD} ${LIBCRYPT} CLEANFILES+=ftpcmd.c y.tab.h diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 885166cfbc05..f6fc3795f5ef 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ftpd.c,v 1.9 1995/05/22 11:03:55 davidg Exp $ */ #ifndef lint @@ -1019,7 +1019,7 @@ send_data(instr, outstr, blksize, filesize, isreg) * are sending a regular file */ netfd = fileno(outstr); - filefd = fileno(instr); + filefd = fileno(instr); if (isreg && filesize < (off_t)16 * 1024 * 1024) { buf = mmap(0, filesize, PROT_READ, MAP_SHARED, filefd, @@ -1052,7 +1052,7 @@ oldway: perror_reply(451, "Local resource failure: malloc"); return; } - + while ((cnt = read(filefd, buf, (u_int)blksize)) > 0 && write(netfd, buf, cnt) == cnt) byte_count += cnt; |