Re: xsrc/44619: Missing substitution in /etc/X11/xinit/xinitrc

[David Holland <dholland-bugs%netbsd.org@localhost>]

The following reply was made to PR xsrc/44619; it has been noted by GNATS.

From: David Holland <dholland-bugs%netbsd.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: xsrc/44619: Missing substitution in /etc/X11/xinit/xinitrc
Date: Mon, 28 Feb 2011 07:04:58 +0000

 On Tue, Feb 22, 2011 at 04:30:01PM +0000, gregoire.sutre%gmail.com@localhost 
wrote:
  > According to the file cpprules.in of the xinit distribution,
  > the `XSLASHGLOB' part should be replaced by `/*'.
 
 I think the best way to deal with this is not to try to wedge in the
 extra SED_MAGIC for producing '/*' but to change the glob in the
 distributed xinitrc template to '/?*', which should be equivalent and
 avoids confusing cpp.
 
 This should be sent upstream, but it's not clear from anything in the
 xinit distribution how to do that.
 
 Index: xinitrc.cpp
 ===================================================================
 RCS file: /cvsroot/xsrc/external/mit/xinit/dist/xinitrc.cpp,v
 retrieving revision 1.1.1.3
 diff -u -p -r1.1.1.3 xinitrc.cpp
 --- xinitrc.cpp        21 Nov 2010 03:47:48 -0000      1.1.1.3
 +++ xinitrc.cpp        28 Feb 2011 07:03:31 -0000
 @@ -84,8 +84,9 @@ fi
  XCOMM This is the fallback case if nothing else is executed above
  #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
  
 +XCOMM do not use slash-star in the glob; slash-questionmark-star is equivalent
  if [ -d XINITDIR/xinitrc.d ] ; then
 -      for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
 +      for f in XINITDIR/xinitrc.d/?*.sh ; do
                [ -x "$f" ] && . "$f"
        done
        unset f
 
 
 -- 
 David A. Holland
 dholland%netbsd.org@localhost