XFree86-xinitrace.patch

   1 --- XFree86-3.3.3.1/xc/programs/xinit/xinit.c.xinitrace Tue Jun  8 12:41:23 1999
   2 +++ XFree86-3.3.3.1/xc/programs/xinit/xinit.c   Tue Jun  8 12:43:39 1999
   3 @@ -561,22 +561,32 @@
   4                         serverpid = -1;
   5                         break;
   6                 }
   7 -               /*
   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.
  11 +
  12 +               /*
  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.
  16                  *
  17 -                * If your machine is substantially slower than 15 seconds,
  18 -                * you can easily adjust this value.
  19 +                * pbrown@redhat.com - 06/08/1999
  20                  */
  21 -               alarm (15);
  22 -               pause ();
  23 -               alarm (0);
  24 -
  25                 if (waitforserver() == 0) {
  26 -                       Error("unable to connect to X server\r\n");
  27 -                       shutdown();
  28 -                       serverpid = -1;
  29 +                 /*
  30 +                  * kludge to avoid race with TCP, giving server time to
  31 +                  * set his socket options before we try to open it,
  32 +                  * either use the 15 second timeout, or await SIGUSR1.
  33 +                  *
  34 +                  * If your machine is substantially slower than 15 seconds,
  35 +                  * you can easily adjust this value.
  36 +                  */
  37 +                 alarm (15);
  38 +                 pause ();
  39 +                 alarm (0);
  40 +
  41 +                 if (waitforserver() == 0) {
  42 +                   Error("unable to connect to X server\r\n");
  43 +                   shutdown();
  44 +                   serverpid = -1;
  45 +                 }
  46                 }
  47                 break;
  48         }