Fix more.

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index e758a5b71bacc6e1847fa5100e7eae88959a7c3b..faea74221ccc7b2d660829b9cf6c2c952d9ce5b0 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -125,7 +125,7 @@ match_byte_assert(uint8_t b, const char *where)
 #define match_byte_assert(b) match_byte_assert(b, WHERE)
 
 static char *
-get_string(void)
+get_string(const char *where)
 {
   if (data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0
       /*&& all_ascii(&data[pos + 4], data[pos])*/)
@@ -140,10 +140,11 @@ get_string(void)
     }
   else
     {
-      fprintf(stderr, "0x%x: expected string\n", pos);
+      fprintf(stderr, "%s: 0x%x: expected string\n", where, pos);
       exit(1);
     }
 }
+#define get_string() get_string(WHERE)
 
 static void
 dump_value(int level)
@@ -151,25 +152,61 @@ dump_value(int level)
   for (int i = 0; i <= level; i++)
     printf ("    ");
 
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
   if (match_byte (3))
     {
       get_string();
       if (match_byte (0x31))
         {
-          match_u32 (1);
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
+          if (match_u32 (1))
+            {
+              printf("(footnote %d) ", get_u32());
+              match_byte_assert (0);
+              match_byte_assert (0);
+              int subn = get_u32 ();
+              printf ("nested %d bytes", subn);
+              pos += subn;
+            }
+          else if (match_u32 (2))
+            {
+              printf("(special 2)");
+              match_byte_assert(0);
+              match_byte_assert(0);
+              match_u32_assert(1);
+              match_byte_assert(0);
+              match_byte_assert(0);
+              int subn = get_u32 ();
+              printf ("nested %d bytes", subn);
+              pos += subn;
+            }
+          else
+            {
+              match_u32_assert(3);
+              printf("(special 3)");
+              match_byte_assert(0);
+              match_byte_assert(0);
+              match_byte_assert(1);
+              match_byte_assert(0);
+              int subn = get_u32 ();
+              printf ("nested %d bytes, ", subn);
+              pos += subn;
+              subn = get_u32 ();
+              printf ("nested %d bytes, ", subn);
+              pos += subn;
+            }
         }
       else
         match_byte_assert (0x58);
       get_string();
       printf("string \"%s\"", get_string());
       match_byte (0);
-      match_byte_assert (1);
+      match_byte (0);
+      match_byte (0);
+      match_byte (1);
+      match_byte (1);
       match_byte (0);
       match_byte (0);
       match_byte (0);
@@ -180,8 +217,8 @@ dump_value(int level)
       match_byte_assert (0x58);
       printf ("variable \"%s\"", get_string());
       get_string();
-      if (!match_byte (3))
-        match_byte_assert (2);
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert(3);
       match_byte (0);
       match_byte (0);
       match_byte (0);
@@ -200,8 +237,11 @@ dump_value(int level)
       vallab = get_string ();
       printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
-      if (!match_u32 (3))
-        match_u32_assert (2);
+      if (!match_u32 (1) && !match_u32(2))
+        match_u32_assert (3);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
       match_byte (0);
     }
   else if (match_byte (4))
@@ -213,7 +253,8 @@ dump_value(int level)
       format = get_u32 ();
       vallab = get_string ();
       var = get_string ();
-      match_byte_assert (2);
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert (3);
       value = get_string ();
       printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
@@ -237,13 +278,11 @@ dump_value(int level)
       match_byte (0);
       match_byte (1);
     }
-  else
+  else if (match_byte (0x31))
     {
       int subn;
       int total_subs = 1;
 
-      match_byte (0);
-      match_byte_assert (0x31);
       match_u32_assert (0);
       match_u32_assert (0);
       subn = get_u32 ();
@@ -259,6 +298,27 @@ dump_value(int level)
           total_subs *= n_subst;
         }
 
+      for (int i = 0; i < total_subs; i++)
+        {
+          putc ('\n', stdout);
+          dump_value (level + 1);
+        }
+    }
+  else
+    {
+      int total_subs = 1;
+
+      match_byte_assert (0x58);
+      printf ("\"%s\" with substitutions:", get_string());
+      for (;;)
+        {
+          int n_subst = get_u32();
+          if (!n_subst)
+            break;
+          printf (" %d", n_subst);
+          total_subs *= n_subst;
+        }
+
       for (int i = 0; i < total_subs; i++)
         {
           putc ('\n', stdout);
@@ -384,6 +444,14 @@ dump_category(int level)
       match_byte (0);
       get_u32 ();
     }
+  else if (match_byte (1))
+    {
+      match_byte (0);
+      if (!match_u32 (2))
+        match_u32_assert (1);
+      match_byte (0);
+      get_u32();
+    }
   else
     {
       match_u32_assert (0);
@@ -410,7 +478,7 @@ dump_dim(void)
       match_byte_assert(0x58);
       get_string();
       printf("string \"%s\": ", get_string());
-      match_byte_assert(1);
+      match_byte(1) || match_byte(0);
     }
   else if (match_byte(5)) 
     {
@@ -420,12 +488,11 @@ dump_dim(void)
       if (!match_byte(2))
         match_byte_assert(3);
     }
-  else
+  else if (match_byte(0x31))
     {
       int subn;
       int total_subs = 1;
 
-      match_byte_assert(0x31);
       match_u32_assert (0);
       match_u32_assert (0);
       subn = get_u32 ();
@@ -447,11 +514,35 @@ dump_dim(void)
           dump_dim_value (0);
         }
     }
+  else
+    {
+      int total_subs = 1;
+
+      match_byte_assert (0x58);
+      printf ("\"%s\" with substitutions:", get_string());
+      for (;;)
+        {
+          int n_subst = get_u32();
+          if (!n_subst)
+            break;
+          printf (" %d", n_subst);
+          total_subs *= n_subst;
+        }
+
+      for (int i = 0; i < total_subs; i++)
+        {
+          putc ('\n', stdout);
+          dump_dim_value (0);
+        }
+    }
+
+  /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
+  pos++;
 
-  match_byte_assert(0);
   if (!match_byte(0) && !match_byte(1))
     match_byte_assert(2);
-  match_u32_assert(2);
+  if (!match_u32(0))
+    match_u32_assert(2);
   if (!match_byte(0))
     match_byte_assert(1);
   match_byte(0);