~mdw
/
adns
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document a few more of tonight's changes.
[adns]
/
regress
/
harness.h.m4
diff --git
a/regress/harness.h.m4
b/regress/harness.h.m4
index
7b5758e
..
35efa18
100644
(file)
--- a/
regress/harness.h.m4
+++ b/
regress/harness.h.m4
@@
-2,7
+2,12
@@
m4_dnl harness.h.m4
m4_dnl (part of complex test harness, not of the library)
m4_dnl - function and other declarations
m4_dnl (part of complex test harness, not of the library)
m4_dnl - function and other declarations
-m4_dnl This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+m4_dnl This file is
+m4_dnl Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+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
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
@@
-25,16
+30,29
@@
m4_include(hmacros.i4)
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/socket.h>
+#include <sys/uio.h>
#include <unistd.h>
#include "internal.h"
#include <unistd.h>
#include "internal.h"
+#ifdef HAVE_POLL
+#include <sys/poll.h>
+#endif
+
/* We override several system calls with #define's */
hm_create_proto_h
m4_define(`hm_syscall', `int H$1(hm_args_massage($3,void));')
m4_include(`hsyscalls.i4')
/* We override several system calls with #define's */
hm_create_proto_h
m4_define(`hm_syscall', `int H$1(hm_args_massage($3,void));')
m4_include(`hsyscalls.i4')
+int Hwritev(int fd, const struct iovec *vector, size_t count);
+int Hgettimeofday(struct timeval *tv, struct timezone *tz);
+
+void *Hmalloc(size_t sz);
+void Hfree(void *ptr);
+void *Hrealloc(void *op, size_t nsz);
+void Hexit(int rv);
+
/* There is a Q function (Q for Question) for each such syscall;
* it constructs a string representing the call, and calls Q_str
* on it, or constructs it in vb and calls Q_vb;
/* There is a Q function (Q for Question) for each such syscall;
* it constructs a string representing the call, and calls Q_str
* on it, or constructs it in vb and calls Q_vb;
@@
-46,6
+64,8
@@
m4_include(`hsyscalls.i4')
void Q_vb(void);
void Q_vb(void);
+extern void Tshutdown(void);
+
/* General help functions */
void Tfailed(const char *why);
/* General help functions */
void Tfailed(const char *why);
@@
-58,6
+78,7
@@
void Tmust(const char *call, const char *arg, int cond);
void Tvbf(const char *fmt, ...) PRINTFFORMAT(1,2);
void Tvbvf(const char *fmt, va_list al);
void Tvbfdset(int max, const fd_set *set);
void Tvbf(const char *fmt, ...) PRINTFFORMAT(1,2);
void Tvbvf(const char *fmt, va_list al);
void Tvbfdset(int max, const fd_set *set);
+void Tvbpollfds(const struct pollfd *fds, int nfds);
void Tvbaddr(const struct sockaddr *addr, int addrlen);
void Tvbbytes(const void *buf, int len);
void Tvberrno(int e);
void Tvbaddr(const struct sockaddr *addr, int addrlen);
void Tvbbytes(const void *buf, int len);
void Tvberrno(int e);
@@
-66,8
+87,7
@@
void Tvba(const char *str);
/* Shared globals */
extern vbuf vb;
/* Shared globals */
extern vbuf vb;
-extern FILE *Toutputfile;
-
+extern struct timeval currenttime;
extern const struct Terrno { const char *n; int v; } Terrnos[];
#endif
extern const struct Terrno { const char *n; int v; } Terrnos[];
#endif