X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump2.c;h=4bd86e1b98d1ecc38e77122841e4c85d91b43524;hb=9eeb4188822b51ae29568c666caed7f57d350194;hp=4fd7531ab530df5860a01cb27195008f47aef06d;hpb=c4b1f46d58ad414cb60147092e4cdc3ce207db8a;p=pspp

diff --git a/dump2.c b/dump2.c
index 4fd7531ab5..4bd86e1b98 100644
--- a/dump2.c
+++ b/dump2.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "u8-mbtouc.h"
 
 static uint8_t *data;
 static size_t n, pos;
@@ -15,6 +16,8 @@ static size_t n, pos;
 #define STR(x) XSTR(x)
 #define WHERE __FILE__":" STR(__LINE__)
 
+bool ok = true;
+
 static unsigned int
 get_u32(void)
 {
@@ -86,14 +89,49 @@ all_ascii(const uint8_t *p)
   return true;
 }
 
+static bool
+all_utf8(const uint8_t *p)
+{
+  size_t len = strlen ((char *) p);
+  for (size_t ofs = 0, mblen; ofs < len; ofs += mblen)
+    {
+      ucs4_t uc;
+
+      mblen = u8_mbtouc (&uc, p + ofs, len - ofs);
+      if (uc < 32 || uc == 127 || uc == 0xfffd)
+        return false;
+    }
+  return true;
+}
+
 static char *
 get_fixed_string(int len, const char *where)
 {
-  if (pos + len > n || !memchr(&data[pos], 0, len) || !all_ascii(&data[pos]))
+  size_t i;
+  for (i = 0; ; i++)
+    {
+      if (!data[pos + i])
+        break;
+      if (i >= len)
+        {
+          fprintf(stderr, "%s: 0x%x: unterminated fixed-width string\n", where, pos);
+          exit(1);
+        }
+    }
+  if (!all_utf8(&data[pos]))
     {
       fprintf(stderr, "%s: 0x%x: bad fixed-width string\n", where, pos);
       exit(1);
     }
+  while (++i < len)
+    {
+      if (data[pos + i])
+        {
+          fprintf(stderr, "%s: 0x%x: text in middle of fixed-width string\n", where, pos);
+          //exit(1);
+          break;
+        }
+    }
   char *s = (char *) &data[pos];
   pos += len;
   return s;
@@ -112,7 +150,7 @@ all_ascii2(const uint8_t *p, size_t n)
 static char *
 get_string(const char *where)
 {
-  if (1
+  if (pos + 4 <= n
       /*data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0*/
       /*&& all_ascii(&data[pos + 4], data[pos])*/)
     {
@@ -138,7 +176,7 @@ dump_raw(FILE *stream, int start, int end, const char *separator)
   for (size_t i = start; i < end; )
     {
       if (i + 5 <= n
-          && data[i] > 0
+          && data[i] > 1
           //&& !data[i + 1]
           && !data[i + 2]
           && !data[i + 3]
@@ -190,7 +228,7 @@ dump_raw(FILE *stream, int start, int end, const char *separator)
 }
 
 static void
-dump_source(int count, int n_series)
+dump_source(int end, int count, int n_series, const char *name)
 {
   const union
     {
@@ -201,7 +239,8 @@ dump_source(int count, int n_series)
   int n_sysmis = 0;
   for (int i = 0; i < n_series; i++)
     {
-      printf ("    series %d: \"%s\"\n        ", i, get_fixed_string(288));
+      printf ("    %08x: series %d: \"%s\", %d values:\n        ",
+              pos, i, get_fixed_string(288), count);
       for (int i = 0; i < count; i++)
         {
           double d = get_double();
@@ -215,42 +254,79 @@ dump_source(int count, int n_series)
         }
       printf ("\n");
     }
+}
 
-  if (!n_sysmis)
+static void
+dump_strings(void)
+
+{
+  if (pos >= n)
     return;
 
-  printf ("\n    %08x:", pos);
-  printf (" %d", get_u32());
-  printf (", \"%s\"\n", get_string());
+  int start = pos;
+  int offset = pos;
+  int n_maps = get_u32();
+  int max1 = -1;
+  for (int k = 0; k < n_maps; k++)
+    {
+      char *source_name = get_string();
+      printf ("%08x: %s\n", offset, source_name);
+
+      int n_series = get_u32();
+      for (int i = 0; i < n_series; i++)
+        {
+          printf ("%08x:", pos);
+          printf (" \"%s\"", get_string());
+          int n_pairs = get_u32();
+          for (int j = 0; j < n_pairs; j++)
+            {
+              int x = get_u32();
+              int y = get_u32();
+              printf (" (%d, %d)", x, y);
+              if (y > max1)
+                max1 = y;
+            }
+          printf ("\n");
+        }
+    }
+  printf ("\n%08x:", pos);
+  int n_strings = get_u32();
+  if (n_strings != max1 + 1)
+    {
+      fprintf (stderr, "n_strings=%d max1+1=%d (-s %#x -n %u)\n", n_strings, max1 + 1, start, n - start);
+      dump_raw (stderr, start, n, "\n");
+      assert(n_strings == max1 + 1);
+    }
+  printf (" %d strings\n", n_strings);
 
-  printf ("\n    %08x:", pos);
-  int n_more_series = get_u32();
-  printf (" %d series to come\n", n_more_series);
+  char **strings = malloc((max1 + 1) * sizeof *strings);
+  for (int i = 0; i <= max1; i++)
+    {
+      int frequency = get_u32();
+      char *s = get_string();
+      printf ("%d: \"%s\" (%d)\n", i, s, frequency);
+      strings[i] = s;
+    }
+  printf ("\n");
 
+  assert (pos == n);
+#if 0
+  pos = ofs;
+  printf("Strings:\n");
   for (int i = 0; i < n_more_series; i++)
     {
-      printf ("%08x:", pos);
-      printf (" \"%s\"", get_string());
+      printf ("  \"%s\"\n", get_string());
       int n_pairs = get_u32();
       for (int j = 0; j < n_pairs; j++)
         {
           int x = get_u32();
+          //assert (x == j);
           int y = get_u32();
-          printf (" (%d,%d)", x, y);
+          printf ("    %d: \"%s\"\n", x, strings[y]);
         }
       printf ("\n");
     }
-
-  printf ("\n%08x:", pos);
-  int n_strings = get_u32();
-  printf (" %d strings\n", n_strings);
-  for (int i = 0; i < n_strings; i++)
-    {
-      int x = get_u32();
-      char *s = get_string();
-      printf ("%d: \"%s\" (%d)\n", i, s, x);
-    }
-  printf ("\n");
+#endif
 }
 
 int
@@ -284,6 +360,7 @@ main(int argc, char **argv)
 
   pos = 0;
   match_byte_assert(0);
+  int version = data[pos];
   if (!match_byte(0xaf))
     match_byte_assert(0xb0);
   int n_sources = data[pos++];
@@ -291,19 +368,48 @@ main(int argc, char **argv)
 
   match_u32_assert(s.st_size);
   printf ("%d sources\n", n_sources);
+
+  struct source
+    {
+      int offset, count, n_series;
+      char *name;
+    }
+  sources[n_sources];
   for (int i = 0; i < n_sources; i++)
     {
-      pos = 8 + 80 * i;
       int count = get_u32();
       int n_series = get_u32();
       int offset = get_u32();
-      char *name = get_fixed_string(64);
-      int dunno = get_u32();
+      char *name = get_fixed_string(version == 0xb0 ? 64 : 28);
+      int dunno = version == 0xb0 ? get_u32() : 0;
       printf ("source %d: %d series, %d observations per series, offset %08x, \"%s\", %x\n",
               i, n_series, count, offset, name, dunno);
-      pos = offset;
-      dump_source(count, n_series);
+      sources[i].offset = offset;
+      sources[i].count = count;
+      sources[i].n_series = n_series;
+      sources[i].name = name;
     }
 
-  return 0;
+  for (int i = 0; i < n_sources; i++)
+    {
+      if (pos != sources[i].offset)
+        {
+          fprintf (stderr, "pos=0x%x expected=0x%x reading source %d\n", pos, sources[i].offset, i);
+          //exit(1);
+        }
+      printf ("source %d:\n", i);
+      pos = sources[i].offset;
+      dump_source(i + 1 >= n_sources ? n : sources[i + 1].offset, sources[i].count, sources[i].n_series, sources[i].name);
+    }
+  dump_strings();
+#if 0
+  if (pos != n)
+    {
+      fprintf (stderr, "consumed %zu bytes, file has %zu bytes\n", pos, n);
+      ok = false;
+    }
+  assert(pos == n);
+#endif
+  
+  return ok ? EXIT_SUCCESS : EXIT_FAILURE;
 }