summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2013-07-31 19:50:47 +0000
committerchristos <christos@NetBSD.org>2013-07-31 19:50:47 +0000
commitfcbfdcc068ddce49b097f1bca9382f0fa2be36c1 (patch)
tree32897fd5f8e769145c5e1b22e26fc78735fc6bda /libexec
parent067ddc43058707c66c960d054440cf0b430e9cac (diff)
fstat returns -1 on error (Maxime Villard)
also while (1) -> for (;;)
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ftpd/ftpd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 04dc930a710..856f42ec95f 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.199 2013/07/03 14:16:01 christos Exp $ */
+/* $NetBSD: ftpd.c,v 1.200 2013/07/31 19:50:47 christos Exp $ */
/*
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994\
#if 0
static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: ftpd.c,v 1.199 2013/07/03 14:16:01 christos Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.200 2013/07/31 19:50:47 christos Exp $");
#endif
#endif /* not lint */
@@ -2149,7 +2149,7 @@ send_data_with_read(int filefd, int netfd, const struct stat *st, int isdata)
(void)gettimeofday(&then, NULL);
} else
bufrem = readsize;
- while (1) {
+ for (;;) {
(void) alarm(curclass.timeout);
c = read(filefd, buf, readsize);
if (c == 0)
@@ -2392,7 +2392,7 @@ receive_data(FILE *instr, FILE *outstr)
(void) alarm(curclass.timeout);
if (curclass.readsize)
readsize = curclass.readsize;
- else if (fstat(filefd, &st))
+ else if (fstat(filefd, &st) != -1)
readsize = (ssize_t)st.st_blksize;
else
readsize = BUFSIZ;