1 --- XFree86-3.3.4.orig/xc/programs/xinit/xinit.c Sun Jun 27 12:32:26 1999
2 +++ XFree86-3.3.4/xc/programs/xinit/xinit.c Sun Aug 8 22:28:20 1999
8 - * kludge to avoid race with TCP, giving server time to
9 - * set his socket options before we try to open it,
10 - * either use the 15 second timeout, or await SIGUSR1.
13 + * before we try the below kludge, see if we are already
14 + * ready to connect. Fast CPUs with cached filesystems
15 + * shouldn't have to wait 15 seconds.
17 - * If your machine is substantially slower than 15 seconds,
18 - * you can easily adjust this value.
19 + * pbrown@redhat.com - 06/08/1999
22 + if (waitforserver() == 0) {
24 + * kludge to avoid race with TCP, giving server time to
25 + * set his socket options before we try to open it,
26 + * either use the 15 second timeout, or await SIGUSR1.
28 + * If your machine is substantially slower than 15 seconds,
29 + * you can easily adjust this value.
36 - sigprocmask(SIG_SETMASK, &old, NULL);
39 + sigprocmask(SIG_SETMASK, &old, NULL);
49 - if (waitforserver() == 0) {
50 - Error("unable to connect to X server\r\n");
53 + if (waitforserver() == 0) {
54 + Error("unable to connect to X server\r\n");