Merge pull request #2791 from havardAasen/havardAasen-patch-1

andypugh · web-flow · commit a27fab362e0c · 2023-12-15T13:42:29.000Z
revert changes for strncat()
diff --git a/src/emc/rs274ngc/interp_remap.cc b/src/emc/rs274ngc/interp_remap.cc
@@ -294,7 +294,7 @@ int Interp::add_parameters(setup_pointer settings,
     while (*s) {
 	errored = true;
 	char c  = toupper(*s);
-	strncat(tail,&c,2);
+	strncat(tail,&c,1);
 	if (*(s+1)) rtapi_strxcat(tail,",");
 	s++;
     }

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ int Interp::add_parameters(setup_pointer settings,`
`294`	`294`	`while (*s) {`
`295`	`295`	`errored = true;`
`296`	`296`	`char c = toupper(*s);`
`297`		`- strncat(tail,&c,2);`
	`297`	`+ strncat(tail,&c,1);`
`298`	`298`	`if (*(s+1)) rtapi_strxcat(tail,",");`
`299`	`299`	`s++;`
`300`	`300`	`}`