Move CAB-creation routines into their own file.

Also tidy up some of the memory management, while I'm here.

3 files changed, 88 insertions, 69 deletions

diff --git a/Makefile.am b/Makefile.am
index b23c901..a113320 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 lib_LTLIBRARIES = libwinterop.so.la libmsi.so.la libpreload.la
 
-libwinterop_so_la_SOURCES = fake-winterop.c memory.c memory.h   \
-dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h
+libwinterop_so_la_SOURCES = fake-winterop.c makecab.c memory.c          \
+memory.h dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h
 
 libmsi_so_la_SOURCES = fake-msi.c md5.c memory.c memory.h version.c     \
 dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h
diff --git a/fake-winterop.c b/fake-winterop.c
index d238784..755853f 100644
--- a/fake-winterop.c
+++ b/fake-winterop.c
@@ -28,73 +28,6 @@ uint32_t ResetAcls(const char16_t **pwzFiles, uint32_t cFiles)
     return 0;
 }
 
-typedef struct CabCreateContext {
-    char *outdir;
-    char *outfile;
-
-    char **args;
-    int nargs, argsize;
-} CabCreateContext;
-
-uint32_t CreateCabBegin(const char16_t *wzCab, const char16_t *wzCabDir,
-                        uint32_t dwMaxFiles, uint32_t dwMaxSize,
-                        uint32_t dwMaxThresh, int compression,
-                        CabCreateContext **out_ctx)
-{
-    CabCreateContext *ctx = snew(CabCreateContext);
-    ctx->outdir = ascii(wzCabDir, true);
-    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", cNULL);
-    ctx->args[ctx->nargs++] = ctx->outfile;
-    *out_ctx = ctx;
-    return 0;
-}
-
-uint32_t CreateCabAddFile(const char16_t *wzFile, const char16_t *wzToken,
-                          void *pmfHash, CabCreateContext *ctx)
-{
-    char *file = ascii(wzFile, true);
-    char *file_abs = realpath(file, NULL);
-    char *cabname = ascii(wzToken, true);
-    printf("CreateCabAddFile: %s :: %s <- %s\n", ctx->outfile,
-           cabname, file_abs);
-    if (ctx->nargs + 1 >= ctx->argsize) {
-        ctx->argsize = ctx->nargs * 5 / 4 + 16;
-        ctx->args = sresize(ctx->args, ctx->argsize, char *);
-    }
-    ctx->args[ctx->nargs++] = cabname;
-    ctx->args[ctx->nargs++] = file_abs;
-    return 0;
-}
-
-uint32_t CreateCabAddFiles(const char16_t *const *pwzFiles,
-                           const char16_t *const *pwzTokens,
-                           void *pmfHash, uint32_t cFiles,
-                           CabCreateContext *ctx)
-{
-    for (uint32_t i = 0; i < cFiles; i++)
-        CreateCabAddFile(pwzFiles[i], pwzTokens[i], pmfHash, ctx);
-    return 0;
-}
-
-uint32_t CreateCabFinish(CabCreateContext *ctx, void (*split_callback)(void))
-{
-    if (ctx->nargs + 1 >= ctx->argsize) {
-        ctx->argsize = ctx->nargs * 5 / 4 + 16;
-        ctx->args = sresize(ctx->args, ctx->argsize, char *);
-    }
-    ctx->args[ctx->nargs++] = NULL;
-    system_argv_array(ctx->args);
-    return 0;
-}
-
-void CreateCabCancel(void *hContext)
-{
-}
-
 uint32_t ExtractCabBegin(void)
 {
     return 0;
diff --git a/makecab.c b/makecab.c
new file mode 100644
index 0000000..ec4ba05
--- /dev/null
+++ b/makecab.c
@@ -0,0 +1,86 @@
+#include <stdint.h>
+
+#include <err.h>
+
+#include "memory.h"
+#include "dupstr.h"
+#include "subproc.h"
+#include "uchars.h"
+
+typedef struct CabCreateContext {
+    char *outfile;
+
+    char **args;
+    int nargs, argsize;
+} CabCreateContext;
+
+uint32_t CreateCabBegin(const char16_t *wzCab, const char16_t *wzCabDir,
+                        uint32_t dwMaxFiles, uint32_t dwMaxSize,
+                        uint32_t dwMaxThresh, int compression,
+                        CabCreateContext **out_ctx)
+{
+    CabCreateContext *ctx = snew(CabCreateContext);
+    char *outdir = ascii(wzCabDir, true);
+    char *cab = ascii(wzCab, true);
+    ctx->outfile = dupcat(outdir, "/", cab, cNULL);
+    sfree(cab);
+    sfree(outdir);
+    ctx->nargs = 0;
+    ctx->argsize = 16;
+    ctx->args = snewn(ctx->argsize, char *);
+    ctx->args[ctx->nargs++] = dupcat(getenv("WIX"), "/", "makecab.py", cNULL);
+    ctx->args[ctx->nargs++] = ctx->outfile;
+    *out_ctx = ctx;
+    return 0;
+}
+
+uint32_t CreateCabAddFile(const char16_t *wzFile, const char16_t *wzToken,
+                          void *pmfHash, CabCreateContext *ctx)
+{
+    char *file = ascii(wzFile, true);
+    char *file_abs = realpath(file, NULL);
+    char *cabname = ascii(wzToken, true);
+    warnx("CreateCabAddFile: %s :: %s <- %s", ctx->outfile,
+          cabname, file_abs);
+    if (ctx->nargs + 1 >= ctx->argsize) {
+        ctx->argsize = ctx->nargs * 5 / 4 + 16;
+        ctx->args = sresize(ctx->args, ctx->argsize, char *);
+    }
+    ctx->args[ctx->nargs++] = cabname;
+    ctx->args[ctx->nargs++] = file_abs;
+    sfree(file);
+    return 0;
+}
+
+uint32_t CreateCabAddFiles(const char16_t *const *pwzFiles,
+                           const char16_t *const *pwzTokens,
+                           void *pmfHash, uint32_t cFiles,
+                           CabCreateContext *ctx)
+{
+    for (uint32_t i = 0; i < cFiles; i++)
+        CreateCabAddFile(pwzFiles[i], pwzTokens[i], pmfHash, ctx);
+    return 0;
+}
+
+void CreateCabCancel(CabCreateContext *ctx)
+{
+    for (int i = 0; i < ctx->nargs; i++)
+        sfree(ctx->args[i]);
+    sfree(ctx->args);
+    sfree(ctx->outfile);
+    sfree(ctx);
+}
+
+uint32_t CreateCabFinish(CabCreateContext *ctx, void (*split_callback)(void))
+{
+    if (ctx->nargs + 1 >= ctx->argsize) {
+        ctx->argsize = ctx->nargs * 5 / 4 + 16;
+        ctx->args = sresize(ctx->args, ctx->argsize, char *);
+    }
+    ctx->args[ctx->nargs++] = NULL;
+    system_argv_array(ctx->args);
+
+    CreateCabCancel(ctx);              /* free everything */
+
+    return 0;
+}