Path: utzoo!yunexus!geac!syntron!jtsv16!uunet!lll-winken!lll-tis!ames!nrl-cmf!mailrus!ukma!gatech!bloom-beacon!PURDUE.EDU!spaf
From: spaf@PURDUE.EDU (Gene Spafford)
Newsgroups: comp.windows.x
Subject: Re:  R3 bug/misfeature:  DISPLAY setting in xinit
Summary: Murphy strikes again
Message-ID: <8810311629.AA02152@uther.cs.purdue.edu>
Date: 31 Oct 88 16:29:05 GMT
Article-I.D.: uther.8810311629.AA02152
Sender: daemon@bloom-beacon.MIT.EDU
Organization: SERC, Department of Computer Sciences, Purdue Univ.
Lines: 50

Arggh!  This is what I get for saving intermediate versions!

The patch I mailed for xinit was not the correct one.  What follows
is:


*** xinit.c.orig	Sun Oct 30 14:05:46 1988
--- xinit.c	Mon Oct 31 11:22:27 1988
***************
*** 560,566 ****
  set_environment ()
  {
      int nenvvars;
!     char **newPtr, **oldPtr;
      static char displaybuf[256];
  
      /* count number of environment variables */
--- 560,566 ----
  set_environment ()
  {
      int nenvvars;
!     char **newPtr, **oldPtr, *ocp;
      static char displaybuf[256];
  
      /* count number of environment variables */
***************
*** 574,584 ****
  		 program, nenvvars + 2);
  	exit (1);
      }
  
      /* put DISPLAY=displayname as first element */
      strcpy (displaybuf, "DISPLAY=");
!     strcpy (displaybuf + 8, displayname);
!     newPtr = newenviron;
      *newPtr++ = displaybuf;
  
      /* copy pointers to other variables */
--- 574,585 ----
  		 program, nenvvars + 2);
  	exit (1);
      }
+     newPtr = newenviron;
  
      /* put DISPLAY=displayname as first element */
      strcpy (displaybuf, "DISPLAY=");
!     ocp = getenv("DISPLAY");
!     strcat (displaybuf, (ocp != NULL) ? ocp : displayname);
      *newPtr++ = displaybuf;
  
      /* copy pointers to other variables */