regress: hfuzzraw: Break out P_succfail()

[adns.git] / regress / hfuzzraw.c.m4

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index f4892799d6a5971dcff23b3f4ef8ab3b6eca21c5..587f7f75268d4e7566ae4d13d2a1a3c276b96ac9 100644 (file)
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -47,8 +47,13 @@ static vbuf fdtab;
 #define FDF_NONBLOCK 002u
 
 static FILE *Tinputfile;
+static int stdout_enable;
 
-void Q_vb(void) { abort(); /* we neve called Q_anythig */ }
+void Q_vb(void) {
+  if (!adns__vbuf_append(&vb,"",1)) Tnomem();
+  if (fprintf(stdout," %s\n",vb.buf) == EOF) Toutputerr();
+  if (fflush(stdout)) Toutputerr();
+}
 
 static void Pformat(const char *what) {
   fprintf(stderr,"adns test harness: format error in raw log input file: %s\n",what);
@@ -56,6 +61,9 @@ static void Pformat(const char *what) {
 }
 
 extern void Tshutdown(void) {
+  int c= fgetc(Tinputfile);
+  if (c!=EOF) Pformat("unwanted additional syscall reply data");
+  if (ferror(Tinputfile)) Tfailed("read test log input (at end)");
 }
 
 static void Pcheckinput(void) {
@@ -80,6 +88,9 @@ void Tensurerecordfile(void) {
     const char fdfstd = FDF_OPEN;
     if (!adns__vbuf_append(&fdtab,&fdfstd,1)) Tnomem();
   }
+
+  const char *proutstr= getenv("ADNS_TEST_FUZZRAW_STDOUT_ENABLE");
+  if (proutstr) stdout_enable= atoi(proutstr);
 }
 
 static void P_read(void *p, size_t sz) {
@@ -156,6 +167,21 @@ int fd;
 }
 #endif
 
+static int P_succfail(void) {
+  int r;
+  P_READ(r);
+  if (r<0 && -r<Tnerrnos) {
+    errno= Terrnos[-r].v;
+    return -1;
+  } else if (r>0 && r<=255) {
+    errno= r;
+    return -1;
+  } else if (r) {
+    Pformat("wrong errno value");
+  }
+  return 0;
+}
+
 m4_define(`hm_syscall', `
  hm_create_proto_h
 int H$1(hm_args_massage($3,void)) {
@@ -176,18 +202,14 @@ int H$1(hm_args_massage($3,void)) {
 
  Tensurerecordfile();
 
+ if (stdout_enable) {
+   hm_create_hqcall_args
+   Q$1(hm_args_massage($3));
+ }
+
  m4_define(`hm_rv_succfail',`
-  P_READ(r);
-  if (r<0 && -r<Tnerrnos) {
-    errno= Terrnos[-r].v;
-    return -1;
-  } else if (r>0 && r<=255) {
-    errno= r;
-    return -1;
-  } else if (r) {
-    Pformat("wrong errno value");
-  }
-  r= 0;
+  r= P_succfail();
+  if (r<0) return r;
  ')
 
  m4_define(`hm_rv_any',`