mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-14 03:10:47 +00:00
57 lines
1.8 KiB
C++
57 lines
1.8 KiB
C++
--- network.cc.orig 2008-02-22 16:51:22.000000000 +0100
|
|
+++ network.cc 2008-12-29 11:24:10.000000000 +0100
|
|
@@ -566,6 +566,7 @@
|
|
strcpy(HostName,"local pipe");
|
|
snprintf(HostAddress,96,"pipe[%d,%d]",pin,pout);
|
|
Quiet=0;
|
|
+ use_execve=0;
|
|
MaxWaitTime = 60000.0; // 1 minute
|
|
}
|
|
|
|
@@ -577,6 +578,7 @@
|
|
strcpy(HostAddress,"unknown");
|
|
memset(HelperBin,0,512);
|
|
Quiet=0;
|
|
+ use_execve=0;
|
|
handshake.erase();
|
|
MaxWaitTime = 60000.0; // 1 minute
|
|
}
|
|
@@ -612,6 +614,25 @@
|
|
Port=port;
|
|
g_strlcpy(HostName,host,128);
|
|
|
|
+ // Special handling for timeseal on FreeBSD:
|
|
+ //
|
|
+ // On FreeBSD, the games/timeseal port provides an a.out timeseal
|
|
+ // binary. However, a.out support is disabled by default on FreeBSD
|
|
+ // >= 5.x. If the a.out kernel module is not loaded, or if a.out
|
|
+ // support is not compiled into the kernel, execvp()ing timeseal
|
|
+ // will not return (because it fallbacks to the shell when execve()
|
|
+ // returns NOEXEC): eboard will not notice the failure (in
|
|
+ // PipeConnection::open()) and will therefore not fallback to a
|
|
+ // direct connection.
|
|
+ //
|
|
+ // We solve the problem by executing timeseal with execve(), which
|
|
+ // will fail if a.out support is not available. Note that unlike
|
|
+ // execvp(), execve() does not search for the program in the path,
|
|
+ // but this is not a problem since eboard uses the absolute path to
|
|
+ // timeseal.
|
|
+ if (! strcmp(helperbin, "timeseal"))
|
|
+ use_execve = 1;
|
|
+
|
|
// build helper path
|
|
if (helpersuffix)
|
|
snprintf(z,256,"%s.%s",helperbin,helpersuffix);
|
|
@@ -728,7 +749,10 @@
|
|
dup2(1,2);
|
|
|
|
setpgid(getpid(),0); // to broadcast SIGKILL later
|
|
- execvp(HelperBin,arguments);
|
|
+ if (use_execve)
|
|
+ execve(HelperBin,arguments,NULL);
|
|
+ else
|
|
+ execvp(HelperBin,arguments);
|
|
write(1,"exec failed\n",12);
|
|
global.debug("exec failed",HelperBin);
|
|
_exit(2); // eek
|