Move dupcat out into its own file, and add dupstr.

Also a handy #define to replace all those tedious castings of NULL.

1 files changed, 4 insertions, 5 deletions

diff --git a/fake-winterop.c b/fake-winterop.c
index b367831..6f7e3d3 100644
--- a/fake-winterop.c
+++ b/fake-winterop.c
@@ -12,6 +12,7 @@
 #include <unistd.h>
 
 #include "memory.h"
+#include "dupstr.h"
 #include "fake-lib.h"
 
 uint32_t HashPublicKeyInfo(void *pCertContext,
@@ -41,13 +42,11 @@ uint32_t CreateCabBegin(const char16_t *wzCab, const char16_t *wzCabDir,
 {
     CabCreateContext *ctx = snew(CabCreateContext);
     ctx->outdir = ascii(wzCabDir, true);
-    ctx->outfile = dupcat(ctx->outdir, "/",
-                          ascii(wzCab, true), (const char *)NULL);
+    ctx->outfile = dupcat(ctx->outdir, "/", ascii(wzCab, true), cNULL);
     ctx->nargs = 0;
     ctx->argsize = 16;
     ctx->args = snewn(ctx->argsize, char *);
-    ctx->args[ctx->nargs++] = dupcat(getenv("WIX"), "/", "makecab.py",
-                                     (const char *)NULL);
+    ctx->args[ctx->nargs++] = dupcat(getenv("WIX"), "/", "makecab.py", cNULL);
     ctx->args[ctx->nargs++] = ctx->outfile;
     *out_ctx = ctx;
     return 0;
@@ -104,7 +103,7 @@ uint32_t ExtractCab(const char16_t *wzCabinet, const char16_t *wzExtractDir)
 {
     char *cab = ascii(wzCabinet, true), *dir = ascii(wzExtractDir, true);
     fprintf(stderr, "ExtractCab(\"%s\", \"%s\"\n", cab, dir);
-    system_argv("cabextract", "-d", dir, cab, (const char *)NULL);
+    system_argv("cabextract", "-d", dir, cab, cNULL);
     return 0;
 }