config_format: yaml: Use \ instead of / for concatenating paths on Windows

cosmo0920 · edsiper · commit bc796b299683 · 2023-12-21T16:52:27.000-06:00
Signed-off-by: Hiroshi Hatake &lt;hatake@calyptia.com&gt;
diff --git a/src/config_format/flb_cf_yaml.c b/src/config_format/flb_cf_yaml.c
@@ -1934,10 +1934,16 @@ static int read_config(struct flb_cf *conf, struct local_ctx *ctx,
             return -1;
         }
 
-        if (flb_sds_printf(&include_dir, "%s/%s", parent->path, cfg_file) == NULL) {
+#ifdef _WIN32
+#define PATH_CONCAT_TEMPLATE "%s\\%s"
+#else
+#define PATH_CONCAT_TEMPLATE "%s/%s"
+#endif
+        if (flb_sds_printf(&include_dir, PATH_CONCAT_TEMPLATE, parent->path, cfg_file) == NULL) {
             flb_error("unable to create full filename");
             return -1;
         }
+#undef PATH_CONCAT_TEMPLATE
 
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -1934,10 +1934,16 @@ static int read_config(struct flb_cf conf, struct local_ctx ctx,`
`1934`	`1934`	`return -1;`
`1935`	`1935`	`}`
`1936`	`1936`
`1937`		`- if (flb_sds_printf(&include_dir, "%s/%s", parent->path, cfg_file) == NULL) {`
	`1937`	`+#ifdef _WIN32`
	`1938`	`+#define PATH_CONCAT_TEMPLATE "%s\\%s"`
	`1939`	`+#else`
	`1940`	`+#define PATH_CONCAT_TEMPLATE "%s/%s"`
	`1941`	`+#endif`
	`1942`	`+ if (flb_sds_printf(&include_dir, PATH_CONCAT_TEMPLATE, parent->path, cfg_file) == NULL) {`
`1938`	`1943`	`flb_error("unable to create full filename");`
`1939`	`1944`	`return -1;`
`1940`	`1945`	`}`
	`1946`	`+#undef PATH_CONCAT_TEMPLATE`
`1941`	`1947`
`1942`	`1948`	`}`
`1943`	`1949`	`else {`