X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fhrecord.c.m4;h=2ce72d785e1f16f40b8dbbdb036fb39346994c98;hb=aea429dc9999927efe7c95756a913d632252ea93;hp=033796c5c638ab7981bd51334c708dd301fdee1b;hpb=87dd63455668503e4f929e741856a3cfc880d570;p=adns.git diff --git a/regress/hrecord.c.m4 b/regress/hrecord.c.m4 index 033796c..2ce72d7 100644 --- a/regress/hrecord.c.m4 +++ b/regress/hrecord.c.m4 @@ -2,16 +2,16 @@ m4_dnl hrecord.c.m4 m4_dnl (part of complex test harness, not of the library) m4_dnl - recording routines -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-2000 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_include(hmacros.i4) @@ -54,6 +53,8 @@ static void R_recordtime(void) { currenttime= tv; } +void T_gettimeofday_hook(void) { } + void Tensurerecordfile(void) { const char *fdstr; int fd, r; @@ -113,7 +114,7 @@ int H$1(hm_args_massage($3,void)) { m4_define(`hm_rv_must',`Tmust("$1","return",!r); Tvba("OK");') m4_define(`hm_rv_len',` if (r==-1) { Tvberrno(e); goto x_error; } - Tmust("$1","return",r<=$'`1); + Tmust("$'`1","return",r<=$'`1); Tvba("OK");') m4_define(`hm_rv_fcntl',` if (r==-1) { Tvberrno(e); goto x_error; } @@ -139,6 +140,7 @@ int H$1(hm_args_massage($3,void)) { m4_define(`hm_arg_bytes_out',`Tvbbytes($'`2,r);') $3 + hm_create_nothing m4_define(`hm_rv_any',`x_error:') m4_define(`hm_rv_fd',`x_error:') m4_define(`hm_rv_succfail',`x_error:') @@ -157,3 +159,5 @@ int H$1(hm_args_massage($3,void)) { m4_define(`hm_specsyscall', `') m4_include(`hsyscalls.i4') + +hm_stdsyscall_close