[wiz at NetBSD.org: [PATCH:xinit] 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.)]

[Thomas Klausner]

Hi Alan!

Here it is again, as requested. Hope the forward works fine.

Thanks for looking at this,
 Thomas

----- Forwarded message from Thomas Klausner <wiz at NetBSD.org> -----

Date: Thu,  4 Apr 2013 14:58:30 +0200
From: Thomas Klausner <wiz at NetBSD.org>
To: xorg-devel at lists.x.org, Alan Coopersmith <alan.coopersmith at oracle.com>
Cc: Thomas Klausner <wiz at NetBSD.org>
Subject: [PATCH:xinit] 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.)
X-Mailer: git-send-email 1.8.1.5

---
 cpprules.in | 1 -
 xinitrc.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpprules.in b/cpprules.in
index 92a987d..eaea428 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -10,7 +10,6 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[ 	]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[ 	]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[ 	]*XHASH/s/XHASH/\#/' \
-                       -e '/XSLASHGLOB/s/XSLASHGLOB/\/\*/' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 SUFFIXES = .cpp
diff --git a/xinitrc.cpp b/xinitrc.cpp
index 049a8e4..81c238b 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -85,7 +85,7 @@ XCOMM This is the fallback case if nothing else is executed above
 #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
 
 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
-- 
1.8.1.5

_______________________________________________
xorg-devel at lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel


----- End forwarded message -----