From 323f68919b57dcc218c7f273c4c4c7d12252b292 Mon Sep 17 00:00:00 2001
From: Danny Smith <danny@gorcha.org>
Date: Sun, 23 Nov 2025 20:33:48 +1100
Subject: [PATCH] Fix XPT writing for OBSV8 and LABELV8 headers

---
 src/sas/readstat_xport_write.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/sas/readstat_xport_write.c b/src/sas/readstat_xport_write.c
index 1f7b317..2383360 100644
--- a/src/sas/readstat_xport_write.c
+++ b/src/sas/readstat_xport_write.c
@@ -49,12 +49,21 @@ static readstat_error_t xport_write_record(readstat_writer_t *writer, const char
     return retval;
 }
 
-static readstat_error_t xport_write_header_record_v8(readstat_writer_t *writer, 
+static readstat_error_t xport_write_header_record_obsv8(readstat_writer_t *writer, 
+        int row_count) {
+    char record[RECORD_LEN+1];
+    snprintf(record, sizeof(record),
+            "HEADER RECORD*******OBSV8   HEADER RECORD!!!!!!!" "%15d",
+            row_count);
+    return xport_write_record(writer, record);
+}
+
+static readstat_error_t xport_write_header_record_labelv8(readstat_writer_t *writer, 
         xport_header_record_t *xrecord) {
     char record[RECORD_LEN+1];
     snprintf(record, sizeof(record),
-            "HEADER RECORD*******%-8sHEADER RECORD!!!!!!!" "%15d" "%15d",
-            xrecord->name, xrecord->num1, xrecord->num2);
+            "HEADER RECORD*******%-8sHEADER RECORD!!!!!!!" "%-5d",
+            xrecord->name, xrecord->num1);
     return xport_write_record(writer, record);
 }
 
@@ -167,7 +176,7 @@ static readstat_error_t xport_write_variables(readstat_writer_t *writer) {
         if (any_has_long_format) {
             strcpy(header.name, "LABELV9");
         }
-        retval = xport_write_header_record_v8(writer, &header);
+        retval = xport_write_header_record_labelv8(writer, &header);
         if (retval != READSTAT_OK)
             goto cleanup;
 
@@ -357,11 +366,7 @@ static readstat_error_t xport_write_namestr_header_record(readstat_writer_t *wri
 
 static readstat_error_t xport_write_obs_header_record(readstat_writer_t *writer) {
     if (writer->version == 8) {
-        xport_header_record_t xrecord = {
-            .name = "OBSV8",
-            .num1 = writer->row_count
-        };
-        return xport_write_header_record_v8(writer, &xrecord);
+        return xport_write_header_record_obsv8(writer, writer->row_count);
     }
     xport_header_record_t xrecord = { 
         .name = "OBS"