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, 21 insertions, 25 deletions

diff --git a/fake-msi.c b/fake-msi.c
index 2223211..12b1489 100644
--- a/fake-msi.c
+++ b/fake-msi.c
@@ -15,6 +15,7 @@
 #include <unistd.h>
 
 #include "memory.h"
+#include "dupstr.h"
 #include "fake-lib.h"
 
 typedef struct MsiTypePrefix {
@@ -42,19 +43,18 @@ uint32_t MsiOpenDatabaseW(const char16_t *filename,
     close(open(ctx->outfile, O_CREAT | O_WRONLY, 0666));
     ctx->outfile = realpath(ctx->outfile, NULL);
     unlink(ctx->outfile);
-    ctx->tempdir = dupcat(ctx->outfile, "-msiXXXXXX", (const char *)NULL);
+    ctx->tempdir = dupcat(ctx->outfile, "-msiXXXXXX", cNULL);
     if (!mkdtemp(ctx->tempdir))
         err(1, "%s: mkdtemp", ctx->tempdir);
     ctx->nargs = 0;
     ctx->argsize = 16;
     ctx->args = snewn(ctx->argsize, char *);
-    ctx->args[ctx->nargs++] = dupcat("sh", (const char *)NULL);
-    ctx->args[ctx->nargs++] = dupcat("-c", (const char *)NULL);
-    ctx->args[ctx->nargs++] = dupcat("cd \"$0\" && \"$@\"",
-                                     (const char *)NULL);
-    ctx->args[ctx->nargs++] = dupcat(ctx->tempdir, (const char *)NULL);
-    ctx->args[ctx->nargs++] = dupcat("msibuild", (const char *)NULL);
-    ctx->args[ctx->nargs++] = dupcat(ctx->outfile, (const char *)NULL);
+    ctx->args[ctx->nargs++] = dupstr("sh");
+    ctx->args[ctx->nargs++] = dupstr("-c");
+    ctx->args[ctx->nargs++] = dupstr("cd \"$0\" && \"$@\"");
+    ctx->args[ctx->nargs++] = dupstr(ctx->tempdir);
+    ctx->args[ctx->nargs++] = dupstr("msibuild");
+    ctx->args[ctx->nargs++] = dupstr(ctx->outfile);
     *out_ctx = ctx;
     return 0;
 }
@@ -64,15 +64,14 @@ uint32_t MsiDatabaseImportW(MsiMainCtx *ctx, const char16_t *folder,
 {
     assert(ctx->t.type == MAIN);
     system_argv("sh", "-c", "cd \"$0\" && cp \"$1\" \"$2\"",
-                ascii(folder, true), ascii(file, true), ctx->tempdir,
-                (const char *)NULL);
+                ascii(folder, true), ascii(file, true), ctx->tempdir, cNULL);
     if (ctx->nargs + 2 >= ctx->argsize) {
         ctx->argsize = ctx->nargs * 5 / 4 + 16;
         ctx->args = sresize(ctx->args, ctx->argsize, char *);
     }
-    ctx->args[ctx->nargs++] = dupcat("-i", (const char *)NULL);
+    ctx->args[ctx->nargs++] = dupstr("-i");
     ctx->args[ctx->nargs++] = dupcat(ctx->tempdir, "/", ascii(file, true),
-                                     (const char *)NULL);
+                                     cNULL);
     return 0;
 }
 
@@ -96,15 +95,13 @@ uint32_t MsiDatabaseOpenViewW(MsiMainCtx *ctx, const char16_t *query,
         view->fp = NULL;               /* special case */
     else {
         if (!strcmp(cquery, "SELECT  `Name`, `Data` FROM `Binary`")) {
-            view->fp = fopen(dupcat(ctx->tempdir, "/", "Binary.idt",
-                                    (const char *)NULL), "a");
-            view->targetdir = dupcat(ctx->tempdir, "/", "Binary",
-                                     (const char *)NULL);
+            view->fp = fopen(dupcat(ctx->tempdir, "/", "Binary.idt", cNULL),
+                             "a");
+            view->targetdir = dupcat(ctx->tempdir, "/", "Binary", cNULL);
         } else if (!strcmp(cquery, "SELECT  `Name`, `Data` FROM `Icon`")) {
-            view->fp = fopen(dupcat(ctx->tempdir, "/", "Icon.idt",
-                                    (const char *)NULL), "a");
-            view->targetdir = dupcat(ctx->tempdir, "/", "Icon",
-                                     (const char *)NULL);
+            view->fp = fopen(dupcat(ctx->tempdir, "/", "Icon.idt", cNULL),
+                             "a");
+            view->targetdir = dupcat(ctx->tempdir, "/", "Icon", cNULL);
         } else
             errx(1, "unrecognised query: %s", cquery);
         if (!view->fp)
@@ -163,8 +160,7 @@ uint32_t MsiViewModify(MsiView *view, uint32_t mode, MsiRecord *rec)
     assert(rec->t.type == RECORD);
     if (view->fp) {
         system_argv("sh", "-c", "cp \"$0\" \"$1\"/\"$2\"",
-                    rec->data, view->targetdir, rec->name,
-                    (const char *)NULL);
+                    rec->data, view->targetdir, rec->name, cNULL);
         fprintf(view->fp, "%s\t%s\r\n", rec->name, rec->name);
     } else {
         MsiMainCtx *ctx = view->ctx;
@@ -172,9 +168,9 @@ uint32_t MsiViewModify(MsiView *view, uint32_t mode, MsiRecord *rec)
             ctx->argsize = ctx->nargs * 5 / 4 + 16;
             ctx->args = sresize(ctx->args, ctx->argsize, char *);
         }
-        ctx->args[ctx->nargs++] = dupcat("-a", (const char *)NULL);
-        ctx->args[ctx->nargs++] = dupcat(rec->name, (const char *)NULL);
-        ctx->args[ctx->nargs++] = dupcat(rec->data, (const char *)NULL);
+        ctx->args[ctx->nargs++] = dupstr("-a");
+        ctx->args[ctx->nargs++] = dupstr(rec->name);
+        ctx->args[ctx->nargs++] = dupstr(rec->data);
     }
     return 0;
 }