From 50daba69a31400a1f058485df58ac8e2982767dc Mon Sep 17 00:00:00 2001
From: cosmonaut <evan@moonside.games>
Date: Tue, 26 Jul 2022 12:45:08 -0700
Subject: [PATCH] fix output paths

---
 tools/cli/main.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/cli/main.c b/tools/cli/main.c
index c0ea7bf..10b5a83 100644
--- a/tools/cli/main.c
+++ b/tools/cli/main.c
@@ -112,6 +112,7 @@ int main(int argc, char *argv[])
 	char *arg;
 	char *inputDirPath = NULL;
 	char *outputDirPath = NULL;
+	char separatorString[2];
 	char *imageOutputFilename;
 	char *metadataFilename;
 	JsonBuilder *jsonBuilder;
@@ -119,6 +120,9 @@ int main(int argc, char *argv[])
 	int32_t imageCount;
 	int32_t i;
 
+	separatorString[0] = SEPARATOR;
+	separatorString[1] = '\0';
+
 	/* Set defaults */
 	createInfo.padding = 0;
 	createInfo.trim = 1;
@@ -213,8 +217,10 @@ int main(int argc, char *argv[])
 	/* output pixel data */
 
 	Cram_GetPixelData(context, &pixelData, &width, &height);
-	imageOutputFilename = malloc(strlen(createInfo.name) + 5);
-	strcpy(imageOutputFilename, createInfo.name);
+	imageOutputFilename = malloc(strlen(outputDirPath) + strlen(createInfo.name) + 6);
+	strcpy(imageOutputFilename, outputDirPath);
+	strcat(imageOutputFilename, separatorString);
+	strcat(imageOutputFilename, createInfo.name);
 	strcat(imageOutputFilename, ".png");
 
 	stbi_write_png(
@@ -252,8 +258,10 @@ int main(int argc, char *argv[])
 	JsonBuilder_FinishArrayProperty(jsonBuilder);
 	JsonBuilder_Finish(jsonBuilder);
 
-	metadataFilename = malloc(strlen(createInfo.name) + 6);
-	strcpy(metadataFilename, createInfo.name);
+	metadataFilename = malloc(strlen(outputDirPath) + strlen(createInfo.name) + 7);
+	strcpy(metadataFilename, outputDirPath);
+	strcat(metadataFilename, separatorString);
+	strcat(metadataFilename, createInfo.name);
 	strcat(metadataFilename, ".json");
 
 	FILE *jsonOutput = fopen(metadataFilename, "w");