X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fhsyscalls.i4;h=fc76fd180c6213d8d2181a6133cc45020f7db7a9;hb=fc440c64836370db9d8cb1a25f09c9df0786f865;hp=94725d8bfa4b7d2db3aed121b0029e5d581deffd;hpb=73eb26037c46bebeaa30ba38eba887216f0e9a6e;p=adns.git diff --git a/regress/hsyscalls.i4 b/regress/hsyscalls.i4 index 94725d8..fc76fd1 100644 --- a/regress/hsyscalls.i4 +++ b/regress/hsyscalls.i4 @@ -2,16 +2,16 @@ m4_dnl hsyscalls.i4 m4_dnl (part of complex test harness, not of the library) m4_dnl - list of syscalls to override/log and their args -m4_dnl This file is -m4_dnl Copyright (C) 1997-2000 Ian Jackson -m4_dnl -m4_dnl It is part of adns, which is -m4_dnl Copyright (C) 1997-2000 Ian Jackson -m4_dnl Copyright (C) 1999 Tony Finch +m4_dnl This file is part of adns, which is +m4_dnl Copyright (C) 1997-2000,2003,2006,2014-2016,2020 Ian Jackson +m4_dnl Copyright (C) 2014 Mark Wooding +m4_dnl Copyright (C) 1999-2000,2003,2006 Tony Finch +m4_dnl Copyright (C) 1991 Massachusetts Institute of Technology +m4_dnl (See the file INSTALL for full details.) 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 the Free Software Foundation; either version 2, or (at your option) +m4_dnl the Free Software Foundation; either version 3, or (at your option) m4_dnl any later version. m4_dnl m4_dnl This program is distributed in the hope that it will be useful, @@ -20,8 +20,7 @@ m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the m4_dnl GNU General Public License for more details. m4_dnl m4_dnl You should have received a copy of the GNU General Public License -m4_dnl along with this program; if not, write to the Free Software Foundation, -m4_dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +m4_dnl along with this program; if not, write to the Free Software Foundation. m4_dnl each system call has m4_dnl hm_syscall(,,) @@ -30,8 +29,11 @@ m4_dnl hm_rv_must must succeed and return 0 m4_dnl hm_rv_any any nonnegative return allowed, -1 means see errno m4_dnl hm_rv_fd file descriptor is returned, -1 means see errno m4_dnl hm_rv_succfail returns 0 (ok) or -1 (see errno) -m4_dnl hm_rv_len() returns length read/written, must be <=max, -1 => errno +m4_dnl hm_rv_len() returns length read, must be <=max, -1 => errno +m4_dnl hm_rv_wlen() returns length written, must be <=max, -1 => errno m4_dnl hm_rv_fcntl syscall is fcntl, do special processing +m4_dnl hm_rv_select select, do special processing } default is _any +m4_dnl hm_rv_poll poll, do special processing } after create_nothing m4_dnl is list of macros for arguments, each followed by hm_na m4_dnl hm_arg_nullptr(,) pointer of type type, must be null m4_dnl hm_arg_int() signed integer @@ -39,6 +41,7 @@ m4_dnl hm_arg_fdset_io(,) fd_set, max bit set is in max m4_dnl hm_arg_timeval_in_rel_null() struct timeval*, pass in, relative, may be null m4_dnl hm_arg_must(,,) must have correct value, or abort test m4_dnl hm_arg_socktype() SOCK_STREAM or SOCK_DGRAM (an int) +m4_dnl hm_arg_addrfam() a supported address family m4_dnl hm_arg_ign(,) input parameter ignored m4_dnl hm_arg_fd() fd m4_dnl hm_arg_fcntl_cmd_arg(,) syscall is fcntl, do special processing @@ -53,7 +56,7 @@ m4_dnl return value from syscall is supposed to be returned length m4_dnl hm_arg_addr_out(,) struct sockaddr*, length io at (an int*) hm_syscall( - select, `hm_rv_any', ` + select, `hm_rv_select', ` hm_arg_int(max) hm_na hm_arg_fdset_io(rfds,max) hm_na hm_arg_fdset_io(wfds,max) hm_na @@ -63,7 +66,7 @@ hm_syscall( #ifdef HAVE_POLL hm_syscall( - poll, `hm_rv_any', ` + poll, `hm_rv_poll', ` hm_arg_pollfds_io(fds,nfds) hm_na hm_arg_int(timeout) hm_na ') @@ -71,7 +74,7 @@ hm_syscall( hm_syscall( socket, `hm_rv_fd', ` - hm_arg_must(int,domain,AF_INET) hm_na + hm_arg_addrfam(domain) hm_na hm_arg_socktype(type) hm_na hm_arg_ign(int,protocol) hm_na ') @@ -89,12 +92,19 @@ hm_syscall( ') hm_syscall( - close, `hm_rv_succfail', ` + bind, `hm_rv_succfail', ` hm_arg_fd(fd) hm_na + hm_arg_addr_in(addr,addrlen) hm_na ') hm_syscall( - sendto, `hm_rv_any', ` + listen, `hm_rv_succfail', ` + hm_arg_fd(fd) hm_na + hm_arg_int(backlog) hm_na +') + +hm_syscall( + sendto, `hm_rv_wlen(msglen)', ` hm_arg_fd(fd) hm_na hm_arg_bytes_in(void,msg,int,msglen) hm_na hm_arg_must(unsigned int,flags,0) hm_na @@ -116,15 +126,26 @@ hm_syscall( ') hm_syscall( - write, `hm_rv_any', ` + write, `hm_rv_wlen(len)', ` hm_arg_fd(fd) hm_na hm_arg_bytes_in(void,buf,size_t,len) hm_na ') hm_specsyscall(int, writev, `int fd, const struct iovec *vector, size_t count') hm_specsyscall(int, gettimeofday, `struct timeval *tv, struct timezone *tz') +hm_specsyscall(pid_t, getpid, `void') +hm_specsyscall(int, close, `int fd') + +m4_define(hm_stdsyscall_close,` +hm_syscall( + close, `hm_rv_succfail', ` + hm_arg_fd(fd) hm_na +') +') hm_specsyscall(void*, malloc, `size_t sz') hm_specsyscall(void, free, `void *ptr') hm_specsyscall(void*, realloc, `void *op, size_t nsz') hm_specsyscall(void, exit, `int rv', NONRETURNING) + +hm_specsyscall(FILE*, fopen, `const char *path, const char *mode')