~mdw
/
adns
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+ * Understand and sort of check OpenBSD `lookup' resolv.conf directive.
[adns]
/
regress
/
hplayback.c.m4
diff --git
a/regress/hplayback.c.m4
b/regress/hplayback.c.m4
index
9088869
..
3437293
100644
(file)
--- a/
regress/hplayback.c.m4
+++ b/
regress/hplayback.c.m4
@@
-3,11
+3,11
@@
m4_dnl (part of complex test harness, not of the library)
m4_dnl - playback routines
m4_dnl This file is
m4_dnl - playback routines
m4_dnl This file is
-m4_dnl Copyright (C) 1997-
1999
Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl Copyright (C) 1997-
2000
Ian Jackson <ian@davenant.greenend.org.uk>
m4_dnl
m4_dnl It is part of adns, which is
m4_dnl
m4_dnl It is part of adns, which is
-m4_dnl Copyright (C) 1997-
1999
Ian Jackson <ian@davenant.greenend.org.uk>
-m4_dnl Copyright (C) 1999 Tony Finch <dot@dotat.at>
+m4_dnl Copyright (C) 1997-
2000
Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl Copyright (C) 1999
-2000
Tony Finch <dot@dotat.at>
m4_dnl
m4_dnl This program is free software; you can redistribute it and/or modify
m4_dnl it under the terms of the GNU General Public License as published by
m4_dnl
m4_dnl This program is free software; you can redistribute it and/or modify
m4_dnl it under the terms of the GNU General Public License as published by
@@
-27,23
+27,32
@@
m4_include(hmacros.i4)
#include <assert.h>
#include <string.h>
#include <assert.h>
#include <string.h>
-#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
#include <errno.h>
#include <stdlib.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <sys/time.h>
+
+#include <unistd.h>
+#include <fcntl.h>
#include "harness.h"
static FILE *Tinputfile, *Treportfile;
static vbuf vb2;
#include "harness.h"
static FILE *Tinputfile, *Treportfile;
static vbuf vb2;
+extern void Tshutdown(void) {
+ adns__vbuf_free(&vb2);
+}
+
static void Tensurereportfile(void) {
const char *fdstr;
int fd;
static void Tensurereportfile(void) {
const char *fdstr;
int fd;
+ if (Treportfile) return;
Treportfile= stderr;
fdstr= getenv("ADNS_TEST_REPORT_FD"); if (!fdstr) return;
fd= atoi(fdstr);
Treportfile= stderr;
fdstr= getenv("ADNS_TEST_REPORT_FD"); if (!fdstr) return;
fd= atoi(fdstr);
@@
-73,6
+82,7
@@
static void Tensureinputfile(void) {
fd= atoi(fdstr);
Tinputfile= fdopen(fd,"r"); if (!Tinputfile) Tfailed("fdopen ADNS_TEST_IN_FD");
}
fd= atoi(fdstr);
Tinputfile= fdopen(fd,"r"); if (!Tinputfile) Tfailed("fdopen ADNS_TEST_IN_FD");
}
+ setvbuf(Tinputfile,0,_IONBF,0);
if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
@@
-144,9
+154,11
@@
static void Pfdset(fd_set *set, int max) {
if (vb2.buf[vb2.used++] != hm_squote[hm_squote) Psyntax("fd set start not [");
FD_ZERO(set);
if (vb2.buf[vb2.used++] != hm_squote[hm_squote) Psyntax("fd set start not [");
FD_ZERO(set);
+ if (vb2.buf[vb2.used] == hm_squote]hm_squote) { vb2.used++; return; }
for (;;) {
r= strtoul(vb2.buf+vb2.used,&ep,10);
if (r>=max) Psyntax("fd set member > max");
for (;;) {
r= strtoul(vb2.buf+vb2.used,&ep,10);
if (r>=max) Psyntax("fd set member > max");
+ if (ep == (char*)vb2.buf+vb2.used) Psyntax("empty entry in fd set");
FD_SET(r,set);
vb2.used= ep - (char*)vb2.buf;
c= vb2.buf[vb2.used++];
FD_SET(r,set);
vb2.used= ep - (char*)vb2.buf;
c= vb2.buf[vb2.used++];
@@
-247,6
+259,7
@@
static int Pbytes(byte *buf, int maxlen) {
void Q_vb(void) {
int r;
void Q_vb(void) {
int r;
+ const char *nl;
Tensureinputfile();
if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
Tensureinputfile();
if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
@@
-266,12
+279,15
@@
void Q_vb(void) {
vb.used,vb.buf, vb.used,vb2.buf+1);
exit(1);
}
vb.used,vb.buf, vb.used,vb2.buf+1);
exit(1);
}
+ Tensurereportfile();
+ nl= memchr(vb.buf,'\n',vb.used);
+ fprintf(Treportfile," %.*s\n", (int)(nl ? nl - (const char*)vb.buf : vb.used), vb.buf);
}
m4_define(`hm_syscall', `
hm_create_proto_h
int H$1(hm_args_massage($3,void)) {
}
m4_define(`hm_syscall', `
hm_create_proto_h
int H$1(hm_args_massage($3,void)) {
- int r;
+ int r
, amtread
;
m4_define(`hm_rv_fd',`char *ep;')
m4_define(`hm_rv_any',`char *ep;')
m4_define(`hm_rv_len',`')
m4_define(`hm_rv_fd',`char *ep;')
m4_define(`hm_rv_any',`char *ep;')
m4_define(`hm_rv_len',`')
@@
-294,11
+310,11
@@
int H$1(hm_args_massage($3,void)) {
fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
Tensurereportfile();
fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
Tensurereportfile();
- fprintf(Treportfile,"
syscallr
%s",vb2.buf);
-
vb2.avail
= strlen(vb2.buf);
- if (
vb.avail<=0 || vb2.buf[--vb2.avail
]!=hm_squote\nhm_squote)
+ fprintf(Treportfile,"%s",vb2.buf);
+
amtread
= strlen(vb2.buf);
+ if (
amtread<=0 || vb2.buf[--amtread
]!=hm_squote\nhm_squote)
Psyntax("badly formed line");
Psyntax("badly formed line");
- vb2.buf[
vb2.avail
]= 0;
+ vb2.buf[
amtread
]= 0;
if (memcmp(vb2.buf," $1=",hm_r_offset)) Psyntax("syscall reply mismatch");
if (vb2.buf[hm_r_offset] == hm_squoteEhm_squote) {
if (memcmp(vb2.buf," $1=",hm_r_offset)) Psyntax("syscall reply mismatch");
if (vb2.buf[hm_r_offset] == hm_squoteEhm_squote) {
@@
-346,7
+362,8
@@
int H$1(hm_args_massage($3,void)) {
m4_define(`hm_arg_pollfds_io',`Parg("$'`1"); Ppollfds($'`1,$'`2);')
m4_define(`hm_arg_addr_out',`Parg("$'`1"); Paddr($'`1,$'`2);')
$3
m4_define(`hm_arg_pollfds_io',`Parg("$'`1"); Ppollfds($'`1,$'`2);')
m4_define(`hm_arg_addr_out',`Parg("$'`1"); Paddr($'`1,$'`2);')
$3
- if (vb2.used != vb2.avail) Psyntax("junk at end of line");
+ assert(vb2.used <= amtread);
+ if (vb2.used != amtread) Psyntax("junk at end of line");
hm_create_nothing
m4_define(`hm_arg_bytes_out',`r= Pbytes($'`2,$'`4);')
hm_create_nothing
m4_define(`hm_arg_bytes_out',`r= Pbytes($'`2,$'`4);')
@@
-357,4
+374,6
@@
int H$1(hm_args_massage($3,void)) {
}
')
}
')
+m4_define(`hm_specsyscall', `')
+
m4_include(`hsyscalls.i4')
m4_include(`hsyscalls.i4')