Module Name: xsrc
Committed By: dholland
Date: Sun Mar 6 01:05:51 UTC 2011
Modified Files:
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
Use xinitrc.d/?*.sh as the matching pattern instead of needing a
fragile sed substitution XSLASHGLOB to produce xinitrc.d/*.sh. (If
that were used literally the slash-star would confuse cpp.)
Fixes PR 44619. Patch has been sent upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xinit/dist/xinitrc.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.1.1.3 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.2
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.1.1.3 Sun Nov 21 03:47:48 2010
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun Mar 6 01:05:51 2011
@@ -84,8 +84,9 @@
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
