Merge branch 'remove_inpu_path_from_output_path' of https://github.co…

…m/martonmiklos/dbcc into martonmiklos-remove_inpu_path_from_output_path
howerj · Nov 16, 2018 · 3d62a67 · 3d62a67
2 parents 5d24f1d + 8233346
commit 3d62a67
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/main.c b/main.c
@@ -3,6 +3,7 @@
  * @copyright Richard James Howe
  * @license MIT */
 #include <assert.h>
+#include <libgen.h>
 #include <stdint.h>
 #include "mpc.h"
 #include "util.h"
@@ -196,18 +197,18 @@ int main(int argc, char **argv)
 
 		dbc_t *dbc = ast2dbc(ast);
 
-		char *outpath = argv[i];
+		char *outpath = basename(argv[i]);
 		if(outdir) {
 			outpath = allocate(strlen(outpath) + strlen(outdir) + 2 /* '/' + '\0'*/);
 			strcat(outpath, outdir);
 			strcat(outpath, "/");
-			strcat(outpath, argv[i]);
+			strcat(outpath, basename(argv[i]));
 		}
 
 		int r = 0;
 		switch(convert) {
 		case CONVERT_TO_C:
-			r = dbc2cWrapper(dbc, outpath, argv[i], use_time_stamps,
+			r = dbc2cWrapper(dbc, outpath, basename(argv[i]), use_time_stamps,
 				generate_print, generate_pack, generate_unpack);
 			break;
 		case CONVERT_TO_XML: