From: Frank Ch. Eigler <fche@redhat.com>
Date: Sat, 21 Jan 2017 22:58:48 +0000 (-0500)
Subject: dtrace wrapper: tolerate \ \n etc. in $CFLAGS
X-Git-Tag: release-3.1~50^2~10
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=100bca3f12490257c766288b6b735e2d60306f88;p=systemtap.git

dtrace wrapper: tolerate \ \n etc. in $CFLAGS

A user reports that some rpmbuild make jobs can cause embedded
wackiness like \ characters in $CFLAGS.  Nuke them.
---

diff --git a/dtrace.in b/dtrace.in
index 78d1c23bd..8cf69ae1c 100644
--- a/dtrace.in
+++ b/dtrace.in
@@ -415,7 +415,8 @@ def main():
         providers.semaphore_write(fdesc)
         fdesc.close()
         cc1 = os.environ.get("CC", "gcc")
-        cflags = "-g " + os.environ.get("CFLAGS", "")
+        cflags = "-g " + os.environ.get("CFLAGS", "").replace('\n', ' ').replace('\r',' ').replace('\\',' ')
+        # sanitize any embedded \ etc. goo; PR21063
         retcode = call(split(cc1) + defines + includes + split(cflags) +
              ["-fPIC", "-I.", "-I@prefix@/include", "-c", fname, "-o",
               filename + suffix], shell=False)