From a3523870493b70767d192dd0300731937a55e67e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Tue, 21 Jul 1998 19:13:28 +0200
Subject: [PATCH] Applied socketpair_ultra fix from Pike 0.6.
Rev: src/modules/files/file.c:1.65
---
src/modules/files/file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index 737d731b3c..5da7eaa6d2 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -6,7 +6,7 @@
#define READ_BUFFER 8192
#include "global.h"
-RCSID("$Id: file.c,v 1.64 1998/06/09 17:14:02 grubba Exp $");
+RCSID("$Id: file.c,v 1.65 1998/07/21 17:13:28 grubba Exp $");
#include "interpret.h"
#include "svalue.h"
#include "stralloc.h"
@@ -1087,14 +1087,14 @@ retry_connect:
retry_accept:
sv[0]=accept(fd,(struct sockaddr *)&addr,&len);
- set_nonblocking(sv[0],0);
-
if(sv[0] < 0) {
if(errno==EINTR) goto retry_accept;
close(sv[1]);
return -1;
}
+ set_nonblocking(sv[0],0);
+
/* We do not trust accept */
len=sizeof(addr);
if(getpeername(sv[0], (struct sockaddr *)&addr,&len)) return -1;
--
GitLab