[PATCH lttng-ust 1/2] Fix: lttng-gen-tp: only replace file extension

[PATCH lttng-ust 1/2] Fix: lttng-gen-tp: only replace file extension

[Jonathan Rajotte]

Previous replace was done on the complete path. A path containing
.c or .o would result in a corrupted file path.

Reported-by: Gunnar Strand <Gunnar.Strand@ericsson.com>
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 tools/lttng-gen-tp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index b62cd990..6aa1bba1 100755
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -79,7 +79,9 @@ class CFile:
     def write(self):
         outputFile = open(self.outputFilename,"w")
 
-        headerFilename = self.outputFilename.replace(".c",".h")
+        headerFilename = self.outputFilename
+        if headerFilename.endswith(".c"):
+            headerFilename = headerFilename[:-2] + ".h"
 
         outputFile.write(CFile.FILE_TPL.format(
                                            headerFilename = headerFilename))
@@ -126,7 +128,10 @@ class ObjFile:
         return cc
 
     def write(self):
-        cFilename = self.outputFilename.replace(".o",".c")
+        cFilename = self.outputFilename
+        if cFilename.endswith(".o"):
+            cFilename = cFilename[:-2] + ".c"
+
         cc = self._detectCC()
         if cc == "":
             raise RuntimeError("No C Compiler detected")
-- 
2.11.0

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Re: [PATCH lttng-ust 1/2] Fix: lttng-gen-tp: only replace file extension

[Mathieu Desnoyers]

Merged into master, 2.10, 2.9, thanks!

Mathieu

----- On Sep 19, 2017, at 12:08 PM, Jonathan Rajotte jonathan.rajotte-julien@efficios.com wrote:

> Previous replace was done on the complete path. A path containing
> .c or .o would result in a corrupted file path.
> 
> Reported-by: Gunnar Strand <Gunnar.Strand@ericsson.com>
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> ---
> tools/lttng-gen-tp | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
> index b62cd990..6aa1bba1 100755
> --- a/tools/lttng-gen-tp
> +++ b/tools/lttng-gen-tp
> @@ -79,7 +79,9 @@ class CFile:
>     def write(self):
>         outputFile = open(self.outputFilename,"w")
> 
> -        headerFilename = self.outputFilename.replace(".c",".h")
> +        headerFilename = self.outputFilename
> +        if headerFilename.endswith(".c"):
> +            headerFilename = headerFilename[:-2] + ".h"
> 
>         outputFile.write(CFile.FILE_TPL.format(
>                                            headerFilename = headerFilename))
> @@ -126,7 +128,10 @@ class ObjFile:
>         return cc
> 
>     def write(self):
> -        cFilename = self.outputFilename.replace(".o",".c")
> +        cFilename = self.outputFilename
> +        if cFilename.endswith(".o"):
> +            cFilename = cFilename[:-2] + ".c"
> +
>         cc = self._detectCC()
>         if cc == "":
>             raise RuntimeError("No C Compiler detected")
> --
> 2.11.0

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev