chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around stupid sh versions which need 4<&4.
[adns.git]
/
regress
/
hplayback.c.m4
diff --git
a/regress/hplayback.c.m4
b/regress/hplayback.c.m4
index bb36528a484a4bda4179ef1be368b8ea40b1a5ea..4c8fb4d71236f3d9e675b704e07bab4a0e36ff7b 100644
(file)
--- a/
regress/hplayback.c.m4
+++ b/
regress/hplayback.c.m4
@@
-27,13
+27,17
@@
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"
#include "harness.h"
@@
-150,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++];
@@
-368,4
+374,6
@@
int H$1(hm_args_massage($3,void)) {
}
')
}
')
+m4_define(`hm_specsyscall', `')
+
m4_include(`hsyscalls.i4')
m4_include(`hsyscalls.i4')