summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorKevin Lo <kevlo@FreeBSD.org>2011-02-09 06:30:09 +0000
committerKevin Lo <kevlo@FreeBSD.org>2011-02-09 06:30:09 +0000
commit58e3262606c3b2f54b7ee075da282a634360b325 (patch)
tree8613dcf9d7d0fec37ffbd56f4eb3864f7fe7d57c /ftp
parentFix build for the case, when WITH_LIBRTMP is defined. (diff)
Fix my last commit
Notes
Notes: svn path=/head/; revision=268808
Diffstat (limited to 'ftp')
-rw-r--r--ftp/atftp/files/patch-tftpd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ftp/atftp/files/patch-tftpd.c b/ftp/atftp/files/patch-tftpd.c
index 01baa6fa655e..b8855c03899e 100644
--- a/ftp/atftp/files/patch-tftpd.c
+++ b/ftp/atftp/files/patch-tftpd.c
@@ -1,5 +1,5 @@
--- tftpd.c.orig 2004-02-27 10:05:26.000000000 +0800
-+++ tftpd.c 2011-01-26 18:08:01.000000000 +0800
++++ tftpd.c 2011-02-09 14:18:04.000000000 +0800
@@ -60,6 +60,9 @@
char directory[MAXLEN] = "/tftpboot/";
int retry_timeout = S_TIMEOUT;
@@ -49,10 +49,10 @@
- select(FD_SETSIZE, &rfds, NULL, NULL, &tv);
+ rv = select(FD_SETSIZE, &rfds, NULL, NULL, &tv);
+ if (rv < 0) {
-+ logger(LOG_ERR, "%s: %d: select: %s",
-+ __FILE__, __LINE__, strerror(errno));
+ if (errno == EINTR)
+ continue;
++ logger(LOG_ERR, "%s: %d: select: %s",
++ __FILE__, __LINE__, strerror(errno));
+
+ /* Clear the bits, they are undefined! */
+ FD_ZERO(&rfds);