From 5ed7dfe24abf84b77d0e4075308a42e31caada32 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 24 Dec 2024 11:23:24 +1300
Subject: [PATCH] Debug more

---
 src/survexport.cc    | 4 ++++
 src/wrapsurvexport.c | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/survexport.cc b/src/survexport.cc
index 6600da14..c3efb9fe 100644
--- a/src/survexport.cc
+++ b/src/survexport.cc
@@ -48,6 +48,10 @@ using namespace std;
 int
 main(int argc, char **argv)
 {
+    printf("argc = %d\n", argc);
+    for (int i = 0; i < argc; ++i) {
+	printf("argv[%d] = %s\n", i, argv[i] ? argv[i] : "<<<NULL>>>");
+    }
    double pan = 0;
    double tilt = -90.0;
    export_format format = FMT_MAX_PLUS_ONE_;
diff --git a/src/wrapsurvexport.c b/src/wrapsurvexport.c
index aea5ee15..30d4f89d 100644
--- a/src/wrapsurvexport.c
+++ b/src/wrapsurvexport.c
@@ -39,21 +39,17 @@ main(int argc, char **argv)
 	e_len = 1;
 	a_len = 0;
     }
-    printf("argv[0] = %s\n", argv[0]);
     char *e = malloc(e_len + strlen("OPENSSL_MODULES=") + 1);
     if (!e) return 1;
     strcpy(e, "OPENSSL_MODULES=");
     memcpy(e + strlen("OPENSSL_MODULES="), e_val, e_len);
     e[strlen("OPENSSL_MODULES=") + e_len] = '\0';
     putenv(e);
-    printf("putenv(%s)\n", e);
     char *a = malloc(a_len + strlen("survexpor_.exe") + 1);
     if (!a) return 1;
     memcpy(a, argv[0], a_len);
     strcpy(a + a_len, "survexpor_.exe");
-    printf("a = %s\n", a);
     const char *real_argv0 = argv[0];
-    if (getenv("OLLY")) argv[0] = a;
     _execv(a, (const char * const*)argv);
     printf("%s: %s\n", real_argv0, strerror(errno));
     return 1;